Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-01-26 08:29:42 -05:00
Code Issues Activity

🐛 Fix problem with performance on layout calculation

Browse source
This commit is contained in:
alonso.torres 2023-10-17 16:14:57 +02:00
parent 6507200735
commit be68e45f65
2 changed files with 57 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
common/src/app/common/geom/bounds_map.cljc
View file

@ -56,24 +56,55 @@
(not (ctm/empty? modifiers)) (not (ctm/empty? modifiers))
(gtr/transform-bounds modifiers)))))) (gtr/transform-bounds modifiers))))))
#?(:clj
(defn- resolve-modif-tree-ids
[objects modif-tree]
;; These are the new bounds calculated. Are the "modified" plus any groups they belong to
(let [ids (keys modif-tree)]
(into (set ids)
(mapcat #(->> (cph/get-parent-ids-seq objects %)
(take-while (partial cph/group-like-shape? objects))))
ids)))
:cljs
;; More performant version using javascript mutable sets
(defn- resolve-modif-tree-ids
[objects modif-tree]
(let [base-ids (keys modif-tree)
ids (js/Set. base-ids)]
(loop [base-ids (seq base-ids)]
(when (some? base-ids)
(let [cid (first base-ids)]
(loop [new-ids
(->> (cph/get-parent-seq objects cid)
(take-while #(and (cph/group-like-shape? %)
(not (.has ids %))))
(seq))]
(when (some? new-ids)
(.add ids (first new-ids))
(recur (next new-ids))))
(recur (next base-ids)))))
ids)))
(defn transform-bounds-map (defn transform-bounds-map
[bounds-map objects modif-tree] ([bounds-map objects modif-tree]
;; We use the volatile in order to solve the dependencies problem. We want the groups to reference the new (transform-bounds-map bounds-map objects modif-tree nil))
;; bounds instead of the old ones. The current as last parameter is to fix a possible infinite loop ([bounds-map objects modif-tree ids]
;; with self-references ;; We use the volatile in order to solve the dependencies problem. We want the groups to reference the new
(let [bm-holder (volatile! nil) ;; bounds instead of the old ones. The current as last parameter is to fix a possible infinite loop
;; with self-references
(let [bm-holder (volatile! nil)
;; These are the new bounds calculated. Are the "modified" plus any groups they belong to ids (or ids (resolve-modif-tree-ids objects modif-tree))
ids (keys modif-tree)
ids (into (set ids)
(mapcat #(->> (cph/get-parent-ids-seq objects %)
(take-while (partial cph/group-like-shape? objects))))
ids)
new-bounds-map new-bounds-map
(->> ids (loop [tr-bounds-map (transient bounds-map)
(reduce ids (seq ids)]
(fn [tr-bounds-map shape-id] (if (not ids)
(persistent! tr-bounds-map)
(let [shape-id (first ids)]
(recur
(cond-> tr-bounds-map (cond-> tr-bounds-map
(not= uuid/zero shape-id) (not= uuid/zero shape-id)
(assoc! shape-id (assoc! shape-id
@ -81,11 +112,10 @@
@bm-holder @bm-holder
objects objects
modif-tree modif-tree
(get bounds-map shape-id)))))) (get bounds-map shape-id)))))
(transient bounds-map)) (next ids)))))]
(persistent!))] (vreset! bm-holder new-bounds-map)
(vreset! bm-holder new-bounds-map) new-bounds-map)))
new-bounds-map))
;; Tool for debugging ;; Tool for debugging
(defn bounds-map (defn bounds-map

10
common/src/app/common/geom/shapes/modifiers.cljc
View file

@ -55,7 +55,11 @@
(if-let [child (get objects child-id)] (if-let [child (get objects child-id)]
(let [child-bounds @(get bounds child-id) (let [child-bounds @(get bounds child-id)
child-modifiers child-modifiers
(gct/calc-child-modifiers parent child modifiers ignore-constraints child-bounds parent-bounds transformed-parent-bounds)] (gct/calc-child-modifiers
parent child modifiers ignore-constraints
child-bounds
parent-bounds transformed-parent-bounds)]
(cgt/add-modifiers modif-tree child-id child-modifiers)) (cgt/add-modifiers modif-tree child-id child-modifiers))
modif-tree)) modif-tree))
modif-tree)))))) modif-tree))))))
@ -73,7 +77,7 @@
(gcfl/layout-child-modifiers parent transformed-parent-bounds child child-bounds layout-line)] (gcfl/layout-child-modifiers parent transformed-parent-bounds child child-bounds layout-line)]
[layout-line (cgt/add-modifiers modif-tree (:id child) modifiers)]))] [layout-line (cgt/add-modifiers modif-tree (:id child) modifiers)]))]
(let [bounds (cgb/transform-bounds-map bounds objects modif-tree) (let [bounds (cgb/transform-bounds-map bounds objects modif-tree children)
children children
(->> children (->> children
@ -113,7 +117,7 @@
(gcgl/child-modifiers parent transformed-parent-bounds child child-bounds grid-data cell-data)] (gcgl/child-modifiers parent transformed-parent-bounds child child-bounds grid-data cell-data)]
(cgt/add-modifiers modif-tree (:id child) modifiers)))] (cgt/add-modifiers modif-tree (:id child) modifiers)))]
(let [bounds (cgb/transform-bounds-map bounds objects modif-tree) (let [bounds (cgb/transform-bounds-map bounds objects modif-tree (:shapes parent))
children children
(->> (cph/get-immediate-children objects (:id parent) {:remove-hidden true}) (->> (cph/get-immediate-children objects (:id parent) {:remove-hidden true})