github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-04-25 11:18:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

♻️ Convert svg-attrs-menu and attribute-value to modern * suffix

Browse Source 
Rename attribute-value -> attribute-value*, svg-attrs-menu -> svg-attrs-menu*.
Update all call sites (circle, path, svg_raw, rect, group) to use [:> ...] syntax.
This commit is contained in:
Andrey Antukh 2026-04-02 16:44:39 +00:00
parent 95ca68e2b8
commit 08247aec3f
6 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/src/app/main/ui/workspace/sidebar/options/menus/svg_attrs.cljs
View File

@ -17,7 +17,8 @@
[app.util.i18n :refer [tr]] [app.util.i18n :refer [tr]]
[rumext.v2 :as mf])) [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) (let [last-value (mf/use-state value)
handle-change* handle-change*
@ -56,13 +57,14 @@
(str (d/name (last attr)))] (str (d/name (last attr)))]
(for [[key value] value] (for [[key value] value]
[:div {:class (stl/css :attr-row) :key key} [:div {:class (stl/css :attr-row) :key key}
[:& attribute-value {:key key [:> attribute-value* {:key key
:attr (conj attr key) :attr (conj attr key)
:value value :value value
:on-change on-change :on-change on-change
:on-delete on-delete}]])])])) :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) (let [state* (mf/use-state true)
open? (deref state*) open? (deref state*)
attrs (:svg-attrs values) attrs (:svg-attrs values)
@ -103,7 +105,7 @@
(when open? (when open?
[:div {:class (stl/css :element-set-content)} [:div {:class (stl/css :element-set-content)}
(for [[attr-key attr-value] attrs] (for [[attr-key attr-value] attrs]
[:& attribute-value {:key attr-key [:> attribute-value* {:key attr-key
:attr [attr-key] :attr [attr-key]
:value attr-value :value attr-value
:on-change handle-change :on-change handle-change

4
frontend/src/app/main/ui/workspace/sidebar/options/shapes/circle.cljs
View File

@ -20,7 +20,7 @@
[app.main.ui.workspace.sidebar.options.menus.measures :refer [measure-attrs measures-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.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]] [app.main.ui.workspace.sidebar.options.menus.svg-attrs :refer [svg-attrs-menu*]]
[rumext.v2 :as mf])) [rumext.v2 :as mf]))
(mf/defc options* (mf/defc options*
@ -133,7 +133,7 @@
[:> shadow-menu* {:ids ids :values (get shape :shadow)}] [:> shadow-menu* {:ids ids :values (get shape :shadow)}]
[:> blur-menu* {:ids ids [:> blur-menu* {:ids ids
:values (select-keys shape [:blur])}] :values (select-keys shape [:blur])}]
[:& svg-attrs-menu {:ids ids [:> svg-attrs-menu* {:ids ids
:values (select-keys shape [:svg-attrs])}] :values (select-keys shape [:svg-attrs])}]
[:> exports-menu* {:type type [:> exports-menu* {:type type
:ids ids :ids ids

4
frontend/src/app/main/ui/workspace/sidebar/options/shapes/group.cljs
View File

@ -23,7 +23,7 @@
[app.main.ui.workspace.sidebar.options.menus.measures :refer [measures-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.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.svg-attrs :refer [svg-attrs-menu*]]
[app.main.ui.workspace.sidebar.options.menus.text :as ot] [app.main.ui.workspace.sidebar.options.menus.text :as ot]
[app.main.ui.workspace.sidebar.options.shapes.multiple :refer [get-attrs]] [app.main.ui.workspace.sidebar.options.shapes.multiple :refer [get-attrs]]
[rumext.v2 :as mf])) [rumext.v2 :as mf]))
@ -174,7 +174,7 @@
[:> ot/text-menu* {:type type :ids text-ids :values text-values}]) [:> ot/text-menu* {:type type :ids text-ids :values text-values}])
(when-not (empty? svg-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 [:> exports-menu* {:type type
:ids ids :ids ids

4
frontend/src/app/main/ui/workspace/sidebar/options/shapes/path.cljs
View File

@ -20,7 +20,7 @@
[app.main.ui.workspace.sidebar.options.menus.measures :refer [measure-attrs measures-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.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]] [app.main.ui.workspace.sidebar.options.menus.svg-attrs :refer [svg-attrs-menu*]]
[rumext.v2 :as mf])) [rumext.v2 :as mf]))
(mf/defc options* (mf/defc options*
@ -134,7 +134,7 @@
[:> shadow-menu* {:ids ids :values (get shape :shadow)}] [:> shadow-menu* {:ids ids :values (get shape :shadow)}]
[:> blur-menu* {:ids ids [:> blur-menu* {:ids ids
:values (select-keys shape [:blur])}] :values (select-keys shape [:blur])}]
[:& svg-attrs-menu {:ids ids [:> svg-attrs-menu* {:ids ids
:values (select-keys shape [:svg-attrs])}] :values (select-keys shape [:svg-attrs])}]
[:> exports-menu* {:type type [:> exports-menu* {:type type
:ids ids :ids ids

4
frontend/src/app/main/ui/workspace/sidebar/options/shapes/rect.cljs
View File

@ -20,7 +20,7 @@
[app.main.ui.workspace.sidebar.options.menus.measures :refer [measure-attrs measures-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.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]] [app.main.ui.workspace.sidebar.options.menus.svg-attrs :refer [svg-attrs-menu*]]
[rumext.v2 :as mf])) [rumext.v2 :as mf]))
(mf/defc options* (mf/defc options*
@ -136,7 +136,7 @@
[:> blur-menu* {:ids ids [:> blur-menu* {:ids ids
:values (select-keys shape [:blur])}] :values (select-keys shape [:blur])}]
[:& svg-attrs-menu {:ids ids [:> svg-attrs-menu* {:ids ids
:values (select-keys shape [:svg-attrs])}] :values (select-keys shape [:svg-attrs])}]
[:> exports-menu* {:type type [:> exports-menu* {:type type
:ids ids :ids ids

4
frontend/src/app/main/ui/workspace/sidebar/options/shapes/svg_raw.cljs
View File

@ -21,7 +21,7 @@
[app.main.ui.workspace.sidebar.options.menus.measures :refer [measure-attrs measures-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.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]] [app.main.ui.workspace.sidebar.options.menus.svg-attrs :refer [svg-attrs-menu*]]
[cuerdas.core :as str] [cuerdas.core :as str]
[rumext.v2 :as mf])) [rumext.v2 :as mf]))
@ -203,7 +203,7 @@
[:> blur-menu* {:ids ids [:> blur-menu* {:ids ids
:values (select-keys shape [:blur])}] :values (select-keys shape [:blur])}]
[:& svg-attrs-menu {:ids ids [:> svg-attrs-menu* {:ids ids
:values (select-keys shape [:svg-attrs])}] :values (select-keys shape [:svg-attrs])}]
[:> exports-menu* {:type type [:> exports-menu* {:type type
:ids ids :ids ids