@astroapps/forms-core 1.1.0 → 1.1.1

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

@@ -1562,14 +1562,6 @@ function createFormState(schemaInterface, evaluators) {
         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);
         controls.updateComputedValue(of.displayData, function () {
           return isDisplayControl(def) ? createOverrideProxy(def.displayData, displayOverrides) : undefined;
         });
@@ -1621,7 +1613,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 +1626,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 +1651,11 @@ function createFormState(schemaInterface, evaluators) {
             dn.control.disabled = disabled.value;
           }
         }, 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;
+          }
+        }, displayOverrides);
         setupValidation(controlImpl, definition, dataNode, schemaInterface, parent, formNode, runAsync);
         controls.createSyncEffect(function () {
           var _dataNode$value;