From b6bcc1795ccae560fd973dcdaf32d42e9a7e88df Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Tue, 21 Jun 2016 18:47:08 +0300 Subject: [PATCH] Fix group rendering. Bug introduced in previous refactor of shapes rendering. --- src/uxbox/main/ui/shapes/group.cljs | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/uxbox/main/ui/shapes/group.cljs b/src/uxbox/main/ui/shapes/group.cljs index 7c8b95d4f..f582897bc 100644 --- a/src/uxbox/main/ui/shapes/group.cljs +++ b/src/uxbox/main/ui/shapes/group.cljs @@ -45,9 +45,10 @@ on-mouse-down #(common/on-mouse-down % shape selected) on-mouse-up #(common/on-mouse-up % shape)] (html - [:g.shape {:class (when selected? "selected") - :on-mouse-down on-mouse-down - :on-mouse-up on-mouse-up} + [:g.shape.group-shape + {:class (when selected? "selected") + :on-mouse-down on-mouse-down + :on-mouse-up on-mouse-up} (group-shape shape render-component)]))) (def group-component @@ -68,12 +69,13 @@ shapes-by-id (get @st/state :shapes-by-id) xf (comp (map #(get shapes-by-id %)) - (remove :hidden) - (map factory))] + (remove :hidden))] (html [:g attrs - (for [item (reverse (into [] xf items))] - (rum/with-key item (str (:id item))))]))) + (for [item (reverse (into [] xf items)) + :let [key (str (:id item))]] + (-> (factory item) + (rum/with-key key)))]))) (def group-shape (mx/component