From 7bde06fc756684d47c89c65199492daef5fe5b63 Mon Sep 17 00:00:00 2001
From: bobzel <zzzman@gmail.com>
Date: Mon, 14 Nov 2022 09:51:49 -0500
Subject: made audio anno recording last as long as record button is pressed.
 added a Hide option to allow an pres item to be animated but not visible
 (used to setup state for subsequent activity))

---
 src/client/views/nodes/DocumentView.tsx   | 10 +++---
 src/client/views/nodes/trails/PresBox.tsx | 60 ++++++++++++++++++-------------
 2 files changed, 42 insertions(+), 28 deletions(-)

(limited to 'src/client/views/nodes')

diff --git a/src/client/views/nodes/DocumentView.tsx b/src/client/views/nodes/DocumentView.tsx
index 6b96362bf..c669d2b96 100644
--- a/src/client/views/nodes/DocumentView.tsx
+++ b/src/client/views/nodes/DocumentView.tsx
@@ -1208,7 +1208,7 @@ export class DocumentViewInternal extends DocComponent<DocumentViewInternalProps
         }
     };
 
-    static recordAudioAnnotation(dataDoc: Doc, field: string, onEnd?: () => void) {
+    static recordAudioAnnotation(dataDoc: Doc, field: string, onRecording?: (stop: () => void) => void, onEnd?: () => void) {
         let gumStream: any;
         let recorder: any;
         navigator.mediaDevices
@@ -1245,12 +1245,14 @@ export class DocumentViewInternal extends DocComponent<DocumentViewInternalProps
                 };
                 runInAction(() => (dataDoc.audioAnnoState = 'recording'));
                 recorder.start();
-                setTimeout(() => {
+                const stopFunc = () => {
                     recorder.stop();
                     DictationManager.Controls.stop(false);
                     runInAction(() => (dataDoc.audioAnnoState = 'stopped'));
                     gumStream.getAudioTracks()[0].stop();
-                }, 5000);
+                };
+                if (onRecording) onRecording(stopFunc);
+                else setTimeout(stopFunc, 5000);
             });
     }
 
