Merge branch 'master' into aarav_edit

1 files changed, 20 insertions, 8 deletions

diff --git a/src/client/views/nodes/KeyValueBox.tsx b/src/client/views/nodes/KeyValueBox.tsx
index 8911fac6d..be897b3f3 100644
--- a/src/client/views/nodes/KeyValueBox.tsx
+++ b/src/client/views/nodes/KeyValueBox.tsx
@@ -9,7 +9,7 @@ import { ComputedField, ScriptField } from '../../../fields/ScriptField';
 import { DocCast } from '../../../fields/Types';
 import { ImageField } from '../../../fields/URLField';
 import { DocumentType } from '../../documents/DocumentTypes';
-import { Docs } from '../../documents/Documents';
+import { Docs, DocumentOptions } from '../../documents/Documents';
 import { SetupDrag } from '../../util/DragManager';
 import { CompiledScript } from '../../util/Scripting';
 import { undoable } from '../../util/UndoManager';
@@ -22,6 +22,7 @@ import './KeyValueBox.scss';
 import { KeyValuePair } from './KeyValuePair';
 import { OpenWhere } from './OpenWhere';
 import { FormattedTextBox } from './formattedText/FormattedTextBox';
+import { DocLayout } from '../../../fields/DocSymbols';
 
 export type KVPScript = {
     script: CompiledScript;
@@ -91,10 +92,11 @@ export class KeyValueBox extends ViewBoxBaseComponent<FieldViewProps>() {
         return !script.compiled ? undefined : { script, type, onDelegate };
     };
 
-    public static ApplyKVPScript = (doc: Doc, key: string, kvpScript: KVPScript, forceOnDelegate?: boolean, setResult?: (value: FieldResult) => void) => {
+    public static ApplyKVPScript = (doc: Doc, keyIn: string, kvpScript: KVPScript, forceOnDelegate?: boolean, setResult?: (value: FieldResult) => void) => {
         const { script, type, onDelegate } = kvpScript;
-        // const target = onDelegate ? Doc.Layout(doc.layout) : Doc.GetProto(doc); // bcz: TODO need to be able to set fields on layout templates
-        const target = forceOnDelegate || onDelegate || key.startsWith('_') ? doc : DocCast(doc.proto, doc);
+        const chooseDelegate = forceOnDelegate || onDelegate || keyIn.startsWith('_');
+        const key = chooseDelegate && keyIn.startsWith('$') ? keyIn.slice(1) : keyIn;
+        const target = chooseDelegate ? doc : DocCast(doc.proto, doc);
         let field: FieldType | undefined;
         switch (type) {
             case 'computed': field = new ComputedField(script); break; // prettier-ignore
@@ -121,10 +123,16 @@ export class KeyValueBox extends ViewBoxBaseComponent<FieldViewProps>() {
         return false;
     };
 
-    public static SetField = undoable((doc: Doc, key: string, value: string, forceOnDelegate?: boolean, setResult?: (value: FieldResult) => void) => {
+    public static SetField = undoable((doc: Doc, key: string, value: string, forceOnDelegateIn?: boolean, setResult?: (value: FieldResult) => void) => {
         const script = KeyValueBox.CompileKVPScript(value);
         if (!script) return false;
-        return KeyValueBox.ApplyKVPScript(doc, key, script, forceOnDelegate, setResult);
+        const ldoc = key.startsWith('_') ? doc[DocLayout] : doc;
+        const forceOnDelegate = forceOnDelegateIn || (ldoc !== doc && !value.startsWith('='));
+        // an '=' value redirects a key targeting the render template to the root document.
+        // also, if ldoc and doc are equal, allow redirecting to data document when not using an equal
+        // in either case, get rid of initial '_' which forces writing to layout
+        const setKey = value.startsWith('=') || ldoc === doc ? key.replace(/^_/, '') : key;
+        return KeyValueBox.ApplyKVPScript(doc, setKey, script, forceOnDelegate, setResult);
     }, 'Set Doc Field');
 
     onPointerDown = (e: React.PointerEvent): void => {
@@ -156,12 +164,16 @@ export class KeyValueBox extends ViewBoxBaseComponent<FieldViewProps>() {
             });
         });
 
-        const layoutProtos = Doc.GetAllPrototypes(this.layoutDoc);
+        const docinfos = new DocumentOptions();
+
+        const layoutProtos = this.layoutDoc !== doc ? Doc.GetAllPrototypes(this.layoutDoc) : [];
         layoutProtos.forEach(proto => {
             Object.keys(proto)
+                .filter(key => !(key in ids) || docinfos['_' + key]) // if '_key' is in docinfos (as opposed to just 'key'), then the template Doc's value should be displayed instead of the root document's value
                 .map(key => '_' + key)
                 .forEach(key => {
-                    if (!(key.replace(/^_/, '') in ids) && doc[key] !== ComputedField.undefined) {
+                    if (doc[key] !== ComputedField.undefined) {
+                        if (key.replace(/^_/, '') in ids) delete ids[key.replace(/^_/, '')];
                         ids[key] = key;
                     }
                 });