2 files changed, 31 insertions, 28 deletions

diff --git a/src/client/util/DragManager.ts b/src/client/util/DragManager.ts
index f4987cf34..947882958 100644
--- a/src/client/util/DragManager.ts
+++ b/src/client/util/DragManager.ts
@@ -448,16 +448,16 @@ export namespace DragManager {
 
         AbortDrag = () => {
             options?.dragComplete?.(new DragCompleteEvent(true, dragData));
-            cleanupDrag();
+            cleanupDrag(true);
         };
 
-        const cleanupDrag = action(() => {
+        const cleanupDrag = action((undo: boolean) => {
             hideDragShowOriginalElements(false);
             document.removeEventListener('pointermove', moveHandler, true);
             document.removeEventListener('pointerup', upHandler, true);
             SnappingManager.SetIsDragging(false);
             SnappingManager.clearSnapLines();
-            batch.end();
+            if (undo && batch.end()) UndoManager.Undo();
             docsBeingDragged.length = 0;
         });
         var startWindowDragTimer: any;
@@ -548,7 +548,7 @@ export namespace DragManager {
         const upHandler = (e: PointerEvent) => {
             clearTimeout(startWindowDragTimer);
             startWindowDragTimer = undefined;
-            dispatchDrag(document.elementFromPoint(e.x, e.y) || document.body, e, new DragCompleteEvent(false, dragData), snapDrag(e, xFromLeft, yFromTop, xFromRight, yFromBottom), finishDrag, options, cleanupDrag);
+            dispatchDrag(document.elementFromPoint(e.x, e.y) || document.body, e, new DragCompleteEvent(false, dragData), snapDrag(e, xFromLeft, yFromTop, xFromRight, yFromBottom), finishDrag, options, () => cleanupDrag(false));
         };
         document.addEventListener('pointermove', moveHandler, true);
         document.addEventListener('pointerup', upHandler, true);
diff --git a/src/client/util/UndoManager.ts b/src/client/util/UndoManager.ts
index d1f1a0099..d0aec45a6 100644
--- a/src/client/util/UndoManager.ts
+++ b/src/client/util/UndoManager.ts
@@ -1,5 +1,5 @@
-import { observable, action, runInAction } from "mobx";
-import { Without } from "../../Utils";
+import { observable, action, runInAction } from 'mobx';
+import { Without } from '../../Utils';
 
 function getBatchName(target: any, key: string | symbol): string {
     const keyName = key.toString();
@@ -28,9 +28,9 @@ function propertyDecorator(target: any, key: string | symbol) {
                     } finally {
                         batch.end();
                     }
-                }
+                },
             });
-        }
+        },
     });
 }
 
@@ -39,7 +39,7 @@ export function undoBatch(fn: (...args: any[]) => any): (...args: any[]) => any;
 export function undoBatch(target: any, key?: string | symbol, descriptor?: TypedPropertyDescriptor<any>): any {
     if (!key) {
         return function () {
-            const batch = UndoManager.StartBatch("");
+            const batch = UndoManager.StartBatch('');
             try {
                 return target.apply(undefined, arguments);
             } finally {
@@ -96,7 +96,7 @@ export namespace UndoManager {
     }
 
     export function PrintBatches(): void {
-        console.log("Open Undo Batches:");
+        console.log('Open Undo Batches:');
         GetOpenBatches().forEach(batch => console.log(batch.batchName));
     }
 
@@ -106,23 +106,25 @@ export namespace UndoManager {
     }
     export function FilterBatches(fieldTypes: string[]) {
         const fieldCounts: { [key: string]: number } = {};
-        const lastStack = UndoManager.undoStack.slice(-1)[0];//.lastElement();
+        const lastStack = UndoManager.undoStack.slice(-1)[0]; //.lastElement();
         if (lastStack) {
             lastStack.forEach(ev => fieldTypes.includes(ev.prop) && (fieldCounts[ev.prop] = (fieldCounts[ev.prop] || 0) + 1));
             const fieldCount2: { [key: string]: number } = {};
-            runInAction(() =>
-                UndoManager.undoStack[UndoManager.undoStack.length - 1] = lastStack.filter(ev => {
-                    if (fieldTypes.includes(ev.prop)) {
-                        fieldCount2[ev.prop] = (fieldCount2[ev.prop] || 0) + 1;
-                        if (fieldCount2[ev.prop] === 1 || fieldCount2[ev.prop] === fieldCounts[ev.prop]) return true;
-                        return false;
-                    }
-                    return true;
-                }));
+            runInAction(
+                () =>
+                    (UndoManager.undoStack[UndoManager.undoStack.length - 1] = lastStack.filter(ev => {
+                        if (fieldTypes.includes(ev.prop)) {
+                            fieldCount2[ev.prop] = (fieldCount2[ev.prop] || 0) + 1;
+                            if (fieldCount2[ev.prop] === 1 || fieldCount2[ev.prop] === fieldCounts[ev.prop]) return true;
+                            return false;
+                        }
+                        return true;
+                    }))
+            );
         }
     }
     export function TraceOpenBatches() {
-        console.log(`Open batches:\n\t${openBatches.map(batch => batch.batchName).join("\n\t")}\n`);
+        console.log(`Open batches:\n\t${openBatches.map(batch => batch.batchName).join('\n\t')}\n`);
     }
     export class Batch {
         private disposed: boolean = false;
@@ -133,15 +135,15 @@ export namespace UndoManager {
 
         private dispose = (cancel: boolean) => {
             if (this.disposed) {
-                throw new Error("Cannot dispose an already disposed batch");
+                throw new Error('Cannot dispose an already disposed batch');
             }
             this.disposed = true;
             openBatches.splice(openBatches.indexOf(this));
-            EndBatch(cancel);
-        }
+            return EndBatch(cancel);
+        };
 
-        end = () => { this.dispose(false); };
-        cancel = () => { this.dispose(true); };
+        end = () => this.dispose(false);
+        cancel = () => this.dispose(true);
     }
 
     export function StartBatch(batchName: string): Batch {
@@ -163,7 +165,9 @@ export namespace UndoManager {
             }
             redoStack.length = 0;
             currentBatch = undefined;
+            return true;
         }
+        return false;
     });
 
     export function RunInTempBatch<T>(fn: () => T) {
@@ -232,5 +236,4 @@ export namespace UndoManager {
 
         undoStack.push(commands);
     });
-
-}
\ No newline at end of file
+}