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

✨ Unapply font-weight token when changing font-family

Browse Source
This commit is contained in:
Florian Schroedl 2025-08-28 13:43:17 +02:00 committed by Andrés Moya
parent a8ed1371d4
commit 3cdbc27de9
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
common/src/app/common/logic/shapes.cljc
View File

@ -17,12 +17,13 @@
[app.common.types.pages-list :as ctpl]
[app.common.types.shape.interactions :as ctsi]
[app.common.types.shape.layout :as ctl]
[app.common.types.shape.token :as ctst]
[app.common.types.text :as ctt]
[app.common.types.token :as cto]
[app.common.uuid :as uuid]
[clojure.set :as set]))
(def text-typography-attrs (set ctt/text-typography-attrs))
(def text-typography-style-attrs (set ctt/text-typography-attrs))
(defn- generate-unapply-tokens
"When updating attributes that have a token applied, we must unapply it, because the value
@ -38,10 +39,14 @@
(let [new-shape (get new-objects (:id shape))
attrs (ctt/get-diff-attrs (:content shape) (:content new-shape))
;; Unapply token when applying typography asset style
attrs (if (seq (set/intersection text-typography-attrs attrs))
(into attrs cto/typography-keys)
attrs)]
attrs (cond-> attrs
;; Unapply token when applying typography asset style
(seq (set/intersection text-typography-style-attrs attrs))
(into cto/typography-keys)
;; Unapply font-weight when changing the font-family attribute
(and (:font-id attrs) (ctst/font-weight-applied? shape))
(conj :font-weight))]
(apply set/union (map cto/shape-attr->token-attrs attrs))))
check-attr

7
common/src/app/common/types/shape/token.cljc Normal file
View File

@ -0,0 +1,7 @@
(ns app.common.types.shape.token)
(defn font-weight-applied?
[shape]
(or
(get-in shape [:applied-tokens :font-weight])
(get-in shape [:applied-tokens :typography :font-weight])))