🐛 Fix shape hidden/blocked attrs handling.

frontend/src/uxbox/main/data/workspace.cljs

@@ -1851,62 +1851,10 @@
     ptk/UpdateEvent
     (update [_ state]
       (let [page-id (::page-id state)]
-        (update-in state [:workspace-data page-id :objects id :segments index] gpt/add delta)))))
+        (update-in state [:workspace-data page-id :objects id :segments index]
-
+                   gpt/add delta)))))
-
-;; --- Shape Visibility
-
-(declare impl-update-shape-hidden)
-
-(defn hide-shape
-  [id]
-  (us/verify ::us/uuid id)
-  (ptk/reify ::hide-shape
-    IBatchedChange
-    ptk/UpdateEvent
-    (update [_ state]
-      (impl-update-shape-hidden state id true))))
-
-(defn show-shape
-  [id]
-  (us/verify ::us/uuid id)
-  (ptk/reify ::show-shape
-    IBatchedChange
-    ptk/UpdateEvent
-    (update [_ state]
-      (impl-update-shape-hidden state id false))))
-
-(defn hide-frame
-  [id]
-  (us/verify ::us/uuid id)
-  (ptk/reify ::hide-shape
-    IBatchedChange
-    ptk/UpdateEvent
-    (update [_ state]
-      (let [hide #(impl-update-shape-hidden %1 %2 true)
-            page-id (::page-id state)
-            objects (get-in state [:workspace-data page-id :objects])
-            frame   (get objects id)]
-        (reduce hide state (cons id (:shapes frame)))))))
-
-(defn show-frame
-  [id]
-  (us/verify ::us/uuid id)
-  (ptk/reify ::hide-shape
-    IBatchedChange
-    ptk/UpdateEvent
-    (update [_ state]
-      (let [show #(impl-update-shape-hidden %1 %2 false)
-            page-id (::page-id state)
-            objects (get-in state [:workspace-data page-id :objects])
-            frame   (get objects id)]
-        (reduce show state (cons id (:shapes frame)))))))
-
-(defn- impl-update-shape-hidden
-  [state id hidden?]
-  (let [page-id (::page-id state)]
-    (assoc-in state [:workspace-data page-id :objects id :hidden] hidden?)))
 
+;; --- Shape attrs (Layers Sidebar)
 
 (defn toggle-collapse
   [id]
@@ -1921,38 +1869,21 @@
     (update [_ state]
       (update state :workspace-local dissoc :expanded))))
 
-;; --- Shape Blocking
+(defn recursive-assign
-
+  "A helper for assign recursively a shape attr."
-(declare impl-update-shape-blocked)
+  [id attr value]
-
+  (ptk/reify ::recursive-assign
-(defn block-shape
-  [id]
-  (us/verify ::us/uuid id)
-  (ptk/reify ::hide-shape
     ptk/UpdateEvent
     (update [_ state]
-      (impl-update-shape-blocked state id true))))
+      (let [page-id (get-in state [:workspace-page :id])
-
+            objects (get-in state [:workspace-data page-id :objects])
-(defn unblock-shape
+            childs (helpers/get-children id objects)]
-  [id]
+        (update-in state [:workspace-data page-id :objects]
-  (us/verify ::us/uuid id)
+                   (fn [objects]
-  (ptk/reify ::hide-shape
+                     (reduce (fn [objects id]
-    ptk/UpdateEvent
+                               (assoc-in objects [id attr] value))
-    (update [_ state]
+                             objects
-      (impl-update-shape-blocked state id false))))
+                             (conj childs id))))))))
-
-(defn- impl-update-shape-blocked
-  [state id blocked?]
-  (let [page-id (::page-id state)
-        obj (get-in state [:workspace-data page-id :objects id])
-        obj (assoc obj :blocked blocked?)
-        state (assoc-in state [:workspace-data page-id :objects id] obj)]
-    (if (= :frame (:type obj))
-      (update-in state [:workspace-data page-id :objects]
-                 (fn [objects]
-                   (reduce #(update %1 %2 assoc :blocked blocked?) objects (:shapes obj))))
-      state)))
-
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Navigation

frontend/src/uxbox/main/ui/workspace/context_menu.cljs

@@ -43,7 +43,7 @@
 
 (mf/defc shape-context-menu
   [{:keys [mdata] :as props}]
-  (let [shape (:shape mdata)
+  (let [{:keys [id] :as shape} (:shape mdata)
         selected (:selected mdata)
 
         do-duplicate #(st/emit! dw/duplicate-selected)
@@ -54,10 +54,10 @@
         do-bring-to-front #(st/emit! (dw/vertical-order-selected :top))
         do-send-backward #(st/emit! (dw/vertical-order-selected :down))
         do-send-to-back #(st/emit! (dw/vertical-order-selected :bottom))
-        do-show-shape #(st/emit! (dw/show-shape (:id shape)))
+        do-show-shape #(st/emit! (dw/recursive-assign id :hidden false))
-        do-hide-shape #(st/emit! (dw/hide-shape (:id shape)))
+        do-hide-shape #(st/emit! (dw/recursive-assign id :hidden true))
-        do-lock-shape #(st/emit! (dw/block-shape (:id shape)))
+        do-lock-shape #(st/emit! (dw/recursive-assign id :blocked true))
-        do-unlock-shape #(st/emit! (dw/unblock-shape (:id shape)))
+        do-unlock-shape #(st/emit! (dw/recursive-assign id :blocked false))
         do-create-group #(st/emit! dw/create-group)
         do-remove-group #(st/emit! dw/remove-group)]
     [:*

frontend/src/uxbox/main/ui/workspace/sidebar/layers.cljs

@@ -83,11 +83,12 @@
 
 (mf/defc layer-item
   [{:keys [index item selected objects] :as props}]
-  (let [selected? (contains? selected (:id item))
+  (let [id        (:id item)
+        selected? (contains? selected id)
 
         expanded-iref (mf/use-memo
-                        (mf/deps (:id item))
+                        (mf/deps id)
-                        (make-collapsed-iref (:id item)))
+                        (make-collapsed-iref id))
 
         expanded? (mf/deref expanded-iref)
 
@@ -96,21 +97,21 @@
           (dom/stop-propagation event)
           (if (and expanded? (kbd/shift? event))
             (st/emit! dw/collapse-all)
-            (st/emit! (dw/toggle-collapse (:id item)))))
+            (st/emit! (dw/toggle-collapse id))))
 
         toggle-blocking
         (fn [event]
           (dom/stop-propagation event)
           (if (:blocked item)
-            (st/emit! (dw/unblock-shape (:id item)))
+            (st/emit! (dw/recursive-assign id :blocked false))
-            (st/emit! (dw/block-shape (:id item)))))
+            (st/emit! (dw/recursive-assign id :blocked true))))
 
         toggle-visibility
         (fn [event]
           (dom/stop-propagation event)
           (if (:hidden item)
-            (st/emit! (dw/show-shape (:id item)))
+            (st/emit! (dw/recursive-assign id :hidden false))
-            (st/emit! (dw/hide-shape (:id item)))))
+            (st/emit! (dw/recursive-assign id :hidden true))))
 
         select-shape
         (fn [event]