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

⏪ Revert some changes from previous merge

Browse source
This commit is contained in:
Andrey Antukh 2022-09-14 11:15:29 +02:00
parent 4af851d4c6
commit 8e2ccfb4b0
1 changed files with 15 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

31
frontend/src/app/main/data/workspace/groups.cljs
View file

@ -161,29 +161,28 @@
(ptk/reify ::ungroup-selected (ptk/reify ::ungroup-selected
ptk/WatchEvent ptk/WatchEvent
(watch [it state _] (watch [it state _]
(let [page-id (:current-page-id state) (let [page-id (:current-page-id state)
objects (wsh/lookup-page-objects state page-id) objects (wsh/lookup-page-objects state page-id)
is-group? #(or (= :bool (:type %)) (= :group (:type %)))
lookup #(get objects %) prepare
prepare #(prepare-remove-group it page-id % objects) (fn [shape-id]
selected (wsh/lookup-selected state) (let [shape (get objects shape-id)]
children (into (d/ordered-set) (cond
(mapcat #(->> % (or (cph/group-shape? shape) (cph/bool-shape? shape))
lookup (remove-group-changes it page-id shape objects)
:shapes) selected))
(cph/frame-shape? shape)
(remove-frame-changes it page-id shape objects))))
changes-list (sequence changes-list (sequence
(comp (map lookup) (keep prepare)
(filter is-group?) (wsh/lookup-selected state))
(map prepare))
selected)
changes {:redo-changes (vec (mapcat :redo-changes changes-list)) changes {:redo-changes (vec (mapcat :redo-changes changes-list))
:undo-changes (vec (mapcat :undo-changes changes-list)) :undo-changes (vec (mapcat :undo-changes changes-list))
:origin it}] :origin it}]
(rx/of (dch/commit-changes changes) (rx/of (dch/commit-changes changes))))))
(dws/select-shapes children))))))
(def mask-group (def mask-group
(ptk/reify ::mask-group (ptk/reify ::mask-group