@react-typed-forms/schemas 16.0.1 → 16.0.3

package/lib/index.js

@@ -32,9 +32,10 @@ function _objectWithoutPropertiesLoose(r, e) {
  * @returns The record with default values applied.
  */
 function applyDefaultValues(v, fields, doneSet) {
+  var _doneSet;
   if (!v) return defaultValueForFields(fields);
   if (doneSet && doneSet.has(v)) return v;
-  doneSet != null ? doneSet : doneSet = new Set();
+  (_doneSet = doneSet) != null ? _doneSet : doneSet = new Set();
   doneSet.add(v);
   const applyValue = fields.filter(x => isCompoundField(x) || !(x.field in v));
   if (!applyValue.length) return v;
@@ -311,7 +312,10 @@ function addMissingControlsForSchema(schema, controls, warning) {
       children: [],
       parent: parentNode
     };
-    entry.children = (_c$children$map = (_c$children = c.children) == null ? void 0 : _c$children.map(x => toControlAndSchema(x, dataSchema != null ? dataSchema : parentSchema, entry, dontRegister))) != null ? _c$children$map : [];
+    entry.children = (_c$children$map = (_c$children = c.children) == null ? void 0 : _c$children.map(x => {
+      var _dataSchema;
+      return toControlAndSchema(x, (_dataSchema = dataSchema) != null ? _dataSchema : parentSchema, entry, dontRegister);
+    })) != null ? _c$children$map : [];
     if (!dontRegister && c.id) controlMap[c.id] = entry;
     if (dataSchema) {
       addSchemaMapEntry(dataSchema.id, entry);
@@ -1511,7 +1515,11 @@ function RenderForm({
       var _options$formState;
       return (_options$formState = options == null ? void 0 : options.formState) != null ? _options$formState : createFormState(schemaInterface);
     });
-    const state = formState.getControlState(data, form, options);
+    let effects = [];
+    const runAsync = cb => {
+      if (effects) effects.push(cb);else cb();
+    };
+    const state = formState.getControlState(data, form, options, runAsync);
     useEffect(() => {
       if (!(options != null && options.formState)) {
         return () => formState.cleanup();
@@ -1597,7 +1605,7 @@ function RenderForm({
       textClass: textClass,
       getChildState(child, parent) {
         var _ref3;
-        return formState.getControlState((_ref3 = parent != null ? parent : state.dataNode) != null ? _ref3 : data, child, childOptions);
+        return formState.getControlState((_ref3 = parent != null ? parent : state.dataNode) != null ? _ref3 : data, child, childOptions, runAsync);
       },
       runExpression: (scope, expr, returnResult) => {
         if (expr != null && expr.type) {
@@ -1605,7 +1613,8 @@ function RenderForm({
             scope,
             dataNode: data,
             schemaInterface,
-            returnResult
+            returnResult,
+            runAsync
           });
         }
       }
@@ -1616,9 +1625,17 @@ function RenderForm({
       style: state.layoutStyle
     });
     const renderedControl = renderer.renderLayout((_options$adjustLayout = options.adjustLayout == null ? void 0 : options.adjustLayout(dataContext, layoutProps)) != null ? _options$adjustLayout : layoutProps);
-    return renderer.renderVisibility(_extends({
+    const rendered = renderer.renderVisibility(_extends({
       visibility
     }, renderedControl));
+    useEffect(() => {
+      if (effects) {
+        const toRun = effects;
+        effects = undefined;
+        toRun.forEach(cb => cb());
+      }
+    }, [effects]);
+    return rendered;
   } finally {
     _effect();
   }