Merge branch 'master' into schema_search

1 files changed, 31 insertions, 52 deletions

diff --git a/src/client/views/collections/CollectionDockingView.tsx b/src/client/views/collections/CollectionDockingView.tsx
index 22bb6e59a..43da0d3cf 100644
--- a/src/client/views/collections/CollectionDockingView.tsx
+++ b/src/client/views/collections/CollectionDockingView.tsx
@@ -191,31 +191,6 @@ export class CollectionDockingView extends React.Component<SubCollectionViewProp
         return retVal;
     }
 
-    @undoBatch
-    @action
-    public static ReplaceTab(document: Doc, stack: any): Opt<Doc> {
-        if (!CollectionDockingView.Instance) return undefined;
-        const instance = CollectionDockingView.Instance;
-        const replaceTab = (doc: Doc, child: any): Opt<Doc> => {
-            for (const contentItem of child.contentItems) {
-                const { config, isStack, isRow, isColumn } = contentItem;
-                if (isRow || isColumn || isStack) {
-                    const val = replaceTab(doc, contentItem);
-                    if (val) return val;
-                } else if (config.component === "DocumentFrameRenderer" &&
-                    config.props.documentId === doc[Id]) {
-                    const alias = Doc.MakeAlias(doc);
-                    config.props.documentId = alias[Id];
-                    config.title = alias.title;
-                    instance.stateChanged();
-                    return alias;
-                }
-            }
-            return undefined;
-        };
-        return replaceTab(document, instance._goldenLayout.root);
-    }
-
     //
     //  Creates a vertical split on the right side of the docking view, and then adds the Document to the right of that split
     //
@@ -358,6 +333,32 @@ export class CollectionDockingView extends React.Component<SubCollectionViewProp
         return true;
     }
 
+    @undoBatch
+    @action
+    public ReplaceTab = (stack: any, document: Doc, libraryPath?: Doc[]) => {
+        Doc.GetProto(document).lastOpened = new DateField;
+        const docContentConfig = CollectionDockingView.makeDocumentConfig(document, undefined, libraryPath);
+        if (stack === undefined) {
+            let stack: any = this._goldenLayout.root;
+            while (!stack.isStack) {
+                if (stack.contentItems.length) {
+                    stack = stack.contentItems[0];
+                } else {
+                    stack.addChild({ type: 'stack', content: [docContentConfig] });
+                    stack = undefined;
+                    break;
+                }
+            }
+            if (stack) {
+                stack.addChild(docContentConfig);
+            }
+        } else {
+            stack.addChild(docContentConfig, undefined);
+        }
+        this.layoutChanged();
+        return true;
+    }
+
     setupGoldenLayout() {
         const config = StrCast(this.props.Document.dockingConfig);
         if (config) {
@@ -727,9 +728,11 @@ export class DockedFrameRenderer extends React.Component<DockedFrameProps> {
                 pinDoc.presZoomButton = true;
                 pinDoc.context = curPres;
                 Doc.AddDocToList(curPres, "data", pinDoc);
+                if (curPres.expandBoolean) pinDoc.presExpandInlineButton = true;
                 if (!DocumentManager.Instance.getDocumentView(curPres)) {
                     CollectionDockingView.AddRightSplit(curPres);
                 }
+                DocumentManager.Instance.jumpToDocument(doc, false, undefined, Cast(doc.context, Doc, null));
             }
         }
     }
@@ -837,12 +840,8 @@ export class DockedFrameRenderer extends React.Component<DockedFrameProps> {
         } else if (location === "close") {
             return CollectionDockingView.CloseRightSplit(doc);
         } else if (location === "replace") {
-            const alias = CollectionDockingView.ReplaceTab(doc, this._stack);
-            if (alias) {
-                runInAction(() => this._document = alias);
-                return true;
-            }
-            return false;
+            CollectionDockingView.UseRightSplit(doc);
+            return true;
         } else {// if (location === "inPlace") {
             return CollectionDockingView.Instance.AddTab(this._stack, doc, libraryPath);
         }
@@ -873,26 +872,7 @@ export class DockedFrameRenderer extends React.Component<DockedFrameProps> {
         const currentFrame = Cast(presTargetDoc.currentFrame, "number", null);
         return currentFrame;
     }
-    renderMiniPres() {
-        return (
-            <div className="miniPres"
-                style={{ width: 250, height: 30, background: '#323232' }}
-            >
-                {<div className="miniPresOverlay">
-                    <div className="miniPres-button" onClick={PresBox.Instance.back}><FontAwesomeIcon icon={"arrow-left"} /></div>
-                    <div className="miniPres-button" onClick={() => PresBox.Instance.startAutoPres(PresBox.Instance.itemIndex)}><FontAwesomeIcon icon={PresBox.Instance.layoutDoc.presStatus === "auto" ? "pause" : "play"} /></div>
-                    <div className="miniPres-button" onClick={PresBox.Instance.next}><FontAwesomeIcon icon={"arrow-right"} /></div>
-                    <div className="miniPres-divider"></div>
-                    <div className="miniPres-button-text">
-                        Slide {PresBox.Instance.itemIndex + 1} / {PresBox.Instance.childDocs.length}
-                        {PresBox.Instance.playButtonFrames}
-                    </div>
-                    <div className="miniPres-divider"></div>
-                    <div className="miniPres-button-text" onClick={PresBox.Instance.updateMinimize}>EXIT</div>
-                </div>}
-            </div>
-        );
-    }
+
     renderMiniMap() {
         return <div className="miniMap" style={{
             width: this.returnMiniSize(), height: this.returnMiniSize(), background: StrCast(this._document!._backgroundColor,
@@ -975,7 +955,6 @@ export class DockedFrameRenderer extends React.Component<DockedFrameProps> {
                 ContainingCollectionView={undefined}
                 ContainingCollectionDoc={undefined} />
             {document._viewType === CollectionViewType.Freeform && !this._document?.hideMinimap ? this.renderMiniMap() : (null)}
-            {document._viewType === CollectionViewType.Freeform && this._document?.miniPres ? this.renderMiniPres() : (null)}
         </>;
     }