From 08247aec3f4e9203d245bb7bdb818e23ac0aa36e Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Thu, 2 Apr 2026 16:44:39 +0000 Subject: [PATCH] :recycle: Convert svg-attrs-menu and attribute-value to modern * suffix Rename attribute-value -> attribute-value*, svg-attrs-menu -> svg-attrs-menu*. Update all call sites (circle, path, svg_raw, rect, group) to use [:> ...] syntax. --- .../sidebar/options/menus/svg_attrs.cljs | 26 ++++++++++--------- .../sidebar/options/shapes/circle.cljs | 6 ++--- .../sidebar/options/shapes/group.cljs | 4 +-- .../sidebar/options/shapes/path.cljs | 6 ++--- .../sidebar/options/shapes/rect.cljs | 6 ++--- .../sidebar/options/shapes/svg_raw.cljs | 6 ++--- 6 files changed, 28 insertions(+), 26 deletions(-) diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/svg_attrs.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/svg_attrs.cljs index b50adf32bf..1928304502 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/svg_attrs.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/svg_attrs.cljs @@ -17,7 +17,8 @@ [app.util.i18n :refer [tr]] [rumext.v2 :as mf])) -(mf/defc attribute-value [{:keys [attr value on-change on-delete] :as props}] +(mf/defc attribute-value* + [{:keys [attr value on-change on-delete]}] (let [last-value (mf/use-state value) handle-change* @@ -56,13 +57,14 @@ (str (d/name (last attr)))] (for [[key value] value] [:div {:class (stl/css :attr-row) :key key} - [:& attribute-value {:key key - :attr (conj attr key) - :value value - :on-change on-change - :on-delete on-delete}]])])])) + [:> attribute-value* {:key key + :attr (conj attr key) + :value value + :on-change on-change + :on-delete on-delete}]])])])) -(mf/defc svg-attrs-menu [{:keys [ids values]}] +(mf/defc svg-attrs-menu* + [{:keys [ids values]}] (let [state* (mf/use-state true) open? (deref state*) attrs (:svg-attrs values) @@ -103,8 +105,8 @@ (when open? [:div {:class (stl/css :element-set-content)} (for [[attr-key attr-value] attrs] - [:& attribute-value {:key attr-key - :attr [attr-key] - :value attr-value - :on-change handle-change - :on-delete handle-delete}])])]))) + [:> attribute-value* {:key attr-key + :attr [attr-key] + :value attr-value + :on-change handle-change + :on-delete handle-delete}])])]))) 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 a55498a2e3..cf5f0cd9fa 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 @@ -20,7 +20,7 @@ [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.svg-attrs :refer [svg-attrs-menu]] + [app.main.ui.workspace.sidebar.options.menus.svg-attrs :refer [svg-attrs-menu*]] [rumext.v2 :as mf])) (mf/defc options* @@ -133,8 +133,8 @@ [:> shadow-menu* {:ids ids :values (get shape :shadow)}] [:> blur-menu* {:ids ids :values (select-keys shape [:blur])}] - [:& svg-attrs-menu {:ids ids - :values (select-keys shape [:svg-attrs])}] + [:> svg-attrs-menu* {:ids ids + :values (select-keys shape [:svg-attrs])}] [:> exports-menu* {:type type :ids ids :shapes shapes 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 80cfe2bd36..6d6815da66 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 @@ -23,7 +23,7 @@ [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.svg-attrs :refer [svg-attrs-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]] [rumext.v2 :as mf])) @@ -174,7 +174,7 @@ [:> ot/text-menu* {:type type :ids text-ids :values text-values}]) (when-not (empty? svg-values) - [:& svg-attrs-menu {:ids ids :values svg-values}]) + [:> svg-attrs-menu* {:ids ids :values svg-values}]) [:> exports-menu* {:type type :ids ids 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 885a9a83bc..79c2788d24 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 @@ -20,7 +20,7 @@ [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.svg-attrs :refer [svg-attrs-menu]] + [app.main.ui.workspace.sidebar.options.menus.svg-attrs :refer [svg-attrs-menu*]] [rumext.v2 :as mf])) (mf/defc options* @@ -134,8 +134,8 @@ [:> shadow-menu* {:ids ids :values (get shape :shadow)}] [:> blur-menu* {:ids ids :values (select-keys shape [:blur])}] - [:& svg-attrs-menu {:ids ids - :values (select-keys shape [:svg-attrs])}] + [:> svg-attrs-menu* {:ids ids + :values (select-keys shape [:svg-attrs])}] [:> exports-menu* {:type type :ids ids :shapes shapes 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 1e5c148a63..ccfadbb62d 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 @@ -20,7 +20,7 @@ [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.svg-attrs :refer [svg-attrs-menu]] + [app.main.ui.workspace.sidebar.options.menus.svg-attrs :refer [svg-attrs-menu*]] [rumext.v2 :as mf])) (mf/defc options* @@ -136,8 +136,8 @@ [:> blur-menu* {:ids ids :values (select-keys shape [:blur])}] - [:& svg-attrs-menu {:ids ids - :values (select-keys shape [:svg-attrs])}] + [:> svg-attrs-menu* {:ids ids + :values (select-keys shape [:svg-attrs])}] [:> exports-menu* {:type type :ids ids :shapes shapes 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 8b5a265ee8..8bb599f3ff 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 @@ -21,7 +21,7 @@ [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.svg-attrs :refer [svg-attrs-menu]] + [app.main.ui.workspace.sidebar.options.menus.svg-attrs :refer [svg-attrs-menu*]] [cuerdas.core :as str] [rumext.v2 :as mf])) @@ -203,8 +203,8 @@ [:> blur-menu* {:ids ids :values (select-keys shape [:blur])}] - [:& svg-attrs-menu {:ids ids - :values (select-keys shape [:svg-attrs])}] + [:> svg-attrs-menu* {:ids ids + :values (select-keys shape [:svg-attrs])}] [:> exports-menu* {:type type :ids ids :shapes shapes