From 3ddd45e99b908debba555ca24f85b935627d7209 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Mon, 25 Nov 2024 09:53:49 +0100 Subject: [PATCH] :bug: Fix incorrect internal form initialization --- frontend/src/app/main/ui/dashboard/team_form.cljs | 4 +++- frontend/src/app/util/forms.cljs | 4 +--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/src/app/main/ui/dashboard/team_form.cljs b/frontend/src/app/main/ui/dashboard/team_form.cljs index cf8796b75..631b17556 100644 --- a/frontend/src/app/main/ui/dashboard/team_form.cljs +++ b/frontend/src/app/main/ui/dashboard/team_form.cljs @@ -73,7 +73,9 @@ {::mf/register modal/components ::mf/register-as :team-form} [{:keys [team] :as props}] - (let [initial (mf/use-memo (fn [] (or team {}))) + (let [initial (mf/use-memo (fn [] + (or (some-> team (select-keys [:name :id])) + {}))) form (fm/use-form :schema schema:team-form :initial initial) handle-keydown diff --git a/frontend/src/app/util/forms.cljs b/frontend/src/app/util/forms.cljs index e5b710aba..f628b06b2 100644 --- a/frontend/src/app/util/forms.cljs +++ b/frontend/src/app/util/forms.cljs @@ -148,9 +148,7 @@ (mf/set-ref-val! internal-state initial)) (mf/with-effect [initial] - (if (fn? initial) - (swap! form-mutator update :data merge (initial)) - (swap! form-mutator update :data merge initial))) + (swap! form-mutator d/deep-merge initial)) form-mutator))