From 99aa09eb865e9b2332bbb17578885f48eb40d872 Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Mon, 22 Aug 2016 17:29:31 +0300
Subject: [PATCH] Fix lense/ref naming on shapes related ns.

---
 src/uxbox/main/ui/shapes/circle.cljs | 2 +-
 src/uxbox/main/ui/shapes/common.cljs | 8 ++++----
 src/uxbox/main/ui/shapes/group.cljs  | 2 +-
 src/uxbox/main/ui/shapes/icon.cljs   | 2 +-
 src/uxbox/main/ui/shapes/line.cljs   | 2 +-
 src/uxbox/main/ui/shapes/path.cljs   | 2 +-
 src/uxbox/main/ui/shapes/rect.cljs   | 2 +-
 src/uxbox/main/ui/shapes/text.cljs   | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/uxbox/main/ui/shapes/circle.cljs b/src/uxbox/main/ui/shapes/circle.cljs
index 59e0df38e..f6084551f 100644
--- a/src/uxbox/main/ui/shapes/circle.cljs
+++ b/src/uxbox/main/ui/shapes/circle.cljs
@@ -20,7 +20,7 @@
 (defn- circle-component-render
   [own shape]
   (let [{:keys [id x y width height group]} shape
-        selected (mx/react common/selected-shapes-ref)
+        selected (mx/react common/selected-ref)
         selected? (contains? selected id)
         on-mouse-down #(common/on-mouse-down % shape selected)]
     (html
diff --git a/src/uxbox/main/ui/shapes/common.cljs b/src/uxbox/main/ui/shapes/common.cljs
index 759b80f5f..d1dce109b 100644
--- a/src/uxbox/main/ui/shapes/common.cljs
+++ b/src/uxbox/main/ui/shapes/common.cljs
@@ -17,14 +17,14 @@
 
 ;; --- Lenses
 
-(def selected-shapes-ref
-  (-> (l/in [:workspace :selected])
-      (l/derive st/state)))
-
 (def drawing-state-ref
   (-> (l/in [:workspace :drawing])
       (l/derive st/state)))
 
+(def selected-ref
+  (-> (l/in [:workspace :selected])
+      (l/derive st/state)))
+
 ;; --- Events
 
 (defn on-mouse-down
diff --git a/src/uxbox/main/ui/shapes/group.cljs b/src/uxbox/main/ui/shapes/group.cljs
index bdf773923..9666c31fd 100644
--- a/src/uxbox/main/ui/shapes/group.cljs
+++ b/src/uxbox/main/ui/shapes/group.cljs
@@ -43,7 +43,7 @@
 (defn- group-component-render
   [own shape]
   (let [{:keys [id x y width height group]} shape
-        selected (mx/react common/selected-shapes-ref)
+        selected (mx/react common/selected-ref)
         selected? (contains? selected id)
         on-mouse-down #(common/on-mouse-down % shape selected)]
     (html
diff --git a/src/uxbox/main/ui/shapes/icon.cljs b/src/uxbox/main/ui/shapes/icon.cljs
index fdf2aa82e..fb29d7ae7 100644
--- a/src/uxbox/main/ui/shapes/icon.cljs
+++ b/src/uxbox/main/ui/shapes/icon.cljs
@@ -18,7 +18,7 @@
 
 (defn- icon-component-render
   [own {:keys [id] :as shape}]
-  (let [selected (mx/react common/selected-shapes-ref)
+  (let [selected (mx/react common/selected-ref)
         selected? (contains? selected id)
         on-mouse-down #(common/on-mouse-down % shape selected)]
     (html
diff --git a/src/uxbox/main/ui/shapes/line.cljs b/src/uxbox/main/ui/shapes/line.cljs
index 9fb1180ce..29b8e3caf 100644
--- a/src/uxbox/main/ui/shapes/line.cljs
+++ b/src/uxbox/main/ui/shapes/line.cljs
@@ -19,7 +19,7 @@
 (defn- line-component-render
   [own shape]
   (let [{:keys [id x y width height group]} shape
-        selected (mx/react common/selected-shapes-ref)
+        selected (mx/react common/selected-ref)
         selected? (contains? selected id)
         on-mouse-down #(common/on-mouse-down % shape selected)]
     (html
diff --git a/src/uxbox/main/ui/shapes/path.cljs b/src/uxbox/main/ui/shapes/path.cljs
index cc82588b8..c5ca94a04 100644
--- a/src/uxbox/main/ui/shapes/path.cljs
+++ b/src/uxbox/main/ui/shapes/path.cljs
@@ -17,7 +17,7 @@
 (mx/defc path-component
   {:mixins [mx/static mx/reactive]}
   [{:keys [id] :as shape}]
-  (let [selected (mx/react common/selected-shapes-ref)
+  (let [selected (mx/react common/selected-ref)
         selected? (contains? selected id)
         on-mouse-down #(common/on-mouse-down % shape selected)]
     [:g.shape {:class (when selected? "selected")
diff --git a/src/uxbox/main/ui/shapes/rect.cljs b/src/uxbox/main/ui/shapes/rect.cljs
index 7594c6c5e..d7ff2044c 100644
--- a/src/uxbox/main/ui/shapes/rect.cljs
+++ b/src/uxbox/main/ui/shapes/rect.cljs
@@ -20,7 +20,7 @@
 (defn- rect-component-render
   [own shape]
   (let [{:keys [id x y width height group]} shape
-        selected (mx/react common/selected-shapes-ref)
+        selected (mx/react common/selected-ref)
         selected? (contains? selected id)
         on-mouse-down #(common/on-mouse-down % shape selected)]
     (html
diff --git a/src/uxbox/main/ui/shapes/text.cljs b/src/uxbox/main/ui/shapes/text.cljs
index c8c0b16b3..f9ba5eca3 100644
--- a/src/uxbox/main/ui/shapes/text.cljs
+++ b/src/uxbox/main/ui/shapes/text.cljs
@@ -38,7 +38,7 @@
 (mx/defcs text-component
   {:mixins [mx/static mx/reactive (mx/local)]}
   [own {:keys [id x1 y1 content group] :as shape}]
-  (let [selected (mx/react common/selected-shapes-ref)
+  (let [selected (mx/react common/selected-ref)
         selected? (and (contains? selected id)
                        (= (count selected) 1))
         local (:rum/local own)]