From 96e6ba77be3f6786107d971e812e29666f6217fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Moya?= Date: Fri, 6 Nov 2020 08:53:55 +0100 Subject: [PATCH] :sparkles: Rename component root when renaming a component --- common/app/common/pages.cljc | 6 +++--- frontend/src/app/main/data/workspace/libraries.cljs | 10 ++++++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/common/app/common/pages.cljc b/common/app/common/pages.cljc index c92015a043..c5ad442da7 100644 --- a/common/app/common/pages.cljc +++ b/common/app/common/pages.cljc @@ -963,14 +963,14 @@ :objects (d/index-by :id shapes)})) (defmethod process-change :mod-component - [data {:keys [id name shapes]}] + [data {:keys [id name objects]}] (update-in data [:components id] #(cond-> % (some? name) (assoc :name name) - (some? shapes) - (assoc :objects (d/index-by :id shapes))))) + (some? objects) + (assoc :objects objects)))) (defmethod process-change :del-component [data {:keys [id]}] diff --git a/frontend/src/app/main/data/workspace/libraries.cljs b/frontend/src/app/main/data/workspace/libraries.cljs index 7809f40fae..9fb6ef150c 100644 --- a/frontend/src/app/main/data/workspace/libraries.cljs +++ b/frontend/src/app/main/data/workspace/libraries.cljs @@ -261,14 +261,20 @@ ptk/WatchEvent (watch [_ state stream] (let [component (get-in state [:workspace-data :components id]) + objects (get component :objects) + new-objects (assoc-in objects + [(:id component) :name] + new-name) rchanges [{:type :mod-component :id id - :name new-name}] + :name new-name + :objects new-objects}] uchanges [{:type :mod-component :id id - :name (:name component)}]] + :name (:name component) + :objects objects}]] (rx/of (dwc/commit-changes rchanges uchanges {:commit-local? true}))))))