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

🐛 Fix problem with indices refreshing on page changes

Browse source
This commit is contained in:
alonso.torres 2021-02-16 13:46:31 +01:00 • committed by Andrés Moya
parent 0f9b2923c2
commit 0014bb3d24
2 changed files with 29 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

22
frontend/src/app/main/data/workspace/common.cljs
View file

@ -63,6 +63,8 @@
;; --- Changes Handling
(defonce page-change? #{:add-page :mod-page :del-page :mov-page})
(defn commit-changes
([changes undo-changes]
(commit-changes changes undo-changes {}))
@ -105,10 +107,24 @@
ptk/WatchEvent
(watch [_ state stream]
(when-not @error
(let [page-id (:current-page-id state)]
(let [;; adds page-id to page changes (that have the `id` field instead)
add-page-id
(fn [{:keys [id type page] :as change}]
(cond-> change
(page-change? type)
(assoc :page-id (or id (:id page)))))
changes-by-pages
(->> changes
(map add-page-id)
(remove #(nil? (:page-id %)))
(group-by :page-id))
process-page-changes
(fn [[page-id changes]]
(update-indices page-id changes))]
(rx/concat
(when (some :page-id changes)
(rx/of (update-indices page-id changes)))
(rx/from (map process-page-changes changes-by-pages))
(when (and save-undo? (seq undo-changes))
(let [entry {:undo-changes undo-changes