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

🐛 Fix issue on renaming group

Browse source
This commit is contained in:
Andrey Antukh 2025-02-11 16:38:36 +01:00
parent 50afc4c507
commit 7497371b32
3 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -181,7 +181,8 @@
(rx/of (dch/commit-changes changes) (rx/of (dch/commit-changes changes)
(wtu/update-workspace-tokens)))))) (wtu/update-workspace-tokens))))))
(defn delete-token-set-path [group? path] (defn delete-token-set-path
[group? path]
(ptk/reify ::delete-token-set-path (ptk/reify ::delete-token-set-path
ptk/WatchEvent ptk/WatchEvent
(watch [it state _] (watch [it state _]
@ -189,9 +190,8 @@
changes (-> (pcb/empty-changes it) changes (-> (pcb/empty-changes it)
(pcb/with-library-data data) (pcb/with-library-data data)
(pcb/delete-token-set-path group? path))] (pcb/delete-token-set-path group? path))]
(rx/of (rx/of (dch/commit-changes changes)
(dch/commit-changes changes) (wtu/update-workspace-tokens))))))
(wtu/update-workspace-tokens))))))
(defn drop-error [{:keys [error to-path]}] (defn drop-error [{:keys [error to-path]}]
(ptk/reify ::drop-error (ptk/reify ::drop-error

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

@ -48,7 +48,8 @@
(dt/update-token-set (:name token-set) (ctob/update-name token-set name)))) (dt/update-token-set (:name token-set) (ctob/update-name token-set name))))
(defn- on-update-token-set-group [path name] (defn- on-update-token-set-group [path name]
(st/emit! (dt/rename-token-set-group path name))) (st/emit! (dt/clear-token-set-edition)
(dt/rename-token-set-group path name)))
(defn- on-create-token-set [name token-set] (defn- on-create-token-set [name token-set]
(st/emit! (ptk/data-event ::ev/event {::ev/name "create-token-set" :name name}) (st/emit! (ptk/data-event ::ev/event {::ev/name "create-token-set" :name name})

8
frontend/src/app/main/ui/workspace/tokens/sets_context_menu.cljs
View file

@ -39,14 +39,14 @@
(let [create-set-at-path (let [create-set-at-path
(mf/use-fn (mf/deps path) #(st/emit! (dt/start-token-set-creation path))) (mf/use-fn (mf/deps path) #(st/emit! (dt/start-token-set-creation path)))
edit-name on-edit
(mf/use-fn (mf/use-fn
(mf/deps path) (mf/deps path)
(fn [] (fn []
(let [name (ctob/join-set-path path)] (let [name (ctob/join-set-path path)]
(st/emit! (dt/start-token-set-edition name))))) (st/emit! (dt/start-token-set-edition name)))))
delete-set on-delete
(mf/use-fn (mf/use-fn
(mf/deps is-group path) (mf/deps is-group path)
#(st/emit! (dt/delete-token-set-path is-group path)))] #(st/emit! (dt/delete-token-set-path is-group path)))]
@ -54,8 +54,8 @@
[:ul {:class (stl/css :context-list)} [:ul {:class (stl/css :context-list)}
(when is-group (when is-group
[:> menu-entry* {:title (tr "workspace.token.add-set-to-group") :on-click create-set-at-path}]) [:> menu-entry* {:title (tr "workspace.token.add-set-to-group") :on-click create-set-at-path}])
[:> menu-entry* {:title (tr "labels.rename") :on-click edit-name}] [:> menu-entry* {:title (tr "labels.rename") :on-click on-edit}]
[:> menu-entry* {:title (tr "labels.delete") :on-click delete-set}]])) [:> menu-entry* {:title (tr "labels.delete") :on-click on-delete}]]))
(mf/defc token-set-context-menu* (mf/defc token-set-context-menu*
[] []