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

🐛 Fix wrong limit handling on undo.

Browse source
This commit is contained in:
Andrey Antukh 2020-09-16 12:17:00 +02:00
parent 0b5ae3632e
commit 43fccd17b4
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -242,9 +242,10 @@
(defn- conj-undo-entry (defn- conj-undo-entry
[undo data] [undo data]
(let [undo (conj undo data)] (let [undo (conj undo data)
(if (> (count undo) MAX-UNDO-SIZE) cnt (count undo)]
(into [] (take MAX-UNDO-SIZE undo)) (if (> cnt MAX-UNDO-SIZE)
(subvec undo (- cnt MAX-UNDO-SIZE))
undo))) undo)))
(defn- materialize-undo (defn- materialize-undo
@ -265,13 +266,15 @@
(update :workspace-undo dissoc :undo-index) (update :workspace-undo dissoc :undo-index)
(update-in [:workspace-undo :items] (fn [queue] (into [] (take (inc index) queue)))))))) (update-in [:workspace-undo :items] (fn [queue] (into [] (take (inc index) queue))))))))
(defn- add-undo-entry [state entry] (defn- add-undo-entry
[state entry]
(if entry (if entry
(let [state (update-in state [:workspace-undo :items] (fnil conj-undo-entry []) entry)] (let [state (update-in state [:workspace-undo :items] (fnil conj-undo-entry []) entry)]
(assoc-in state [:workspace-undo :index] (dec (count (get-in state [:workspace-undo :items]))))) (assoc-in state [:workspace-undo :index] (dec (count (get-in state [:workspace-undo :items])))))
state)) state))
(defn- accumulate-undo-entry [state {:keys [undo-changes redo-changes]}] (defn- accumulate-undo-entry
[state {:keys [undo-changes redo-changes]}]
(-> state (-> state
(update-in [:workspace-undo :transaction :undo-changes] #(into undo-changes %)) (update-in [:workspace-undo :transaction :undo-changes] #(into undo-changes %))
(update-in [:workspace-undo :transaction :redo-changes] #(into % redo-changes)))) (update-in [:workspace-undo :transaction :redo-changes] #(into % redo-changes))))