@astroapps/forms-core 1.0.2 → 1.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astroapps/forms-core",
-  "version": "1.0.2",
+  "version": "1.1.1",
   "description": "",
   "type": "module",
   "main": "lib/index.cjs",

package/src/formNode.ts

@@ -247,3 +247,48 @@ export function visitFormDataInContext<A>(
   const dataNode = lookupDataNode(node.definition, parentContext);
   return visitFormData(node, dataNode ?? parentContext, cb, !dataNode);
 }
+
+export interface FormDataNode {
+  parent?: FormDataNode;
+  formNode: FormNode;
+  parentData: SchemaDataNode;
+  childIndex?: number;
+}
+
+export function visitFormDataNode<A>(
+  node: FormDataNode,
+  visitFn: (node: FormDataNode, data?: SchemaDataNode) => A | undefined,
+): A | undefined {
+  const dataNode = lookupDataNode(node.formNode.definition, node.parentData);
+  const v = visitFn(node, dataNode);
+  if (v !== undefined) return v;
+
+  const parentData = 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: SchemaDataNode) {
+    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;
+    }
+  }
+}

package/src/formState.ts

@@ -24,15 +24,14 @@ import { SchemaInterface } from "./schemaInterface";
 import { FieldOption } from "./schemaField";
 import {
   CleanupScope,
-  clearMetaValue,
   Control,
   createScopedEffect,
   createSyncEffect,
   ensureMetaValue,
   getControlPath,
   getCurrentFields,
+  getMetaValue,
   newControl,
-  trackedValue,
   unsafeRestoreControl,
   updateComputedValue,
 } from "@astroapps/controls";
@@ -49,6 +48,7 @@ export interface ControlState {
   definition: ControlDefinition;
   schemaInterface: SchemaInterface;
   dataNode?: SchemaDataNode | undefined;
+  display?: string;
   stateId?: string;
   style?: object;
   layoutStyle?: object;
@@ -58,6 +58,7 @@ export interface ControlState {
   disabled: boolean;
   clearHidden: boolean;
   variables: Record<string, any>;
+  meta: Control<Record<string, any>>;
 }
 
 export interface FormContextOptions {
@@ -88,10 +89,24 @@ export interface FormState {
   cleanup(): void;
 
   evalExpression(expr: EntityExpression, context: ExpressionEvalContext): void;
+
+  getExistingControlState(
+    parent: SchemaDataNode,
+    formNode: FormNode,
+    stateKey?: string,
+  ): ControlState | undefined;
 }
 
 const formStates: FormState[] = [];
 
+export function getControlStateId(
+  parent: SchemaDataNode,
+  formNode: FormNode,
+  stateKey?: string,
+): string {
+  return parent.id + "$" + formNode.id + (stateKey ?? "");
+}
+
 export function createFormState(
   schemaInterface: SchemaInterface,
   evaluators: Record<string, ExpressionEval<any>> = defaultEvaluators,
@@ -113,13 +128,25 @@ export function createFormState(
       // console.log("Cleanup form state");
       controlStates.cleanup();
     },
+    getExistingControlState(
+      parent: SchemaDataNode,
+      formNode: FormNode,
+      stateKey?: string,
+    ): ControlState | undefined {
+      const stateId = getControlStateId(parent, formNode, stateKey);
+      const control = getCurrentFields(controlStates)[stateId];
+      if (control) {
+        return getMetaValue<Control<ControlState>>(control, "impl")?.value;
+      }
+      return undefined;
+    },
     getControlState(
       parent: SchemaDataNode,
       formNode: FormNode,
       context: FormContextOptions,
       runAsync: (af: () => void) => void,
     ): ControlState {
-      const stateId = parent.id + "$" + formNode.id + (context.stateKey ?? "");
+      const stateId = getControlStateId(parent, formNode, context.stateKey);
       const controlImpl = controlStates.fields[stateId];
       controlImpl.value = context;
       function evalExpr<A>(
@@ -173,34 +200,6 @@ export function createFormState(
           Control<any>
         >;
 
-        createScopedEffect((c) => {
-          const textDisplay =
-            isDisplayControl(def) && isTextDisplay(def.displayData)
-              ? def.displayData
-              : undefined;
-          evalExpr(
-            c,
-            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?.html,
-            df.html,
-            htmlDisplay && firstExpr(formNode, DynamicPropertyType.Display),
-            coerceString,
-          );
-        }, displayOverrides);
-
         updateComputedValue(of.displayData, () =>
           isDisplayControl(def)
             ? createOverrideProxy(def.displayData, displayOverrides)
@@ -281,6 +280,7 @@ export function createFormState(
           hidden: false,
           variables: controlImpl.fields.variables.current.value ?? {},
           stateId,
+          meta: newControl({}),
         });
 
         const {
@@ -292,6 +292,7 @@ export function createFormState(
           allowedOptions,
           disabled,
           variables,
+          display,
         } = control.fields;
 
         createScopedEffect(
@@ -330,6 +331,18 @@ export function createFormState(
           scope,
         );
 
+        createScopedEffect(
+          (c) =>
+            evalExpr(
+              c,
+              undefined,
+              display,
+              firstExpr(formNode, DynamicPropertyType.Display),
+              coerceString,
+            ),
+          scope,
+        );
+
         updateComputedValue(dataNode, () => lookupDataNode(definition, parent));
         updateComputedValue(
           hidden,
@@ -361,6 +374,14 @@ export function createFormState(
           }
         }, 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,