github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-05-01 06:08:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Fix some synchronization problems

Browse Source
This commit is contained in:
Andrés Moya 2022-08-25 16:49:51 +02:00
parent 6b25bf6c4f
commit d213bc96d4
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/app/main/data/workspace/libraries.cljs
View File

@ -754,8 +754,8 @@
:library-id library-id})))
(when (and (seq (:redo-changes library-changes))
sync-components?)
(rx/of (sync-file-2nd-stage file-id library-id asset-id))))))))))
(rx/of (sync-file-2nd-stage file-id library-id nil)))))))))) ; In 2nd stage the original asset is not used
; because other components may have changed
(defn- sync-file-2nd-stage
"If some components have been modified, we need to launch another synchronization
to update the instances of the changed components."

20
frontend/src/app/main/data/workspace/libraries_helpers.cljs
View File

@ -242,7 +242,7 @@
(log/debug :msg "Sync component in local library" :component-id (:id container)))
(let [linked-shapes (->> (vals (:objects container))
(filter #(uses-assets? asset-type asset-id % library-id)))]
(filter #(uses-assets? asset-type asset-id % library-id (cph/component? container))))]
(loop [shapes (seq linked-shapes)
changes (-> (pcb/empty-changes it)
(pcb/with-container container)
@ -260,22 +260,26 @@
(defmulti uses-assets?
"Checks if a shape uses some asset of the given type in the given library."
(fn [asset-type _ _ _] asset-type))
(fn [asset-type _ _ _ _] asset-type))
(defmethod uses-assets? :components
[_ component-id shape library-id]
(if (nil? component-id)
(ctk/uses-library-components? shape library-id)
(ctk/instance-of? shape library-id component-id)))
[_ component-id shape library-id component?]
(and (if (nil? component-id)
(ctk/uses-library-components? shape library-id)
(ctk/instance-of? shape library-id component-id))
;; Subinstances are synced with the near component, not the remote.
;; So an instance that is not root, cannot be considered "using"
;; the component.
(or (:component-root? shape) component?)))
(defmethod uses-assets? :colors
[_ color-id shape library-id]
[_ color-id shape library-id _]
(if (nil? color-id)
(ctc/uses-library-colors? shape library-id)
(ctc/uses-library-color? shape library-id color-id)))
(defmethod uses-assets? :typographies
[_ typography-id shape library-id]
[_ typography-id shape library-id _]
(if (nil? typography-id)
(cty/uses-library-typographies? shape library-id)
(cty/uses-library-typography? shape library-id typography-id)))