@astroapps/forms-core 1.1.0 → 1.2.0

package/lib/formState.d.ts

@@ -10,6 +10,7 @@ export interface ControlState {
     definition: ControlDefinition;
     schemaInterface: SchemaInterface;
     dataNode?: SchemaDataNode | undefined;
+    display?: string;
     stateId?: string;
     style?: object;
     layoutStyle?: object;

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,15 +1566,9 @@ function createFormState(schemaInterface, evaluators) {
         var def = formNode.definition;
         var definition = createOverrideProxy(def, definitionOverrides);
         var of = definitionOverrides.fields;
-        var df = displayOverrides.fields;
-        controls.createScopedEffect(function (c) {
-          var textDisplay = isDisplayControl(def) && isTextDisplay(def.displayData) ? def.displayData : undefined;
-          evalExpr(c, textDisplay == null ? void 0 : textDisplay.text, df.text, textDisplay && firstExpr(formNode, exports.DynamicPropertyType.Display), coerceString);
-        }, displayOverrides);
-        controls.createScopedEffect(function (c) {
-          var htmlDisplay = isDisplayControl(def) && isHtmlDisplay(def.displayData) ? def.displayData : undefined;
-          evalExpr(c, htmlDisplay == null ? void 0 : htmlDisplay.html, df.html, htmlDisplay && firstExpr(formNode, exports.DynamicPropertyType.Display), coerceString);
-        }, displayOverrides);
+        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;
         });
@@ -1621,7 +1620,8 @@ function createFormState(schemaInterface, evaluators) {
           layoutStyle = _control$fields.layoutStyle,
           allowedOptions = _control$fields.allowedOptions,
           disabled = _control$fields.disabled,
-          variables = _control$fields.variables;
+          variables = _control$fields.variables,
+          display = _control$fields.display;
         controls.createScopedEffect(function (c) {
           return evalExpr(c, undefined, style, firstExpr(formNode, exports.DynamicPropertyType.Style), coerceStyle);
         }, scope);
@@ -1633,6 +1633,9 @@ function createFormState(schemaInterface, evaluators) {
             return x;
           });
         }, scope);
+        controls.createScopedEffect(function (c) {
+          return evalExpr(c, undefined, display, firstExpr(formNode, exports.DynamicPropertyType.Display), coerceString);
+        }, scope);
         controls.updateComputedValue(dataNode, function () {
           return lookupDataNode(definition, parent);
         });
@@ -1655,6 +1658,17 @@ function createFormState(schemaInterface, evaluators) {
             dn.control.disabled = disabled.value;
           }
         }, scope);
+        controls.createSyncEffect(function () {
+          if (isDisplayControl(def)) {
+            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);
         controls.createSyncEffect(function () {
           var _dataNode$value;
@@ -1736,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);
     },
@@ -1755,6 +1770,8 @@ function createOverrideProxy(proxyFor, handlers) {
     }
   });
 }
+var NoValue = function NoValue() {};
+var NoOverride = new NoValue();
 
 exports.DefaultSchemaInterface = DefaultSchemaInterface;
 exports.FormNode = FormNode;
@@ -1837,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;