Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-01-09 16:30:37 -05:00
Code Issues Activity

⚡ Improved copy objects performance

Browse source
This commit is contained in:
alonso.torres 2022-04-22 22:14:37 +02:00
parent 9492dd7856
commit 581c50b5ff
2 changed files with 26 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
common/src/app/common/pages/helpers.cljc
View file

@ -502,3 +502,20 @@
(reduce process-shape (transient {})) (reduce process-shape (transient {}))
(persistent!)) (persistent!))
persistent!))) persistent!)))
(defn selected-subtree
"Given a set of shapes, returns an objects subtree with the parents
of the selected items up to the root. Useful to calculate a partial z-index"
[objects selected]
(let [selected+parents
(into selected
(mapcat #(get-parent-ids objects %))
selected)
remove-children
(fn [shape]
(update shape :shapes #(filterv selected+parents %)))]
(-> (select-keys objects selected+parents)
(d/update-vals remove-children))))

38
frontend/src/app/main/data/workspace.cljs
View file

@ -49,7 +49,6 @@
[app.main.data.workspace.zoom :as dwz] [app.main.data.workspace.zoom :as dwz]
[app.main.repo :as rp] [app.main.repo :as rp]
[app.main.streams :as ms] [app.main.streams :as ms]
[app.main.worker :as uw]
[app.util.dom :as dom] [app.util.dom :as dom]
[app.util.globals :as ug] [app.util.globals :as ug]
[app.util.http :as http] [app.util.http :as http]
@ -1193,28 +1192,14 @@
(defn copy-selected (defn copy-selected
[] []
(letfn [;; Sort objects so they have the same relative ordering (letfn [(sort-selected [state data]
;; when pasted later.
(sort-selected-async [state data]
(let [selected (wsh/lookup-selected state)
objects (wsh/lookup-page-objects state)
page-id (:current-page-id state)]
(->> (uw/ask! {:cmd :selection/query-z-index
:page-id page-id
:objects objects
:ids selected})
(rx/map (fn [z-indexes]
(assoc data :selected
(->> (d/zip selected z-indexes)
(sort-by second)
(map first)
(into (d/ordered-set)))))))))
;; We cannot call to a remote procedure in Safari (for the copy) so we need
;; to calculate it here instead of on the worker
(sort-selected-sync [state data]
(let [selected (wsh/lookup-selected state) (let [selected (wsh/lookup-selected state)
objects (wsh/lookup-page-objects state) objects (wsh/lookup-page-objects state)
;; Narrow the objects map so it contains only relevant data for
;; selected and its parents
objects (cph/selected-subtree objects selected)
z-index (cp/calculate-z-index objects) z-index (cp/calculate-z-index objects)
z-values (->> selected z-values (->> selected
(map #(vector % (map #(vector %
@ -1289,18 +1274,13 @@
:file-id (:current-file-id state) :file-id (:current-file-id state)
:selected selected :selected selected
:objects {} :objects {}
:images #{}} :images #{}}]
sort-results
(fn [obs]
;; Safari doesn't allow asynchronous sorting on the copy
(if (cfg/check-browser? :safari)
(rx/map (partial sort-selected-sync state) obs)
(rx/mapcat (partial sort-selected-async state) obs)))]
(->> (rx/from (seq (vals pdata))) (->> (rx/from (seq (vals pdata)))
(rx/merge-map (partial prepare-object objects selected)) (rx/merge-map (partial prepare-object objects selected))
(rx/reduce collect-data initial) (rx/reduce collect-data initial)
(sort-results) (rx/map (partial sort-selected state))
(rx/map t/encode-str) (rx/map t/encode-str)
(rx/map wapi/write-to-clipboard) (rx/map wapi/write-to-clipboard)
(rx/catch on-copy-error) (rx/catch on-copy-error)