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

🔧 Check for emtpy/nil attrs when getting inline style

Browse Source
This commit is contained in:
Elena Torro
2025-11-21 13:20:38 +01:00
parent 4f24a8f5f1
commit d47bf3521f
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
frontend/src/app/util/text/content/from_dom.cljs
View File

@@ -38,16 +38,21 @@
(defn get-attrs-from-styles (defn get-attrs-from-styles
[element attrs defaults] [element attrs defaults]
(let [attrs (or attrs [])
value-empty? (fn [v]
(or (nil? v)
(and (string? v) (empty? v))
(and (coll? v) (empty? v))))]
(reduce (fn [acc key] (reduce (fn [acc key]
(let [style (.-style element)] (let [style (.-style element)
(if (contains? styles/mapping key) value (if (contains? styles/mapping key)
(let [style-name (styles/get-style-name-as-css-variable key) (let [style-name (styles/get-style-name-as-css-variable key)
[_ style-decode] (get styles/mapping key) [_ style-decode] (get styles/mapping key)]
value (style-decode (.getPropertyValue style style-name))] (style-decode (.getPropertyValue style style-name)))
(assoc acc key (if (empty? value) (get defaults key) value))) (let [style-name (styles/get-style-name key)]
(let [style-name (styles/get-style-name key) (styles/normalize-attr-value key (.getPropertyValue style style-name))))]
value (styles/normalize-attr-value key (.getPropertyValue style style-name))] (assoc acc key (if (value-empty? value) (get defaults key) value))))
(assoc acc key (if (empty? value) (get defaults key) value)))))) {} attrs)) {} attrs)))
(defn get-inline-styles (defn get-inline-styles
[element] [element]