warnings and fix to doc decorations close button to deselect first

5 files changed, 10 insertions, 6 deletions

diff --git a/src/client/views/DocumentDecorations.tsx b/src/client/views/DocumentDecorations.tsx
index fdaca87a9..228cea00e 100644
--- a/src/client/views/DocumentDecorations.tsx
+++ b/src/client/views/DocumentDecorations.tsx
@@ -233,11 +233,12 @@ export class DocumentDecorations extends React.Component<{}, { value: string }>
         e.stopPropagation();
         if (e.button === 0) {
             const recent = Cast(CurrentUserUtils.UserDocument.recentlyClosed, Doc) as Doc;
-            SelectionManager.SelectedDocuments().map(dv => {
+            let selected = SelectionManager.SelectedDocuments().slice();
+            SelectionManager.DeselectAll();
+            selected.map(dv => {
                 recent && Doc.AddDocToList(recent, "data", dv.props.Document, undefined, true, true);
                 dv.props.removeDocument && dv.props.removeDocument(dv.props.Document);
             });
-            SelectionManager.DeselectAll();
             document.removeEventListener("pointermove", this.onCloseMove);
             document.removeEventListener("pointerup", this.onCloseUp);
         }
diff --git a/src/client/views/GlobalKeyHandler.ts b/src/client/views/GlobalKeyHandler.ts
index c48e1df4f..979687ffb 100644
--- a/src/client/views/GlobalKeyHandler.ts
+++ b/src/client/views/GlobalKeyHandler.ts
@@ -127,7 +127,7 @@ export default class KeyManager {
 
         switch (keyname) {
             case "f":
-                let dv = SelectionManager.SelectedDocuments()?.[0];
+                const dv = SelectionManager.SelectedDocuments()?.[0];
                 if (dv) {
                     const ex = dv.props.ScreenToLocalTransform().inverse().transformPoint(0, 0)[0];
                     const ey = dv.props.ScreenToLocalTransform().inverse().transformPoint(0, 0)[1];
diff --git a/src/client/views/MainView.scss b/src/client/views/MainView.scss
index a8924c6b1..51a062118 100644
--- a/src/client/views/MainView.scss
+++ b/src/client/views/MainView.scss
@@ -70,7 +70,7 @@
     position: absolute;
     display: flex;
     flex-direction: column;
-    z-index: 1;
+    z-index: 2;
 }
 
 .mainView-expandFlyoutButton {
@@ -88,7 +88,7 @@
     border: 1px solid black;
     border-radius: 5px;
     position: absolute;
-    z-index: 1;
+    z-index: 2;
     touch-action: none;
     cursor: ew-resize;
 }
diff --git a/src/client/views/collections/ParentDocumentSelector.tsx b/src/client/views/collections/ParentDocumentSelector.tsx
index ffaf41b91..422d01cee 100644
--- a/src/client/views/collections/ParentDocumentSelector.tsx
+++ b/src/client/views/collections/ParentDocumentSelector.tsx
@@ -118,7 +118,7 @@ export class ButtonSelector extends React.Component<{ Document: Doc, Stack: any
 
     render() {
         const view = DocumentManager.Instance.getDocumentView(this.props.Document);
-        let flyout = (
+        const flyout = (
             <div className="ParentDocumentSelector-flyout" title=" ">
                 <DocumentButtonBar views={[view]} stack={this.props.Stack} />
             </div>
diff --git a/src/client/views/nodes/DocumentBox.tsx b/src/client/views/nodes/DocumentBox.tsx
index 6be0289d7..94755afec 100644
--- a/src/client/views/nodes/DocumentBox.tsx
+++ b/src/client/views/nodes/DocumentBox.tsx
@@ -33,6 +33,9 @@ export class DocumentBox extends DocComponent<FieldViewProps, DocBoxSchema>(DocB
             }
         });
     }
+    componentWillUnmount() {
+        this._prevSelectionDisposer && this._prevSelectionDisposer();
+    }
     specificContextMenu = (e: React.MouseEvent): void => {
         const funcs: ContextMenuProps[] = [];
         funcs.push({ description: (this.isSelectionLocked() ? "Show" : "Lock") + " Selection", event: () => this.toggleLockSelection, icon: "expand-arrows-alt" });