Get rid of buggy reactive locks and refactor all related code.

frontend/src/uxbox/main/ui/shapes/common.cljs

@@ -16,7 +16,6 @@
             [uxbox.main.data.shapes :as uds]
             [uxbox.main.ui.keyboard :as kbd]
             [uxbox.util.geom.point :as gpt]
-            [uxbox.util.rlocks :as rlocks]
             [uxbox.util.dom :as dom]))
 
 ;; --- Refs
@@ -37,12 +36,13 @@
 
 ;; --- Movement
 
+;; TODO: implement in the same way as drawing (move under uxbox.main.data.workspace.)
+
 (defn start-move
   []
   (letfn [(on-move [shape delta]
             (st/emit! (uds/apply-temporal-displacement shape delta)))
           (on-stop [{:keys [id] :as shape}]
-            (rlocks/release! :shape/move)
             (st/emit! (uds/apply-displacement shape)))
           (on-start [shape]
             (let [stoper (->> streams/events
@@ -55,7 +55,6 @@
               (when @refs/selected-alignment
                 (st/emit! (uds/initial-align-shape shape)))
               (rx/subscribe stream on-move nil on-stop)))]
-    (rlocks/acquire! :shape/move)
     (run! on-start @selected-ref)))
 
 ;; --- Events

frontend/src/uxbox/main/ui/shapes/path.cljs

@@ -48,6 +48,7 @@
 (mx/defc path-shape
   {:mixins [mx/static]}
   [{:keys [id tmp-resize-xform tmp-displacement rotation] :as shape}]
+
   (let [shape (cond-> shape
                 tmp-displacement (geom/transform (gmt/translate-matrix tmp-displacement))
                 tmp-resize-xform (geom/transform tmp-resize-xform)

frontend/src/uxbox/main/ui/shapes/selection.cljs

@@ -20,7 +20,6 @@
             [uxbox.main.ui.shapes.common :as scommon]
             [uxbox.main.geom :as geom]
             [uxbox.util.mixins :as mx :include-macros true]
-            [uxbox.util.rlocks :as rlocks]
             [uxbox.util.geom.matrix :as gmt]
             [uxbox.util.geom.point :as gpt]
             [uxbox.util.dom :as dom]))
@@ -209,8 +208,7 @@
               (apply st/emit! (sequence xf ids))))
 
           (on-end []
-            (apply st/emit! (map uds/apply-resize-matrix ids))
-            (rlocks/release! :shape/resize))]
+            (apply st/emit! (map uds/apply-resize-matrix ids)))]
 
     (let [shape  (->> (geom/shape->rect-shape shape)
                       (geom/size))
@@ -229,7 +227,6 @@
                       (rx/with-latest-from vector streams/mouse-position-ctrl)
                       (rx/scan accumulate-width shape)
                       (rx/map (partial calculate-ratio shape)))]
-      (rlocks/acquire! :shape/resize)
       (rx/subscribe stream
                     (partial on-resize shape)
                     nil
@@ -316,27 +313,30 @@
 
 ;; --- Selection Handlers (Component)
 
+(defn get-path-edition-stoper
+  [stream]
+  (letfn [(stoper-event? [{:keys [type shift] :as event}]
+            (and (uev/mouse-event? event) (= type :up)))]
+    (rx/merge
+     (rx/filter stoper-event? stream)
+     (->> stream
+          (rx/filter #(= % ::uev/interrupt))
+          (rx/take 1)))))
+
 (defn start-path-edition
   [shape-id index]
   (letfn [(on-move [delta]
-            (st/emit! (uds/update-path shape-id index delta)))
-          (on-end []
-            (rlocks/release! :shape/resize))]
-    (let [stoper (->> streams/events
-                      (rx/map first)
-                      (rx/filter #(= % :mouse/up))
-                      (rx/take 1))
+            (st/emit! (uds/update-path shape-id index delta)))]
+    (let [stoper (get-path-edition-stoper streams/events)
           stream (rx/take-until stoper streams/mouse-position-deltas)]
-      (rlocks/acquire! :shape/resize)
       (when @refs/selected-alignment
         (st/emit! (uds/initial-path-point-align shape-id index)))
-      (rx/subscribe stream on-move nil on-end))))
+      (rx/subscribe stream on-move))))
 
 (mx/defc path-edition-selection-handlers
   [{:keys [id points] :as shape} zoom]
   (letfn [(on-mouse-down [index event]
             (dom/stop-propagation event)
-            (rlocks/acquire! :shape/resize)
             (start-path-edition id index))]
     [:g.controls
      (for [[index {:keys [x y]}] (map-indexed vector points)]

frontend/src/uxbox/main/ui/shapes/text.cljs

@@ -17,7 +17,6 @@
             [uxbox.util.color :as color]
             [uxbox.util.dom :as dom]
             [uxbox.util.geom.matrix :as gmt]
-            [uxbox.util.rlocks :as rlocks]
             [uxbox.util.mixins :as mx :include-macros true])
   (:import goog.events.EventType))
 
@@ -48,6 +47,8 @@
     (letfn [(on-mouse-down [event]
               (handle-mouse-down event shape selected))
             (on-double-click [event]
+              ;; TODO: handle grouping event propagation
+              ;; TODO: handle actions locking properly
               (dom/stop-propagation event)
               (st/emit! (uds/start-edition-mode id)))]
       [:g.shape {:class (when selected? "selected")
@@ -149,11 +150,9 @@
     own))
 
 (mx/defc text-shape-wrapper
-  {
-   :did-mount text-shape-wrapper-did-mount
+  {:did-mount text-shape-wrapper-did-mount
    :did-remount text-shape-wrapper-did-remount}
   [{:keys [id tmp-resize-xform tmp-displacement drawing?] :as shape}]
-  (println "text-shape-wrapper" shape)
   (let [xfmt (cond-> (gmt/matrix)
                 tmp-displacement (gmt/translate tmp-displacement)
                 tmp-resize-xform (gmt/multiply tmp-resize-xform))
@@ -182,7 +181,6 @@
   (let [style (make-style shape)]
     [:div {:style style} content]))
 
-
 ;; --- Text Shape Html
 
 (mx/defc text-shape