@maif/react-forms 1.0.46 → 1.0.47

package/lib/esm/index.js

@@ -29137,14 +29137,16 @@ var cleanInputArray = function cleanInputArray(obj, defaultValues, flow, subSche
 
     if (step.array && !step.render) {
       return _objectSpread2$1(_objectSpread2$1({}, acc), {}, _defineProperty$1({}, key, (v || []).map(function (value) {
+        var _subSchema$key, _subSchema$key2;
+
         return {
-          value: value
+          value: _typeof$1(value) === 'object' && !(value instanceof Date) && !Array.isArray(value) ? cleanInputArray(value, defaultValues, (_subSchema$key = subSchema[key]) === null || _subSchema$key === void 0 ? void 0 : _subSchema$key.flow, ((_subSchema$key2 = subSchema[key]) === null || _subSchema$key2 === void 0 ? void 0 : _subSchema$key2.schema) || {}) : value
         };
       })));
     } else if (_typeof$1(v) === 'object' && !(v instanceof Date) && !Array.isArray(v)) {
-      var _subSchema$key, _subSchema$key2;
+      var _subSchema$key3, _subSchema$key4;
 
-      return _objectSpread2$1(_objectSpread2$1({}, acc), {}, _defineProperty$1({}, key, cleanInputArray(v, defaultValues, (_subSchema$key = subSchema[key]) === null || _subSchema$key === void 0 ? void 0 : _subSchema$key.flow, ((_subSchema$key2 = subSchema[key]) === null || _subSchema$key2 === void 0 ? void 0 : _subSchema$key2.schema) || {})));
+      return _objectSpread2$1(_objectSpread2$1({}, acc), {}, _defineProperty$1({}, key, cleanInputArray(v, defaultValues, (_subSchema$key3 = subSchema[key]) === null || _subSchema$key3 === void 0 ? void 0 : _subSchema$key3.flow, ((_subSchema$key4 = subSchema[key]) === null || _subSchema$key4 === void 0 ? void 0 : _subSchema$key4.schema) || {})));
     } else {
       return _objectSpread2$1(_objectSpread2$1({}, acc), {}, _defineProperty$1({}, key, v === undefined ? Array.isArray(v) ? [] : step.type === type.object ? {} : null : v));
     }
@@ -29166,25 +29168,23 @@ var cleanOutputArray = function cleanOutputArray(obj, subSchema) {
       }).getOrElse(false);
 
       if (isArray) {
-        return _objectSpread2$1(_objectSpread2$1({}, acc), {}, _defineProperty$1({}, key, v.map(function (_ref6) {
-          var _subSchema$key3;
+        return _objectSpread2$1(_objectSpread2$1({}, acc), {}, _defineProperty$1({}, key, v.map(function (step) {
+          var _subSchema$key5;
 
-          var value = _ref6.value;
-          if (!!value && _typeof$1(value) === 'object' && !(value instanceof Date && !Array.isArray(value))) return cleanOutputArray(value, ((_subSchema$key3 = subSchema[key]) === null || _subSchema$key3 === void 0 ? void 0 : _subSchema$key3.schema) || {});
-          return value;
+          if (!!step.value && _typeof$1(step.value) === 'object' && !(step.value instanceof Date && !Array.isArray(step.value))) return cleanOutputArray(step.value, ((_subSchema$key5 = subSchema[key]) === null || _subSchema$key5 === void 0 ? void 0 : _subSchema$key5.schema) || {});
+          return step.value;
         })));
       }
 
-      console.log('Not array', key);
       return _objectSpread2$1(_objectSpread2$1({}, acc), {}, _defineProperty$1({}, key, v));
     } else if (!!v && _typeof$1(v) === 'object' && !(v instanceof Date && !Array.isArray(v))) {
-      var _subSchema$key4;
+      var _subSchema$key6;
 
-      return _objectSpread2$1(_objectSpread2$1({}, acc), {}, _defineProperty$1({}, key, cleanOutputArray(v, ((_subSchema$key4 = subSchema[key]) === null || _subSchema$key4 === void 0 ? void 0 : _subSchema$key4.schema) || {})));
+      return _objectSpread2$1(_objectSpread2$1({}, acc), {}, _defineProperty$1({}, key, cleanOutputArray(v, ((_subSchema$key6 = subSchema[key]) === null || _subSchema$key6 === void 0 ? void 0 : _subSchema$key6.schema) || {})));
     } else {
-      var _subSchema$key5;
+      var _subSchema$key7;
 
-      if (((_subSchema$key5 = subSchema[key]) === null || _subSchema$key5 === void 0 ? void 0 : _subSchema$key5.type) === 'json') {
+      if (((_subSchema$key7 = subSchema[key]) === null || _subSchema$key7 === void 0 ? void 0 : _subSchema$key7.type) === 'json') {
         try {
           return _objectSpread2$1(_objectSpread2$1({}, acc), {}, _defineProperty$1({}, key, JSON.parse(v)));
         } catch (err) {
@@ -29209,14 +29209,14 @@ var validate = function validate(flow, schema, value) {
   });
 };
 
-var Watcher = function Watcher(_ref7) {
-  var options = _ref7.options,
-      control = _ref7.control,
-      schema = _ref7.schema,
-      onSubmit = _ref7.onSubmit,
-      handleSubmit = _ref7.handleSubmit;
-      _ref7.getValues;
-      _ref7.watch;
+var Watcher = function Watcher(_ref6) {
+  var options = _ref6.options,
+      control = _ref6.control,
+      schema = _ref6.schema,
+      onSubmit = _ref6.onSubmit,
+      handleSubmit = _ref6.handleSubmit;
+      _ref6.getValues;
+      _ref6.watch;
   var data = useWatch({
     control: control
   });
@@ -29242,20 +29242,20 @@ var Watcher = function Watcher(_ref7) {
   return null;
 };
 
-var Form = /*#__PURE__*/React.forwardRef(function (_ref8, ref) {
-  var schema = _ref8.schema,
-      flow = _ref8.flow,
-      value = _ref8.value,
-      inputWrapper = _ref8.inputWrapper,
-      onSubmit = _ref8.onSubmit,
-      _ref8$onError = _ref8.onError,
-      onError = _ref8$onError === void 0 ? function () {} : _ref8$onError,
-      footer = _ref8.footer,
-      _ref8$style = _ref8.style,
-      style = _ref8$style === void 0 ? {} : _ref8$style,
-      className = _ref8.className,
-      _ref8$options = _ref8.options,
-      options = _ref8$options === void 0 ? {} : _ref8$options;
+var Form = /*#__PURE__*/React.forwardRef(function (_ref7, ref) {
+  var schema = _ref7.schema,
+      flow = _ref7.flow,
+      value = _ref7.value,
+      inputWrapper = _ref7.inputWrapper,
+      onSubmit = _ref7.onSubmit,
+      _ref7$onError = _ref7.onError,
+      onError = _ref7$onError === void 0 ? function () {} : _ref7$onError,
+      footer = _ref7.footer,
+      _ref7$style = _ref7.style,
+      style = _ref7$style === void 0 ? {} : _ref7$style,
+      className = _ref7.className,
+      _ref7$options = _ref7.options,
+      options = _ref7$options === void 0 ? {} : _ref7$options;
   var classes = useCustomStyle(style);
   var formFlow = flow || Object.keys(schema);
 
@@ -29453,18 +29453,18 @@ var Footer = function Footer(props) {
   }, ((_props$actions8 = props.actions) === null || _props$actions8 === void 0 ? void 0 : (_props$actions8$submi = _props$actions8.submit) === null || _props$actions8$submi === void 0 ? void 0 : _props$actions8$submi.label) || 'Save'));
 };
 
-var Step = function Step(_ref9) {
-  var entry = _ref9.entry,
-      realEntry = _ref9.realEntry,
-      step = _ref9.step,
-      schema = _ref9.schema,
-      inputWrapper = _ref9.inputWrapper,
-      httpClient = _ref9.httpClient,
-      defaultValue = _ref9.defaultValue,
-      index = _ref9.index,
-      functionalProperty = _ref9.functionalProperty,
-      parent = _ref9.parent,
-      onAfterChange = _ref9.onAfterChange;
+var Step = function Step(_ref8) {
+  var entry = _ref8.entry,
+      realEntry = _ref8.realEntry,
+      step = _ref8.step,
+      schema = _ref8.schema,
+      inputWrapper = _ref8.inputWrapper,
+      httpClient = _ref8.httpClient,
+      defaultValue = _ref8.defaultValue,
+      index = _ref8.index,
+      functionalProperty = _ref8.functionalProperty,
+      parent = _ref8.parent,
+      onAfterChange = _ref8.onAfterChange;
   var classes = useCustomStyle();
 
   var _useFormContext2 = useFormContext(),
@@ -29558,12 +29558,12 @@ var Step = function Step(_ref9) {
     var newData = cleanOutputArray(d, schema);
     if (!deepEqual(newData, currentData) || newData !== undefined && currentData === undefined) onAfterChangeFunc({
       entry: entry,
-      previousValue: currentData,
       value: getValues(entry),
+      rawValues: newData,
+      previousValue: currentData,
       getValue: function getValue(e) {
         return getValues(e);
       },
-      rawValues: newData,
       setValue: _setValue,
       onChange: function onChange(v) {
         return _setValue(entry, v);
@@ -29835,11 +29835,11 @@ var Step = function Step(_ref9) {
       return /*#__PURE__*/React.createElement(Controller, {
         name: entry,
         control: control,
-        render: function render(_ref10) {
-          var field = _ref10.field;
+        render: function render(_ref9) {
+          var field = _ref9.field;
 
-          var FileInput = function FileInput(_ref11) {
-            var onChange = _ref11.onChange;
+          var FileInput = function FileInput(_ref10) {
+            var onChange = _ref10.onChange;
 
             var _useState3 = useState(false),
                 _useState4 = _slicedToArray(_useState3, 2),
@@ -29924,11 +29924,11 @@ var Step = function Step(_ref9) {
   }
 };
 
-var ArrayStep = function ArrayStep(_ref12) {
-  var entry = _ref12.entry,
-      step = _ref12.step,
-      component = _ref12.component,
-      disabled = _ref12.disabled;
+var ArrayStep = function ArrayStep(_ref11) {
+  var entry = _ref11.entry,
+      step = _ref11.step,
+      component = _ref11.component,
+      disabled = _ref11.disabled;
   var classes = useCustomStyle();
 
   var _useFormContext3 = useFormContext(),
@@ -30015,19 +30015,19 @@ var ArrayStep = function ArrayStep(_ref12) {
   }, error.message)));
 };
 
-var NestedForm = function NestedForm(_ref13) {
+var NestedForm = function NestedForm(_ref12) {
   var _classNames17;
 
-  var schema = _ref13.schema,
-      flow = _ref13.flow,
-      parent = _ref13.parent,
-      inputWrapper = _ref13.inputWrapper,
-      maybeCustomHttpClient = _ref13.maybeCustomHttpClient,
-      errorDisplayed = _ref13.errorDisplayed,
-      value = _ref13.value,
-      step = _ref13.step,
-      functionalProperty = _ref13.functionalProperty,
-      index = _ref13.index;
+  var schema = _ref12.schema,
+      flow = _ref12.flow,
+      parent = _ref12.parent,
+      inputWrapper = _ref12.inputWrapper,
+      maybeCustomHttpClient = _ref12.maybeCustomHttpClient,
+      errorDisplayed = _ref12.errorDisplayed,
+      value = _ref12.value,
+      step = _ref12.step,
+      functionalProperty = _ref12.functionalProperty,
+      index = _ref12.index;
 
   var _useFormContext4 = useFormContext(),
       getValues = _useFormContext4.getValues,
@@ -30138,10 +30138,10 @@ var NestedForm = function NestedForm(_ref13) {
     onClick: function onClick() {
       return setCollapsed(!collapsed);
     }
-  }), computedSandF.map(function (_ref14, idx) {
-    var step = _ref14.step,
-        visibleStep = _ref14.visibleStep,
-        entry = _ref14.entry;
+  }), computedSandF.map(function (_ref13, idx) {
+    var step = _ref13.step,
+        visibleStep = _ref13.visibleStep,
+        entry = _ref13.entry;
 
     if (!step && typeof entry === 'string') {
       console.error("no step found for the entry \"".concat(entry, "\" in the given schema. Your form might not work properly. Please fix it"));

package/lib/index.js

@@ -29171,14 +29171,16 @@ var cleanInputArray = function cleanInputArray(obj, defaultValues, flow, subSche
 
     if (step.array && !step.render) {
       return _objectSpread2$1(_objectSpread2$1({}, acc), {}, _defineProperty$1({}, key, (v || []).map(function (value) {
+        var _subSchema$key, _subSchema$key2;
+
         return {
-          value: value
+          value: _typeof$1(value) === 'object' && !(value instanceof Date) && !Array.isArray(value) ? cleanInputArray(value, defaultValues, (_subSchema$key = subSchema[key]) === null || _subSchema$key === void 0 ? void 0 : _subSchema$key.flow, ((_subSchema$key2 = subSchema[key]) === null || _subSchema$key2 === void 0 ? void 0 : _subSchema$key2.schema) || {}) : value
         };
       })));
     } else if (_typeof$1(v) === 'object' && !(v instanceof Date) && !Array.isArray(v)) {
-      var _subSchema$key, _subSchema$key2;
+      var _subSchema$key3, _subSchema$key4;
 
-      return _objectSpread2$1(_objectSpread2$1({}, acc), {}, _defineProperty$1({}, key, cleanInputArray(v, defaultValues, (_subSchema$key = subSchema[key]) === null || _subSchema$key === void 0 ? void 0 : _subSchema$key.flow, ((_subSchema$key2 = subSchema[key]) === null || _subSchema$key2 === void 0 ? void 0 : _subSchema$key2.schema) || {})));
+      return _objectSpread2$1(_objectSpread2$1({}, acc), {}, _defineProperty$1({}, key, cleanInputArray(v, defaultValues, (_subSchema$key3 = subSchema[key]) === null || _subSchema$key3 === void 0 ? void 0 : _subSchema$key3.flow, ((_subSchema$key4 = subSchema[key]) === null || _subSchema$key4 === void 0 ? void 0 : _subSchema$key4.schema) || {})));
     } else {
       return _objectSpread2$1(_objectSpread2$1({}, acc), {}, _defineProperty$1({}, key, v === undefined ? Array.isArray(v) ? [] : step.type === type.object ? {} : null : v));
     }
@@ -29200,25 +29202,23 @@ var cleanOutputArray = function cleanOutputArray(obj, subSchema) {
       }).getOrElse(false);
 
       if (isArray) {
-        return _objectSpread2$1(_objectSpread2$1({}, acc), {}, _defineProperty$1({}, key, v.map(function (_ref6) {
-          var _subSchema$key3;
+        return _objectSpread2$1(_objectSpread2$1({}, acc), {}, _defineProperty$1({}, key, v.map(function (step) {
+          var _subSchema$key5;
 
-          var value = _ref6.value;
-          if (!!value && _typeof$1(value) === 'object' && !(value instanceof Date && !Array.isArray(value))) return cleanOutputArray(value, ((_subSchema$key3 = subSchema[key]) === null || _subSchema$key3 === void 0 ? void 0 : _subSchema$key3.schema) || {});
-          return value;
+          if (!!step.value && _typeof$1(step.value) === 'object' && !(step.value instanceof Date && !Array.isArray(step.value))) return cleanOutputArray(step.value, ((_subSchema$key5 = subSchema[key]) === null || _subSchema$key5 === void 0 ? void 0 : _subSchema$key5.schema) || {});
+          return step.value;
         })));
       }
 
-      console.log('Not array', key);
       return _objectSpread2$1(_objectSpread2$1({}, acc), {}, _defineProperty$1({}, key, v));
     } else if (!!v && _typeof$1(v) === 'object' && !(v instanceof Date && !Array.isArray(v))) {
-      var _subSchema$key4;
+      var _subSchema$key6;
 
-      return _objectSpread2$1(_objectSpread2$1({}, acc), {}, _defineProperty$1({}, key, cleanOutputArray(v, ((_subSchema$key4 = subSchema[key]) === null || _subSchema$key4 === void 0 ? void 0 : _subSchema$key4.schema) || {})));
+      return _objectSpread2$1(_objectSpread2$1({}, acc), {}, _defineProperty$1({}, key, cleanOutputArray(v, ((_subSchema$key6 = subSchema[key]) === null || _subSchema$key6 === void 0 ? void 0 : _subSchema$key6.schema) || {})));
     } else {
-      var _subSchema$key5;
+      var _subSchema$key7;
 
-      if (((_subSchema$key5 = subSchema[key]) === null || _subSchema$key5 === void 0 ? void 0 : _subSchema$key5.type) === 'json') {
+      if (((_subSchema$key7 = subSchema[key]) === null || _subSchema$key7 === void 0 ? void 0 : _subSchema$key7.type) === 'json') {
         try {
           return _objectSpread2$1(_objectSpread2$1({}, acc), {}, _defineProperty$1({}, key, JSON.parse(v)));
         } catch (err) {
@@ -29243,14 +29243,14 @@ var validate = function validate(flow, schema, value) {
   });
 };
 
-var Watcher = function Watcher(_ref7) {
-  var options = _ref7.options,
-      control = _ref7.control,
-      schema = _ref7.schema,
-      onSubmit = _ref7.onSubmit,
-      handleSubmit = _ref7.handleSubmit;
-      _ref7.getValues;
-      _ref7.watch;
+var Watcher = function Watcher(_ref6) {
+  var options = _ref6.options,
+      control = _ref6.control,
+      schema = _ref6.schema,
+      onSubmit = _ref6.onSubmit,
+      handleSubmit = _ref6.handleSubmit;
+      _ref6.getValues;
+      _ref6.watch;
   var data = reactHookForm.useWatch({
     control: control
   });
@@ -29276,20 +29276,20 @@ var Watcher = function Watcher(_ref7) {
   return null;
 };
 
-var Form = /*#__PURE__*/React__default["default"].forwardRef(function (_ref8, ref) {
-  var schema = _ref8.schema,
-      flow = _ref8.flow,
-      value = _ref8.value,
-      inputWrapper = _ref8.inputWrapper,
-      onSubmit = _ref8.onSubmit,
-      _ref8$onError = _ref8.onError,
-      onError = _ref8$onError === void 0 ? function () {} : _ref8$onError,
-      footer = _ref8.footer,
-      _ref8$style = _ref8.style,
-      style = _ref8$style === void 0 ? {} : _ref8$style,
-      className = _ref8.className,
-      _ref8$options = _ref8.options,
-      options = _ref8$options === void 0 ? {} : _ref8$options;
+var Form = /*#__PURE__*/React__default["default"].forwardRef(function (_ref7, ref) {
+  var schema = _ref7.schema,
+      flow = _ref7.flow,
+      value = _ref7.value,
+      inputWrapper = _ref7.inputWrapper,
+      onSubmit = _ref7.onSubmit,
+      _ref7$onError = _ref7.onError,
+      onError = _ref7$onError === void 0 ? function () {} : _ref7$onError,
+      footer = _ref7.footer,
+      _ref7$style = _ref7.style,
+      style = _ref7$style === void 0 ? {} : _ref7$style,
+      className = _ref7.className,
+      _ref7$options = _ref7.options,
+      options = _ref7$options === void 0 ? {} : _ref7$options;
   var classes = useCustomStyle(style);
   var formFlow = flow || Object.keys(schema);
 
@@ -29487,18 +29487,18 @@ var Footer = function Footer(props) {
   }, ((_props$actions8 = props.actions) === null || _props$actions8 === void 0 ? void 0 : (_props$actions8$submi = _props$actions8.submit) === null || _props$actions8$submi === void 0 ? void 0 : _props$actions8$submi.label) || 'Save'));
 };
 
-var Step = function Step(_ref9) {
-  var entry = _ref9.entry,
-      realEntry = _ref9.realEntry,
-      step = _ref9.step,
-      schema = _ref9.schema,
-      inputWrapper = _ref9.inputWrapper,
-      httpClient = _ref9.httpClient,
-      defaultValue = _ref9.defaultValue,
-      index = _ref9.index,
-      functionalProperty = _ref9.functionalProperty,
-      parent = _ref9.parent,
-      onAfterChange = _ref9.onAfterChange;
+var Step = function Step(_ref8) {
+  var entry = _ref8.entry,
+      realEntry = _ref8.realEntry,
+      step = _ref8.step,
+      schema = _ref8.schema,
+      inputWrapper = _ref8.inputWrapper,
+      httpClient = _ref8.httpClient,
+      defaultValue = _ref8.defaultValue,
+      index = _ref8.index,
+      functionalProperty = _ref8.functionalProperty,
+      parent = _ref8.parent,
+      onAfterChange = _ref8.onAfterChange;
   var classes = useCustomStyle();
 
   var _useFormContext2 = reactHookForm.useFormContext(),
@@ -29592,12 +29592,12 @@ var Step = function Step(_ref9) {
     var newData = cleanOutputArray(d, schema);
     if (!deepEqual__default["default"](newData, currentData) || newData !== undefined && currentData === undefined) onAfterChangeFunc({
       entry: entry,
-      previousValue: currentData,
       value: getValues(entry),
+      rawValues: newData,
+      previousValue: currentData,
       getValue: function getValue(e) {
         return getValues(e);
       },
-      rawValues: newData,
       setValue: _setValue,
       onChange: function onChange(v) {
         return _setValue(entry, v);
@@ -29869,11 +29869,11 @@ var Step = function Step(_ref9) {
       return /*#__PURE__*/React__default["default"].createElement(reactHookForm.Controller, {
         name: entry,
         control: control,
-        render: function render(_ref10) {
-          var field = _ref10.field;
+        render: function render(_ref9) {
+          var field = _ref9.field;
 
-          var FileInput = function FileInput(_ref11) {
-            var onChange = _ref11.onChange;
+          var FileInput = function FileInput(_ref10) {
+            var onChange = _ref10.onChange;
 
             var _useState3 = React.useState(false),
                 _useState4 = _slicedToArray(_useState3, 2),
@@ -29958,11 +29958,11 @@ var Step = function Step(_ref9) {
   }
 };
 
-var ArrayStep = function ArrayStep(_ref12) {
-  var entry = _ref12.entry,
-      step = _ref12.step,
-      component = _ref12.component,
-      disabled = _ref12.disabled;
+var ArrayStep = function ArrayStep(_ref11) {
+  var entry = _ref11.entry,
+      step = _ref11.step,
+      component = _ref11.component,
+      disabled = _ref11.disabled;
   var classes = useCustomStyle();
 
   var _useFormContext3 = reactHookForm.useFormContext(),
@@ -30049,19 +30049,19 @@ var ArrayStep = function ArrayStep(_ref12) {
   }, error.message)));
 };
 
-var NestedForm = function NestedForm(_ref13) {
+var NestedForm = function NestedForm(_ref12) {
   var _classNames17;
 
-  var schema = _ref13.schema,
-      flow = _ref13.flow,
-      parent = _ref13.parent,
-      inputWrapper = _ref13.inputWrapper,
-      maybeCustomHttpClient = _ref13.maybeCustomHttpClient,
-      errorDisplayed = _ref13.errorDisplayed,
-      value = _ref13.value,
-      step = _ref13.step,
-      functionalProperty = _ref13.functionalProperty,
-      index = _ref13.index;
+  var schema = _ref12.schema,
+      flow = _ref12.flow,
+      parent = _ref12.parent,
+      inputWrapper = _ref12.inputWrapper,
+      maybeCustomHttpClient = _ref12.maybeCustomHttpClient,
+      errorDisplayed = _ref12.errorDisplayed,
+      value = _ref12.value,
+      step = _ref12.step,
+      functionalProperty = _ref12.functionalProperty,
+      index = _ref12.index;
 
   var _useFormContext4 = reactHookForm.useFormContext(),
       getValues = _useFormContext4.getValues,
@@ -30172,10 +30172,10 @@ var NestedForm = function NestedForm(_ref13) {
     onClick: function onClick() {
       return setCollapsed(!collapsed);
     }
-  }), computedSandF.map(function (_ref14, idx) {
-    var step = _ref14.step,
-        visibleStep = _ref14.visibleStep,
-        entry = _ref14.entry;
+  }), computedSandF.map(function (_ref13, idx) {
+    var step = _ref13.step,
+        visibleStep = _ref13.visibleStep,
+        entry = _ref13.entry;
 
     if (!step && typeof entry === 'string') {
       console.error("no step found for the entry \"".concat(entry, "\" in the given schema. Your form might not work properly. Please fix it"));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@maif/react-forms",
   "description": "Build react safe forms as fast as possible",
-  "version": "1.0.46",
+  "version": "1.0.47",
   "main": "lib/index.js",
   "module": "lib/esm/index.js",
   "types": "lib/index.js",