3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-17 12:36:11 +02:00
Code Issues Projects Releases Packages Wiki Activity

🎉 Avoid setting token to group shapes (#6055)

Browse source 
* 🎉 Avoid setting token to group shapes

* 📎 Fix on update shape when double click
This commit is contained in:
Eva Marco 2025-03-12 14:18:59 +01:00 • committed by GitHub
parent 2aee2ea79e
commit 0efbebd94f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 28 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
frontend/src/app/main/ui/workspace/tokens/changes.cljs
View file

@ -49,6 +49,13 @@
(rx/mapcat
(fn [resolved-tokens]
(let [undo-id (js/Symbol)
objects (dsh/lookup-page-objects state)
shape-ids (or (->> (select-keys objects shape-ids)
(filter (fn [[_ shape]] (not= (:type shape) :group)))
(keys))
[])
resolved-value (get-in resolved-tokens [(wtt/token-identifier token) :resolved-value])
tokenized-attributes (wtt/attributes-map attributes token)]
(rx/of

6
frontend/src/app/main/ui/workspace/tokens/context_menu.cljs
View file

@ -371,8 +371,10 @@
(mf/defc menu-tree
[{:keys [selected-shapes submenu-offset type errors] :as context-data}]
(let [entries (if (and (not (some? errors))
(seq selected-shapes))
(let [shape-types (into #{} (map :type selected-shapes))
entries (if (and (not (some? errors))
(seq selected-shapes)
(not= shape-types #{:group}))
(if (some? type)
(submenu-actions-selection-actions context-data)
(selection-actions context-data))