@astroapps/forms-core 1.1.1 → 1.2.1

package/lib/index.js

@@ -617,6 +617,9 @@ function mergeField(field, mergeInto) {
     return extras.length ? [...f, ...extras] : f;
   }
 }
+function mergeOption(fields, name, value, fieldName) {
+  return fields.map(x => x.field === fieldName ? addFieldOption(x, name, value) : x);
+}
 function mergeFields(fields, name, value, newFields) {
   const withType = fields.map(x => x.isTypeField ? addFieldOption(x, name, value) : x);
   return newFields.map(x => _extends({}, x, {
@@ -1309,8 +1312,8 @@ function createValidators(def, context) {
     });
   }
 }
-function setupValidation(controlImpl, definition, dataNode, schemaInterface, parent, formNode, runAsync) {
-  const validationEnabled = createScopedComputed(controlImpl, () => !definition.hidden);
+function setupValidation(controlImpl, definition, dataNode, schemaInterface, parent, formNode, hidden, runAsync) {
+  const validationEnabled = createScopedComputed(controlImpl, () => !hidden.value);
   const validatorsScope = createCleanupScope();
   createEffect(() => {
     validatorsScope.cleanup();
@@ -1403,7 +1406,10 @@ function createFormState(schemaInterface, evaluators = defaultEvaluators) {
         const def = formNode.definition;
         const definition = createOverrideProxy(def, definitionOverrides);
         const of = definitionOverrides.fields;
-        const df = displayOverrides.fields;
+        const {
+          text,
+          html
+        } = displayOverrides.fields;
         updateComputedValue(of.displayData, () => isDisplayControl(def) ? createOverrideProxy(def.displayData, displayOverrides) : undefined);
         createScopedEffect(c => {
           evalExpr(c, def.hidden, of.hidden, firstExpr(formNode, DynamicPropertyType.Visible), r => !r);
@@ -1466,10 +1472,16 @@ function createFormState(schemaInterface, evaluators = defaultEvaluators) {
         }, scope);
         createSyncEffect(() => {
           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);
+        setupValidation(controlImpl, definition, dataNode, schemaInterface, parent, formNode, hidden, runAsync);
         createSyncEffect(() => {
           var _dataNode$value;
           const dn = (_dataNode$value = dataNode.value) == null ? void 0 : _dataNode$value.control;
@@ -1542,7 +1554,8 @@ function createOverrideProxy(proxyFor, handlers) {
   return new Proxy(proxyFor, {
     get(target, p, receiver) {
       if (Object.hasOwn(overrides, p)) {
-        return overrides[p].value;
+        const nv = overrides[p].value;
+        if (nv !== NoOverride) return nv;
       }
       return Reflect.get(target, p, receiver);
     },
@@ -1561,6 +1574,8 @@ function createOverrideProxy(proxyFor, handlers) {
     }
   });
 }
+class NoValue {}
+const NoOverride = new NoValue();
 
-export { ActionStyle, AdornmentPlacement, ControlAdornmentType, ControlDefinitionType, DataRenderType, DateComparison, DefaultSchemaInterface, DisplayDataType, DynamicPropertyType, ExpressionType, FieldType, FormNode, FormTree, GroupRenderType, IconLibrary, IconPlacement, SchemaDataNode, SchemaDataTree, SchemaDataTreeImpl, SchemaNode, SchemaTags, SchemaTree, SyncTextType, ValidationMessageType, ValidatorType, addFieldOption, boolField, buildSchema, compoundField, createControlMap, createFormLookup, createFormState, createFormTree, createOverrideProxy, createSchemaDataNode, createSchemaLookup, createSchemaNode, createSchemaTree, createScoped, createScopedComputed, dateField, dateTimeField, defaultCompoundField, defaultScalarField, defaultSchemaInterface, doubleField, fieldPathForDefinition, findField, fontAwesomeIcon, getControlStateId, getDisplayOnlyOptions, getGroupRendererOptions, getJsonPath, getMetaFields, getRootDataNode, getSchemaFieldList, getSchemaNodePath, getSchemaNodePathString, getSchemaPath, getTagParam, hideDisplayOnly, intField, isActionControl, isArrayRenderer, isAutoCompleteClasses, isAutocompleteRenderer, isCheckEntryClasses, isCompoundField, isCompoundNode, isControlDisabled, isControlDisplayOnly, isControlReadonly, isDataControl, isDataGroupRenderer, isDateTimeRenderer, isDialogRenderer, isDisplayControl, isDisplayOnlyRenderer, isFlexRenderer, isGridRenderer, isGroupControl, isHtmlDisplay, isInlineRenderer, isScalarField, isSelectChildRenderer, isTabsRenderer, isTextDisplay, isTextfieldRenderer, isWizardRenderer, jsonPathString, legacyFormNode, lookupDataNode, makeCompoundField, makeParamTag, makeScalarField, makeSchemaDataNode, mergeField, mergeFields, missingField, relativePath, relativeSegmentPath, resolveSchemaNode, resolveSchemas, schemaDataForFieldPath, schemaDataForFieldRef, schemaForFieldPath, schemaForFieldRef, stringField, stringOptionsField, timeField, traverseData, traverseParents, traverseSchemaPath, validDataNode, visitControlData, visitControlDataArray, visitControlDefinition, visitFormData, visitFormDataInContext, visitFormDataNode, withScalarOptions };
+export { ActionStyle, AdornmentPlacement, ControlAdornmentType, ControlDefinitionType, DataRenderType, DateComparison, DefaultSchemaInterface, DisplayDataType, DynamicPropertyType, ExpressionType, FieldType, FormNode, FormTree, GroupRenderType, IconLibrary, IconPlacement, SchemaDataNode, SchemaDataTree, SchemaDataTreeImpl, SchemaNode, SchemaTags, SchemaTree, SyncTextType, ValidationMessageType, ValidatorType, addFieldOption, boolField, buildSchema, compoundField, createControlMap, createFormLookup, createFormState, createFormTree, createOverrideProxy, createSchemaDataNode, createSchemaLookup, createSchemaNode, createSchemaTree, createScoped, createScopedComputed, dateField, dateTimeField, defaultCompoundField, defaultScalarField, defaultSchemaInterface, doubleField, fieldPathForDefinition, findField, fontAwesomeIcon, getControlStateId, getDisplayOnlyOptions, getGroupRendererOptions, getJsonPath, getMetaFields, getRootDataNode, getSchemaFieldList, getSchemaNodePath, getSchemaNodePathString, getSchemaPath, getTagParam, hideDisplayOnly, intField, isActionControl, isArrayRenderer, isAutoCompleteClasses, isAutocompleteRenderer, isCheckEntryClasses, isCompoundField, isCompoundNode, isControlDisabled, isControlDisplayOnly, isControlReadonly, isDataControl, isDataGroupRenderer, isDateTimeRenderer, isDialogRenderer, isDisplayControl, isDisplayOnlyRenderer, isFlexRenderer, isGridRenderer, isGroupControl, isHtmlDisplay, isInlineRenderer, isScalarField, isSelectChildRenderer, isTabsRenderer, isTextDisplay, isTextfieldRenderer, isWizardRenderer, jsonPathString, legacyFormNode, lookupDataNode, makeCompoundField, makeParamTag, makeScalarField, makeSchemaDataNode, mergeField, mergeFields, mergeOption, missingField, relativePath, relativeSegmentPath, resolveSchemaNode, resolveSchemas, schemaDataForFieldPath, schemaDataForFieldRef, schemaForFieldPath, schemaForFieldRef, stringField, stringOptionsField, timeField, traverseData, traverseParents, traverseSchemaPath, validDataNode, visitControlData, visitControlDataArray, visitControlDefinition, visitFormData, visitFormDataInContext, visitFormDataNode, withScalarOptions };
 //# sourceMappingURL=index.js.map