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

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

Browse source 
Several related bugfixes
This commit is contained in:
Pablo Alba 2023-11-23 13:01:38 +01:00 • committed by GitHub
commit a29291e6f2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 42 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -904,7 +904,7 @@
root-main
root-instance)]
(cond-> new-shape
:always
(= (:id original-shape) (:id component-shape))
(assoc :frame-id (if (= (:type parent-shape) :frame)
(:id parent-shape)
(:frame-id parent-shape)))

21
frontend/src/app/main/data/workspace/selection.cljs
View file

@ -17,6 +17,7 @@
[app.common.geom.shapes :as gsh]
[app.common.record :as cr]
[app.common.types.component :as ctk]
[app.common.types.container :as ctn]
[app.common.types.file :as ctf]
[app.common.types.page :as ctp]
[app.common.types.shape.interactions :as ctsi]
@ -428,14 +429,18 @@
bool? (cfh/bool-shape? obj)
new-id (ids-map (:id obj))
parent-id (or parent-id frame-id)
parent (get objects parent-id)
name (:name obj)
is-component-root? (or (:saved-component-root obj)
;; Backward compatibility
(:saved-component-root? obj)
(ctk/instance-root? obj))
is-component-root? (or (:saved-component-root obj)
;; Backward compatibility
(:saved-component-root? obj)
(ctk/instance-root? obj))
duplicating-component? (or duplicating-component? (ctk/instance-head? obj))
is-component-main? (ctk/main-instance? obj)
is-component-main? (ctk/main-instance? obj)
into-component? (and duplicating-component?
(ctn/in-any-component? objects parent))
regenerate-component
(fn [changes shape]
(let [components-v2 (dm/get-in library-data [:options :components-v2])
@ -453,8 +458,10 @@
:main-instance
:use-for-thumbnail)
(cond->
(or frame? group? bool?)
(cond-> into-component?
(dissoc :component-root))
(cond-> (or frame? group? bool?)
(assoc :shapes []))
(gsh/move delta)