From f6c62075229c2047dfbc7bc7338a92a02199d0fa Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Tue, 9 Apr 2024 12:07:17 +0200 Subject: [PATCH] :bug: Fix problem renaming boards from viewport --- frontend/src/app/main/data/workspace.cljs | 6 +++--- .../src/app/main/ui/workspace/sidebar/layer_name.cljs | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/frontend/src/app/main/data/workspace.cljs b/frontend/src/app/main/data/workspace.cljs index a6487e363..91a080b71 100644 --- a/frontend/src/app/main/data/workspace.cljs +++ b/frontend/src/app/main/data/workspace.cljs @@ -682,12 +682,12 @@ (defn end-rename-shape "End the ongoing shape rename process" - ([] (end-rename-shape nil)) - ([name] + ([] (end-rename-shape nil nil)) + ([shape-id name] (ptk/reify ::end-rename-shape ptk/WatchEvent (watch [_ state _] - (when-let [shape-id (dm/get-in state [:workspace-local :shape-for-rename])] + (when-let [shape-id (d/nilv shape-id (dm/get-in state [:workspace-local :shape-for-rename]))] (let [shape (wsh/lookup-shape state shape-id) name (str/trim name) clean-name (cfh/clean-path name) diff --git a/frontend/src/app/main/ui/workspace/sidebar/layer_name.cljs b/frontend/src/app/main/ui/workspace/sidebar/layer_name.cljs index 45d0a9015..43d87b40d 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/layer_name.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/layer_name.cljs @@ -51,21 +51,21 @@ accept-edit (mf/use-fn - (mf/deps on-stop-edit) + (mf/deps shape-id on-stop-edit) (fn [] (let [name-input (mf/ref-val ref) name (str/trim (dom/get-value name-input))] (on-stop-edit) (reset! edition* false) - (st/emit! (dw/end-rename-shape name))))) + (st/emit! (dw/end-rename-shape shape-id name))))) cancel-edit (mf/use-fn - (mf/deps on-stop-edit) + (mf/deps shape-id on-stop-edit) (fn [] (on-stop-edit) (reset! edition* false) - (st/emit! (dw/end-rename-shape nil)))) + (st/emit! (dw/end-rename-shape shape-id nil)))) on-key-down (mf/use-fn