From 5b995f78aa12b3c6a381af774824f7998acbe114 Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Wed, 19 Oct 2016 17:40:06 +0200
Subject: [PATCH] Cosmetic changes on rect shapes components.

---
 src/uxbox/main/ui/shapes/rect.cljs | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/uxbox/main/ui/shapes/rect.cljs b/src/uxbox/main/ui/shapes/rect.cljs
index d51803388..2ce55e0ef 100644
--- a/src/uxbox/main/ui/shapes/rect.cljs
+++ b/src/uxbox/main/ui/shapes/rect.cljs
@@ -5,9 +5,7 @@
 ;; Copyright (c) 2016 Andrey Antukh <niwi@niwi.nz>
 
 (ns uxbox.main.ui.shapes.rect
-  (:require [sablono.core :refer-macros [html]]
-            [rum.core :as rum]
-            [uxbox.main.ui.shapes.common :as common]
+  (:require [uxbox.main.ui.shapes.common :as common]
             [uxbox.main.ui.shapes.attrs :as attrs]
             [uxbox.util.mixins :as mx :include-macros true]
             [uxbox.main.geom :as geom]
@@ -17,26 +15,21 @@
 
 (declare rect-shape)
 
-(defn- rect-component-render
-  [own shape]
+(mx/defc rect-component
+  {:mixins [mx/reactive mx/static]}
+  [shape]
   (let [{:keys [id x y width height group]} shape
         selected (mx/react common/selected-ref)
         selected? (contains? selected id)
         on-mouse-down #(common/on-mouse-down % shape selected)]
-    (html
-     [:g.shape {:class (when selected? "selected")
-                :on-mouse-down on-mouse-down}
-      (rect-shape shape identity)])))
-
-(def rect-component
-  (mx/component
-   {:render rect-component-render
-    :name "rect-component"
-    :mixins [mx/static mx/reactive]}))
+    [:g.shape {:class (when selected? "selected")
+               :on-mouse-down on-mouse-down}
+     (rect-shape shape identity)]))
 
 ;; --- Rect Shape
 
 (mx/defc rect-shape
+  {:mixins [mx/static]}
   [{:keys [id x1 y1] :as shape}]
   (let [key (str "shape-" id)
         rfm (geom/transformation-matrix shape)