@react-typed-forms/schemas 16.0.0 → 16.0.2

package/lib/index.cjs

@@ -631,6 +631,9 @@ function getNullToggler(c) {
       c.value = currentNotNull ? lastDefined.current.value : null;
       c.disabled = !currentNotNull;
     }, core.ControlChange.Value);
+    c.subscribe(function () {
+      notNull.value = c.current.value != null;
+    }, core.ControlChange.Value);
     return notNull;
     function disableIfNotEditing() {
       notNull.disabled = isEditing.current.value === false;
@@ -670,6 +673,22 @@ function getAllValues(control) {
     return core.newControl([control.value]);
   });
 }
+function clearMultiValues(dataNode) {
+  var c = dataNode.control;
+  var sf = dataNode.schema.field;
+  if (sf.collection) {
+    return;
+  } else if (formsCore.isCompoundField(sf)) {
+    dataNode.schema.getChildNodes().forEach(function (c) {
+      clearMultiValues(dataNode.getChild(c));
+    });
+  } else {
+    var allValues = getAllValues(c);
+    allValues.setValue(function (x) {
+      return [c.current.value];
+    });
+  }
+}
 function applyValues(dataNode, value) {
   var c = dataNode.control;
   var sf = dataNode.schema.field;
@@ -692,7 +711,10 @@ function applyValues(dataNode, value) {
 }
 function collectDifferences(dataNode, values) {
   values.forEach(function (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);
   });
   var allEdits = [];
   resetMultiValues(dataNode);
@@ -1590,7 +1612,10 @@ function RenderForm(_ref) {
       }),
       formState = _useState[0],
       setFormState = _useState[1];
-    var state = formState.getControlState(data, form, options);
+    var effects = [];
+    var state = formState.getControlState(data, form, options, function (cb) {
+      return effects.push(cb);
+    });
     react.useEffect(function () {
       if (!(options != null && options.formState)) {
         return function () {
@@ -1677,7 +1702,9 @@ function RenderForm(_ref) {
       textClass: textClass,
       getChildState: function getChildState(child, parent) {
         var _ref4;
-        return formState.getControlState((_ref4 = parent != null ? parent : state.dataNode) != null ? _ref4 : data, child, childOptions);
+        return formState.getControlState((_ref4 = parent != null ? parent : state.dataNode) != null ? _ref4 : data, child, childOptions, function (cb) {
+          return effects.push(cb);
+        });
       },
       runExpression: function runExpression(scope, expr, returnResult) {
         if (expr != null && expr.type) {
@@ -1685,7 +1712,10 @@ function RenderForm(_ref) {
             scope: scope,
             dataNode: data,
             schemaInterface: schemaInterface,
-            returnResult: returnResult
+            returnResult: returnResult,
+            runAsync: function runAsync(cb) {
+              return effects.push(cb);
+            }
           });
         }
       }
@@ -1696,9 +1726,15 @@ function RenderForm(_ref) {
       style: state.layoutStyle
     });
     var renderedControl = renderer.renderLayout((_options$adjustLayout = options.adjustLayout == null ? void 0 : options.adjustLayout(dataContext, layoutProps)) != null ? _options$adjustLayout : layoutProps);
-    return renderer.renderVisibility(_extends({
+    var rendered = renderer.renderVisibility(_extends({
       visibility: visibility
     }, renderedControl));
+    react.useEffect(function () {
+      effects.forEach(function (cb) {
+        return cb();
+      });
+    }, [effects]);
+    return rendered;
   } finally {
     _effect();
   }
@@ -1815,6 +1851,7 @@ exports.applyValues = applyValues;
 exports.autocompleteOptions = autocompleteOptions;
 exports.checkListOptions = checkListOptions;
 exports.cleanDataForSchema = cleanDataForSchema;
+exports.clearMultiValues = clearMultiValues;
 exports.coerceToString = coerceToString;
 exports.collectDifferences = collectDifferences;
 exports.compoundControl = compoundControl;