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

⚡ Improve performance on multiple options

Browse source
This commit is contained in:
alonso.torres 2023-01-23 14:03:02 +01:00
parent 088a8af345
commit 3d064b804b
1 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

22
frontend/src/app/main/ui/workspace/sidebar/options/shapes/multiple.cljs
View file

@ -248,16 +248,15 @@
(dissoc :content))) (dissoc :content)))
(defn- is-bool-descendant? (defn- is-bool-descendant?
[shape all-shapes selected-shape-ids] [[_ shape] objects selected-shape-ids]
(let [parent-id (:parent-id shape) (let [parent-id (:parent-id shape)
parent (->> all-shapes parent (get objects parent-id)]
(filter #(= (:id %) parent-id))
first)]
(cond (cond
(nil? shape) false ;; failsafe (nil? shape) false ;; failsafe
(some #{(:id shape)} selected-shape-ids) false ;; if it is one of the selected shapes, it is considerer not a bool descendant (contains? selected-shape-ids (:id shape)) false ;; if it is one of the selected shapes, it is considerer not a bool descendant
(= :bool (:type parent)) true ;; if its parent is of type bool, it is a bool descendant (= :bool (:type parent)) true ;; if its parent is of type bool, it is a bool descendant
:else (is-bool-descendant? parent all-shapes selected-shape-ids)))) ;; else, check its parent :else (recur [parent-id parent] objects selected-shape-ids)))) ;; else, check its parent
(mf/defc options (mf/defc options
{::mf/wrap [#(mf/memo' % (mf/check-props ["shapes" "shapes-with-children" "page-id" "file-id"]))] {::mf/wrap [#(mf/memo' % (mf/check-props ["shapes" "shapes-with-children" "page-id" "file-id"]))]
@ -267,8 +266,13 @@
shapes-with-children (unchecked-get props "shapes-with-children") shapes-with-children (unchecked-get props "shapes-with-children")
;; remove children from bool shapes ;; remove children from bool shapes
shape-ids (map :id shapes) shape-ids (into #{} (map :id) shapes)
shapes-with-children (filter #(not (is-bool-descendant? % shapes-with-children shape-ids)) shapes-with-children)
objects (->> shapes-with-children (group-by :id) (d/mapm (fn [_ v] (first v))))
objects
(into {}
(filter #(not (is-bool-descendant? % objects shape-ids)))
objects)
workspace-modifiers (mf/deref refs/workspace-modifiers) workspace-modifiers (mf/deref refs/workspace-modifiers)
shapes (map #(gsh/transform-shape % (get-in workspace-modifiers [(:id %) :modifiers])) shapes) shapes (map #(gsh/transform-shape % (get-in workspace-modifiers [(:id %) :modifiers])) shapes)
@ -276,7 +280,7 @@
page-id (unchecked-get props "page-id") page-id (unchecked-get props "page-id")
file-id (unchecked-get props "file-id") file-id (unchecked-get props "file-id")
shared-libs (unchecked-get props "shared-libs") shared-libs (unchecked-get props "shared-libs")
objects (->> shapes-with-children (group-by :id) (d/mapm (fn [_ v] (first v))))
show-caps (some #(and (= :path (:type %)) (gsh/open-path? %)) shapes) show-caps (some #(and (= :path (:type %)) (gsh/open-path? %)) shapes)
;; Selrect/points only used for measures and it's the one that changes the most. We separate it ;; Selrect/points only used for measures and it's the one that changes the most. We separate it