Changed link undoing

2 files changed, 7 insertions, 11 deletions

diff --git a/src/client/util/DragManager.ts b/src/client/util/DragManager.ts
index 95416cd53..a898175b8 100644
--- a/src/client/util/DragManager.ts
+++ b/src/client/util/DragManager.ts
@@ -422,7 +422,6 @@ export namespace DragManager {
             if (options) {
                 options.handlers.dragComplete({});
             }
-            DocumentDecorations.Instance.endLinkDragBatch();
         };
 
         AbortDrag = () => {
diff --git a/src/client/views/DocumentDecorations.tsx b/src/client/views/DocumentDecorations.tsx
index ee16938ff..a34c47fdf 100644
--- a/src/client/views/DocumentDecorations.tsx
+++ b/src/client/views/DocumentDecorations.tsx
@@ -378,16 +378,7 @@ export class DocumentDecorations extends React.Component<{}, { value: string }>
         }
     }
 
-    endLinkDragBatch = () => {
-        if (!this._linkDrag) {
-            return;
-        }
-        this._linkDrag.end();
-        this._linkDrag = undefined;
-    }
-
     onLinkerButtonDown = (e: React.PointerEvent): void => {
-        this._linkDrag = UndoManager.StartBatch("Drag Link");
         e.stopPropagation();
         document.removeEventListener("pointermove", this.onLinkerButtonMoved);
         document.addEventListener("pointermove", this.onLinkerButtonMoved);
@@ -424,9 +415,15 @@ export class DocumentDecorations extends React.Component<{}, { value: string }>
             let container = selDoc.props.ContainingCollectionView ? selDoc.props.ContainingCollectionView.props.Document.proto : undefined;
             let dragData = new DragManager.LinkDragData(selDoc.props.Document, container ? [container] : []);
             FormattedTextBox.InputBoxOverlay = undefined;
+            this._linkDrag = UndoManager.StartBatch("Drag Link");
             DragManager.StartLinkDrag(this._linkerButton.current, dragData, e.pageX, e.pageY, {
                 handlers: {
-                    dragComplete: action(emptyFunction),
+                    dragComplete: () => {
+                        if (this._linkDrag) {
+                            this._linkDrag.end();
+                            this._linkDrag = undefined;
+                        }
+                    },
                 },
                 hideSource: false
             });