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

🐛 Fix selecting children from hidden parent layers

Browse source
This commit is contained in:
alonso.torres 2023-03-02 17:33:27 +01:00
parent 6962e15b6d
commit 475ce08d3e
4 changed files with 24 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
frontend/src/app/main/ui/workspace/viewport/hooks.cljs
View file

@ -244,6 +244,7 @@
hover-shape
(->> ids
(remove remove-id?)
(remove (partial cph/hidden-parent? objects))
(filter #(or (empty? focus) (cp/is-in-focus? objects focus %)))
(first)
(get objects))]

16
frontend/src/app/util/snap_data.cljs
View file

@ -82,7 +82,9 @@
grid-y-data (get-grids-snap-points frame :y)]
(cond-> page-data
(not (ctl/any-layout-descent? objects frame))
(and (not (ctl/any-layout-descent? objects frame))
(not (:hidden frame))
(not (cph/hidden-parent? objects frame-id)))
(-> ;; Update root frame information
(assoc-in [uuid/zero :objects-data frame-id] frame-data)
@ -106,7 +108,9 @@
:id (:id shape)
:pt %)))]
(cond-> page-data
(not (ctl/any-layout-descent? objects shape))
(and (not (ctl/any-layout-descent? objects shape))
(not (:hidden shape))
(not (cph/hidden-parent? objects (:id shape))))
(-> (assoc-in [frame-id :objects-data (:id shape)] shape-data)
(update-in [frame-id :x] (make-insert-tree-data shape-data :x))
(update-in [frame-id :y] (make-insert-tree-data shape-data :y))))))
@ -124,9 +128,11 @@
:pt %)))]
(if-let [frame-id (:frame-id guide)]
;; Guide inside frame, we add the information only on that frame
(-> page-data
(assoc-in [frame-id :objects-data (:id guide)] guide-data)
(update-in [frame-id (:axis guide)] (make-insert-tree-data guide-data (:axis guide))))
(cond-> page-data
(and (not (:hidden frame))
(not (cph/hidden-parent? objects frame-id)))
(-> (assoc-in [frame-id :objects-data (:id guide)] guide-data)
(update-in [frame-id (:axis guide)] (make-insert-tree-data guide-data (:axis guide)))))
;; Guide outside the frame. We add the information in the global guides data
(-> page-data