From c2360916452354186f97740fba078419fa0f3d34 Mon Sep 17 00:00:00 2001 From: Pablo Alba Date: Mon, 11 Dec 2023 13:41:56 +0100 Subject: [PATCH 1/2] :bug: Fix a copy inside a copy shouldn't be able to do an Update Main --- frontend/src/app/main/ui/workspace/sidebar/assets/common.cljs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frontend/src/app/main/ui/workspace/sidebar/assets/common.cljs b/frontend/src/app/main/ui/workspace/sidebar/assets/common.cljs index 53cd48ac6..43d329737 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/assets/common.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/assets/common.cljs @@ -13,6 +13,7 @@ [app.common.spec :as us] [app.common.thumbnails :as thc] [app.common.types.component :as ctk] + [app.common.types.container :as ctn] [app.common.types.file :as ctf] [app.main.data.modal :as modal] [app.main.data.workspace :as dw] @@ -354,6 +355,7 @@ (not is-dangling?) (or (not components-v2) (and (not main-instance?) + (not (ctn/has-any-copy-parent? objects shape)) (cfh/component-touched? objects (:id shape))))) From b41f63c16e1f54e2d2c2edfdeae2ae20a09c53f7 Mon Sep 17 00:00:00 2001 From: Pablo Alba Date: Mon, 11 Dec 2023 19:13:54 +0100 Subject: [PATCH 2/2] :bug: Fix component restoration is not notified to files using the library --- backend/src/app/rpc/commands/files_update.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/app/rpc/commands/files_update.clj b/backend/src/app/rpc/commands/files_update.clj index 6026db5c1..d5bffab98 100644 --- a/backend/src/app/rpc/commands/files_update.clj +++ b/backend/src/app/rpc/commands/files_update.clj @@ -74,7 +74,7 @@ (def ^:private library-change-types #{:add-color :mod-color :del-color :add-media :mod-media :del-media - :add-component :mod-component :del-component + :add-component :mod-component :del-component :restore-component :add-typography :mod-typography :del-typography}) (def ^:private file-change-types