3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-10 11:16:36 +02:00
Code Issues Projects Releases Packages Wiki Activity

🐛 Fix problems on sync with components chain with deleted components

Browse source
This commit is contained in:
Pablo Alba 2024-02-28 13:24:45 +01:00 • committed by Andrés Moya
parent 697a542754
commit 74d2273d24
4 changed files with 28 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

12
frontend/src/app/main/data/workspace/libraries_helpers.cljs
View file

@ -317,10 +317,10 @@
(let [file (wsh/get-file state file-id)
components-v2 (get-in file [:options :components-v2])]
(loop [pages (vals (get file :pages-index))
(loop [containers (ctf/object-containers-seq file)
changes (pcb/empty-changes it)]
(if-let [page (first pages)]
(recur (next pages)
(if-let [container (first containers)]
(recur (next containers)
(pcb/concat-changes
changes
(generate-sync-container it
@ -328,7 +328,7 @@
asset-id
library-id
state
(cfh/make-container page :page)
container
components-v2)))
changes))))
@ -597,9 +597,7 @@
(log/debug :msg "Sync shape direct" :shape (str shape-id) :reset? reset?)
(let [shape-inst (ctn/get-shape container shape-id)
library (dm/get-in libraries [(:component-file shape-inst) :data])
component (or (ctkl/get-component library (:component-id shape-inst))
(and reset?
(ctkl/get-deleted-component library (:component-id shape-inst))))]
component (ctkl/get-component library (:component-id shape-inst) true)]
(if (and (ctk/in-component-copy? shape-inst)
(or (ctf/direct-copy? shape-inst component container nil libraries) reset?)) ; In a normal sync, we don't want to sync remote mains, only direct/near
(let [redirect-shaperef (partial redirect-shaperef container libraries)