fixed proxyfields to use cache if it's available which saves orders of magnitude opening up Files list. Fixed copying docs to appear in Files list. fixed undo for change perspective and header color

1 files changed, 37 insertions, 37 deletions

diff --git a/src/client/views/nodes/DocumentView.tsx b/src/client/views/nodes/DocumentView.tsx
index 5b26469ed..b5dde211b 100644
--- a/src/client/views/nodes/DocumentView.tsx
+++ b/src/client/views/nodes/DocumentView.tsx
@@ -1,7 +1,7 @@
 import { IconProp } from '@fortawesome/fontawesome-svg-core';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { Tooltip } from '@material-ui/core';
-import { action, computed, IReactionDisposer, observable, reaction, runInAction } from 'mobx';
+import { action, computed, IReactionDisposer, observable, reaction, runInAction, trace } from 'mobx';
 import { observer } from 'mobx-react';
 import { AclAdmin, AclEdit, AclPrivate, DataSym, Doc, DocListCast, Field, Opt, StrListCast, WidthSym } from '../../../fields/Doc';
 import { Document } from '../../../fields/documentSchemas';
@@ -53,7 +53,6 @@ import { RadialMenu } from './RadialMenu';
 import { ScriptingBox } from './ScriptingBox';
 import { PresBox } from './trails/PresBox';
 import React = require('react');
-import { CollectionTreeView } from '../collections/CollectionTreeView';
 const { Howl } = require('howler');
 
 interface Window {
@@ -1056,24 +1055,36 @@ export class DocumentViewInternal extends DocComponent<DocumentViewInternalProps
             : false;
     };
     linkButtonInverseScaling = () => (this.props.NativeDimScaling?.() || 1) * this.props.DocumentView().screenToLocalTransform().Scale;
