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

1 files changed, 20 insertions, 18 deletions

diff --git a/src/client/util/DocumentManager.ts b/src/client/util/DocumentManager.ts
index 4ab2e8d05..e33449782 100644
--- a/src/client/util/DocumentManager.ts
+++ b/src/client/util/DocumentManager.ts
@@ -8,7 +8,7 @@ import { Cast, DocCast, NumCast, StrCast } from '../../fields/Types';
 import { AudioField } from '../../fields/URLField';
 import { CollectionViewType } from '../documents/DocumentTypes';
 import { DocumentView, DocumentViewInternal } from '../views/nodes/DocumentView';
-import { FocusViewOptions } from '../views/nodes/FocusViewOptions';
+import { FocusEffectDelay, FocusViewOptions } from '../views/nodes/FocusViewOptions';
 import { OpenWhere } from '../views/nodes/OpenWhere';
 import { PresBox } from '../views/nodes/trails';
 
@@ -256,7 +256,11 @@ export class DocumentManager {
         Doc.RemoveDocFromList(Doc.MyRecentlyClosed, undefined, targetDoc);
         const docContextPath = DocumentManager.GetContextPath(targetDoc, true);
         if (docContextPath.some(doc => doc.hidden)) options.toggleTarget = false;
-        if (DocumentView.activateTabView(docContextPath[0])) options.toggleTarget = false;
+        let activatedTab = false;
+        if (DocumentView.activateTabView(docContextPath[0])) {
+            options.toggleTarget = false;
+            activatedTab = true;
+        }
 
         const rootContextView =
             docContextPath.length &&
@@ -268,7 +272,7 @@ export class DocumentManager {
                     return;
                 }
                 options.didMove = true;
-                (!DocumentView.LightboxDoc() && docContextPath.some(doc => DocumentView.activateTabView(doc))) || DocumentViewInternal.addDocTabFunc(docContextPath[0], options.openLocation ?? OpenWhere.addRight);
+                (!DocumentView.LightboxDoc() && (activatedTab || docContextPath.some(doc => DocumentView.activateTabView(doc)))) || DocumentViewInternal.addDocTabFunc(docContextPath[0], options.openLocation ?? OpenWhere.addRight);
                 this.AddViewRenderedCb(docContextPath[0], dv => res(dv));
             }));
         if (options.openLocation?.includes(OpenWhere.lightbox)) {
@@ -348,21 +352,19 @@ export class DocumentManager {
             // if there's an options.effect, it will be handled from linkFollowHighlight.  We delay the start of
             // the highlight so that the target document can be somewhat centered so that the effect/highlight will be seen
             // bcz: should this delay be an options parameter?
-            setTimeout(
-                () => {
-                    Doc.linkFollowHighlight(viewSpec ? [docView.Document, viewSpec] : docView.Document, undefined, options.effect);
-                    if (options.zoomTextSelections && Doc.IsUnhighlightTimerSet() && contextView && targetDoc.text_html) {
-                        // if the docView is a text anchor, the contextView is the PDF/Web/Text doc
-                        contextView.setTextHtmlOverlay(StrCast(targetDoc.text_html), options.effect);
-                        DocumentManager._overlayViews.add(contextView);
-                    }
-                    Doc.AddUnHighlightWatcher(() => {
-                        docView.Document[Animation] = undefined;
-                        DocumentManager.removeOverlayViews();
-                    });
-                },
-                (options.zoomTime ?? 0) * 0.5
-            );
+            setTimeout(() => {
+                Doc.linkFollowHighlight(viewSpec ? [docView.Document, viewSpec] : docView.Document, undefined, options.effect);
+                const zoomableText = StrCast(targetDoc.text_html, StrCast(targetDoc.ai_firefly_prompt));
+                if (options.zoomTextSelections && Doc.IsUnhighlightTimerSet() && contextView && zoomableText) {
+                    // if the docView is a text anchor, the contextView is the PDF/Web/Text doc
+                    contextView.setTextHtmlOverlay(zoomableText, options.effect);
+                    DocumentManager._overlayViews.add(contextView);
+                }
+                Doc.AddUnHighlightWatcher(() => {
+                    docView.Document[Animation] = undefined;
+                    DocumentManager.removeOverlayViews();
+                });
+            }, FocusEffectDelay(options));
             if (options.playMedia) docView.ComponentView?.playFrom?.(NumCast(docView.Document._layout_currentTimecode));
             if (options.playAudio) DocumentManager.playAudioAnno(docView.Document);
             if (options.toggleTarget && (!options.didMove || docView.Document.hidden)) docView.Document.hidden = !docView.Document.hidden;