@astroapps/forms-core 1.0.2 → 1.1.1

package/lib/index.js

@@ -1,4 +1,4 @@
-import { ensureMetaValue, newControl, updateComputedValue, addDependent, createSyncEffect, createAsyncEffect, collectChanges, trackedValue, createCleanupScope, createEffect, trackControlChange, ControlChange, createScopedEffect, getControlPath, unsafeRestoreControl, getCurrentFields } from '@astroapps/controls';
+import { ensureMetaValue, newControl, updateComputedValue, addDependent, createSyncEffect, createAsyncEffect, collectChanges, trackedValue, createCleanupScope, createEffect, trackControlChange, ControlChange, getCurrentFields, getMetaValue, createScopedEffect, getControlPath, unsafeRestoreControl } from '@astroapps/controls';
 import jsonata from 'jsonata';
 import { v4 } from 'uuid';
 
@@ -1074,6 +1074,35 @@ function visitFormDataInContext(parentContext, node, cb) {
   const dataNode = lookupDataNode(node.definition, parentContext);
   return visitFormData(node, dataNode != null ? dataNode : parentContext, cb, !dataNode);
 }
+function visitFormDataNode(node, visitFn) {
+  const dataNode = lookupDataNode(node.formNode.definition, node.parentData);
+  const v = visitFn(node, dataNode);
+  if (v !== undefined) return v;
+  const parentData = dataNode != null ? dataNode : node.parentData;
+  if (parentData.schema.field.collection && parentData.elementIndex == null) {
+    const elemCount = parentData.control.elements.length;
+    for (let i = 0; i < elemCount; i++) {
+      const _v = visitChildren(parentData.getChildElement(i));
+      if (_v !== undefined) return _v;
+    }
+    return undefined;
+  } else {
+    return visitChildren(parentData);
+  }
+  function visitChildren(parentData) {
+    const children = node.formNode.getChildNodes();
+    for (let i = 0; i < children.length; i++) {
+      const child = children[i];
+      const res = visitFormDataNode({
+        formNode: child,
+        parent: node,
+        parentData,
+        childIndex: i
+      }, visitFn);
+      if (res !== undefined) return res;
+    }
+  }
+}
 
 /**
  * Converts a JSON path array to a string.
@@ -1319,6 +1348,9 @@ function setupValidation(controlImpl, definition, dataNode, schemaInterface, par
   }, c => {}, controlImpl);
 }
 
+function getControlStateId(parent, formNode, stateKey) {
+  return parent.id + "$" + formNode.id + (stateKey != null ? stateKey : "");
+}
 function createFormState(schemaInterface, evaluators = defaultEvaluators) {
   // console.log("createFormState");
   const controlStates = newControl({});
@@ -1332,9 +1364,17 @@ function createFormState(schemaInterface, evaluators = defaultEvaluators) {
       // console.log("Cleanup form state");
       controlStates.cleanup();
     },
+    getExistingControlState(parent, formNode, stateKey) {
+      const stateId = getControlStateId(parent, formNode, stateKey);
+      const control = getCurrentFields(controlStates)[stateId];
+      if (control) {
+        var _getMetaValue;
+        return (_getMetaValue = getMetaValue(control, "impl")) == null ? void 0 : _getMetaValue.value;
+      }
+      return undefined;
+    },
     getControlState(parent, formNode, context, runAsync) {
-      var _context$stateKey;
-      const stateId = parent.id + "$" + formNode.id + ((_context$stateKey = context.stateKey) != null ? _context$stateKey : "");
+      const stateId = getControlStateId(parent, formNode, context.stateKey);
       const controlImpl = controlStates.fields[stateId];
       controlImpl.value = context;
       function evalExpr(scope, init, nk, e, coerce) {
@@ -1364,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);
@@ -1400,7 +1432,8 @@ function createFormState(schemaInterface, evaluators = defaultEvaluators) {
           clearHidden: false,
           hidden: false,
           variables: (_controlImpl$fields$v = controlImpl.fields.variables.current.value) != null ? _controlImpl$fields$v : {},
-          stateId
+          stateId,
+          meta: newControl({})
         });
         const {
           dataNode,
@@ -1410,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));
@@ -1429,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;
@@ -1522,5 +1562,5 @@ function createOverrideProxy(proxyFor, handlers) {
   });
 }
 
-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, 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, 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, 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