johanels/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-12-12 06:24:17 +01:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

🐛 Fix empty text attr defaults

Browse Source
This commit is contained in:
Aitor Moreno
2025-10-30 14:16:30 +01:00
parent e681f95a70
commit fadbe24aaa
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,8 +47,11 @@
element))) element)))
(defn get-styles-from-attrs (defn get-styles-from-attrs
[node attrs] [node attrs defaults]
(let [styles (reduce (fn [acc key] (assoc acc key (get node key))) {} attrs) (let [styles (reduce
(fn [acc key]
(let [default-value (get defaults key)]
(assoc acc key (get node key default-value)))) {} attrs)
fills fills
(cond (cond
;; DEPRECATED: still here for backward compatibility with ;; DEPRECATED: still here for backward compatibility with
@@ -68,7 +71,10 @@
(defn get-paragraph-styles (defn get-paragraph-styles
[paragraph] [paragraph]
(let [styles (get-styles-from-attrs paragraph (d/concat-set txt/paragraph-attrs txt/text-node-attrs)) (let [styles (get-styles-from-attrs
paragraph
(d/concat-set txt/paragraph-attrs txt/text-node-attrs)
txt/default-text-attrs)
;; If the text is not empty we must the paragraph font size to 0, ;; If the text is not empty we must the paragraph font size to 0,
;; it affects to the height calculation the browser does ;; it affects to the height calculation the browser does
font-size (if (some #(not= "" (:text %)) (:children paragraph)) font-size (if (some #(not= "" (:text %)) (:children paragraph))
@@ -84,12 +90,12 @@
(defn get-root-styles (defn get-root-styles
[root] [root]
(get-styles-from-attrs root txt/root-attrs)) (get-styles-from-attrs root txt/root-attrs txt/default-text-attrs))
(defn get-inline-styles (defn get-inline-styles
[inline paragraph] [inline paragraph]
(let [node (if (= "" (:text inline)) paragraph inline) (let [node (if (= "" (:text inline)) paragraph inline)
styles (get-styles-from-attrs node txt/text-node-attrs)] styles (get-styles-from-attrs node txt/text-node-attrs txt/default-text-attrs)]
(dissoc styles :line-height))) (dissoc styles :line-height)))
(defn get-inline-children (defn get-inline-children
@@ -98,11 +104,15 @@
(dom/create-element "br") (dom/create-element "br")
(dom/create-text (:text inline)))]) (dom/create-text (:text inline)))])
(defn create-random-key
[]
(.toString (.floor js/Math (* (.random js/Math) (.-MAX_SAFE_INTEGER js/Number))) 36))
(defn create-inline (defn create-inline
[inline paragraph] [inline paragraph]
(create-element (create-element
"span" "span"
{:id (:key inline) {:id (or (:key inline) (create-random-key))
:data {:itype "inline"} :data {:itype "inline"}
:style (get-inline-styles inline paragraph)} :style (get-inline-styles inline paragraph)}
(get-inline-children inline))) (get-inline-children inline)))
@@ -111,7 +121,7 @@
[paragraph] [paragraph]
(create-element (create-element
"div" "div"
{:id (:key paragraph) {:id (or (:key paragraph) (create-random-key))
:data {:itype "paragraph"} :data {:itype "paragraph"}
:style (get-paragraph-styles paragraph)} :style (get-paragraph-styles paragraph)}
(mapv #(create-inline % paragraph) (:children paragraph)))) (mapv #(create-inline % paragraph) (:children paragraph))))
@@ -121,7 +131,7 @@
(let [root-styles (get-root-styles root)] (let [root-styles (get-root-styles root)]
(create-element (create-element
"div" "div"
{:id (:key root) {:id (or (:key root) (create-random-key))
:data {:itype "root"} :data {:itype "root"}
:style root-styles} :style root-styles}
(mapv create-paragraph (get-in root [:children 0 :children]))))) (mapv create-paragraph (get-in root [:children 0 :children])))))