Merge branch 'master' into sophie-ai-images

1 files changed, 9 insertions, 3 deletions

diff --git a/src/client/views/nodes/formattedText/RichTextRules.ts b/src/client/views/nodes/formattedText/RichTextRules.ts
index 3e2afd2ce..456ed4732 100644
--- a/src/client/views/nodes/formattedText/RichTextRules.ts
+++ b/src/client/views/nodes/formattedText/RichTextRules.ts
@@ -95,7 +95,6 @@ export class RichTextRules {
                 textDocInline.title_custom = true; // And make sure that it's 'custom' so that editing text doesn't change the title of the containing doc
                 textDocInline.isTemplateForField = inlineFieldKey; // this is needed in case the containing text doc is converted to a template at some point
                 textDocInline.proto = textDoc; // make the annotation inherit from the outer text doc so that it can resolve any nested field references, e.g., [[field]]
-                textDocInline._textContext = ComputedField.MakeFunction(`copyField(self.${inlineFieldKey})`);
                 textDoc[inlineLayoutKey] = FormattedTextBox.LayoutString(inlineFieldKey); // create a layout string for the layout key that will render the annotation text
                 textDoc[inlineFieldKey] = ''; // set a default value for the annotation
                 const node = (state.doc.resolve(start) as any).nodeAfter;
@@ -265,9 +264,16 @@ export class RichTextRules {
                         this.TextBox.EditorView?.dispatch(fstate.tr.setSelection(new TextSelection(fstate.doc.resolve(selection))));
                     }
                 };
+                const getTitledDoc = (docTitle: string) => {
+                    if (!DocServer.FindDocByTitle(docTitle)) {
+                        Doc.AddToMyPublished(Docs.Create.TextDocument('', { title: docTitle, _width: 400, _layout_autoHeight: true }));
+                    }
+                    const titledDoc = DocServer.FindDocByTitle(docTitle);
+                    return titledDoc ? Doc.BestEmbedding(titledDoc) : titledDoc;
+                };
                 if (!fieldKey) {
                     if (docTitle) {
-                        const target = DocServer.FindDocByTitle(docTitle);
+                        const target = getTitledDoc(docTitle);
                         if (target) {
                             setTimeout(() => linkToDoc(target));
                             return state.tr.deleteRange(end - 1, end).deleteRange(start, start + 3);
@@ -279,7 +285,7 @@ export class RichTextRules {
                     const num = value.match(/^[0-9.]$/);
                     this.Document[DocData][fieldKey] = value === 'true' ? true : value === 'false' ? false : num ? Number(value) : value;
                 }
-                const target = DocServer.FindDocByTitle(docTitle);
+                const target = getTitledDoc(docTitle);
                 const fieldView = state.schema.nodes.dashField.create({ fieldKey, docId: target?.[Id], hideKey: false });
                 return state.tr.setSelection(new TextSelection(state.doc.resolve(start), state.doc.resolve(end))).replaceSelectionWith(fieldView, true);
             }),