@react-typed-forms/schemas 16.0.0 → 16.0.2

package/lib/util.d.ts

@@ -222,6 +222,7 @@ export declare function getExternalEditData(c: Control<any>): Control<ExternalEd
 export declare function getLastDefinedValue<V>(control: Control<V>): Control<V>;
 export declare function getIsEditing(control: Control<any>): Control<boolean | undefined>;
 export declare function getAllValues(control: Control<any>): Control<unknown[]>;
+export declare function clearMultiValues(dataNode: SchemaDataNode): void;
 export declare function applyValues(dataNode: SchemaDataNode, value: unknown): void;
 export declare function collectDifferences(dataNode: SchemaDataNode, values: unknown[]): () => {
     editable: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-typed-forms/schemas",
-  "version": "16.0.0",
+  "version": "16.0.2",
   "description": "",
   "type": "module",
   "main": "lib/index.cjs",
@@ -34,7 +34,7 @@
     "clsx": "^1 || ^2",
     "uuid": "^10.0.0",
     "jsonata": "^2.0.4",
-    "@astroapps/forms-core": "^1.0.0"
+    "@astroapps/forms-core": "^1.0.1"
   },
   "peerDependencies": {
     "react": "^18.2.0 || ^19",

package/src/RenderForm.tsx

@@ -45,6 +45,7 @@ export interface RenderFormProps {
   renderer: FormRenderer;
   options?: ControlRenderOptions;
 }
+
 /* @trackControls */
 export function RenderForm({
   data,
@@ -56,7 +57,10 @@ export function RenderForm({
   const [formState, setFormState] = useState(
     () => options?.formState ?? createFormState(schemaInterface),
   );
-  const state = formState.getControlState(data, form, options);
+  const effects: (() => void)[] = [];
+  const state = formState.getControlState(data, form, options, (cb) =>
+    effects.push(cb),
+  );
 
   useEffect(() => {
     if (!options?.formState) {
@@ -160,6 +164,7 @@ export function RenderForm({
         parent ?? state.dataNode ?? data,
         child,
         childOptions,
+        (cb) => effects.push(cb),
       );
     },
     runExpression: (scope, expr, returnResult) => {
@@ -169,6 +174,7 @@ export function RenderForm({
           dataNode: data,
           schemaInterface,
           returnResult,
+          runAsync: (cb) => effects.push(cb),
         });
       }
     },
@@ -182,7 +188,14 @@ export function RenderForm({
   const renderedControl = renderer.renderLayout(
     options.adjustLayout?.(dataContext, layoutProps) ?? layoutProps,
   );
-  return renderer.renderVisibility({ visibility, ...renderedControl });
+  const rendered = renderer.renderVisibility({
+    visibility,
+    ...renderedControl,
+  });
+  useEffect(() => {
+    effects.forEach((cb) => cb());
+  }, [effects]);
+  return rendered;
 }
 
 /**

package/src/util.ts

@@ -859,6 +859,9 @@ export function getNullToggler(c: Control<any>): Control<boolean> {
       c.value = currentNotNull ? lastDefined.current.value : null;
       c.disabled = !currentNotNull;
     }, ControlChange.Value);
+    c.subscribe(() => {
+      notNull.value = c.current.value != null;
+    }, ControlChange.Value);
     return notNull;
     function disableIfNotEditing() {
       notNull.disabled = isEditing.current.value === false;
@@ -916,6 +919,21 @@ export function getAllValues(control: Control<any>): Control<unknown[]> {
   );
 }
 
+export function clearMultiValues(dataNode: SchemaDataNode): void {
+  const c = dataNode.control;
+  const sf = dataNode.schema.field;
+  if (sf.collection) {
+    return;
+  } else if (isCompoundField(sf)) {
+    dataNode.schema.getChildNodes().forEach((c) => {
+      clearMultiValues(dataNode.getChild(c));
+    });
+  } else {
+    const allValues = getAllValues(c);
+    allValues.setValue((x) => [c.current.value]);
+  }
+}
+
 export function applyValues(dataNode: SchemaDataNode, value: unknown): void {
   const c = dataNode.control;
   const sf = dataNode.schema.field;
@@ -945,8 +963,10 @@ export function collectDifferences(
   values: unknown[],
 ): () => { editable: number; editing: number } {
   values.forEach((v, i) => {
-    if (i == 0) dataNode.control.setInitialValue(v);
-    else applyValues(dataNode, v);
+    if (i == 0) {
+      dataNode.control.setInitialValue(v);
+      clearMultiValues(dataNode);
+    } else applyValues(dataNode, v);
   });
   const allEdits: Control<boolean | undefined>[] = [];
   resetMultiValues(dataNode);