@astroapps/forms-core 1.1.1 → 1.2.0

package/lib/index.cjs

@@ -704,6 +704,11 @@ function mergeField(field, mergeInto) {
     return extras.length ? [].concat(f, extras) : f;
   }
 }
+function mergeOption(fields, name, value, fieldName) {
+  return fields.map(function (x) {
+    return x.field === fieldName ? addFieldOption(x, name, value) : x;
+  });
+}
 function mergeFields(fields, name, value, newFields) {
   var withType = fields.map(function (x) {
     return x.isTypeField ? addFieldOption(x, name, value) : x;
@@ -1561,7 +1566,9 @@ function createFormState(schemaInterface, evaluators) {
         var def = formNode.definition;
         var definition = createOverrideProxy(def, definitionOverrides);
         var of = definitionOverrides.fields;
-        var df = displayOverrides.fields;
+        var _displayOverrides$fie = displayOverrides.fields,
+          text = _displayOverrides$fie.text,
+          html = _displayOverrides$fie.html;
         controls.updateComputedValue(of.displayData, function () {
           return isDisplayControl(def) ? createOverrideProxy(def.displayData, displayOverrides) : undefined;
         });
@@ -1653,7 +1660,13 @@ function createFormState(schemaInterface, evaluators) {
         }, scope);
         controls.createSyncEffect(function () {
           if (isDisplayControl(def)) {
-            if (isTextDisplay(def.displayData)) df.text.value = display.value;else if (isHtmlDisplay(def.displayData)) df.html.value = display.value;
+            if (display.value !== undefined) {
+              text.value = isTextDisplay(def.displayData) ? display.value : NoOverride;
+              html.value = isHtmlDisplay(def.displayData) ? display.value : NoOverride;
+            } else {
+              text.value = NoOverride;
+              html.value = NoOverride;
+            }
           }
         }, displayOverrides);
         setupValidation(controlImpl, definition, dataNode, schemaInterface, parent, formNode, runAsync);
@@ -1737,7 +1750,8 @@ function createOverrideProxy(proxyFor, handlers) {
   return new Proxy(proxyFor, {
     get: function get(target, p, receiver) {
       if (Object.hasOwn(overrides, p)) {
-        return overrides[p].value;
+        var nv = overrides[p].value;
+        if (nv !== NoOverride) return nv;
       }
       return Reflect.get(target, p, receiver);
     },
@@ -1756,6 +1770,8 @@ function createOverrideProxy(proxyFor, handlers) {
     }
   });
 }
+var NoValue = function NoValue() {};
+var NoOverride = new NoValue();
 
 exports.DefaultSchemaInterface = DefaultSchemaInterface;
 exports.FormNode = FormNode;
@@ -1838,6 +1854,7 @@ exports.makeScalarField = makeScalarField;
 exports.makeSchemaDataNode = makeSchemaDataNode;
 exports.mergeField = mergeField;
 exports.mergeFields = mergeFields;
+exports.mergeOption = mergeOption;
 exports.missingField = missingField;
 exports.relativePath = relativePath;
 exports.relativeSegmentPath = relativeSegmentPath;