Adapt code to components api change.

This commit is contained in:
Andrey Antukh 2016-07-09 16:37:53 +03:00
parent 938f4f5bfd
commit d5bab51c03
No known key found for this signature in database
GPG Key ID: 4DFEBCB8316A8B95
9 changed files with 21 additions and 38 deletions

View File

@ -83,7 +83,7 @@
(defn- recovery-page-will-mount (defn- recovery-page-will-mount
[own] [own]
(let [[token] (:rum/props own)] (let [[token] (:rum/args own)]
(rs/emit! (uda/validate-recovery-token token)) (rs/emit! (uda/validate-recovery-token token))
own)) own))

View File

@ -202,7 +202,7 @@
(when (kbd/shift? event) (when (kbd/shift? event)
(toggle-check image))) (toggle-check image)))
(forward-click [event] (forward-click [event]
(dom/click (mx/get-ref-dom own "file-input"))) (dom/click (mx/ref-node own "file-input")))
(delete-selected [] (delete-selected []
(->> (:selected @local) (->> (:selected @local)
(run! #(rs/emit! (di/delete-image coll-id %))))) (run! #(rs/emit! (di/delete-image coll-id %)))))

View File

@ -30,7 +30,7 @@
(defn- on-out-clicked (defn- on-out-clicked
[own event] [own event]
(let [parent (mx/get-ref-dom own "parent") (let [parent (mx/ref-node own "parent")
current (dom/get-target event)] current (dom/get-target event)]
(when (dom/equals? parent current) (when (dom/equals? parent current)
(udl/close!)))) (udl/close!))))

View File

@ -106,8 +106,8 @@
(defn- text-shape-edit-did-mount (defn- text-shape-edit-did-mount
[own] [own]
(let [[shape] (:rum/props own) (let [[shape] (:rum/args own)
dom (mx/get-ref-dom own "container")] dom (mx/ref-node own "container")]
(set! (.-textContent dom) (:content shape "")) (set! (.-textContent dom) (:content shape ""))
(.focus dom) (.focus dom)
own)) own))
@ -125,7 +125,7 @@
(on-done)) (on-done))
(on-input [ev] (on-input [ev]
(let [content (dom/event->inner-text ev) (let [content (dom/event->inner-text ev)
sid (:id (first (:rum/props own)))] sid (:id (first (:rum/args own)))]
(rs/emit! (uds/update-text sid {:content content}))))] (rs/emit! (uds/update-text sid {:content content}))))]
(html (html
[:g [:g

View File

@ -37,17 +37,17 @@
(defn- workspace-will-mount (defn- workspace-will-mount
[own] [own]
(let [[projectid pageid] (:rum/props own)] (let [[projectid pageid] (:rum/args own)]
(rs/emit! (dw/initialize projectid pageid) (rs/emit! (dw/initialize projectid pageid)
(udh/watch-page-changes)) (udh/watch-page-changes))
own)) own))
(defn- workspace-did-mount (defn- workspace-did-mount
[own] [own]
(let [[projectid pageid] (:rum/props own) (let [[projectid pageid] (:rum/args own)
sub1 (scroll/watch-scroll-interactions own) sub1 (scroll/watch-scroll-interactions own)
sub2 (udp/watch-page-changes pageid) sub2 (udp/watch-page-changes pageid)
dom (mx/get-ref-dom own "workspace-canvas")] dom (mx/ref-node own "workspace-canvas")]
;; Set initial scroll position ;; Set initial scroll position
(set! (.-scrollLeft dom) (* c/canvas-start-scroll-x @wb/zoom-l)) (set! (.-scrollLeft dom) (* c/canvas-start-scroll-x @wb/zoom-l))
@ -67,8 +67,8 @@
(defn- workspace-transfer-state (defn- workspace-transfer-state
[old-state state] [old-state state]
(let [[projectid pageid] (:rum/props state) (let [[projectid pageid] (:rum/args state)
[oldprojectid oldpageid] (:rum/props old-state)] [oldprojectid oldpageid] (:rum/args old-state)]
(if (not= pageid oldpageid) (if (not= pageid oldpageid)
(do (do
(rs/emit! (dw/initialize projectid pageid)) (rs/emit! (dw/initialize projectid pageid))
@ -96,7 +96,7 @@
(rs/emit! (dw/increase-zoom)) (rs/emit! (dw/increase-zoom))
(rs/emit! (dw/decrease-zoom))) (rs/emit! (dw/decrease-zoom)))
(let [dom (mx/get-ref-dom own "workspace-canvas")] (let [dom (mx/ref-node own "workspace-canvas")]
(set! (.-scrollLeft dom) (* c/canvas-start-scroll-x @wb/zoom-l)) (set! (.-scrollLeft dom) (* c/canvas-start-scroll-x @wb/zoom-l))
(set! (.-scrollTop dom) (* c/canvas-start-scroll-y @wb/zoom-l))))) (set! (.-scrollTop dom) (* c/canvas-start-scroll-y @wb/zoom-l)))))

View File

@ -119,14 +119,14 @@
(defn- viewport-did-mount (defn- viewport-did-mount
[own] [own]
(letfn [(translate-point-to-viewport [pt] (letfn [(translate-point-to-viewport [pt]
(let [viewport (mx/get-ref-dom own "viewport") (let [viewport (mx/ref-node own "viewport")
brect (.getBoundingClientRect viewport) brect (.getBoundingClientRect viewport)
brect (gpt/point (parse-int (.-left brect)) brect (gpt/point (parse-int (.-left brect))
(parse-int (.-top brect)))] (parse-int (.-top brect)))]
(gpt/subtract pt brect))) (gpt/subtract pt brect)))
(translate-point-to-canvas [pt] (translate-point-to-canvas [pt]
(let [viewport (mx/get-ref-dom own "viewport")] (let [viewport (mx/ref-node own "viewport")]
(when-let [canvas (dom/get-element-by-class "page-canvas" viewport)] (when-let [canvas (dom/get-element-by-class "page-canvas" viewport)]
(let [brect (.getBoundingClientRect canvas) (let [brect (.getBoundingClientRect canvas)
bbox (.getBBox canvas) bbox (.getBBox canvas)

View File

@ -25,7 +25,7 @@
(defn- resolve-position (defn- resolve-position
[own pt] [own pt]
(let [overlay (mx/get-ref-dom own "overlay") (let [overlay (mx/ref-node own "overlay")
brect (.getBoundingClientRect overlay) brect (.getBoundingClientRect overlay)
bpt (gpt/point (.-left brect) (.-top brect))] bpt (gpt/point (.-left brect) (.-top brect))]
(gpt/subtract pt bpt))) (gpt/subtract pt bpt)))

View File

@ -37,7 +37,7 @@
(on-scroll [pt initial] (on-scroll [pt initial]
(let [{:keys [x y]} (gpt/subtract pt initial) (let [{:keys [x y]} (gpt/subtract pt initial)
el (mx/get-ref-dom own "workspace-canvas") el (mx/ref-node own "workspace-canvas")
cx (.-scrollLeft el) cx (.-scrollLeft el)
cy (.-scrollTop el)] cy (.-scrollTop el)]
(set! (.-scrollLeft el) (- cx x)) (set! (.-scrollLeft el) (- cx x))

View File

@ -28,29 +28,12 @@
(rum/with-key element (str i))))) (rum/with-key element (str i)))))
(defn local (defn local
"Adds an atom to components state that can be used as local state.
Atom is stored under key `:rum/local`.
Component will be automatically re-rendered if atoms value changes"
([] ([]
(local {} :rum/local)) (rum/local {} :rum/local))
([initial] ([initial]
(local initial :rum/local)) (rum/local initial :rum/local))
([initial key] ([initial key]
{:transfer-state (rum/local initial key)))
(fn [old new]
(assoc new key (old key)))
:will-mount
(fn [state]
(let [local-state (atom initial)
component (:rum/react-component state)]
(add-watch local-state key
(fn [_ _ oldv newv]
(when (not= oldv newv)
(rum/request-render component))))
(assoc state key local-state)))
}))
(def static (def static rum/static)
{:should-update (def ref-node rum/ref-node)
(fn [old-state new-state]
(not= (:rum/props old-state) (:rum/props new-state)))})