Merge branch 'sharing-jenny' of https://github.com/brown-dash/Dash-Web into sharing-jenny

1 files changed, 17 insertions, 12 deletions

diff --git a/src/client/views/collections/collectionFreeForm/MarqueeView.tsx b/src/client/views/collections/collectionFreeForm/MarqueeView.tsx
index 4513ffb39..58a00bbac 100644
--- a/src/client/views/collections/collectionFreeForm/MarqueeView.tsx
+++ b/src/client/views/collections/collectionFreeForm/MarqueeView.tsx
@@ -40,6 +40,16 @@ interface MarqueeViewProps {
     nudge?: (x: number, y: number, nudgeTime?: number) => boolean;
     ungroup?: () => void;
     setPreviewCursor?: (func: (x: number, y: number, drag: boolean, hide: boolean) => void) => void;
+    slowLoadDocuments: (
+        files: File[] | string,
+        options: DocumentOptions,
+        generatedDocuments: Doc[],
+        text: string,
+        completed: ((doc: Doc[]) => void) | undefined,
+        clientX: number,
+        clientY: number,
+        addDocument: (doc: Doc | Doc[]) => boolean
+    ) => Promise<void>;
 }
 
 export interface MarqueeViewBounds {
@@ -277,8 +287,8 @@ export class MarqueeView extends React.Component<SubCollectionViewProps & Marque
         const hideMarquee = () => {
             this.hideMarquee();
             MarqueeOptionsMenu.Instance.fadeOut(true);
-            document.removeEventListener('pointerdown', hideMarquee);
-            document.removeEventListener('wheel', hideMarquee);
+            document.removeEventListener('pointerdown', hideMarquee, true);
+            document.removeEventListener('wheel', hideMarquee, true);
         };
         if (PresBox.startMarquee) {
             this.pinWithView();
@@ -292,8 +302,8 @@ export class MarqueeView extends React.Component<SubCollectionViewProps & Marque
             MarqueeOptionsMenu.Instance.hideMarquee = this.hideMarquee;
             MarqueeOptionsMenu.Instance.jumpTo(e.clientX, e.clientY);
             MarqueeOptionsMenu.Instance.pinWithView = this.pinWithView;
-            document.addEventListener('pointerdown', hideMarquee);
-            document.addEventListener('wheel', hideMarquee);
+            document.addEventListener('pointerdown', hideMarquee, true);
+            document.addEventListener('wheel', hideMarquee, true);
         } else {
             this.hideMarquee();
         }
@@ -330,7 +340,7 @@ export class MarqueeView extends React.Component<SubCollectionViewProps & Marque
             this._downY = y;
             const effectiveAcl = GetEffectiveAcl(this.props.Document[DataSym]);
             if ([AclAdmin, AclEdit, AclAugment].includes(effectiveAcl)) {
-                PreviewCursor.Show(x, y, this.onKeyPress, this.props.addLiveTextDocument, this.props.getTransform, this.props.addDocument, this.props.nudge);
+                PreviewCursor.Show(x, y, this.onKeyPress, this.props.addLiveTextDocument, this.props.getTransform, this.props.addDocument, this.props.nudge, this.props.slowLoadDocuments);
             }
             this.clearSelection();
         }
@@ -356,14 +366,9 @@ export class MarqueeView extends React.Component<SubCollectionViewProps & Marque
     };
 
     @action
-    showMarquee = () => {
-        this._visible = true;
-    };
-
+    showMarquee = () => (this._visible = true);
     @action
-    hideMarquee = () => {
-        this._visible = false;
-    };
+    hideMarquee = () => (this._visible = false);
 
     @undoBatch
     @action