♻️ Convert token theme-selector components to modern * suffix format

Rename themes-list, theme-options, theme-selector to * suffix;
rename grouped? -> is-grouped; update call sites in themes.cljs.
This commit is contained in:
Andrey Antukh 2026-04-02 17:14:31 +00:00
parent bc1a4d7670
commit 0da185d2d5
2 changed files with 15 additions and 15 deletions

View File

@ -12,7 +12,7 @@
[app.main.ui.context :as ctx]
[app.main.ui.ds.buttons.button :refer [button*]]
[app.main.ui.ds.foundations.typography.text :refer [text*]]
[app.main.ui.workspace.tokens.themes.theme-selector :refer [theme-selector]]
[app.main.ui.workspace.tokens.themes.theme-selector :refer [theme-selector*]]
[app.util.dom :as dom]
[app.util.i18n :refer [tr]]
[rumext.v2 :as mf]))
@ -44,7 +44,7 @@
(tr "workspace.tokens.create-one")])]
(if can-edit?
[:div {:class (stl/css :theme-selector-wrapper)}
[:& theme-selector]
[:> theme-selector*]
[:> button* {:variant "secondary"
:type "button"
:class (stl/css :edit-theme-button)
@ -52,4 +52,4 @@
(tr "labels.edit")]]
[:div {:title (when-not can-edit?
(tr "workspace.tokens.no-permission-themes"))}
[:& theme-selector]]))]))
[:> theme-selector*]]))]))

View File

@ -23,8 +23,8 @@
[cuerdas.core :as str]
[rumext.v2 :as mf]))
(mf/defc themes-list
[{:keys [themes active-theme-paths on-close grouped?]}]
(mf/defc themes-list*
[{:keys [themes active-theme-paths on-close is-grouped]}]
(when (seq themes)
[:ul {:class (stl/css :theme-options)}
(for [[_ {:keys [id name] :as theme}] themes
@ -39,7 +39,7 @@
:aria-selected selected?
:class (stl/css-case
:checked-element true
:sub-item grouped?
:sub-item is-grouped
:is-selected selected?)
:on-click select-theme}
[:> text* {:as "span" :typography "body-small" :class (stl/css :label) :title name} name]
@ -52,7 +52,7 @@
[]
(modal/show! :tokens/themes {}))
(mf/defc theme-options
(mf/defc theme-options*
[{:keys [active-theme-paths themes on-close]}]
[:ul {:class (stl/css :theme-options :custom-select-dropdown)
:role "listbox"}
@ -62,10 +62,10 @@
:role "group"}
(when (seq group)
[:> text* {:as "span" :typography "headline-small" :class (stl/css :group) :id (dm/str (str/kebab group) "-label") :title group} group])
[:& themes-list {:themes themes
:active-theme-paths active-theme-paths
:on-close on-close
:grouped? true}]])
[:> themes-list* {:themes themes
:active-theme-paths active-theme-paths
:on-close on-close
:is-grouped true}]])
[:li {:class (stl/css :separator)
:aria-hidden true}]
[:li {:class (stl/css-case :checked-element true
@ -75,7 +75,7 @@
[:> text* {:as "span" :typography "body-small"} (tr "workspace.tokens.edit-themes")]
[:> icon* {:icon-id i/arrow-right :aria-hidden true}]]])
(mf/defc theme-selector
(mf/defc theme-selector*
[{:keys []}]
(let [;; Store
active-theme-paths (mf/deref refs/workspace-active-theme-paths-no-hidden)
@ -140,7 +140,7 @@
[:& dropdown {:show is-open?
:on-close on-close-dropdown}
[:& theme-options {:active-theme-paths active-theme-paths
:themes themes
:on-close on-close-dropdown}]]])
[:> theme-options* {:active-theme-paths active-theme-paths
:themes themes
:on-close on-close-dropdown}]]])
container))]))