3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-07-09 14:47:26 +02:00
Code Issues Projects Releases Packages Wiki Activity

Remove default theme name, disable empty themen name submit

Browse source
This commit is contained in:
Florian Schroedl 2024-08-27 14:37:24 +02:00
parent 3b7432a859
commit 3bb99e8f7c
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
frontend/src/app/main/ui/workspace/tokens/modals/themes.cljs
View file

@ -112,6 +112,9 @@
(let [edit? (some? (:id theme)) (let [edit? (some? (:id theme))
theme-state (mf/use-state {:token-sets token-sets theme-state (mf/use-state {:token-sets token-sets
:theme theme}) :theme theme})
disabled? (-> (get-in @theme-state [:theme :name])
(str/trim)
(str/empty?))
token-set-active? (mf/use-callback token-set-active? (mf/use-callback
(mf/deps theme-state) (mf/deps theme-state)
(fn [id] (fn [id]
@ -135,10 +138,10 @@
final-group (-> (:group theme) final-group (-> (:group theme)
(str/trim) (str/trim)
(str/lower))] (str/lower))]
(when-not (str/empty? final-name)
(cond-> theme (cond-> theme
(empty final-name) (assoc :name "Theme")
(empty final-group) (dissoc :group) (empty final-group) (dissoc :group)
:always on-submit)) :always on-submit)))
(on-back)))] (on-back)))]
[:form {:on-submit on-save-form} [:form {:on-submit on-save-form}
[:div {:class (stl/css :edit-theme-wrapper)} [:div {:class (stl/css :edit-theme-wrapper)}
@ -178,7 +181,8 @@
"Cancel"] "Cancel"]
[:button {:class (stl/css :button-primary) [:button {:class (stl/css :button-primary)
:type "submit" :type "submit"
:on-click on-save-form} :on-click on-save-form
:disabled disabled?}
"Save theme"]]]]])) "Save theme"]]]]]))
(mf/defc controlled-edit-theme (mf/defc controlled-edit-theme
@ -195,7 +199,7 @@
(mf/defc create-theme (mf/defc create-theme
[{:keys [set-state]}] [{:keys [set-state]}]
(let [token-sets (mf/deref refs/workspace-ordered-token-sets) (let [token-sets (mf/deref refs/workspace-ordered-token-sets)
theme {:name "Theme" :sets #{}}] theme {:name "" :sets #{}}]
[:& edit-theme [:& edit-theme
{:token-sets token-sets {:token-sets token-sets
:theme theme :theme theme