github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-04-25 11:18:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

🔧 Filter out empty paragraph content

Browse Source
This commit is contained in:
Elena Torro 2025-11-04 09:31:28 +01:00
parent 87fc71b55d
commit e673035817
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/app/main/ui/workspace/shapes/text/v2_editor.scss
View File

@ -35,7 +35,7 @@
}
[data-itype="inline"] {
display: inline-block;
display: inline;
line-break: auto;
line-height: inherit;
caret-color: var(--text-editor-caret-color);

27
frontend/src/app/util/text/content/to_dom.cljs
View File

@ -99,8 +99,9 @@
(dissoc styles :line-height)))
(defn get-inline-children
[inline]
[(if (= "" (:text inline))
[inline paragraph]
[(if (and (= "" (:text inline))
(= 1 (count (:children paragraph))))
(dom/create-element "br")
(dom/create-text (:text inline)))])
@ -108,6 +109,17 @@
[]
(.toString (.floor js/Math (* (.random js/Math) (.-MAX_SAFE_INTEGER js/Number))) 36))
(defn has-content?
[paragraph]
(some #(not= "" (:text % "")) (:children paragraph)))
(defn should-filter-empty-paragraph?
[paragraphs index]
(and (not (has-content? (nth paragraphs index)))
(< index (count paragraphs))
(some has-content? (drop (inc index) paragraphs))
(every? #(not (has-content? %)) (take (inc index) paragraphs))))
(defn create-inline
[inline paragraph]
(create-element
@ -115,7 +127,7 @@
{:id (or (:key inline) (create-random-key))
:data {:itype "inline"}
:style (get-inline-styles inline paragraph)}
(get-inline-children inline)))
(get-inline-children inline paragraph)))
(defn create-paragraph
[paragraph]
@ -128,10 +140,15 @@
(defn create-root
[root]
(let [root-styles (get-root-styles root)]
(let [root-styles (get-root-styles root)
paragraphs (get-in root [:children 0 :children])
filtered-paragraphs (->> paragraphs
(map-indexed vector)
(remove (fn [[index _]] (should-filter-empty-paragraph? paragraphs index)))
(mapv second))]
(create-element
"div"
{:id (or (:key root) (create-random-key))
:data {:itype "root"}
:style root-styles}
(mapv create-paragraph (get-in root [:children 0 :children])))))
(mapv create-paragraph filtered-paragraphs))))