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

🐛 Fix multiselect options

Browse Source
This commit is contained in:
Eva Marco 2026-04-23 13:26:20 +02:00
parent a3c330d6e7
commit 3e9da023f0
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/src/app/common/text.cljc
View File

@ -37,7 +37,9 @@
(defn attrs-to-styles
[attrs]
(reduce-kv (fn [res k v]
(conj res (encode-style k v)))
(if (some? v)
(conj res (encode-style k v))
res))
#{}
attrs))

4
common/src/app/common/types/text.cljc
View File

@ -95,7 +95,9 @@
:text-direction "ltr"})
(def default-text-attrs
{:font-id "sourcesanspro"
{:typography-ref-file nil
:typography-ref-id nil
:font-id "sourcesanspro"
:font-family "sourcesanspro"
:font-variant-id "regular"
:font-size "14"

16
frontend/src/app/util/text/content/styles.cljs
View File

@ -132,8 +132,10 @@
"Maps attrs to styles"
[styles]
(let [mapped-styles
(into {} (map attr->style styles))]
(clj->js mapped-styles)))
(into {} (comp (filter (fn [[_ v]] (some? v)))
(map attr->style))
styles)]
(clj->js mapped-styles)))
(defn style-needs-mapping?
[name]
@ -199,12 +201,14 @@
(let [style-name (get-style-name-as-css-variable k)
[_ style-decode] (get mapping k)
style-value (.getPropertyValue style-declaration style-name)]
(when (or (not removed-mixed) (not (contains? mixed-values style-value)))
(assoc acc k (style-decode style-value))))
(if (or (not removed-mixed) (not (contains? mixed-values style-value)))
(assoc acc k (style-decode style-value))
acc))
(let [style-name (get-style-name k)
style-value (normalize-attr-value k (.getPropertyValue style-declaration style-name))]
(when (or (not removed-mixed) (not (contains? mixed-values style-value)))
(assoc acc k style-value))))) {} txt/text-style-attrs))
(if (or (not removed-mixed) (not (contains? mixed-values style-value)))
(assoc acc k style-value)
acc)))) {} txt/text-style-attrs))
(defn get-styles-from-event
"Returns a ClojureScript object compatible with text nodes"