🐛 Create guard for undo transactions

frontend/src/app/main/data/workspace/changes.cljs

@@ -51,7 +51,7 @@
 
 (defn update-shapes
   ([ids update-fn] (update-shapes ids update-fn nil))
-  ([ids update-fn {:keys [reg-objects? save-undo? stack-undo? attrs ignore-tree page-id ignore-remote? ignore-touched]
+  ([ids update-fn {:keys [reg-objects? save-undo? stack-undo? attrs ignore-tree page-id ignore-remote? ignore-touched undo-group]
                    :or {reg-objects? false save-undo? true stack-undo? false ignore-remote? false ignore-touched false}}]
    (dm/assert! (sm/coll-of-uuid? ids))
    (dm/assert! (fn? update-fn))
@@ -78,7 +78,9 @@
                         (-> (pcb/empty-changes it page-id)
                             (pcb/set-save-undo? save-undo?)
                             (pcb/set-stack-undo? stack-undo?)
-                            (pcb/with-objects objects))
+                            (pcb/with-objects objects)
+                            (cond-> undo-group
+                              (pcb/set-undo-group undo-group)))
                         ids)
              changes (add-undo-group changes state)]
          (rx/concat

frontend/src/app/main/data/workspace/drawing/common.cljs

@@ -63,7 +63,7 @@
 
              ;; Add & select the created shape to the workspace
              (rx/concat
-              (if (or (= :text (:type shape)) (= :frame (:type shape)))
+              (if (= :frame (:type shape))
                 (rx/of (dwu/start-undo-transaction (:id shape)))
                 (rx/empty))
 

frontend/src/app/main/data/workspace/shapes.cljs

@@ -114,6 +114,10 @@
              [shape changes]
              (prepare-add-shape changes attrs objects selected)
 
+             changes (cond-> changes
+                       (cph/text-shape? shape)
+                       (pcb/set-undo-group (:id shape)))
+
              undo-id (js/Symbol)]
 
          (rx/concat

frontend/src/app/main/data/workspace/texts.cljs

@@ -156,8 +156,8 @@
                            (cond-> new-shape?
                              (assoc :name text))
                            (cond-> (or (some? width) (some? height))
-                             (gsh/transform-shape (ctm/change-size shape width height)))))))
-                  (dwu/commit-undo-transaction (:id shape))))))
+                             (gsh/transform-shape (ctm/change-size shape width height))))))
+                   {:undo-group (when new-shape? id)})))))
 
             (when (some? id)
               (rx/of (dws/deselect-shape id)

frontend/src/app/main/data/workspace/undo.cljs

@@ -11,8 +11,12 @@
    [app.common.logging :as log]
    [app.common.pages.changes :as cpc]
    [app.common.schema :as sm]
+   [app.util.time :as dt]
+   [beicon.core :as rx]
    [potok.core :as ptk]))
 
+(def discard-transaction-time-millis (* 20 1000))
+
 ;; Change this to :info :debug or :trace to debug this module
 (log/set-level! :warn)
 
@@ -107,10 +111,18 @@
 (def empty-tx
   {:undo-changes [] :redo-changes []})
 
+(declare check-open-transactions)
+
 (defn start-undo-transaction
   "Start a transaction, so that every changes inside are added together in a single undo entry."
   [id]
   (ptk/reify ::start-undo-transaction
+    ptk/WatchEvent
+    (watch [_ _ _]
+      (->> (rx/of (check-open-transactions))
+           ;; Wait the configured time
+           (rx/delay discard-transaction-time-millis)))
+
     ptk/UpdateEvent
     (update [_ state]
       (log/info :msg "start-undo-transaction")
@@ -120,21 +132,24 @@
         (cond-> state
           (nil? current-tx)  (assoc-in [:workspace-undo :transaction] empty-tx)
           (nil? pending-tx)  (assoc-in [:workspace-undo :transactions-pending] #{id})
-          (some? pending-tx) (update-in [:workspace-undo :transactions-pending] conj id))))))
+          (some? pending-tx) (update-in [:workspace-undo :transactions-pending] conj id)
+          :always            (update-in [:workspace-undo :transactions-pending-ts] assoc id (dt/now)))))))
 
 (defn discard-undo-transaction []
   (ptk/reify ::discard-undo-transaction
     ptk/UpdateEvent
     (update [_ state]
       (log/info :msg "discard-undo-transaction")
-      (update state :workspace-undo dissoc :transaction :transactions-pending))))
+      (update state :workspace-undo dissoc :transaction :transactions-pending :transactions-pending-ts))))
 
 (defn commit-undo-transaction [id]
   (ptk/reify ::commit-undo-transaction
     ptk/UpdateEvent
     (update [_ state]
       (log/info :msg "commit-undo-transaction")
-      (let [state (update-in state [:workspace-undo :transactions-pending] disj id)]
+      (let [state (-> state
+                      (update-in [:workspace-undo :transactions-pending] disj id)
+                      (update-in [:workspace-undo :transactions-pending-ts] dissoc id))]
         (if (empty? (get-in state [:workspace-undo :transactions-pending]))
           (-> state
               (add-undo-entry (get-in state [:workspace-undo :transaction]))
@@ -147,3 +162,17 @@
     (update [_ state]
       (assoc state :workspace-undo {}))))
 
+(defn check-open-transactions
+  []
+  (ptk/reify ::check-open-transactions
+    ptk/WatchEvent
+    (watch [_ state _]
+      (log/info :msg "check-open-transactions")
+      (let [pending-ts (-> (dm/get-in state [:workspace-undo :transactions-pending-ts])
+                           (update-vals #(.toMillis (dt/diff (dt/now) %))))]
+        (->> pending-ts
+             (filter (fn [[_ ts]] (>= ts discard-transaction-time-millis)))
+             (rx/from)
+             (rx/tap #(js/console.warn (dm/str "FORCE COMMIT TRANSACTION AFTER " (second %) "MS")))
+             (rx/map first)
+             (rx/map commit-undo-transaction))))))