3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-15 01:06:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

🐛 Fix token set selection & rename (#5783)

Browse source 
* 🐛 Fix set selection

* 🐛 Fix set name not being updated

* ♻️ Add better list assertion & test set renaming
This commit is contained in:
Florian Schrödl 2025-02-06 14:16:03 +01:00 • committed by GitHub
parent 8b466ef0a3
commit 0c275cf490
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 79 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

24
frontend/src/app/main/data/tokens.cljs
View file

@ -19,6 +19,7 @@
[app.main.data.notifications :as ntf]
[app.main.data.workspace.shapes :as dwsh]
[app.main.data.workspace.tokens.selected-set :as dwts]
[app.main.data.workspace.undo :as dwu]
[app.main.store :as st]
[app.main.ui.workspace.tokens.update :as wtu]
[app.util.i18n :refer [tr]]
@ -221,15 +222,20 @@
(ptk/reify ::drop-token-set
ptk/WatchEvent
(watch [it state _]
(try
(when-let [changes (clt/generate-move-token-set (pcb/empty-changes it) (get-tokens-lib state) drop-opts)]
(rx/of
(dch/commit-changes changes)
(some-> (get-in changes [:redo-changes 0 :to-path]) (dwts/set-selected-token-set-name))
(wtu/update-workspace-tokens)))
(catch js/Error e
(rx/of
(drop-error (ex-data e))))))))
(let [undo-id (js/Symbol)]
(try
(when-let [changes (clt/generate-move-token-set (pcb/empty-changes it) (get-tokens-lib state) drop-opts)]
(rx/of
(dwu/start-undo-transaction undo-id)
(dch/commit-changes changes)
(some-> (get-in changes [:redo-changes 0 :to-path])
(ctob/join-set-path)
(dwts/set-selected-token-set-name))
(wtu/update-workspace-tokens)
(dwu/commit-undo-transaction undo-id)))
(catch js/Error e
(rx/of
(drop-error (ex-data e)))))))))
(defn update-create-token
[{:keys [token prev-token-name]}]

2
frontend/src/app/main/ui/workspace/tokens/sets.cljs
View file

@ -37,7 +37,7 @@
(st/emit! (dwts/set-selected-token-set-name set-name)))
(defn on-update-token-set [set-name token-set]
(st/emit! (wdt/update-token-set set-name (ctob/update-name token-set set-name))))
(st/emit! (wdt/update-token-set (:name token-set) (ctob/update-name token-set set-name))))
(defn on-update-token-set-group [set-group-path set-group-fname]
(st/emit! (wdt/rename-token-set-group set-group-path set-group-fname)))