From c1688edf66f00e06ac2b74992b8ba7a518d6a136 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Thu, 2 Apr 2026 16:51:22 +0000 Subject: [PATCH] :recycle: Convert frame-grid and grid-options to modern * suffix Rename grid-options -> grid-options*, frame-grid -> frame-grid*. Update internal call and call site in shapes/frame.cljs to [:> ...] syntax. --- .../sidebar/options/menus/frame_grid.cljs | 18 +++++++++--------- .../sidebar/options/shapes/frame.cljs | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/frame_grid.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/frame_grid.cljs index 326b5efa4a..f3f8619d56 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/frame_grid.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/frame_grid.cljs @@ -33,7 +33,7 @@ :separator 18 12 10 8 6 4 3 2]) -(mf/defc grid-options +(mf/defc grid-options* {::mf/wrap [mf/memo]} [{:keys [shape-id index grid frame-width frame-height default-grid-params]}] (let [on-change (mf/use-fn (mf/deps shape-id index) #(st/emit! (dw/set-frame-grid shape-id index %))) @@ -296,7 +296,7 @@ [:button {:class (stl/css :option-btn) :on-click handle-set-as-default} (tr "workspace.options.grid.params.set-default")]])]])])])) -(mf/defc frame-grid +(mf/defc frame-grid* [{:keys [shape]}] (let [state* (mf/use-state true) open? (deref state*) @@ -331,12 +331,12 @@ (when (and open? (seq frame-grids)) [:div {:class (stl/css :element-set-content)} (for [[index grid] (map-indexed vector frame-grids)] - [:& grid-options {:key (str id "-" index) - :shape-id id - :grid grid - :index index - :frame-width (:width shape) - :frame-height (:height shape) - :default-grid-params default-grid-params}])])])) + [:> grid-options* {:key (str id "-" index) + :shape-id id + :grid grid + :index index + :frame-width (:width shape) + :frame-height (:height shape) + :default-grid-params default-grid-params}])])])) diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/shapes/frame.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/shapes/frame.cljs index 004cd131a5..2948e11420 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options/shapes/frame.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/shapes/frame.cljs @@ -16,7 +16,7 @@ [app.main.ui.workspace.sidebar.options.menus.constraints :refer [constraint-attrs constraints-menu*]] [app.main.ui.workspace.sidebar.options.menus.exports :refer [exports-menu* exports-attrs]] [app.main.ui.workspace.sidebar.options.menus.fill :as fill] - [app.main.ui.workspace.sidebar.options.menus.frame-grid :refer [frame-grid]] + [app.main.ui.workspace.sidebar.options.menus.frame-grid :refer [frame-grid*]] [app.main.ui.workspace.sidebar.options.menus.grid-cell :as grid-cell] [app.main.ui.workspace.sidebar.options.menus.layer :refer [layer-attrs layer-menu*]] [app.main.ui.workspace.sidebar.options.menus.layout-container :refer [layout-container-flex-attrs layout-container-menu]] @@ -160,7 +160,7 @@ [:> shadow-menu* {:ids ids :values (get shape :shadow)}] [:> blur-menu* {:ids ids :values (select-keys shape [:blur])}] - [:& frame-grid {:shape shape}] + [:> frame-grid* {:shape shape}] [:> exports-menu* {:type shape-type :ids ids :shapes shapes