Merge branch 'master' into mobile_revision_direct

1 files changed, 6 insertions, 4 deletions

diff --git a/src/client/views/nodes/ComparisonBox.tsx b/src/client/views/nodes/ComparisonBox.tsx
index 14a2c25bf..f140cc6e5 100644
--- a/src/client/views/nodes/ComparisonBox.tsx
+++ b/src/client/views/nodes/ComparisonBox.tsx
@@ -39,10 +39,12 @@ export class ComparisonBox extends ViewBoxAnnotatableComponent<FieldViewProps, C
 
     @undoBatch
     private dropHandler = (event: Event, dropEvent: DragManager.DropEvent, fieldKey: string) => {
-        event.stopPropagation(); // prevent parent Doc from registering new position so that it snaps back into place
-        const droppedDocs = dropEvent.complete.docDragData?.droppedDocuments;
-        if (droppedDocs?.length) {
-            this.dataDoc[fieldKey] = droppedDocs[0];
+        if (dropEvent.complete.docDragData) {
+            event.stopPropagation(); // prevent parent Doc from registering new position so that it snaps back into place
+            const droppedDocs = dropEvent.complete.docDragData?.droppedDocuments;
+            if (droppedDocs?.length) {
+                this.dataDoc[fieldKey] = droppedDocs[0];
+            }
         }
     }