From e6fa720ce120ce4952efa0e740c8030158495437 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Wed, 28 Dec 2016 15:34:27 +0100 Subject: [PATCH] Remove previously introduced hack for recursive layer-group component. --- .../src/uxbox/main/ui/workspace/sidebar/layers.cljs | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/layers.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/layers.cljs index 549d6068c..3b2f147ea 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/layers.cljs +++ b/frontend/src/uxbox/main/ui/workspace/sidebar/layers.cljs @@ -193,14 +193,6 @@ [:div.element-icon (element-icon item)] (shape-name item)]]))) - -;; TODO: Fix this temporary hack (Looks like a problem in defcs macro) -(declare layer-group) -(mx/defc defcs-macro-hack - {:mixins [mx/static mx/reactive (mx/local)]} - [shape selected] - (layer-group shape selected)) - ;; --- Layer Group (Component) (mx/defcs layer-group @@ -288,8 +280,7 @@ (for [shape (map #(get shapes-map %) (:items item)) :let [key (str (:id shape))]] (if (= (:type shape) :group) - ;; TODO: Fix this temporary hack (Looks like a problem in defcs macro) - (-> (defcs-macro-hack shape selected) + (-> (layer-group shape selected) (mx/with-key key)) (-> (layer-simple shape selected) (mx/with-key key))))])])))