From c907126b6010318bccb3d6798fbc9cd7c283a74e Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Thu, 2 Apr 2020 23:55:56 +0200 Subject: [PATCH] :recycle: Replace wrap-memo with memo. --- frontend/src/uxbox/main/ui/dashboard/grid.cljs | 2 +- frontend/src/uxbox/main/ui/viewer/thumbnails.cljs | 2 +- frontend/src/uxbox/main/ui/workspace/grid.cljs | 2 +- frontend/src/uxbox/main/ui/workspace/header.cljs | 2 +- frontend/src/uxbox/main/ui/workspace/rules.cljs | 8 ++++---- frontend/src/uxbox/main/ui/workspace/sidebar.cljs | 2 +- frontend/src/uxbox/main/ui/workspace/sidebar/layers.cljs | 6 +++--- frontend/src/uxbox/main/ui/workspace/sidebar/options.cljs | 2 +- .../src/uxbox/main/ui/workspace/sidebar/options/page.cljs | 2 +- frontend/src/uxbox/main/ui/workspace/viewport.cljs | 4 ++-- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/frontend/src/uxbox/main/ui/dashboard/grid.cljs b/frontend/src/uxbox/main/ui/dashboard/grid.cljs index eb9146adf..1fc12d738 100644 --- a/frontend/src/uxbox/main/ui/dashboard/grid.cljs +++ b/frontend/src/uxbox/main/ui/dashboard/grid.cljs @@ -35,7 +35,7 @@ (str (t locale "ds.updated-at" time)))) (mf/defc grid-item - {:wrap [mf/wrap-memo]} + {:wrap [mf/memo]} [{:keys [file] :as props}] (let [local (mf/use-state {:menu-open false :edition false}) diff --git a/frontend/src/uxbox/main/ui/viewer/thumbnails.cljs b/frontend/src/uxbox/main/ui/viewer/thumbnails.cljs index f17057f2d..bf830a853 100644 --- a/frontend/src/uxbox/main/ui/viewer/thumbnails.cljs +++ b/frontend/src/uxbox/main/ui/viewer/thumbnails.cljs @@ -78,7 +78,7 @@ children]]]))) (mf/defc frame-svg - {::mf/wrap [mf/wrap-memo]} + {::mf/wrap [mf/memo]} [{:keys [objects frame zoom] :or {zoom 1} :as props}] (let [childs (mapv #(get objects %) (:shapes frame)) modifier (-> (gpt/point (:x frame) (:y frame)) diff --git a/frontend/src/uxbox/main/ui/workspace/grid.cljs b/frontend/src/uxbox/main/ui/workspace/grid.cljs index 624014089..5441c0ad8 100644 --- a/frontend/src/uxbox/main/ui/workspace/grid.cljs +++ b/frontend/src/uxbox/main/ui/workspace/grid.cljs @@ -20,7 +20,7 @@ (l/derive refs/workspace-data))) (mf/defc grid - {:wrap [mf/wrap-memo]} + {:wrap [mf/memo]} [props] (prn "grid$render") (let [options (mf/deref options-iref) diff --git a/frontend/src/uxbox/main/ui/workspace/header.cljs b/frontend/src/uxbox/main/ui/workspace/header.cljs index 0979c6ae3..311a04be3 100644 --- a/frontend/src/uxbox/main/ui/workspace/header.cljs +++ b/frontend/src/uxbox/main/ui/workspace/header.cljs @@ -29,7 +29,7 @@ ;; --- Zoom Widget (mf/defc zoom-widget - {:wrap [mf/wrap-memo]} + {:wrap [mf/memo]} [props] (let [zoom (mf/deref refs/selected-zoom) show-dropdown? (mf/use-state false) diff --git a/frontend/src/uxbox/main/ui/workspace/rules.cljs b/frontend/src/uxbox/main/ui/workspace/rules.cljs index 3e68885bc..f87106c5c 100644 --- a/frontend/src/uxbox/main/ui/workspace/rules.cljs +++ b/frontend/src/uxbox/main/ui/workspace/rules.cljs @@ -99,7 +99,7 @@ ;; --- Horizontal Rule Ticks (Component) (mf/defc horizontal-rule-ticks - {:wrap [mf/wrap-memo]} + {:wrap [mf/memo]} [{:keys [zoom]}] (let [path (reduce (partial make-vertical-tick zoom) [] +ticks+)] [:g @@ -110,7 +110,7 @@ ;; --- Vertical Rule Ticks (Component) (mf/defc vertical-rule-ticks - {:wrap [mf/wrap-memo]} + {:wrap [mf/memo]} [{:keys [zoom]}] (let [path (reduce (partial make-horizontal-tick zoom) [] +ticks+)] [:g @@ -121,7 +121,7 @@ ;; --- Horizontal Rule (Component) (mf/defc horizontal-rule - {:wrap [mf/wrap-memo]} + {:wrap [mf/memo]} [props] (let [scroll (use-rxsub ms/viewport-scroll) zoom (mf/deref refs/selected-zoom) @@ -137,7 +137,7 @@ ;; --- Vertical Rule (Component) (mf/defc vertical-rule - {:wrap [mf/wrap-memo]} + {:wrap [mf/memo]} [props] (let [scroll (use-rxsub ms/viewport-scroll) zoom (or (mf/deref refs/selected-zoom) 1) diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar.cljs index 6e8d5756c..4245dddd5 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar.cljs +++ b/frontend/src/uxbox/main/ui/workspace/sidebar.cljs @@ -22,7 +22,7 @@ ;; --- Left Sidebar (Component) (mf/defc left-sidebar - {:wrap [mf/wrap-memo]} + {:wrap [mf/memo]} [{:keys [layout page file] :as props}] [:aside.settings-bar.settings-bar-left [:div.settings-bar-inside diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/layers.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/layers.cljs index 4ebfe45dd..66adf94ef 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/layers.cljs +++ b/frontend/src/uxbox/main/ui/workspace/sidebar/layers.cljs @@ -83,7 +83,7 @@ #(select-keys % [:id :frame :name :type :hidden :blocked])) (mf/defc layer-item - {:wrap [mf/wrap-memo]} + {:wrap [mf/memo]} [{:keys [index item selected objects] :as props}] (let [selected? (contains? selected (:id item)) local (mf/use-state {:collapsed false}) @@ -187,7 +187,7 @@ :key (:id item)}]))])])) (mf/defc layers-tree - {::mf/wrap [mf/wrap-memo]} + {::mf/wrap [mf/memo]} [props] (let [selected (mf/deref refs/selected-shapes) data (mf/deref refs/workspace-data) @@ -209,7 +209,7 @@ ;; only render visible items instead of all. (mf/defc layers-toolbox - {:wrap [mf/wrap-memo]} + {:wrap [mf/memo]} [{:keys [page] :as props}] (let [locale (i18n/use-locale) on-click #(st/emit! (dw/toggle-layout-flag :layers))] diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/options.cljs index f92de7436..17701a409 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/options.cljs +++ b/frontend/src/uxbox/main/ui/workspace/sidebar/options.cljs @@ -49,7 +49,7 @@ [:& shape-options {:shape shape}])) (mf/defc options-toolbox - {:wrap [mf/wrap-memo]} + {:wrap [mf/memo]} [{:keys [page selected] :as props}] (let [close #(st/emit! (udw/toggle-layout-flag :element-options)) selected (mf/deref refs/selected-shapes)] diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options/page.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/options/page.cljs index 43e1b8b18..325d43c9b 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/options/page.cljs +++ b/frontend/src/uxbox/main/ui/workspace/sidebar/options/page.cljs @@ -70,7 +70,7 @@ (l/derive refs/workspace-data))) (mf/defc grid-options - {:wrap [mf/wrap-memo]} + {:wrap [mf/memo]} [props] (let [options (->> (mf/deref options-iref) (merge default-options)) diff --git a/frontend/src/uxbox/main/ui/workspace/viewport.cljs b/frontend/src/uxbox/main/ui/workspace/viewport.cljs index 85b6ebb23..fe1556a0f 100644 --- a/frontend/src/uxbox/main/ui/workspace/viewport.cljs +++ b/frontend/src/uxbox/main/ui/workspace/viewport.cljs @@ -75,7 +75,7 @@ ;; --- Selection Rect (mf/defc selection-rect - {:wrap [mf/wrap-memo]} + {:wrap [mf/memo]} [{:keys [data] :as props}] (when data [:rect.selection-rect @@ -119,7 +119,7 @@ [:& frames {:data data}])) (mf/defc frames - {:wrap [mf/wrap-memo]} + {:wrap [mf/memo]} [{:keys [data] :as props}] (let [objects (:objects data) root (get objects uuid/zero)