From 919483d4222de685c1062a1e715f57c09442b676 Mon Sep 17 00:00:00 2001
From: bobzel <zzzman@gmail.com>
Date: Fri, 5 Feb 2021 13:57:34 -0500
Subject: from last

---
 src/client/views/DocumentDecorations.tsx        | 15 ++++++++++-----
 src/client/views/collections/CollectionMenu.tsx |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/client/views/DocumentDecorations.tsx b/src/client/views/DocumentDecorations.tsx
index 0dfa0f8b2..77b43db9b 100644
--- a/src/client/views/DocumentDecorations.tsx
+++ b/src/client/views/DocumentDecorations.tsx
@@ -175,7 +175,10 @@ export class DocumentDecorations extends React.Component<{ boundsLeft: number, b
                 } else if (e.altKey) {    // open same document in new tab
                     CollectionDockingView.ToggleSplit(Cast(selectedDocs[0].props.Document._fullScreenView, Doc, null) || selectedDocs[0].props.Document, "right");
                 } else {
-                    runInAction(() => LightboxView.LightboxDoc = selectedDocs[0].props.Document);
+                    runInAction(() => {
+                        LightboxView.LightboxDoc = selectedDocs[0].props.Document;
+                        LightboxView.LightboxFuture = selectedDocs.slice(1).map(view => view.props.Document);
+                    });
                 }
             }
         }
@@ -572,10 +575,12 @@ export class DocumentDecorations extends React.Component<{ boundsLeft: number, b
                     <FontAwesomeIcon className="documentdecorations-times" icon={"times"} size="lg" />
                 </div></Tooltip>);
 
-        const openIcon = !canOpen ? (null) : <Tooltip key="open" title={<div className="dash-tooltip">Open in Tab (ctrl: as alias, shift: in new collection)</div>} placement="top"><div className="documentDecorations-openInTab" onContextMenu={e => { e.preventDefault(); e.stopPropagation(); }} onPointerDown={this.onMaximizeDown}>
-            {SelectionManager.Views().length === 1 ? <FontAwesomeIcon icon="external-link-alt" className="documentView-minimizedIcon" /> : "..."}
-        </div>
-        </Tooltip>;
+        const openIcon = !canOpen ? (null) :
+            <Tooltip key="open" title={<div className="dash-tooltip">Open in Tab (ctrl: as alias, shift: in new collection)</div>} placement="top">
+                <div className="documentDecorations-openInTab" onContextMenu={e => { e.preventDefault(); e.stopPropagation(); }} onPointerDown={this.onMaximizeDown}>
+                    <FontAwesomeIcon icon="external-link-alt" className="documentView-minimizedIcon" />
+                </div>
+            </Tooltip>;
 
         const titleArea = this._edtingTitle ?
             <input ref={this._keyinput} className="documentDecorations-title" type="text" name="dynbox" autoComplete="on" value={this._accumulatedTitle}
diff --git a/src/client/views/collections/CollectionMenu.tsx b/src/client/views/collections/CollectionMenu.tsx
index 3f0b8eb3e..d6e4b01c4 100644
--- a/src/client/views/collections/CollectionMenu.tsx
+++ b/src/client/views/collections/CollectionMenu.tsx
@@ -493,7 +493,7 @@ export class CollectionViewBaseChrome extends React.Component<CollectionMenuProp
                 const docs = DocListCast(targetDoc[Doc.LayoutFieldKey(targetDoc)]);
                 if (docs.length) {
                     LightboxView.LightboxDoc = docs[0];
-                    LightboxView.LightboxFuture = docs;
+                    LightboxView.LightboxFuture = docs.slice(1);
                 }
             })}>
                 <FontAwesomeIcon className="documentdecorations-icon" icon="desktop" size="lg" />
-- 
cgit v1.2.3-70-g09d2