github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-04-25 19:28:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Fix problem with frame title movement

Browse Source
This commit is contained in:
alonso.torres 2026-02-25 13:47:40 +01:00 committed by Belén Albeza
parent baa44119f4
commit f41eca12f4
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
common/src/app/common/types/shape_tree.cljc
View File

@ -115,21 +115,25 @@
(defn get-frames
"Retrieves all frame objects as vector"
([objects] (get-frames objects nil))
([objects {:keys [skip-components? skip-copies?]
([objects {:keys [skip-components? skip-copies? ignore-index?]
:or {skip-components? false
skip-copies? false}}]
(->> (or (-> objects meta ::index-frames)
(let [lookup (d/getf objects)
xform (comp (remove #(= uuid/zero %))
(keep lookup)
(filter cfh/frame-shape?))]
(->> (keys objects)
(sequence xform))))
(remove #(or (and ^boolean skip-components?
^boolean (ctk/instance-head? %))
(and ^boolean skip-copies?
(and ^boolean (ctk/instance-head? %)
(not ^boolean (ctk/main-instance? %)))))))))
skip-copies? false
ignore-index? false}}]
(let [frame-index
(if (and (not ignore-index?) (-> objects meta ::index-frames))
(-> objects meta ::index-frames)
(let [lookup (d/getf objects)
xform (comp (remove #(= uuid/zero %))
(keep lookup)
(filter cfh/frame-shape?))]
(->> (keys objects)
(sequence xform))))]
(->> frame-index
(remove #(or (and ^boolean skip-components?
^boolean (ctk/instance-head? %))
(and ^boolean skip-copies?
(and ^boolean (ctk/instance-head? %)
(not ^boolean (ctk/main-instance? %))))))))))
(defn get-frames-ids
"Retrieves all frame ids as vector"

2
frontend/src/app/main/ui/workspace/viewport/widgets.cljs
View File

@ -242,7 +242,7 @@
[{:keys [objects zoom selected focus is-show-artboard-names
on-frame-enter on-frame-leave on-frame-select]}]
(let [selected (or selected #{})
shapes (ctt/get-frames objects {:skip-copies? true})
shapes (ctt/get-frames objects {:skip-copies? true :ignore-index? true})
shapes (if (dbg/enabled? :shape-titles)
(into (set shapes)
(map (d/getf objects))