@react-typed-forms/schemas 16.0.2 → 16.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-typed-forms/schemas",
-  "version": "16.0.2",
+  "version": "16.1.0",
   "description": "",
   "type": "module",
   "main": "lib/index.cjs",
@@ -34,15 +34,15 @@
     "clsx": "^1 || ^2",
     "uuid": "^10.0.0",
     "jsonata": "^2.0.4",
-    "@astroapps/forms-core": "^1.0.1"
+    "@astroapps/forms-core": "^1.1.0"
   },
   "peerDependencies": {
     "react": "^18.2.0 || ^19",
-    "@react-typed-forms/core": "^4.4.0"
+    "@react-typed-forms/core": "^4.4.2"
   },
   "devDependencies": {
     "react": "^18.2.0 || ^19",
-    "@react-typed-forms/core": "^4.4.0",
+    "@react-typed-forms/core": "^4.4.2",
     "@react-typed-forms/transform": "^0.2.0",
     "jest": "^29.7.0",
     "tsx": "^4.19.1",

package/src/RenderForm.tsx

@@ -57,10 +57,12 @@ export function RenderForm({
   const [formState, setFormState] = useState(
     () => options?.formState ?? createFormState(schemaInterface),
   );
-  const effects: (() => void)[] = [];
-  const state = formState.getControlState(data, form, options, (cb) =>
-    effects.push(cb),
-  );
+  let effects: (() => void)[] | undefined = [];
+  const runAsync = (cb: () => void) => {
+    if (effects) effects.push(cb);
+    else cb();
+  };
+  const state = formState.getControlState(data, form, options, runAsync);
 
   useEffect(() => {
     if (!options?.formState) {
@@ -164,7 +166,7 @@ export function RenderForm({
         parent ?? state.dataNode ?? data,
         child,
         childOptions,
-        (cb) => effects.push(cb),
+        runAsync,
       );
     },
     runExpression: (scope, expr, returnResult) => {
@@ -174,7 +176,7 @@ export function RenderForm({
           dataNode: data,
           schemaInterface,
           returnResult,
-          runAsync: (cb) => effects.push(cb),
+          runAsync,
         });
       }
     },
@@ -193,7 +195,11 @@ export function RenderForm({
     ...renderedControl,
   });
   useEffect(() => {
-    effects.forEach((cb) => cb());
+    if (effects) {
+      const toRun = effects;
+      effects = undefined;
+      toRun.forEach((cb) => cb());
+    }
   }, [effects]);
   return rendered;
 }