@react-typed-forms/schemas 10.0.1 → 10.0.3

package/lib/index.js

@@ -210,27 +210,31 @@ function _createForOfIteratorHelperLoose(o, allowArrayLike) {
   throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
 
-function applyDefaultValues(v, fields) {
+function applyDefaultValues(v, fields, doneSet) {
+  var _doneSet;
   if (!v) return defaultValueForFields(fields);
+  if (doneSet && doneSet.has(v)) return v;
+  (_doneSet = doneSet) != null ? _doneSet : doneSet = new Set();
+  doneSet.add(v);
   var applyValue = fields.filter(function (x) {
     return isCompoundField(x) || !(x.field in v);
   });
   if (!applyValue.length) return v;
   var out = _extends({}, v);
   applyValue.forEach(function (x) {
-    out[x.field] = x.field in v ? applyDefaultForField(v[x.field], x, fields) : defaultValueForField(x);
+    out[x.field] = x.field in v ? applyDefaultForField(v[x.field], x, fields, false, doneSet) : defaultValueForField(x);
   });
   return out;
 }
-function applyDefaultForField(v, field, parent, notElement) {
+function applyDefaultForField(v, field, parent, notElement, doneSet) {
   if (field.collection && !notElement) {
     return (v != null ? v : []).map(function (x) {
-      return applyDefaultForField(x, field, parent, true);
+      return applyDefaultForField(x, field, parent, true, doneSet);
     });
   }
   if (isCompoundField(field)) {
     if (!v && !field.required) return v;
-    return applyDefaultValues(v, field.treeChildren ? parent : field.children);
+    return applyDefaultValues(v, field.treeChildren ? parent : field.children, doneSet);
   }
   return defaultValueForField(field);
 }
@@ -1106,14 +1110,22 @@ function useValidationHook(definition, field) {
           var lv = x;
           core.useControlEffect(function () {
             core.trackControlChange(control, core.ControlChange.Validate);
-            return field ? schemaInterface.controlLength(field, control) : 0;
-          }, function (len) {
+            return [field ? schemaInterface.controlLength(field, control) : 0, hidden];
+          }, function (_ref) {
+            var len = _ref[0],
+              hidden = _ref[1];
+            if (hidden) {
+              control.setError("length", undefined);
+              return;
+            }
             if (lv.min != null && len < lv.min) {
               if (field != null && field.collection) {
                 control.setValue(function (v) {
-                  return [].concat(v, Array.from({
-                    length: lv.min - len
-                  }));
+                  return Array.isArray(v) ? v.concat(Array.from({
+                    length: lv.min - v.length
+                  })) : Array.from({
+                    length: lv.min
+                  });
                 });
               } else {
                 control.setError("length", "Length must be at least " + lv.min);
@@ -1135,9 +1147,9 @@ function useJsonataValidator(control, context, expr, hidden, i) {
   var errorMsg = useJsonataExpression(expr.expression, context);
   core.useControlEffect(function () {
     return [hidden, errorMsg.value];
-  }, function (_ref) {
-    var hidden = _ref[0],
-      msg = _ref[1];
+  }, function (_ref2) {
+    var hidden = _ref2[0],
+      msg = _ref2[1];
     return control.setError("jsonata" + i, !hidden ? msg : null);
   }, true);
 }