Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-02-13 10:38:13 -05:00
Code Issues Activity

Add page metadata changes to the undo stack.

Browse source
This commit is contained in:
Andrey Antukh 2016-11-29 16:17:12 +01:00
parent bb28ab78d6
commit 438f8f5f82
No known key found for this signature in database
GPG key ID: 4DFEBCB8316A8B95
1 changed files with 20 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
frontend/src/uxbox/main/data/undo.cljs
View file

@ -27,7 +27,8 @@
(rx/take 1))]
(->> stream
(rx/take-until stopper)
(rx/filter #(satisfies? udp/IPageUpdate %))
(rx/filter #(or (satisfies? udp/IPageUpdate %)
(satisfies? udp/IMetadataUpdate %)))
(rx/filter #(not (undo? %)))
(rx/filter #(not (redo? %)))
(rx/debounce 500)
@ -42,15 +43,13 @@
(defrecord SaveUndoEntry [id]
ptk/UpdateEvent
(update [_ state]
(let [page (udp/pack-page state id)]
(let [page (udp/pack-page state id)
undo {:data (:data page)
:metadata (:metadata page)}]
(-> state
(update-in [:undo id :stack] #(cons (:data page) %))
(update-in [:undo id :stack] #(cons undo %))
(assoc-in [:undo id :selected] 0)))))
;; ptk/EffectEvent
;; (effect [_ state]
;; (let [undo (get-in state [:undo id])]
;; (println (pr-str undo)))))
(defn save-undo-entry
[id]
@ -91,15 +90,17 @@
ptk/UpdateEvent
(update [_ state]
(let [page-id (get-in state [:workspace :page])
undo (get-in state [:undo page-id])
stack (:stack undo)
selected (:selected undo 0)]
undo-state (get-in state [:undo page-id])
stack (:stack undo-state)
selected (:selected undo-state 0)]
(if (>= selected (dec (count stack)))
state
(let [pointer (inc selected)
page (get-in state [:pages page-id])
data (nth stack pointer)
packed (assoc page :data data)]
undo (nth stack pointer)
data (:data undo)
metadata (:metadata undo)
packed (assoc page :data data :metadata metadata)]
;; (println "Undo: pointer=" pointer)
;; (println "Undo: packed=")
@ -124,15 +125,17 @@
ptk/UpdateEvent
(update [_ state]
(let [page-id (get-in state [:workspace :page])
undo (get-in state [:undo page-id])
stack (:stack undo)
selected (:selected undo)]
undo-state (get-in state [:undo page-id])
stack (:stack undo-state)
selected (:selected undo-state)]
(if (or (nil? selected) (zero? selected))
state
(let [pointer (dec selected)
data (nth stack pointer)
undo (nth stack pointer)
data (:data undo)
metadata (:metadata undo)
page (get-in state [:pages page-id])
packed (assoc page :data data)]
packed (assoc page :data data :metadata metadata)]
;; (println "Redo: pointer=" pointer)
;; (println "Redo: packed=")