mirror of
https://github.com/penpot/penpot.git
synced 2025-06-01 13:51:45 +02:00
📎 Fix merge issues from staging to develop
This commit is contained in:
parent
c2158b0f3c
commit
a08b9adeee
1 changed files with 0 additions and 11 deletions
|
@ -761,17 +761,6 @@
|
||||||
changes
|
changes
|
||||||
(-> (pcb/empty-changes it page-id)
|
(-> (pcb/empty-changes it page-id)
|
||||||
(pcb/with-objects objects)
|
(pcb/with-objects objects)
|
||||||
(pcb/update-shapes moving-frames
|
|
||||||
(fn [shape]
|
|
||||||
;; Hide in viewer must be enabled just when a board is moved
|
|
||||||
;; inside another artboard an nested to it, we have to avoid
|
|
||||||
;; situations like: 1. Moving inside the same frame; 2. Moving
|
|
||||||
;; outside the frame
|
|
||||||
(cond-> shape
|
|
||||||
(and (not= frame-id (:id shape))
|
|
||||||
(not= frame-id (:frame-id shape))
|
|
||||||
(not= frame-id uuid/zero))
|
|
||||||
(assoc :hide-in-viewer true))))
|
|
||||||
(pcb/change-parent frame-id moving-shapes))]
|
(pcb/change-parent frame-id moving-shapes))]
|
||||||
|
|
||||||
(when-not (empty? changes)
|
(when-not (empty? changes)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue