Merge branch 'master' into nathan-starter

1 files changed, 4 insertions, 3 deletions

diff --git a/src/client/views/nodes/KeyValueBox.tsx b/src/client/views/nodes/KeyValueBox.tsx
index d85432631..31a2367fc 100644
--- a/src/client/views/nodes/KeyValueBox.tsx
+++ b/src/client/views/nodes/KeyValueBox.tsx
@@ -55,7 +55,7 @@ export class KeyValueBox extends ObservableReactComponent<FieldViewProps> {
     @observable _splitPercentage = 50;
 
     get fieldDocToLayout() {
-        return this._props.fieldKey ? DocCast(this._props.Document[this._props.fieldKey], DocCast(this._props.Document)) : this._props.Document;
+        return DocCast(this._props.Document);
     }
 
     @action
@@ -105,14 +105,15 @@ export class KeyValueBox extends ObservableReactComponent<FieldViewProps> {
             default: {
                 const _setCacheResult_ = (value: FieldResult) => {
                     field = value as Field;
-                    setResult?.(value);
+                    if (setResult) setResult?.(value);
+                    else target[key] = field;
                 };
                 const res = script.run({ this: Doc.Layout(doc), self: doc, _setCacheResult_ }, console.log);
                 if (!res.success) {
                     if (key) target[key] = script.originalScript;
                     return false;
                 }
-                field === undefined && (field = res.result);
+                field === undefined && (field = res.result instanceof Array ? new List<any>(res.result) : res.result);
             }
         }
         if (!key) return false;