merged with master and cleaned up outpainting a bit.

1 files changed, 19 insertions, 26 deletions

diff --git a/src/client/util/DictationManager.ts b/src/client/util/DictationManager.ts
index 897366757..dcef4a4fe 100644
--- a/src/client/util/DictationManager.ts
+++ b/src/client/util/DictationManager.ts
@@ -2,7 +2,6 @@
 import * as interpreter from 'words-to-numbers';
 import { ClientUtils } from '../../ClientUtils';
 import { Doc, Opt } from '../../fields/Doc';
-import { DocData } from '../../fields/DocSymbols';
 import { List } from '../../fields/List';
 import { RichTextField } from '../../fields/RichTextField';
 import { listSpec } from '../../fields/Schema';
@@ -339,13 +338,12 @@ export namespace DictationManager {
                 {
                     action: (target: DocumentView) => {
                         const newBox = Docs.Create.TextDocument('', { _width: 400, _height: 200, title: 'My Outline', _layout_autoHeight: true });
-                        const proto = newBox[DocData];
                         const prompt = 'Press alt + r to start dictating here...';
                         const head = 3;
                         const anchor = head + prompt.length;
                         const proseMirrorState = `{"doc":{"type":"doc","content":[{"type":"ordered_list","content":[{"type":"list_item","content":[{"type":"paragraph","content":[{"type":"text","text":"${prompt}"}]}]}]}]},"selection":{"type":"text","anchor":${anchor},"head":${head}}}`;
-                        proto.data = new RichTextField(proseMirrorState, prompt);
-                        proto.backgroundColor = '#eeffff';
+                        newBox.$data = new RichTextField(proseMirrorState, prompt);
+                        newBox.$backgroundColor = '#eeffff';
                         target.props.addDocTab(newBox, OpenWhere.addRight);
                     },
                 },
@@ -358,23 +356,16 @@ export namespace DictationManager {
                 action: (target: DocumentView, matches: RegExpExecArray) => {
                     const count = interpretNumber(matches[1]);
                     const what = matches[2];
-                    const dataDoc = Doc.GetProto(target.Document);
-                    const fieldKey = 'data';
-                    if (isNaN(count)) {
-                        return;
-                    }
-                    for (let i = 0; i < count; i++) {
-                        let created: Doc | undefined;
-                        switch (what) {
-                            case 'image':
-                                created = Docs.Create.ImageDocument('https://upload.wikimedia.org/wikipedia/commons/thumb/3/3a/Cat03.jpg/1200px-Cat03.jpg');
-                                break;
-                            case 'nested collection':
-                                created = Docs.Create.FreeformDocument([], {});
-                                break;
-                            default:
+                    if (!isNaN(count)) {
+                        for (let i = 0; i < count; i++) {
+                            const created = (() => {
+                                switch (what) {
+                                    case 'image':            return Docs.Create.ImageDocument('https://upload.wikimedia.org/wikipedia/commons/thumb/3/3a/Cat03.jpg/1200px-Cat03.jpg');
+                                    case 'nested collection':return Docs.Create.FreeformDocument([], {});
+                                } // prettier-ignore
+                            })();
+                            created && Doc.AddDocToList(target.dataDoc, Doc.LayoutDataKey(target.Document), created);
                         }
-                        created && Doc.AddDocToList(dataDoc, fieldKey, created);
                     }
                 },
                 restrictTo: [DocumentType.COL],
@@ -390,13 +381,15 @@ export namespace DictationManager {
             },
         ];
     }
-    export function recordAudioAnnotation(dataDoc: Doc, field: string, onRecording?: (stop: () => void) => void, onEnd?: () => void) {
+    export function recordAudioAnnotation(doc: Doc, fieldIn: string, onRecording?: (stop: () => void) => void, onEnd?: () => void) {
+        const field = '$' + fieldIn + '_audioAnnotations';
         let gumStream: MediaStream | undefined;
         let recorder: MediaRecorder | undefined;
         navigator.mediaDevices.getUserMedia({ audio: true }).then(stream => {
-            let audioTextAnnos = Cast(dataDoc[field + '_audioAnnotations_text'], listSpec('string'), null);
+            let audioTextAnnos = Cast(doc[field + '_text'], listSpec('string'), null);
             if (audioTextAnnos) audioTextAnnos.push('');
-            else audioTextAnnos = dataDoc[field + '_audioAnnotations_text'] = new List<string>(['']);
+            else audioTextAnnos = doc[field + '_text'] = new List<string>(['']);
+            doc._layout_showTags = true;
             DictationManager.Controls.listen({
                 interimHandler: value => { audioTextAnnos[audioTextAnnos.length - 1] = value; }, // prettier-ignore
                 continuous: { indefinite: false },
@@ -417,16 +410,16 @@ export namespace DictationManager {
                 const [{ result }] = await Networking.UploadFilesToServer({ file: file as Blob & { name: string; lastModified: number; webkitRelativePath: string } });
                 if (!(result instanceof Error)) {
                     const audioField = new AudioField(result.accessPaths.agnostic.client);
-                    const audioAnnos = Cast(dataDoc[field + '_audioAnnotations'], listSpec(AudioField), null);
+                    const audioAnnos = Cast(doc[field], listSpec(AudioField), null);
                     if (audioAnnos) audioAnnos.push(audioField);
-                    else dataDoc[field + '_audioAnnotations'] = new List([audioField]);
+                    else doc[field] = new List([audioField]);
                 }
             };
             recorder.start();
             const stopFunc = () => {
                 recorder?.stop();
                 DictationManager.Controls.stop(/* false */);
-                dataDoc.audioAnnoState = AudioAnnoState.stopped;
+                doc._audioAnnoState = AudioAnnoState.stopped;
                 gumStream?.getAudioTracks()[0].stop();
             };
             if (onRecording) onRecording(stopFunc);