diff --git a/frontend/uxbox/ui/workspace/base.cljs b/frontend/uxbox/ui/workspace/base.cljs index f2b95f9a8..e43648250 100644 --- a/frontend/uxbox/ui/workspace/base.cljs +++ b/frontend/uxbox/ui/workspace/base.cljs @@ -76,20 +76,17 @@ (defn- mouse-mixin-did-mount [own] - (println "mouse-mixin-did-mount") - (let [canvas (util/get-ref-dom own "canvas") - on-mousemove (fn [event] - (let [brect (.getBoundingClientRect canvas) - offset-x (.-left brect) - offset-y (.-top brect) - x (.-clientX event) - y (.-clientY event)] - (rx/push! mouse-bus [(- x offset-x) - (- y offset-y)]))) - key (events/listen js/document - EventType.MOUSEMOVE - on-mousemove)] - (assoc own ::eventkey key))) + (letfn [(on-mousemove [event] + (let [canvas (util/get-ref-dom own "canvas") + brect (.getBoundingClientRect canvas) + offset-x (.-left brect) + offset-y (.-top brect) + x (.-clientX event) + y (.-clientY event)] + (rx/push! mouse-bus [(- x offset-x) + (- y offset-y)])))] + (->> (events/listen js/document EventType.MOUSEMOVE on-mousemove) + (assoc own ::eventkey)))) (defn- mouse-mixin-will-unmount [own] diff --git a/frontend/uxbox/ui/workspace/workarea.cljs b/frontend/uxbox/ui/workspace/workarea.cljs index ac31e95b4..7cbd050e2 100644 --- a/frontend/uxbox/ui/workspace/workarea.cljs +++ b/frontend/uxbox/ui/workspace/workarea.cljs @@ -43,7 +43,6 @@ :name "background" :mixins [mx/static]})) - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Grid ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -123,22 +122,6 @@ ;; Canvas ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; (rum/defc canvas < rum/reactive -;; shapes-push-mixin -;; (mx/cmds-mixin -;; [::draw draw! (fn [[conn page] shape] -;; (actions/draw-shape conn page shape))] - -;; [::move move! (fn [[conn] selections] -;; (actions/update-shapes conn selections))]) -;; [conn -;; page -;; shapes -;; {:keys [viewport-height -;; viewport-width -;; document-start-x -;; document-start-y]}] - (defn canvas-render [] (let [page (rum/react wb/page-state)