-    @computed get contents() {
-        TraceMobx();
+    get audioAnnoState() {
+        return this.dataDoc.audioAnnoState ?? 'stopped';
+    }
+    @computed get audioAnnoView() {
         const audioAnnosCount = Cast(this.dataDoc[this.LayoutFieldKey + '-audioAnnotations'], listSpec(AudioField), null)?.length;
         const audioTextAnnos = Cast(this.dataDoc[this.LayoutFieldKey + '-audioAnnotations-text'], listSpec('string'), null);
-        const audioView =
-            (!this.props.isSelected() && !this._isHovering && this.dataDoc.audioAnnoState !== 2) || this.props.renderDepth === -1 || SnappingManager.GetIsDragging() || (!audioAnnosCount && !this.dataDoc.audioAnnoState) ? null : (
-                <Tooltip title={<div>{audioTextAnnos?.lastElement()}</div>}>
-                    <div className="documentView-audioBackground" onPointerDown={this.playAnnotation}>
-                        <FontAwesomeIcon
-                            className="documentView-audioFont"
-                            style={{ color: [audioAnnosCount ? 'blue' : 'gray', 'green', 'red'][NumCast(this.dataDoc.audioAnnoState)] }}
-                            icon={!audioAnnosCount ? 'microphone' : 'file-audio'}
-                            size="sm"
-                        />
-                    </div>
-                </Tooltip>
-            );
-
+        const audioIconColors = new Map<string, string>([
+            ['recording', 'red'],
+            ['playing', 'green'],
+            ['stopped', audioAnnosCount ? 'blue' : 'gray'],
+        ]);
+        return this.props.renderDepth === -1 || SnappingManager.GetIsDragging() || (!this.props.isSelected() && !this._isHovering && this.audioAnnoState !== 'recording') || (!audioAnnosCount && this.audioAnnoState === 'stopped') ? null : (
+            <Tooltip title={<div>{audioTextAnnos?.lastElement()}</div>}>
+                <div className="documentView-audioBackground" onPointerDown={this.playAnnotation}>
+                    <FontAwesomeIcon className="documentView-audioFont" style={{ color: audioIconColors.get(StrCast(this.audioAnnoState)) }} icon={!audioAnnosCount ? 'microphone' : 'file-audio'} size="sm" />
+                </div>
+            </Tooltip>
+        );
+    }
+    @computed get linkCountView() {
+        return this.props.renderDepth === -1 || SnappingManager.GetIsDragging() || (!this.props.isSelected() && !this._isHovering) || this.hideLinkButton ? null : (
+            <DocumentLinksButton
+                View={this.props.DocumentView()}
+                scaling={this.linkButtonInverseScaling}
+                Offset={[this.topMost ? 0 : !this.props.isSelected() ? -15 : -36, undefined, undefined, this.topMost ? 10 : !this.props.isSelected() ? -15 : -32]}
+            />
+        );
+    }
+    @computed get contents() {
+        TraceMobx();
         return (
             <div
                 className="documentView-contentsView"
@@ -1095,10 +1106,7 @@ export class DocumentViewInternal extends DocComponent<DocumentViewInternalProps
                         width={this.props.PanelWidth()}
                         height={this.props.PanelHeight()}
                         onError={(e: any) => {
-                            setTimeout(
-                                action(() => (this._retryThumb = 0)),
-                                0
-                            );
+                            setTimeout(action(() => (this._retryThumb = 0)));
                             setTimeout(
                                 action(() => (this._retryThumb = 1)),
                                 150
@@ -1124,14 +1132,8 @@ export class DocumentViewInternal extends DocComponent<DocumentViewInternalProps
                     layoutKey={this.finalLayoutKey}
                 />
                 {this.layoutDoc.hideAllLinks ? null : this.allLinkEndpoints}
-                {(!this.props.isSelected() && !this._isHovering) || this.hideLinkButton || this.props.renderDepth === -1 || SnappingManager.GetIsDragging() ? null : (
-                    <DocumentLinksButton
-                        View={this.props.DocumentView()}
-                        scaling={this.linkButtonInverseScaling}
-                        Offset={[this.topMost ? 0 : !this.props.isSelected() ? -15 : -36, undefined, undefined, this.topMost ? 10 : !this.props.isSelected() ? -15 : -32]}
-                    />
-                )}
-                {audioView}
+                {this.linkCountView}
+                {this.audioAnnoView}
             </div>
         );
     }
@@ -1210,7 +1212,7 @@ export class DocumentViewInternal extends DocComponent<DocumentViewInternalProps
         const self = this;
         const audioAnnos = Cast(this.dataDoc[this.LayoutFieldKey + '-audioAnnotations'], listSpec(AudioField), null);
         const anno = audioAnnos.lastElement();
-        if (anno instanceof AudioField && this.dataDoc.audioAnnoState === 0) {
+        if (anno instanceof AudioField && this.audioAnnoState === 'stopped') {
             new Howl({
                 src: [anno.url.href],
                 format: ['mp3'],
@@ -1218,12 +1220,10 @@ export class DocumentViewInternal extends DocComponent<DocumentViewInternalProps
                 loop: false,
                 volume: 0.5,
                 onend: function () {
-                    runInAction(() => {
-                        self.dataDoc.audioAnnoState = 0;
-                    });
+                    runInAction(() => (self.dataDoc.audioAnnoState = 'stopped'));
                 },
             });
-            this.dataDoc.audioAnnoState = 1;
+            this.dataDoc.audioAnnoState = 'playing';
         }
     };
 
@@ -1262,12 +1262,12 @@ export class DocumentViewInternal extends DocComponent<DocumentViewInternalProps
                         }
                     }
                 };
-                runInAction(() => (dataDoc.audioAnnoState = 2));
+                runInAction(() => (dataDoc.audioAnnoState = 'recording'));
                 recorder.start();
                 setTimeout(() => {
                     recorder.stop();
                     DictationManager.Controls.stop(false);
-                    runInAction(() => (dataDoc.audioAnnoState = 0));
+                    runInAction(() => (dataDoc.audioAnnoState = 'stopped'));
                     gumStream.getAudioTracks()[0].stop();
                 }, 5000);
             });