@@ -1385,7 +1387,7 @@ export class DocumentViewInternal extends DocComponent<DocumentViewInternalProps
                 : this.boxShadow || (this.props.Document.isTemplateForField ? 'black 0.2vw 0.2vw 0.8vw' : undefined);
         const renderDoc = this.renderDoc({
             borderRadius: this.borderRounding,
-            outline: highlighting && !this.borderRounding && !highlighting.highlightStroke? `${highlighting.highlightColor} ${highlighting.highlightStyle} ${highlighting.highlightIndex}px` : 'solid 0px',
+            outline: highlighting && !this.borderRounding && !highlighting.highlightStroke ? `${highlighting.highlightColor} ${highlighting.highlightStyle} ${highlighting.highlightIndex}px` : 'solid 0px',
             border: highlighting && this.borderRounding && highlighting.highlightStyle === 'dashed' ? `${highlighting.highlightStyle} ${highlighting.highlightColor} ${highlighting.highlightIndex}px` : undefined,
             boxShadow,
             clipPath: borderPath.path ? `path('${borderPath.path}')` : undefined,
diff --git a/src/client/views/nodes/trails/PresBox.tsx b/src/client/views/nodes/trails/PresBox.tsx
index 5e9301e6a..9e3b42cf6 100644
--- a/src/client/views/nodes/trails/PresBox.tsx
+++ b/src/client/views/nodes/trails/PresBox.tsx
@@ -330,7 +330,7 @@ export class PresBox extends ViewBoxBaseComponent<FieldViewProps>() {
                 this.startTempMedia(targetDoc, activeItem);
             }
             if (targetDoc) {
-                Doc.linkFollowHighlight(targetDoc.annotationOn instanceof Doc ? [targetDoc, targetDoc.annotationOn] : targetDoc);
+                //  Doc.linkFollowHighlight(targetDoc.annotationOn instanceof Doc ? [targetDoc, targetDoc.annotationOn] : targetDoc);
                 targetDoc && runInAction(() => (targetDoc.focusSpeed = activeItem.presMovement === PresMovement.Jump ? 0 : NumCast(activeItem.presTransition, 500)));
                 setTimeout(() => (targetDoc.focusSpeed = undefined), NumCast(targetDoc.focusSpeed) + 10);
             }
@@ -392,12 +392,7 @@ export class PresBox extends ViewBoxBaseComponent<FieldViewProps>() {
                 () =>
                     StrListCast(activeItem.presPinLayoutData)
                         .map(str => JSON.parse(str) as { id: string; x: number; y: number; w: number; h: number })
-                        .forEach(
-                            action(data => {
-                                const doc = DocServer.GetCachedRefField(data.id) as Doc;
-                                doc._dataTransition = undefined;
-                            })
-                        ),
+                        .forEach(action(data => ((DocServer.GetCachedRefField(data.id) as Doc)._dataTransition = undefined))),
                 transTime + 10
             );
         }
@@ -616,26 +611,29 @@ export class PresBox extends ViewBoxBaseComponent<FieldViewProps>() {
             if (tagDoc === this.layoutDoc.presCollection) {
                 tagDoc.opacity = 1;
             } else {
-                if (curDoc.presHideBefore) {
-                    if (itemIndexes.length > 1 && curInd !== 0) {
+                const hidingIndBef = itemIndexes.find(item => item >= this.itemIndex);
+                if (curDoc.presHideBefore && index === hidingIndBef) {
+                    if (index > this.itemIndex) {
+                        tagDoc.opacity = 0;
+                    } else if (index === this.itemIndex || !curDoc.presHideAfter) {
                         tagDoc.opacity = 1;
-                    } else {
-                        if (index > this.itemIndex) {
-                            tagDoc.opacity = 0;
-                        } else if (index === this.itemIndex || !curDoc.presHideAfter) {
-                            tagDoc.opacity = 1;
-                        }
                     }
                 }
-                if (curDoc.presHideAfter) {
-                    if (itemIndexes.length > 1 && curInd !== itemIndexes.length - 1) {
+                const hidingIndAft = itemIndexes
+                    .slice()
+                    .reverse()
+                    .find(item => item < this.itemIndex);
+                if (curDoc.presHideAfter && index === hidingIndAft) {
+                    if (index < this.itemIndex) {
+                        tagDoc.opacity = 0;
+                    } else if (index === this.itemIndex || !curDoc.presHideBefore) {
                         tagDoc.opacity = 1;
-                    } else {
-                        if (index < this.itemIndex) {
-                            tagDoc.opacity = 0;
-                        } else if (index === this.itemIndex || !curDoc.presHideBefore) {
-                            tagDoc.opacity = 1;
-                        }
+                    }
+                }
+                const hidingInd = itemIndexes.find(item => item === this.itemIndex);
+                if (curDoc.presHide && index === hidingInd) {
+                    if (index === this.itemIndex) {
+                        tagDoc.opacity = 0;
                     }
                 }
             }
@@ -1180,6 +1178,13 @@ export class PresBox extends ViewBoxBaseComponent<FieldViewProps>() {
         this.selectedArray.forEach(doc => (doc.presHideBefore = activeItem.presHideBefore));
     };
 
+    @undoBatch
+    @action
+    updateHide = (activeItem: Doc) => {
+        activeItem.presHide = !activeItem.presHide;
+        this.selectedArray.forEach(doc => (doc.presHide = activeItem.presHide));
+    };
+
     @undoBatch
     @action
     updateHideAfter = (activeItem: Doc) => {
@@ -1317,7 +1322,7 @@ export class PresBox extends ViewBoxBaseComponent<FieldViewProps>() {
                                 </div>
                             </div>
                         </div>
-                        {inputter('0.1', '0.1', '10', transitionSpeed, [PresMovement.Pan, PresMovement.Zoom].includes(activeItem.presMovement as any), this.setTransitionTime)}
+                        {inputter('0.1', '0.1', '10', transitionSpeed, true, this.setTransitionTime)}
                         <div className={'slider-headers'}>
                             <div className="slider-text">Fast</div>
                             <div className="slider-text">Medium</div>
@@ -1334,6 +1339,13 @@ export class PresBox extends ViewBoxBaseComponent<FieldViewProps>() {
                                     </div>
                                 </Tooltip>
                             )}
+                            {isPresCollection ? null : (
+                                <Tooltip title={<div className="dash-tooltip">{'Hide while presented'}</div>}>
+                                    <div className={`ribbon-toggle ${activeItem.presHide ? 'active' : ''}`} onClick={() => this.updateHide(activeItem)}>
+                                        Hide
+                                    </div>
+                                </Tooltip>
+                            )}
                             {isPresCollection ? null : (
                                 <Tooltip title={<div className="dash-tooltip">{'Hide after presented'}</div>}>
                                     <div className={`ribbon-toggle ${activeItem.presHideAfter ? 'active' : ''}`} onClick={() => this.updateHideAfter(activeItem)}>
-- 
cgit v1.2.3-70-g09d2