3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-06-07 10:41:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3923 from penpot/hiru-components-bugfix-1

Browse source 
Some components bugfix
This commit is contained in:
Alejandro 2023-12-14 12:15:36 +01:00 • committed by GitHub
commit 86a4833c4a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -603,6 +603,23 @@
(generate-detach-instance changes container shape-id)))) (generate-detach-instance changes container shape-id))))
changes))) changes)))
(defn- find-main-container
"Find the container that has the main shape."
[container-inst shape-inst shape-main library component]
(loop [shape-inst' shape-inst
component' component]
(let [container (ctf/get-component-container library component')] ; TODO: this won't work if some intermediate component is in a different library
(if (some? (ctn/get-shape container (:id shape-main))) ; for this to work we need to have access to the libraries list here
container
(let [parent (ctn/get-shape container-inst (:parent-id shape-inst'))
shape-inst' (ctn/get-head-shape (:objects container-inst) parent)
component' (or (ctkl/get-component library (:component-id shape-inst'))
(ctkl/get-deleted-component library (:component-id shape-inst')))]
(if (some? component)
(recur shape-inst'
component')
nil))))))
(defn- generate-sync-shape-direct-recursive (defn- generate-sync-shape-direct-recursive
[changes container shape-inst component library shape-main root-inst root-main reset? initial-root? redirect-shaperef components-v2] [changes container shape-inst component library shape-main root-inst root-main reset? initial-root? redirect-shaperef components-v2]
(log/debug :msg "Sync shape direct recursive" (log/debug :msg "Sync shape direct recursive"
@ -639,7 +656,7 @@
set-remote-synced? set-remote-synced?
(change-remote-synced shape-inst container true)) (change-remote-synced shape-inst container true))
component-container (ctf/get-component-container library component) component-container (find-main-container container shape-inst shape-main library component)
children-inst (vec (ctn/get-direct-children container shape-inst)) children-inst (vec (ctn/get-direct-children container shape-inst))
children-main (vec (ctn/get-direct-children component-container shape-main)) children-main (vec (ctn/get-direct-children component-container shape-main))
@ -948,11 +965,11 @@
(:id parent-shape) (:id parent-shape)
(:frame-id parent-shape))) (:frame-id parent-shape)))
(nil? (:shape-ref original-shape))
(assoc :shape-ref (:id original-shape))
set-remote-synced? set-remote-synced?
(assoc :remote-synced true)))) (assoc :remote-synced true)
:always
(assoc :shape-ref (:id original-shape)))))
update-original-shape (fn [original-shape _new-shape] update-original-shape (fn [original-shape _new-shape]
original-shape) original-shape)