@astroapps/forms-core 1.1.0 → 1.1.1

package/lib/index.js

@@ -1404,14 +1404,6 @@ function createFormState(schemaInterface, evaluators = defaultEvaluators) {
         const definition = createOverrideProxy(def, definitionOverrides);
         const of = definitionOverrides.fields;
         const df = displayOverrides.fields;
-        createScopedEffect(c => {
-          const textDisplay = isDisplayControl(def) && isTextDisplay(def.displayData) ? def.displayData : undefined;
-          evalExpr(c, textDisplay == null ? void 0 : textDisplay.text, df.text, textDisplay && firstExpr(formNode, DynamicPropertyType.Display), coerceString);
-        }, displayOverrides);
-        createScopedEffect(c => {
-          const htmlDisplay = isDisplayControl(def) && isHtmlDisplay(def.displayData) ? def.displayData : undefined;
-          evalExpr(c, htmlDisplay == null ? void 0 : htmlDisplay.html, df.html, htmlDisplay && firstExpr(formNode, DynamicPropertyType.Display), coerceString);
-        }, displayOverrides);
         updateComputedValue(of.displayData, () => isDisplayControl(def) ? createOverrideProxy(def.displayData, displayOverrides) : undefined);
         createScopedEffect(c => {
           evalExpr(c, def.hidden, of.hidden, firstExpr(formNode, DynamicPropertyType.Visible), r => !r);
@@ -1451,11 +1443,13 @@ function createFormState(schemaInterface, evaluators = defaultEvaluators) {
           layoutStyle,
           allowedOptions,
           disabled,
-          variables
+          variables,
+          display
         } = control.fields;
         createScopedEffect(c => evalExpr(c, undefined, style, firstExpr(formNode, DynamicPropertyType.Style), coerceStyle), scope);
         createScopedEffect(c => evalExpr(c, undefined, layoutStyle, firstExpr(formNode, DynamicPropertyType.LayoutStyle), coerceStyle), scope);
         createScopedEffect(c => evalExpr(c, undefined, allowedOptions, firstExpr(formNode, DynamicPropertyType.AllowedOptions), x => x), scope);
+        createScopedEffect(c => evalExpr(c, undefined, display, firstExpr(formNode, DynamicPropertyType.Display), coerceString), scope);
         updateComputedValue(dataNode, () => lookupDataNode(definition, parent));
         updateComputedValue(hidden, () => !!cf.hidden.value || definition.hidden || dataNode.value && (!validDataNode(dataNode.value) || hideDisplayOnly(dataNode.value, schemaInterface, definition)));
         updateComputedValue(readonly, () => !!cf.readonly.value || isControlReadonly(definition));
@@ -1470,6 +1464,11 @@ function createFormState(schemaInterface, evaluators = defaultEvaluators) {
             dn.control.disabled = disabled.value;
           }
         }, scope);
+        createSyncEffect(() => {
+          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);
         createSyncEffect(() => {
           var _dataNode$value;