github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-09-07 20:49:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

✨ Simplify commit-undo-transaction impl

Browse Source
This commit is contained in:
Andrey Antukh 2025-08-25 10:22:16 +02:00 committed by Pablo Alba
parent 1384ed8aba
commit 254a7461b2
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
frontend/src/app/main/data/workspace/undo.cljs
View File

@ -185,21 +185,32 @@
ptk/UpdateEvent ptk/UpdateEvent
(update [_ state] (update [_ state]
(log/info :hint "discard-undo-transaction") (log/info :hint "discard-undo-transaction")
(update state :workspace-undo dissoc :transaction :transactions-pending :transactions-pending-ts)))) (update state :workspace-undo dissoc :transaction :transactions-pending))))
(defn commit-undo-transaction [id] (defn- add-transaction-undo-entry
"Conditionally add an undo entry from the current transaction. That
only happens when no pending transactions are available and the
current transaction exists."
[state]
(let [undo-state (get state :workspace-undo)
current-tx (get undo-state :transaction)
pending-tx (get undo-state :transactions-pending)]
(if (and (some? current-tx)
(empty? pending-tx))
(-> state
(add-undo-entry current-tx)
(update :workspace-undo dissoc :transaction))
state)))
(defn commit-undo-transaction
[id]
(ptk/reify ::commit-undo-transaction (ptk/reify ::commit-undo-transaction
ptk/UpdateEvent ptk/UpdateEvent
(update [_ state] (update [_ state]
(log/info :hint "commit-undo-transaction") (log/info :hint "commit-undo-transaction")
(let [state (-> state (-> state
(update-in [:workspace-undo :transactions-pending] disj id) (update-in [:workspace-undo :transactions-pending] dissoc id)
(update-in [:workspace-undo :transactions-pending-ts] dissoc id))] (add-transaction-undo-entry)))))
(if (empty? (get-in state [:workspace-undo :transactions-pending]))
(-> state
(add-undo-entry (get-in state [:workspace-undo :transaction]))
(update :workspace-undo dissoc :transaction))
state)))))
(def reinitialize-undo (def reinitialize-undo
"Clears the undo stack, removing all entries and transactions." "Clears the undo stack, removing all entries and transactions."
@ -214,7 +225,7 @@
ptk/WatchEvent ptk/WatchEvent
(watch [_ state _] (watch [_ state _]
(log/info :hint "check-open-transactions" :timeout timeout) (log/info :hint "check-open-transactions" :timeout timeout)
(let [pending-ts (-> (dm/get-in state [:workspace-undo :transactions-pending-ts]) (let [pending-ts (-> (dm/get-in state [:workspace-undo :transactions-pending])
(update-vals #(ct/diff-ms % (ct/now))))] (update-vals #(ct/diff-ms % (ct/now))))]
(->> pending-ts (->> pending-ts
(filter (fn [[_ ts]] (>= ts timeout))) (filter (fn [[_ ts]] (>= ts timeout)))