Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-01-08 07:50:43 -05:00
Code Issues Activity

Fix theme group drop-down not updating group value

Browse source
This commit is contained in:
Florian Schroedl 2024-09-26 15:15:50 +02:00
parent b3ff480e81
commit 29a2478bb5
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -124,19 +124,20 @@
(mf/deps theme-state) (mf/deps theme-state)
(fn [set-name] (fn [set-name]
(swap! theme-state #(ctob/toggle-set % set-name)))) (swap! theme-state #(ctob/toggle-set % set-name))))
on-change-field (fn [field] on-change-field (fn [field value]
(fn [e] (swap! theme-state #(assoc % field value)))
(swap! theme-state #(assoc % field (dom/get-target-val e)))))
group-input-ref (mf/use-ref) group-input-ref (mf/use-ref)
on-update-group (on-change-field :group) on-update-group (partial on-change-field :group)
on-update-name (on-change-field :name) on-update-name (partial on-change-field :name)
on-save-form (mf/use-callback on-save-form (mf/use-callback
(mf/deps theme-state on-submit) (mf/deps theme-state on-submit)
(fn [e] (fn [e]
(dom/prevent-default e) (dom/prevent-default e)
(let [theme (-> @theme-state (let [theme (-> @theme-state
(update :name str/trim) (update :name str/trim)
(update :description str/trim))] (update :group str/trim)
(update :description str/trim)
(doto js/console.log))]
(when-not (str/empty? (:name theme)) (when-not (str/empty? (:name theme))
(on-submit theme))) (on-submit theme)))
(on-back)))] (on-back)))]
@ -158,12 +159,12 @@
theme-groups) theme-groups)
:on-select (fn [{:keys [value]}] :on-select (fn [{:keys [value]}]
(set! (.-value (mf/ref-val group-input-ref)) value) (set! (.-value (mf/ref-val group-input-ref)) value)
(swap! theme-state assoc-in [:theme :group] value)) (on-update-group value))
:on-close on-close-dropdown}]) :on-close on-close-dropdown}])
[:& labeled-input {:label "Group" [:& labeled-input {:label "Group"
:input-props {:ref group-input-ref :input-props {:ref group-input-ref
:default-value (:group theme) :default-value (:group theme)
:on-change on-update-group} :on-change (comp on-update-group dom/get-target-val)}
:render-right (when (seq theme-groups) :render-right (when (seq theme-groups)
(mf/fnc [] (mf/fnc []
[:button {:class (stl/css :group-drop-down-button) [:button {:class (stl/css :group-drop-down-button)
@ -174,7 +175,7 @@
i/arrow]))}]] i/arrow]))}]]
[:& labeled-input {:label "Theme" [:& labeled-input {:label "Theme"
:input-props {:default-value (:name theme) :input-props {:default-value (:name theme)
:on-change on-update-name}}]] :on-change (comp on-update-name dom/get-target-val)}}]]
[:div {:class (stl/css :sets-list-wrapper)} [:div {:class (stl/css :sets-list-wrapper)}
[:& wts/controlled-sets-list [:& wts/controlled-sets-list
{:token-sets token-sets {:token-sets token-sets