mirror of
https://github.com/penpot/penpot.git
synced 2026-11-21 01:22:01 +00:00
🐛 Record user undo changes before starting derived component sync
Hand applied transitions to the component watcher only after the workspace records their undo entry. Keep the handoff synchronous with the captured prior file data. This preserves transaction order when nesting triggers several component syncs. Fix F137. The minimal replay failed both undo and redo before the fix; its 4 checks now pass. Existing sync scenarios pass their behavior and undo checks; 60 golden digests need review for the accumulated Phase 4 fixes. Common benchmark ratios against Phase 1e: main 10/100/1000 0.46/0.52/0.53; levels 0.47; chain 0.51; library 0.51; many 0.49; switch 0.61. This handoff changes no common benchmark code. AI-assisted-by: GPT-6
This commit is contained in:
parent
f78a45d5f8
commit
88dd41f065
@ -41,6 +41,15 @@
|
||||
(def changes-applied?
|
||||
(ptk/type? ::changes-applied))
|
||||
|
||||
(def changes-recorded?
|
||||
(ptk/type? ::changes-recorded))
|
||||
|
||||
(defn changes-recorded
|
||||
"The commit has applied and its undo entry has been recorded. Derived
|
||||
edits can now follow it without reversing transaction history."
|
||||
[transition]
|
||||
(ptk/data-event ::changes-recorded transition))
|
||||
|
||||
(defn- fix-page-id
|
||||
"For events that modifies the page, page-id does not comes
|
||||
as a property so we assign it from the `id` property."
|
||||
|
||||
@ -499,19 +499,23 @@
|
||||
(rx/take-until stopper-s)))
|
||||
|
||||
(->> stream
|
||||
(rx/filter dch/commit?)
|
||||
(rx/filter dch/changes-applied?)
|
||||
(rx/map deref)
|
||||
(rx/mapcat
|
||||
(fn [{:keys [file-id save-undo? undo-changes redo-changes undo-group tags stack-undo? selected-before translation?]}]
|
||||
(if (and save-undo? (seq undo-changes))
|
||||
(let [entry {:undo-changes (mapv #(assoc % ::dwu/file-id file-id) undo-changes)
|
||||
:redo-changes (mapv #(assoc % ::dwu/file-id file-id) redo-changes)
|
||||
:undo-group undo-group
|
||||
:tags tags
|
||||
:selected-before selected-before
|
||||
:translation (boolean translation?)}]
|
||||
(rx/of (dwu/append-undo entry stack-undo?)))
|
||||
(rx/empty))))))
|
||||
(fn [{:keys [commit] :as transition}]
|
||||
(let [{:keys [file-id save-undo? undo-changes redo-changes undo-group
|
||||
tags stack-undo? selected-before translation?]} commit]
|
||||
(rx/concat
|
||||
(if (and save-undo? (seq undo-changes))
|
||||
(let [entry {:undo-changes (mapv #(assoc % ::dwu/file-id file-id) undo-changes)
|
||||
:redo-changes (mapv #(assoc % ::dwu/file-id file-id) redo-changes)
|
||||
:undo-group undo-group
|
||||
:tags tags
|
||||
:selected-before selected-before
|
||||
:translation (boolean translation?)}]
|
||||
(rx/of (dwu/append-undo entry stack-undo?)))
|
||||
(rx/empty))
|
||||
(rx/of (dch/changes-recorded transition))))))))
|
||||
(rx/take-until stopper-s)))))))
|
||||
|
||||
(defn initialize-workspace
|
||||
|
||||
@ -1553,7 +1553,7 @@
|
||||
|
||||
local-commits-s
|
||||
(->> stream
|
||||
(rx/filter dch/changes-applied?)
|
||||
(rx/filter dch/changes-recorded?)
|
||||
(rx/map deref)
|
||||
(rx/filter #(= :local (get-in % [:commit :source])))
|
||||
;; Keep waits pending while component changes are checked.
|
||||
|
||||
@ -86,3 +86,6 @@
|
||||
(t/deftest ^:async nested-text-rotation-shrunk-regression
|
||||
(await (replay {:world [2 0 {:text true}]
|
||||
:ops [[:nest 0] [:detach 0] [:rotate 0]]})))
|
||||
|
||||
(t/deftest ^:async nesting-restores-default-constraints-on-undo
|
||||
(await (replay {:world [2 0] :ops [[:nest 0]]})))
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user