From f6870a2fee639b634ef4dea0ed17b070a01f51d8 Mon Sep 17 00:00:00 2001
From: "alonso.torres" <alonso.torres@kaleidos.net>
Date: Fri, 25 Sep 2020 09:13:50 +0200
Subject: [PATCH] :sparkles: Review improvements

---
 frontend/src/app/main/ui/shapes/filters.cljs          | 4 ++--
 frontend/src/app/main/ui/workspace/colorpalette.cljs  | 1 -
 frontend/src/app/main/ui/workspace/shapes/common.cljs | 6 +++---
 frontend/src/app/main/ui/workspace/shapes/frame.cljs  | 6 +++---
 frontend/src/app/main/ui/workspace/shapes/path.cljs   | 6 +++---
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/frontend/src/app/main/ui/shapes/filters.cljs b/frontend/src/app/main/ui/shapes/filters.cljs
index 3600042b0..5f583b2dc 100644
--- a/frontend/src/app/main/ui/shapes/filters.cljs
+++ b/frontend/src/app/main/ui/shapes/filters.cljs
@@ -133,13 +133,13 @@
               drop-shadow-filters (->> filters (filter #(= :drop-shadow (:style %))))
               drop-shadow-filters (->> drop-shadow-filters
                                        (map #(str "filter" (:id %)))
-                                       (concat ["BackgroundImageFix"])
+                                       (cons "BackgroundImageFix")
                                        (map add-in-filter drop-shadow-filters))
 
               inner-shadow-filters (->> filters (filter #(= :inner-shadow (:style %))))
               inner-shadow-filters (->> inner-shadow-filters
                                        (map #(str "filter" (:id %)))
-                                       (concat ["shape"])
+                                       (cons "shape")
                                        (map add-in-filter inner-shadow-filters))]
 
           [:*
diff --git a/frontend/src/app/main/ui/workspace/colorpalette.cljs b/frontend/src/app/main/ui/workspace/colorpalette.cljs
index 9b264d236..bfda8cd1b 100644
--- a/frontend/src/app/main/ui/workspace/colorpalette.cljs
+++ b/frontend/src/app/main/ui/workspace/colorpalette.cljs
@@ -53,7 +53,6 @@
         file-id (:file-id color)
         select-color
         (fn [event]
-          (println "item" id file-id)
           (let [ids (get-in @st/state [:workspace-local :selected])]
             (if (kbd/shift? event)
               (st/emit! (mdc/change-stroke ids (:value color) id file-id))
diff --git a/frontend/src/app/main/ui/workspace/shapes/common.cljs b/frontend/src/app/main/ui/workspace/shapes/common.cljs
index 9aeaaacd4..2df882f9e 100644
--- a/frontend/src/app/main/ui/workspace/shapes/common.cljs
+++ b/frontend/src/app/main/ui/workspace/shapes/common.cljs
@@ -71,11 +71,11 @@
           on-context-menu (mf/use-callback
                            (mf/deps shape)
                            #(on-context-menu % shape))
-          filter-id (mf/use-var (filters/get-filter-id))]
+          filter-id (mf/use-memo filters/get-filter-id)]
       [:g.shape {:on-mouse-down on-mouse-down
                  :on-context-menu on-context-menu
-                 :filter (filters/filter-str @filter-id shape)}
-       [:& filters/filters {:filter-id @filter-id :shape shape}]
+                 :filter (filters/filter-str filter-id shape)}
+       [:& filters/filters {:filter-id filter-id :shape shape}]
        [:& component {:shape shape}]])))
 
 
diff --git a/frontend/src/app/main/ui/workspace/shapes/frame.cljs b/frontend/src/app/main/ui/workspace/shapes/frame.cljs
index 19a47795f..0fb0a0024 100644
--- a/frontend/src/app/main/ui/workspace/shapes/frame.cljs
+++ b/frontend/src/app/main/ui/workspace/shapes/frame.cljs
@@ -99,7 +99,7 @@
              (fn []
                (st/emit! (dws/change-hover-state (:id shape) false))))
 
-            filter-id (mf/use-var (filters/get-filter-id))]
+            filter-id (mf/use-memo filters/get-filter-id)]
 
         (when-not (:hidden shape)
           [:g {:class (when selected? "selected")
@@ -124,8 +124,8 @@
                    :on-mouse-over on-mouse-over
                    :on-mouse-out on-mouse-out}
             (:name shape)]
-           [:g.frame {:filter (filters/filter-str @filter-id shape)}
-            [:& filters/filters {:filter-id @filter-id :shape shape}]
+           [:g.frame {:filter (filters/filter-str filter-id shape)}
+            [:& filters/filters {:filter-id filter-id :shape shape}]
             [:& frame-shape
              {:shape shape
               :childs children}]]])))))
diff --git a/frontend/src/app/main/ui/workspace/shapes/path.cljs b/frontend/src/app/main/ui/workspace/shapes/path.cljs
index 5bad12bcd..d128509aa 100644
--- a/frontend/src/app/main/ui/workspace/shapes/path.cljs
+++ b/frontend/src/app/main/ui/workspace/shapes/path.cljs
@@ -43,12 +43,12 @@
                                (dom/stop-propagation event)
                                (dom/prevent-default event)
                                (st/emit! (dw/start-edition-mode (:id shape)))))))
-        filter-id (mf/use-var (filters/get-filter-id))]
+        filter-id (mf/use-memo filters/get-filter-id)]
 
     [:g.shape {:on-double-click on-double-click
                :on-mouse-down on-mouse-down
                :on-context-menu on-context-menu
-               :filter (filters/filter-str @filter-id shape)}
-     [:& filters/filters {:filter-id @filter-id :shape shape}]
+               :filter (filters/filter-str filter-id shape)}
+     [:& filters/filters {:filter-id filter-id :shape shape}]
      [:& path/path-shape {:shape shape :background? true}]]))