From 8b32c693772fe0473a1186a4a7b2f71907048f79 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Sat, 9 Jul 2016 18:48:17 +0300 Subject: [PATCH] Remove o replace apropriately the transfer-state func on components. --- src/uxbox/main/ui/dashboard/icons.cljs | 4 ++-- src/uxbox/main/ui/dashboard/images.cljs | 4 ++-- src/uxbox/main/ui/dashboard/projects.cljs | 4 ++-- src/uxbox/main/ui/lightbox.cljs | 5 ----- src/uxbox/main/ui/workspace.cljs | 4 ++-- src/uxbox/main/ui/workspace/base.cljs | 20 ++++++++++--------- src/uxbox/main/ui/workspace/canvas.cljs | 8 -------- src/uxbox/main/ui/workspace/drawarea.cljs | 5 ----- src/uxbox/main/ui/workspace/ruler.cljs | 6 ------ src/uxbox/main/ui/workspace/selrect.cljs | 5 ----- src/uxbox/main/ui/workspace/shortcuts.cljs | 7 +------ .../main/ui/workspace/sidebar/sitemap.cljs | 2 +- 12 files changed, 21 insertions(+), 53 deletions(-) diff --git a/src/uxbox/main/ui/dashboard/icons.cljs b/src/uxbox/main/ui/dashboard/icons.cljs index 70d804af6e..d82cd6dfe3 100644 --- a/src/uxbox/main/ui/dashboard/icons.cljs +++ b/src/uxbox/main/ui/dashboard/icons.cljs @@ -139,7 +139,7 @@ (rs/emit! (dd/initialize :dashboard/icons)) own) -(defn icons-page-transfer-state +(defn icons-page-did-remount [old-state state] (rs/emit! (dd/initialize :dashboard/icons)) state) @@ -148,7 +148,7 @@ (mx/component {:render icons-page-render :will-mount icons-page-will-mount - :transfer-state icons-page-transfer-state + :did-remount icons-page-did-remount :name "icons-page" :mixins [mx/static]})) diff --git a/src/uxbox/main/ui/dashboard/images.cljs b/src/uxbox/main/ui/dashboard/images.cljs index 71a02a366c..45a729cc2f 100644 --- a/src/uxbox/main/ui/dashboard/images.cljs +++ b/src/uxbox/main/ui/dashboard/images.cljs @@ -356,7 +356,7 @@ (di/initialize)) own) -(defn- images-page-transfer-state +(defn- images-page-did-remount [old-state state] (rs/emit! (dd/initialize :dashboard/images)) state) @@ -365,6 +365,6 @@ (mx/component {:render images-page-render :will-mount images-page-will-mount - :transfer-state images-page-transfer-state + :did-remount images-page-did-remount :name "images-page" :mixins [mx/static]})) diff --git a/src/uxbox/main/ui/dashboard/projects.cljs b/src/uxbox/main/ui/dashboard/projects.cljs index 2ad17006f2..d3293e056a 100644 --- a/src/uxbox/main/ui/dashboard/projects.cljs +++ b/src/uxbox/main/ui/dashboard/projects.cljs @@ -234,7 +234,7 @@ (dp/initialize)) own) -(defn projects-page-transfer-state +(defn projects-page-did-remount [old-state state] (rs/emit! (dd/initialize :dashboard/projects)) state) @@ -243,7 +243,7 @@ (mx/component {:render projects-page-render :will-mount projects-page-will-mount - :transfer-state projects-page-transfer-state + :did-remount projects-page-did-remount :name "projects-page" :mixins [rum/static]})) diff --git a/src/uxbox/main/ui/lightbox.cljs b/src/uxbox/main/ui/lightbox.cljs index 39c2c88c68..0cbdfbcf02 100644 --- a/src/uxbox/main/ui/lightbox.cljs +++ b/src/uxbox/main/ui/lightbox.cljs @@ -47,10 +47,6 @@ (events/unlistenByKey (::key own)) (dissoc own ::key)) -(defn- lightbox-transfer-state - [old-own own] - (assoc own ::key (::key old-own))) - (defn- lightbox-render [own] (let [data (mx/react lightbox-l) @@ -68,7 +64,6 @@ (mx/component {:name "lightbox" :render lightbox-render - :transfer-state lightbox-transfer-state :will-mount lightbox-will-mount :will-unmount lightbox-will-umount :mixins [mx/reactive mx/static]})) diff --git a/src/uxbox/main/ui/workspace.cljs b/src/uxbox/main/ui/workspace.cljs index 4cfdf01278..702c6b8d1a 100644 --- a/src/uxbox/main/ui/workspace.cljs +++ b/src/uxbox/main/ui/workspace.cljs @@ -65,7 +65,7 @@ (dissoc own ::sub1 ::sub2)) -(defn- workspace-transfer-state +(defn- workspace-did-remount [old-state state] (let [[projectid pageid] (:rum/args state) [oldprojectid oldpageid] (:rum/args old-state)] @@ -146,7 +146,7 @@ (def workspace (mx/component {:render workspace-render - :transfer-state workspace-transfer-state + :did-remount workspace-did-remount :will-mount workspace-will-mount :will-unmount workspace-will-unmount :did-mount workspace-did-mount diff --git a/src/uxbox/main/ui/workspace/base.cljs b/src/uxbox/main/ui/workspace/base.cljs index e01e75743f..4e474ebf3a 100644 --- a/src/uxbox/main/ui/workspace/base.cljs +++ b/src/uxbox/main/ui/workspace/base.cljs @@ -19,23 +19,25 @@ ;; --- Lenses -(def ^:const workspace-l - (as-> (l/in [:workspace]) $ - (l/derive $ st/state))) +(def workspace-l + (-> (l/in [:workspace]) + (l/derive st/state))) -(def ^:const project-l +(def project-l (letfn [(getter [state] (let [project (get-in state [:workspace :project])] (get-in state [:projects-by-id project])))] - (as-> (l/lens getter) $ - (l/derive $ st/state)))) + (-> (l/lens getter) + (l/derive st/state)))) -(def ^:const page-l +(def page-l (letfn [(getter [state] (let [page (get-in state [:workspace :page])] + ;; (println "page-l$getter" page) + (get-in state [:pages-by-id page])))] - (as-> (l/lens getter) $ - (l/derive $ st/state)))) + (-> (l/lens getter) + (l/derive st/state)))) (def ^:const selected-shapes-l (as-> (l/in [:selected]) $ diff --git a/src/uxbox/main/ui/workspace/canvas.cljs b/src/uxbox/main/ui/workspace/canvas.cljs index ca1ef9c7f5..f15bb6c5a0 100644 --- a/src/uxbox/main/ui/workspace/canvas.cljs +++ b/src/uxbox/main/ui/workspace/canvas.cljs @@ -168,13 +168,6 @@ ::key2 key2 ::key3 key3)))) -(defn- viewport-transfer-state - [old-own own] - (->> [::key1 ::key2 ::key3 - ::sub1 ::sub2] - (select-keys old-own) - (merge own))) - (defn- viewport-will-unmount [own] (events/unlistenByKey (::key1 own)) @@ -190,5 +183,4 @@ :name "viewport" :did-mount viewport-did-mount :will-unmount viewport-will-unmount - :transfer-state viewport-transfer-state :mixins [mx/reactive]})) diff --git a/src/uxbox/main/ui/workspace/drawarea.cljs b/src/uxbox/main/ui/workspace/drawarea.cljs index 8c675e49c2..3ec7909cb9 100644 --- a/src/uxbox/main/ui/workspace/drawarea.cljs +++ b/src/uxbox/main/ui/workspace/drawarea.cljs @@ -45,10 +45,6 @@ [own] (assoc own ::sub (watch-draw-actions))) -(defn- draw-area-transfer-state - [oldown own] - (assoc own ::sub (::sub oldown))) - (defn- draw-area-will-unmount [own] (.close (::sub own)) @@ -60,7 +56,6 @@ :name "draw-area" :will-mount draw-area-will-mount :will-unmount draw-area-will-unmount - :transfer-state draw-area-transfer-state :mixins [mx/static mx/reactive]})) ;; --- Drawing Logic diff --git a/src/uxbox/main/ui/workspace/ruler.cljs b/src/uxbox/main/ui/workspace/ruler.cljs index 6bcc1fbe10..f62922a903 100644 --- a/src/uxbox/main/ui/workspace/ruler.cljs +++ b/src/uxbox/main/ui/workspace/ruler.cljs @@ -87,11 +87,6 @@ (subscription) (dissoc own ::sub))) -(defn- overlay-transfer-state - [old-own own] - (let [sub (::sub old-own)] - (assoc own ::sub sub))) - (declare overlay-line-render) (defn- overlay-render @@ -115,7 +110,6 @@ {:render #(overlay-render % (:rum/local %)) :will-mount #(overlay-will-mount % (:rum/local %)) :will-unmount overlay-will-unmount - :transfer-state overlay-transfer-state :name "overlay" :mixins [mx/static (mx/local) mx/reactive]})) diff --git a/src/uxbox/main/ui/workspace/selrect.cljs b/src/uxbox/main/ui/workspace/selrect.cljs index e7c5ac31e7..e5508f442b 100644 --- a/src/uxbox/main/ui/workspace/selrect.cljs +++ b/src/uxbox/main/ui/workspace/selrect.cljs @@ -45,17 +45,12 @@ (.close (::sub own)) (dissoc own ::sub)) -(defn- selrect-transfer-state - [oldown own] - (assoc own ::sub (::sub oldown))) - (def selrect (mx/component {:render selrect-render :name "selrect" :will-mount selrect-will-mount :will-unmount selrect-will-unmount - :transfer-state selrect-transfer-state :mixins [mx/static mx/reactive]})) ;; --- Implementation diff --git a/src/uxbox/main/ui/workspace/shortcuts.cljs b/src/uxbox/main/ui/workspace/shortcuts.cljs index 5adfe1ffd7..0cbbada435 100644 --- a/src/uxbox/main/ui/workspace/shortcuts.cljs +++ b/src/uxbox/main/ui/workspace/shortcuts.cljs @@ -105,11 +105,6 @@ (.close (::sub own)) (dissoc own ::sub)) -(defn- transfer-state - [oldown own] - (assoc own ::sub (::sub oldown))) - (def shortcuts-mixin {:will-mount will-mount - :will-unmount will-unmount - :transfer-state transfer-state}) + :will-unmount will-unmount}) diff --git a/src/uxbox/main/ui/workspace/sidebar/sitemap.cljs b/src/uxbox/main/ui/workspace/sidebar/sitemap.cljs index 0ab71e3df0..a1de4fb642 100644 --- a/src/uxbox/main/ui/workspace/sidebar/sitemap.cljs +++ b/src/uxbox/main/ui/workspace/sidebar/sitemap.cljs @@ -65,7 +65,7 @@ (if (> total 1) [:a {:on-click on-delete} i/trash])]]))) -(def ^:const page-item +(def page-item (mx/component {:render page-item-render :name "page-item"