From 8e2ccfb4b0a3ae3b46f096a84ffe81c46be9970e Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Wed, 14 Sep 2022 11:15:29 +0200
Subject: [PATCH] :rewind: Revert some changes from previous merge

---
 .../src/app/main/data/workspace/groups.cljs   | 31 +++++++++----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/frontend/src/app/main/data/workspace/groups.cljs b/frontend/src/app/main/data/workspace/groups.cljs
index 3e5f249e1..34d7b7df6 100644
--- a/frontend/src/app/main/data/workspace/groups.cljs
+++ b/frontend/src/app/main/data/workspace/groups.cljs
@@ -161,29 +161,28 @@
   (ptk/reify ::ungroup-selected
     ptk/WatchEvent
     (watch [it state _]
-      (let [page-id   (:current-page-id state)
-            objects   (wsh/lookup-page-objects state page-id)
-            is-group? #(or (= :bool (:type %)) (= :group (:type %)))
-            lookup    #(get objects %)
-            prepare   #(prepare-remove-group it page-id % objects)
-            selected (wsh/lookup-selected state)
-            children (into (d/ordered-set)
-                           (mapcat #(->> %
-                                         lookup
-                                         :shapes) selected))
+      (let [page-id       (:current-page-id state)
+            objects       (wsh/lookup-page-objects state page-id)
+
+            prepare
+            (fn [shape-id]
+              (let [shape (get objects shape-id)]
+                (cond
+                  (or (cph/group-shape? shape) (cph/bool-shape? shape))
+                  (remove-group-changes it page-id shape objects)
+
+                  (cph/frame-shape? shape)
+                  (remove-frame-changes it page-id shape objects))))
 
             changes-list (sequence
-                          (comp (map lookup)
-                                (filter is-group?)
-                                (map prepare))
-                          selected)
+                          (keep prepare)
+                          (wsh/lookup-selected state))
 
             changes {:redo-changes (vec (mapcat :redo-changes changes-list))
                      :undo-changes (vec (mapcat :undo-changes changes-list))
                      :origin it}]
 
-        (rx/of (dch/commit-changes changes)
-               (dws/select-shapes children))))))
+        (rx/of (dch/commit-changes changes))))))
 
 (def mask-group
   (ptk/reify ::mask-group