mirror of
https://github.com/penpot/penpot.git
synced 2026-04-25 11:18:36 +00:00
♻️ 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.
This commit is contained in:
Andrey Antukh
parent
d59dbde0e7
commit
6e853c3f33
@ -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}])])])))
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user