From 0e5d3e2619c2454b89e1b3405ee9461aec940402 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Thu, 2 Apr 2026 16:35:16 +0000 Subject: [PATCH] :recycle: Convert blur-menu, constraints-menu and stroke-menu to modern rumext * format Rename components to blur-menu*, constraints-menu* and stroke-menu*. Update :refer imports and all [:& ...] call sites to [:> ...*] for blur-menu*, constraints-menu* and stroke-menu* across all nine shapes-specific options panels. --- .../workspace/sidebar/options/menus/blur.cljs | 2 +- .../sidebar/options/menus/constraints.cljs | 2 +- .../sidebar/options/menus/stroke.cljs | 2 +- .../sidebar/options/shapes/bool.cljs | 24 +++++++++---------- .../sidebar/options/shapes/circle.cljs | 22 ++++++++--------- .../sidebar/options/shapes/frame.cljs | 22 ++++++++--------- .../sidebar/options/shapes/group.cljs | 18 +++++++------- .../sidebar/options/shapes/multiple.cljs | 22 ++++++++--------- .../sidebar/options/shapes/path.cljs | 24 +++++++++---------- .../sidebar/options/shapes/rect.cljs | 22 ++++++++--------- .../sidebar/options/shapes/svg_raw.cljs | 22 ++++++++--------- .../sidebar/options/shapes/text.cljs | 20 ++++++++-------- 12 files changed, 101 insertions(+), 101 deletions(-) diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/blur.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/blur.cljs index f1beba6eb0..077442c428 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/blur.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/blur.cljs @@ -32,7 +32,7 @@ :value 4 :hidden false})) -(mf/defc blur-menu [{:keys [ids type values]}] +(mf/defc blur-menu* [{:keys [ids type values]}] (let [blur (:blur values) has-value? (not (nil? blur)) render-wasm? (features/use-feature "render-wasm/v1") diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/constraints.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/constraints.cljs index a56843dce2..ee62bee93f 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/constraints.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/constraints.cljs @@ -28,7 +28,7 @@ :parent-id :frame-id]) -(mf/defc constraints-menu +(mf/defc constraints-menu* [{:keys [ids values] :as props}] (let [state* (mf/use-state true) open? (deref state*) diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/stroke.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/stroke.cljs index c35bac471e..5431343b73 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/stroke.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/stroke.cljs @@ -37,7 +37,7 @@ :stroke-cap-start :stroke-cap-end]) -(mf/defc stroke-menu +(mf/defc stroke-menu* {::mf/wrap [#(mf/memo' % (mf/check-props ["ids" "values" "type" "show-caps" "applied-tokens"]))]} [{:keys [ids type values show-caps disable-stroke-style applied-tokens shapes objects] :as props}] (let [label (case type diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/shapes/bool.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/shapes/bool.cljs index 8404baada7..b836aea6ce 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options/shapes/bool.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/shapes/bool.cljs @@ -9,8 +9,8 @@ [app.common.data.macros :as dm] [app.common.types.shape.layout :as ctl] [app.main.refs :as refs] - [app.main.ui.workspace.sidebar.options.menus.blur :refer [blur-menu]] - [app.main.ui.workspace.sidebar.options.menus.constraints :refer [constraint-attrs constraints-menu]] + [app.main.ui.workspace.sidebar.options.menus.blur :refer [blur-menu*]] + [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.grid-cell :as grid-cell] @@ -19,7 +19,7 @@ [app.main.ui.workspace.sidebar.options.menus.layout-item :refer [layout-item-attrs layout-item-menu]] [app.main.ui.workspace.sidebar.options.menus.measures :refer [measure-attrs measures-menu*]] [app.main.ui.workspace.sidebar.options.menus.shadow :refer [shadow-menu*]] - [app.main.ui.workspace.sidebar.options.menus.stroke :refer [stroke-attrs stroke-menu]] + [app.main.ui.workspace.sidebar.options.menus.stroke :refer [stroke-attrs stroke-menu*]] [rumext.v2 :as mf])) (mf/defc options* @@ -118,8 +118,8 @@ :shape shape}]) (when (or (not ^boolean is-layout-child?) ^boolean is-layout-child-absolute?) - [:& constraints-menu {:ids ids - :values constraint-values}]) + [:> constraints-menu* {:ids ids + :values constraint-values}]) [:> fill/fill-menu* {:ids ids @@ -127,15 +127,15 @@ :values shape :applied-tokens applied-tokens}] - [:& stroke-menu {:ids ids - :type type - :show-caps true - :values stroke-values - :applied-tokens applied-tokens}] + [:> stroke-menu* {:ids ids + :type type + :show-caps true + :values stroke-values + :applied-tokens applied-tokens}] [:> shadow-menu* {:ids ids :values (get shape :shadow)}] - [:& blur-menu {:ids ids - :values (select-keys shape [:blur])}] + [:> blur-menu* {:ids ids + :values (select-keys shape [:blur])}] [:> exports-menu* {:type type :ids ids diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/shapes/circle.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/shapes/circle.cljs index 92c630b854..a55498a2e3 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options/shapes/circle.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/shapes/circle.cljs @@ -9,8 +9,8 @@ [app.common.data.macros :as dm] [app.common.types.shape.layout :as ctl] [app.main.refs :as refs] - [app.main.ui.workspace.sidebar.options.menus.blur :refer [blur-menu]] - [app.main.ui.workspace.sidebar.options.menus.constraints :refer [constraint-attrs constraints-menu]] + [app.main.ui.workspace.sidebar.options.menus.blur :refer [blur-menu*]] + [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.grid-cell :as grid-cell] @@ -19,7 +19,7 @@ [app.main.ui.workspace.sidebar.options.menus.layout-item :refer [layout-item-attrs layout-item-menu]] [app.main.ui.workspace.sidebar.options.menus.measures :refer [measure-attrs measures-menu*]] [app.main.ui.workspace.sidebar.options.menus.shadow :refer [shadow-menu*]] - [app.main.ui.workspace.sidebar.options.menus.stroke :refer [stroke-attrs stroke-menu]] + [app.main.ui.workspace.sidebar.options.menus.stroke :refer [stroke-attrs stroke-menu*]] [app.main.ui.workspace.sidebar.options.menus.svg-attrs :refer [svg-attrs-menu]] [rumext.v2 :as mf])) @@ -117,8 +117,8 @@ :shape shape}]) (when (or (not ^boolean is-layout-child?) ^boolean is-layout-child-absolute?) - [:& constraints-menu {:ids ids - :values constraint-values}]) + [:> constraints-menu* {:ids ids + :values constraint-values}]) [:> fill/fill-menu* {:ids ids @@ -126,13 +126,13 @@ :values shape :applied-tokens applied-tokens}] - [:& stroke-menu {:ids ids - :type type - :values stroke-values - :applied-tokens applied-tokens}] + [:> stroke-menu* {:ids ids + :type type + :values stroke-values + :applied-tokens applied-tokens}] [:> shadow-menu* {:ids ids :values (get shape :shadow)}] - [:& blur-menu {:ids ids - :values (select-keys shape [:blur])}] + [:> blur-menu* {:ids ids + :values (select-keys shape [:blur])}] [:& svg-attrs-menu {:ids ids :values (select-keys shape [:svg-attrs])}] [:> exports-menu* {:type type 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 d2051a051e..004cd131a5 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 @@ -10,10 +10,10 @@ [app.common.types.component :as ctk] [app.common.types.shape.layout :as ctl] [app.main.refs :as refs] - [app.main.ui.workspace.sidebar.options.menus.blur :refer [blur-menu]] + [app.main.ui.workspace.sidebar.options.menus.blur :refer [blur-menu*]] [app.main.ui.workspace.sidebar.options.menus.color-selection :refer [color-selection-menu*]] [app.main.ui.workspace.sidebar.options.menus.component :refer [component-menu* component-variant-main*]] - [app.main.ui.workspace.sidebar.options.menus.constraints :refer [constraint-attrs constraints-menu]] + [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]] @@ -23,7 +23,7 @@ [app.main.ui.workspace.sidebar.options.menus.layout-item :refer [layout-item-attrs layout-item-menu]] [app.main.ui.workspace.sidebar.options.menus.measures :refer [select-measure-keys measures-menu*]] [app.main.ui.workspace.sidebar.options.menus.shadow :refer [shadow-menu*]] - [app.main.ui.workspace.sidebar.options.menus.stroke :refer [stroke-attrs stroke-menu]] + [app.main.ui.workspace.sidebar.options.menus.stroke :refer [stroke-attrs stroke-menu*]] [rumext.v2 :as mf])) (mf/defc options* @@ -140,8 +140,8 @@ :shape shape}]) (when (or (not ^boolean is-layout-child?) ^boolean is-layout-child-absolute?) - [:& constraints-menu {:ids ids - :values constraint-values}]) + [:> constraints-menu* {:ids ids + :values constraint-values}]) [:> fill/fill-menu* {:ids ids @@ -149,17 +149,17 @@ :values shape :applied-tokens applied-tokens}] - [:& stroke-menu {:ids ids - :type shape-type - :values stroke-values - :applied-tokens applied-tokens}] + [:> stroke-menu* {:ids ids + :type shape-type + :values stroke-values + :applied-tokens applied-tokens}] [:> color-selection-menu* {:type shape-type :shapes shapes-with-children :file-id file-id :libraries libraries}] [:> shadow-menu* {:ids ids :values (get shape :shadow)}] - [:& blur-menu {:ids ids - :values (select-keys shape [:blur])}] + [:> blur-menu* {:ids ids + :values (select-keys shape [:blur])}] [:& frame-grid {:shape shape}] [:> exports-menu* {:type shape-type :ids ids diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/shapes/group.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/shapes/group.cljs index eaab775a8e..30d19bc83c 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options/shapes/group.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/shapes/group.cljs @@ -11,9 +11,9 @@ [app.common.data.macros :as dm] [app.common.types.shape.layout :as ctl] [app.main.refs :as refs] - [app.main.ui.workspace.sidebar.options.menus.blur :refer [blur-menu]] + [app.main.ui.workspace.sidebar.options.menus.blur :refer [blur-menu*]] [app.main.ui.workspace.sidebar.options.menus.color-selection :refer [color-selection-menu*]] - [app.main.ui.workspace.sidebar.options.menus.constraints :refer [constraints-menu]] + [app.main.ui.workspace.sidebar.options.menus.constraints :refer [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.grid-cell :as grid-cell] @@ -22,7 +22,7 @@ [app.main.ui.workspace.sidebar.options.menus.layout-item :refer [layout-item-menu]] [app.main.ui.workspace.sidebar.options.menus.measures :refer [measures-menu*]] [app.main.ui.workspace.sidebar.options.menus.shadow :refer [shadow-menu*]] - [app.main.ui.workspace.sidebar.options.menus.stroke :refer [stroke-menu]] + [app.main.ui.workspace.sidebar.options.menus.stroke :refer [stroke-menu*]] [app.main.ui.workspace.sidebar.options.menus.svg-attrs :refer [svg-attrs-menu]] [app.main.ui.workspace.sidebar.options.menus.text :as ot] [app.main.ui.workspace.sidebar.options.shapes.multiple :refer [get-attrs]] @@ -143,7 +143,7 @@ :values layout-item-values}]) (when (or (not ^boolean is-layout-child?) ^boolean is-layout-child-absolute?) - [:& constraints-menu {:ids constraint-ids :values constraint-values}]) + [:> constraints-menu* {:ids constraint-ids :values constraint-values}]) (when-not (empty? fill-ids) [:> fill/fill-menu* @@ -153,10 +153,10 @@ :applied-tokens fill-tokens}]) (when-not (empty? stroke-ids) - [:& stroke-menu {:type type - :ids stroke-ids - :values stroke-values - :applied-tokens stroke-tokens}]) + [:> stroke-menu* {:type type + :ids stroke-ids + :values stroke-values + :applied-tokens stroke-tokens}]) [:> color-selection-menu* {:type type @@ -168,7 +168,7 @@ [:> shadow-menu* {:ids ids :values (get shape :shadow) :type type}]) (when-not (empty? blur-ids) - [:& blur-menu {:type type :ids blur-ids :values blur-values}]) + [:> blur-menu* {:type type :ids blur-ids :values blur-values}]) (when-not (empty? text-ids) [:& ot/text-menu {:type type :ids text-ids :values text-values}]) diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/shapes/multiple.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/shapes/multiple.cljs index f3c6ee2b1e..34b7f1c098 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options/shapes/multiple.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/shapes/multiple.cljs @@ -20,10 +20,10 @@ [app.common.types.token :as tt] [app.common.weak :as weak] [app.main.refs :as refs] - [app.main.ui.workspace.sidebar.options.menus.blur :refer [blur-attrs blur-menu]] + [app.main.ui.workspace.sidebar.options.menus.blur :refer [blur-attrs blur-menu*]] [app.main.ui.workspace.sidebar.options.menus.color-selection :refer [color-selection-menu*]] [app.main.ui.workspace.sidebar.options.menus.component :refer [component-menu*]] - [app.main.ui.workspace.sidebar.options.menus.constraints :refer [constraint-attrs constraints-menu]] + [app.main.ui.workspace.sidebar.options.menus.constraints :refer [constraint-attrs constraints-menu*]] [app.main.ui.workspace.sidebar.options.menus.exports :refer [exports-attrs exports-menu*]] [app.main.ui.workspace.sidebar.options.menus.fill :as fill] [app.main.ui.workspace.sidebar.options.menus.layer :refer [layer-attrs layer-menu*]] @@ -31,7 +31,7 @@ [app.main.ui.workspace.sidebar.options.menus.layout-item :refer [layout-item-attrs layout-item-menu]] [app.main.ui.workspace.sidebar.options.menus.measures :refer [select-measure-keys measure-attrs measures-menu*]] [app.main.ui.workspace.sidebar.options.menus.shadow :refer [shadow-attrs shadow-menu*]] - [app.main.ui.workspace.sidebar.options.menus.stroke :refer [stroke-attrs stroke-menu]] + [app.main.ui.workspace.sidebar.options.menus.stroke :refer [stroke-attrs stroke-menu*]] [app.main.ui.workspace.sidebar.options.menus.text :as ot] [rumext.v2 :as mf])) @@ -475,7 +475,7 @@ :values layout-item-values}]) (when-not (or (empty? constraint-ids) ^boolean is-layout-child?) - [:& constraints-menu {:ids constraint-ids :values constraint-values}]) + [:> constraints-menu* {:ids constraint-ids :values constraint-values}]) (when-not (empty? text-ids) [:& ot/text-menu {:type type :ids text-ids :values text-values}]) @@ -487,12 +487,12 @@ :applied-tokens fill-tokens}]) (when-not (empty? stroke-ids) - [:& stroke-menu {:type type - :ids stroke-ids - :show-caps show-caps? - :values stroke-values - :disable-stroke-style has-text? - :applied-tokens stroke-tokens}]) + [:> stroke-menu* {:type type + :ids stroke-ids + :show-caps show-caps? + :values stroke-values + :disable-stroke-style has-text? + :applied-tokens stroke-tokens}]) (when-not (empty? shapes) [:> color-selection-menu* @@ -507,7 +507,7 @@ :values (get shadow-values :shadow)}]) (when-not (empty? blur-ids) - [:& blur-menu {:type type :ids blur-ids :values blur-values}]) + [:> blur-menu* {:type type :ids blur-ids :values blur-values}]) (when-not (empty? exports-ids) [:> exports-menu* {:type type diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/shapes/path.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/shapes/path.cljs index 98cd626d17..885a9a83bc 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options/shapes/path.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/shapes/path.cljs @@ -9,8 +9,8 @@ [app.common.data.macros :as dm] [app.common.types.shape.layout :as ctl] [app.main.refs :as refs] - [app.main.ui.workspace.sidebar.options.menus.blur :refer [blur-menu]] - [app.main.ui.workspace.sidebar.options.menus.constraints :refer [constraint-attrs constraints-menu]] + [app.main.ui.workspace.sidebar.options.menus.blur :refer [blur-menu*]] + [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.grid-cell :as grid-cell] @@ -19,7 +19,7 @@ [app.main.ui.workspace.sidebar.options.menus.layout-item :refer [layout-item-attrs layout-item-menu]] [app.main.ui.workspace.sidebar.options.menus.measures :refer [measure-attrs measures-menu*]] [app.main.ui.workspace.sidebar.options.menus.shadow :refer [shadow-menu*]] - [app.main.ui.workspace.sidebar.options.menus.stroke :refer [stroke-attrs stroke-menu]] + [app.main.ui.workspace.sidebar.options.menus.stroke :refer [stroke-attrs stroke-menu*]] [app.main.ui.workspace.sidebar.options.menus.svg-attrs :refer [svg-attrs-menu]] [rumext.v2 :as mf])) @@ -117,8 +117,8 @@ :shape shape}]) (when (or (not ^boolean is-layout-child?) ^boolean is-layout-child-absolute?) - [:& constraints-menu {:ids ids - :values constraint-values}]) + [:> constraints-menu* {:ids ids + :values constraint-values}]) [:> fill/fill-menu* {:ids ids @@ -126,14 +126,14 @@ :values shape :applied-tokens applied-tokens}] - [:& stroke-menu {:ids ids - :type type - :show-caps true - :values stroke-values - :applied-tokens applied-tokens}] + [:> stroke-menu* {:ids ids + :type type + :show-caps true + :values stroke-values + :applied-tokens applied-tokens}] [:> shadow-menu* {:ids ids :values (get shape :shadow)}] - [:& blur-menu {:ids ids - :values (select-keys shape [:blur])}] + [:> blur-menu* {:ids ids + :values (select-keys shape [:blur])}] [:& svg-attrs-menu {:ids ids :values (select-keys shape [:svg-attrs])}] [:> exports-menu* {:type type diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/shapes/rect.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/shapes/rect.cljs index 4113de291c..1e5c148a63 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options/shapes/rect.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/shapes/rect.cljs @@ -9,8 +9,8 @@ [app.common.data.macros :as dm] [app.common.types.shape.layout :as ctl] [app.main.refs :as refs] - [app.main.ui.workspace.sidebar.options.menus.blur :refer [blur-menu]] - [app.main.ui.workspace.sidebar.options.menus.constraints :refer [constraint-attrs constraints-menu]] + [app.main.ui.workspace.sidebar.options.menus.blur :refer [blur-menu*]] + [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.grid-cell :as grid-cell] @@ -19,7 +19,7 @@ [app.main.ui.workspace.sidebar.options.menus.layout-item :refer [layout-item-attrs layout-item-menu]] [app.main.ui.workspace.sidebar.options.menus.measures :refer [measure-attrs measures-menu*]] [app.main.ui.workspace.sidebar.options.menus.shadow :refer [shadow-menu*]] - [app.main.ui.workspace.sidebar.options.menus.stroke :refer [stroke-attrs stroke-menu]] + [app.main.ui.workspace.sidebar.options.menus.stroke :refer [stroke-attrs stroke-menu*]] [app.main.ui.workspace.sidebar.options.menus.svg-attrs :refer [svg-attrs-menu]] [rumext.v2 :as mf])) @@ -117,8 +117,8 @@ :shape shape}]) (when (or (not ^boolean is-layout-child?) ^boolean is-layout-child-absolute?) - [:& constraints-menu {:ids ids - :values constraint-values}]) + [:> constraints-menu* {:ids ids + :values constraint-values}]) [:> fill/fill-menu* {:ids ids @@ -126,15 +126,15 @@ :values shape :applied-tokens applied-tokens}] - [:& stroke-menu {:ids ids - :type type - :values stroke-values - :applied-tokens applied-tokens}] + [:> stroke-menu* {:ids ids + :type type + :values stroke-values + :applied-tokens applied-tokens}] [:> shadow-menu* {:ids ids :values (get shape :shadow)}] - [:& blur-menu {:ids ids - :values (select-keys shape [:blur])}] + [:> blur-menu* {:ids ids + :values (select-keys shape [:blur])}] [:& svg-attrs-menu {:ids ids :values (select-keys shape [:svg-attrs])}] diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/shapes/svg_raw.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/shapes/svg_raw.cljs index c71448aaa3..8b5a265ee8 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options/shapes/svg_raw.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/shapes/svg_raw.cljs @@ -11,8 +11,8 @@ [app.common.types.color :as cc] [app.common.types.shape.layout :as ctl] [app.main.refs :as refs] - [app.main.ui.workspace.sidebar.options.menus.blur :refer [blur-menu]] - [app.main.ui.workspace.sidebar.options.menus.constraints :refer [constraint-attrs constraints-menu]] + [app.main.ui.workspace.sidebar.options.menus.blur :refer [blur-menu*]] + [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.grid-cell :as grid-cell] @@ -20,7 +20,7 @@ [app.main.ui.workspace.sidebar.options.menus.layout-item :refer [layout-item-attrs layout-item-menu]] [app.main.ui.workspace.sidebar.options.menus.measures :refer [measure-attrs measures-menu*]] [app.main.ui.workspace.sidebar.options.menus.shadow :refer [shadow-menu*]] - [app.main.ui.workspace.sidebar.options.menus.stroke :refer [stroke-attrs stroke-menu]] + [app.main.ui.workspace.sidebar.options.menus.stroke :refer [stroke-attrs stroke-menu*]] [app.main.ui.workspace.sidebar.options.menus.svg-attrs :refer [svg-attrs-menu]] [cuerdas.core :as str] [rumext.v2 :as mf])) @@ -184,8 +184,8 @@ :shape shape}]) (when (or (not ^boolean is-layout-child?) ^boolean is-layout-child-absolute?) - [:& constraints-menu {:ids ids - :values constraint-values}]) + [:> constraints-menu* {:ids ids + :values constraint-values}]) [:> fill/fill-menu* {:ids ids @@ -193,15 +193,15 @@ :values fill-values :applied-tokens applied-tokens}] - [:& stroke-menu {:ids ids - :type type - :values stroke-values - :applied-tokens applied-tokens}] + [:> stroke-menu* {:ids ids + :type type + :values stroke-values + :applied-tokens applied-tokens}] [:> shadow-menu* {:ids ids :values (get shape :shadow)}] - [:& blur-menu {:ids ids - :values (select-keys shape [:blur])}] + [:> blur-menu* {:ids ids + :values (select-keys shape [:blur])}] [:& svg-attrs-menu {:ids ids :values (select-keys shape [:svg-attrs])}] diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/shapes/text.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/shapes/text.cljs index 41673ddd89..17f239bcb4 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options/shapes/text.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/shapes/text.cljs @@ -14,9 +14,9 @@ [app.main.features :as features] [app.main.refs :as refs] [app.main.store :as st] - [app.main.ui.workspace.sidebar.options.menus.blur :refer [blur-menu]] + [app.main.ui.workspace.sidebar.options.menus.blur :refer [blur-menu*]] [app.main.ui.workspace.sidebar.options.menus.color-selection :refer [color-selection-menu*]] - [app.main.ui.workspace.sidebar.options.menus.constraints :refer [constraint-attrs constraints-menu]] + [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.grid-cell :as grid-cell] @@ -25,7 +25,7 @@ [app.main.ui.workspace.sidebar.options.menus.layout-item :refer [layout-item-attrs layout-item-menu]] [app.main.ui.workspace.sidebar.options.menus.measures :refer [measure-attrs measures-menu*]] [app.main.ui.workspace.sidebar.options.menus.shadow :refer [shadow-menu*]] - [app.main.ui.workspace.sidebar.options.menus.stroke :refer [stroke-attrs stroke-menu]] + [app.main.ui.workspace.sidebar.options.menus.stroke :refer [stroke-attrs stroke-menu*]] [app.main.ui.workspace.sidebar.options.menus.text :refer [text-menu]] [rumext.v2 :as mf])) @@ -172,7 +172,7 @@ :shape shape}]) (when (or (not ^boolean is-layout-child?) ^boolean is-layout-child-absolute?) - [:& constraints-menu + [:> constraints-menu* {:ids ids :values (select-keys shape constraint-attrs)}]) @@ -187,11 +187,11 @@ :values fill-values :applied-tokens applied-tokens}] - [:& stroke-menu {:ids ids - :type type - :values stroke-values - :disable-stroke-style true - :applied-tokens applied-tokens}] + [:> stroke-menu* {:ids ids + :type type + :values stroke-values + :disable-stroke-style true + :applied-tokens applied-tokens}] (when (= :multiple (:fills fill-values)) [:> color-selection-menu* @@ -202,7 +202,7 @@ [:> shadow-menu* {:ids ids :values (get shape :shadow)}] - [:& blur-menu + [:> blur-menu* {:ids ids :values (select-keys shape [:blur])}]