@maif/react-forms 1.0.46 → 1.0.49

package/lib/esm/index.js

@@ -452,6 +452,42 @@ function _extends() {
   return _extends.apply(this, arguments);
 }
 
+function _objectWithoutPropertiesLoose(source, excluded) {
+  if (source == null) return {};
+  var target = {};
+  var sourceKeys = Object.keys(source);
+  var key, i;
+
+  for (i = 0; i < sourceKeys.length; i++) {
+    key = sourceKeys[i];
+    if (excluded.indexOf(key) >= 0) continue;
+    target[key] = source[key];
+  }
+
+  return target;
+}
+
+function _objectWithoutProperties(source, excluded) {
+  if (source == null) return {};
+
+  var target = _objectWithoutPropertiesLoose(source, excluded);
+
+  var key, i;
+
+  if (Object.getOwnPropertySymbols) {
+    var sourceSymbolKeys = Object.getOwnPropertySymbols(source);
+
+    for (i = 0; i < sourceSymbolKeys.length; i++) {
+      key = sourceSymbolKeys[i];
+      if (excluded.indexOf(key) >= 0) continue;
+      if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue;
+      target[key] = source[key];
+    }
+  }
+
+  return target;
+}
+
 function _readOnlyError(name) {
   throw new TypeError("\"" + name + "\" is read-only");
 }
@@ -838,20 +874,34 @@ var BooleanInput = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
 });
 
 var Collapse = function Collapse(props) {
-  var _classNames4;
+  var _classNames5;
 
   var _useState = useState(props.initCollapsed || props.collapsed),
       _useState2 = _slicedToArray(_useState, 2),
       collapsed = _useState2[0],
       setCollapsed = _useState2[1];
 
+  var _useState3 = useState(false),
+      _useState4 = _slicedToArray(_useState3, 2),
+      expandedAll = _useState4[0],
+      setExpandedAll = _useState4[1];
+
   var classes = useCustomStyle();
 
   var toggle = function toggle(e) {
-    if (e && e.preventDefault) e.preventDefault();
+    if (e && e.preventDefault) e.stopPropagation();
     setCollapsed(!collapsed);
   };
 
+  var childrenWithProps = React.Children.map(props.children, function (child) {
+    if ( /*#__PURE__*/React.isValidElement(child)) {
+      return /*#__PURE__*/React.cloneElement(child, {
+        collapsed: expandedAll
+      });
+    }
+
+    return child;
+  });
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("hr", {
     className: classNames(_defineProperty$1({}, classes.collapse_error, props.errored))
   }), /*#__PURE__*/React.createElement("div", {
@@ -859,17 +909,29 @@ var Collapse = function Collapse(props) {
     onClick: toggle
   }, /*#__PURE__*/React.createElement("span", {
     className: classNames(classes.collapse_label, _defineProperty$1({}, classes.collapse_error, props.errored))
-  }, props.label), /*#__PURE__*/React.createElement("button", {
+  }, props.label), /*#__PURE__*/React.createElement("div", {
+    style: {
+      marginLeft: 'auto'
+    },
+    className: classNames(classes.flex)
+  }, /*#__PURE__*/React.createElement("button", {
     type: "button",
     className: classNames(classes.btn, classes.btn_sm, _defineProperty$1({}, classes.collapse_error, props.errored)),
+    onClick: function onClick(e) {
+      if (e) e.stopPropagation();
+      setExpandedAll(!expandedAll);
+    }
+  }, expandedAll ? 'Expand all' : 'Collapse all'), /*#__PURE__*/React.createElement("button", {
+    type: "button",
+    className: classNames(classes.btn, classes.btn_sm, classes.ml_5, _defineProperty$1({}, classes.collapse_error, props.errored)),
     onClick: toggle
   }, !!collapsed && /*#__PURE__*/React.createElement(Eye, {
     size: 16
   }), !collapsed && /*#__PURE__*/React.createElement(EyeOff, {
     size: 16
-  }))), /*#__PURE__*/React.createElement("div", {
-    className: classNames("".concat(classes.ml_10), (_classNames4 = {}, _defineProperty$1(_classNames4, classes.display__none, !!collapsed), _defineProperty$1(_classNames4, classes.flex, !!props.inline), _defineProperty$1(_classNames4, classes.collapse__inline, !!props.inline), _classNames4))
-  }, props.children), props.lineEnd && /*#__PURE__*/React.createElement("hr", null));
+  })))), /*#__PURE__*/React.createElement("div", {
+    className: classNames("".concat(classes.ml_10), (_classNames5 = {}, _defineProperty$1(_classNames5, classes.display__none, !!collapsed), _defineProperty$1(_classNames5, classes.flex, !!props.inline), _defineProperty$1(_classNames5, classes.collapse__inline, !!props.inline), _classNames5))
+  }, childrenWithProps), props.lineEnd && /*#__PURE__*/React.createElement("hr", null));
 };
 
 var option = function option(x) {
@@ -28504,6 +28566,13 @@ function CodeInput(_ref) {
       e.stopImmediatePropagation();
     });
     if (setRef) setRef(e);
+    e.dispatch({
+      changes: {
+        from: 0,
+        to: e.state.doc.length,
+        insert: value === null || value === undefined ? '' : _typeof$1(value) === 'object' ? JSON.stringify(value, null, 2) : value
+      }
+    });
     setEditor(e);
   }, []);
   useEffect(function () {
@@ -29002,6 +29071,8 @@ var ControlledInput = function ControlledInput(_ref) {
   }, component ? component(field, props) : /*#__PURE__*/React.cloneElement(children, _objectSpread2$1({}, props)));
 };
 
+var _excluded = ["schema", "flow", "parent", "inputWrapper", "maybeCustomHttpClient", "errorDisplayed", "value", "step", "functionalProperty", "index"];
+
 var usePrevious = function usePrevious(value) {
   // The ref object is a generic container whose current property is mutable ...
   // ... and can hold any value, similar to an instance property on a class
@@ -29021,7 +29092,8 @@ var BasicWrapper = function BasicWrapper(_ref) {
       label = _ref.label,
       help = _ref.help,
       children = _ref.children,
-      render = _ref.render;
+      render = _ref.render,
+      collapsed = _ref.collapsed;
 
   if (_typeof$1(entry) === 'object') {
     return children;
@@ -29050,10 +29122,20 @@ var BasicWrapper = function BasicWrapper(_ref) {
       label: label,
       error: error,
       help: help,
-      children: children
+      children: children,
+      collapsed: collapsed
     });
   }
 
+  var childrenWithProps = React.Children.map(children, function (child) {
+    if ( /*#__PURE__*/React.isValidElement(child)) {
+      return /*#__PURE__*/React.cloneElement(child, {
+        collapsed: collapsed
+      });
+    }
+
+    return child;
+  });
   return /*#__PURE__*/React.createElement("div", {
     className: "".concat(classes.mt_10, " ").concat(className),
     style: {
@@ -29078,7 +29160,7 @@ var BasicWrapper = function BasicWrapper(_ref) {
       marginLeft: '.5rem',
       cursor: 'help'
     }
-  })))), children, error && /*#__PURE__*/React.createElement("div", {
+  })))), childrenWithProps, error && /*#__PURE__*/React.createElement("div", {
     className: classNames(classes.feedback, _defineProperty$1({}, classes.txt_red, errorDisplayed))
   }, error.message));
 };
@@ -29137,14 +29219,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 +29250,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 +29291,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 +29324,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);
 
@@ -29342,7 +29424,11 @@ var Form = /*#__PURE__*/React.forwardRef(function (_ref8, ref) {
         }, onError)();
       },
       trigger: trigger,
-      methods: methods
+      methods: _objectSpread2$1(_objectSpread2$1({}, methods), {}, {
+        data: function data() {
+          return cleanOutputArray(getValues(), schema);
+        }
+      })
     };
   });
   return /*#__PURE__*/React.createElement(FormProvider, methods, /*#__PURE__*/React.createElement(Watcher, {
@@ -29453,18 +29539,19 @@ 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,
+      collapsed = _ref8.collapsed;
   var classes = useCustomStyle();
 
   var _useFormContext2 = useFormContext(),
@@ -29485,7 +29572,8 @@ var Step = function Step(_ref9) {
       return !!errors[step] && (dirtyFields[step] || touchedFields[step]);
     });
     return /*#__PURE__*/React.createElement(Collapse, _extends({}, entry, {
-      errored: errored
+      errored: errored,
+      collapsed: collapsed
     }), entry.flow.map(function (en, entryIdx) {
       var stp = schema[en];
       _typeof$1(en) === 'object' ? undefined : en.split('.').reduce(function (object, key) {
@@ -29524,11 +29612,13 @@ var Step = function Step(_ref9) {
         entry: en,
         label: functionalProperty(en, (stp === null || stp === void 0 ? void 0 : stp.label) === null ? null : (stp === null || stp === void 0 ? void 0 : stp.label) || en),
         help: stp === null || stp === void 0 ? void 0 : stp.help,
-        render: inputWrapper
+        render: inputWrapper,
+        collapsed: collapsed
       }, /*#__PURE__*/React.createElement(Step, {
         entry: en,
         step: stp,
         schema: schema,
+        collapsed: collapsed,
         inputWrapper: inputWrapper,
         httpClient: httpClient,
         defaultValue: stp === null || stp === void 0 ? void 0 : stp.defaultValue,
@@ -29558,12 +29648,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);
@@ -29606,7 +29696,8 @@ var Step = function Step(_ref9) {
           defaultValue: (_props$defaultValue = props.defaultValue) === null || _props$defaultValue === void 0 ? void 0 : _props$defaultValue.value,
           value: props.value,
           index: idx,
-          functionalProperty: functionalProperty
+          functionalProperty: functionalProperty,
+          collapsed: collapsed
         });
       }
     }));
@@ -29767,6 +29858,7 @@ var Step = function Step(_ref9) {
             flow: flow,
             step: step,
             parent: entry,
+            collapsed: collapsed,
             inputWrapper: inputWrapper,
             maybeCustomHttpClient: httpClient,
             value: getValues(entry) || defaultValue,
@@ -29835,11 +29927,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 +30016,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 +30107,20 @@ 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,
+      props = _objectWithoutProperties(_ref12, _excluded);
 
   var _useFormContext4 = useFormContext(),
       getValues = _useFormContext4.getValues,
@@ -30036,17 +30129,15 @@ var NestedForm = function NestedForm(_ref13) {
       _useFormContext4.trigger;
       _useFormContext4.formState;
 
-  var _useState7 = useState(!!step.collapsed),
+  var _useState7 = useState(!!step.collapsed || props.collapsed),
       _useState8 = _slicedToArray(_useState7, 2),
       collapsed = _useState8[0],
       setCollapsed = _useState8[1];
 
-  var classes = useCustomStyle(); // TODO - voir ce qui se passe et à quoi ça sert
-  // const v = getValues(parent);
-  // useEffect(() => {
-  //   trigger(parent)
-  // }, [JSON.stringify(v)])
-
+  useEffect(function () {
+    setCollapsed(props.collapsed);
+  }, [props.collapsed]);
+  var classes = useCustomStyle();
   var schemaAndFlow = option(step.conditionalSchema).map(function (condiSchema) {
     var ref = option(condiSchema.ref).map(function (ref) {
       return getValues(ref);
@@ -30138,10 +30229,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

@@ -486,6 +486,42 @@ function _extends() {
   return _extends.apply(this, arguments);
 }
 
+function _objectWithoutPropertiesLoose(source, excluded) {
+  if (source == null) return {};
+  var target = {};
+  var sourceKeys = Object.keys(source);
+  var key, i;
+
+  for (i = 0; i < sourceKeys.length; i++) {
+    key = sourceKeys[i];
+    if (excluded.indexOf(key) >= 0) continue;
+    target[key] = source[key];
+  }
+
+  return target;
+}
+
+function _objectWithoutProperties(source, excluded) {
+  if (source == null) return {};
+
+  var target = _objectWithoutPropertiesLoose(source, excluded);
+
+  var key, i;
+
+  if (Object.getOwnPropertySymbols) {
+    var sourceSymbolKeys = Object.getOwnPropertySymbols(source);
+
+    for (i = 0; i < sourceSymbolKeys.length; i++) {
+      key = sourceSymbolKeys[i];
+      if (excluded.indexOf(key) >= 0) continue;
+      if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue;
+      target[key] = source[key];
+    }
+  }
+
+  return target;
+}
+
 function _readOnlyError(name) {
   throw new TypeError("\"" + name + "\" is read-only");
 }
@@ -872,20 +908,34 @@ var BooleanInput = /*#__PURE__*/React__default["default"].forwardRef(function (_
 });
 
 var Collapse = function Collapse(props) {
-  var _classNames4;
+  var _classNames5;
 
   var _useState = React.useState(props.initCollapsed || props.collapsed),
       _useState2 = _slicedToArray(_useState, 2),
       collapsed = _useState2[0],
       setCollapsed = _useState2[1];
 
+  var _useState3 = React.useState(false),
+      _useState4 = _slicedToArray(_useState3, 2),
+      expandedAll = _useState4[0],
+      setExpandedAll = _useState4[1];
+
   var classes = useCustomStyle();
 
   var toggle = function toggle(e) {
-    if (e && e.preventDefault) e.preventDefault();
+    if (e && e.preventDefault) e.stopPropagation();
     setCollapsed(!collapsed);
   };
 
+  var childrenWithProps = React__default["default"].Children.map(props.children, function (child) {
+    if ( /*#__PURE__*/React__default["default"].isValidElement(child)) {
+      return /*#__PURE__*/React__default["default"].cloneElement(child, {
+        collapsed: expandedAll
+      });
+    }
+
+    return child;
+  });
   return /*#__PURE__*/React__default["default"].createElement("div", null, /*#__PURE__*/React__default["default"].createElement("hr", {
     className: classNames__default["default"](_defineProperty$1({}, classes.collapse_error, props.errored))
   }), /*#__PURE__*/React__default["default"].createElement("div", {
@@ -893,17 +943,29 @@ var Collapse = function Collapse(props) {
     onClick: toggle
   }, /*#__PURE__*/React__default["default"].createElement("span", {
     className: classNames__default["default"](classes.collapse_label, _defineProperty$1({}, classes.collapse_error, props.errored))
-  }, props.label), /*#__PURE__*/React__default["default"].createElement("button", {
+  }, props.label), /*#__PURE__*/React__default["default"].createElement("div", {
+    style: {
+      marginLeft: 'auto'
+    },
+    className: classNames__default["default"](classes.flex)
+  }, /*#__PURE__*/React__default["default"].createElement("button", {
     type: "button",
     className: classNames__default["default"](classes.btn, classes.btn_sm, _defineProperty$1({}, classes.collapse_error, props.errored)),
+    onClick: function onClick(e) {
+      if (e) e.stopPropagation();
+      setExpandedAll(!expandedAll);
+    }
+  }, expandedAll ? 'Expand all' : 'Collapse all'), /*#__PURE__*/React__default["default"].createElement("button", {
+    type: "button",
+    className: classNames__default["default"](classes.btn, classes.btn_sm, classes.ml_5, _defineProperty$1({}, classes.collapse_error, props.errored)),
     onClick: toggle
   }, !!collapsed && /*#__PURE__*/React__default["default"].createElement(reactFeather.Eye, {
     size: 16
   }), !collapsed && /*#__PURE__*/React__default["default"].createElement(reactFeather.EyeOff, {
     size: 16
-  }))), /*#__PURE__*/React__default["default"].createElement("div", {
-    className: classNames__default["default"]("".concat(classes.ml_10), (_classNames4 = {}, _defineProperty$1(_classNames4, classes.display__none, !!collapsed), _defineProperty$1(_classNames4, classes.flex, !!props.inline), _defineProperty$1(_classNames4, classes.collapse__inline, !!props.inline), _classNames4))
-  }, props.children), props.lineEnd && /*#__PURE__*/React__default["default"].createElement("hr", null));
+  })))), /*#__PURE__*/React__default["default"].createElement("div", {
+    className: classNames__default["default"]("".concat(classes.ml_10), (_classNames5 = {}, _defineProperty$1(_classNames5, classes.display__none, !!collapsed), _defineProperty$1(_classNames5, classes.flex, !!props.inline), _defineProperty$1(_classNames5, classes.collapse__inline, !!props.inline), _classNames5))
+  }, childrenWithProps), props.lineEnd && /*#__PURE__*/React__default["default"].createElement("hr", null));
 };
 
 var option = function option(x) {
@@ -28538,6 +28600,13 @@ function CodeInput(_ref) {
       e.stopImmediatePropagation();
     });
     if (setRef) setRef(e);
+    e.dispatch({
+      changes: {
+        from: 0,
+        to: e.state.doc.length,
+        insert: value === null || value === undefined ? '' : _typeof$1(value) === 'object' ? JSON.stringify(value, null, 2) : value
+      }
+    });
     setEditor(e);
   }, []);
   React.useEffect(function () {
@@ -29036,6 +29105,8 @@ var ControlledInput = function ControlledInput(_ref) {
   }, component ? component(field, props) : /*#__PURE__*/React__default["default"].cloneElement(children, _objectSpread2$1({}, props)));
 };
 
+var _excluded = ["schema", "flow", "parent", "inputWrapper", "maybeCustomHttpClient", "errorDisplayed", "value", "step", "functionalProperty", "index"];
+
 var usePrevious = function usePrevious(value) {
   // The ref object is a generic container whose current property is mutable ...
   // ... and can hold any value, similar to an instance property on a class
@@ -29055,7 +29126,8 @@ var BasicWrapper = function BasicWrapper(_ref) {
       label = _ref.label,
       help = _ref.help,
       children = _ref.children,
-      render = _ref.render;
+      render = _ref.render,
+      collapsed = _ref.collapsed;
 
   if (_typeof$1(entry) === 'object') {
     return children;
@@ -29084,10 +29156,20 @@ var BasicWrapper = function BasicWrapper(_ref) {
       label: label,
       error: error,
       help: help,
-      children: children
+      children: children,
+      collapsed: collapsed
     });
   }
 
+  var childrenWithProps = React__default["default"].Children.map(children, function (child) {
+    if ( /*#__PURE__*/React__default["default"].isValidElement(child)) {
+      return /*#__PURE__*/React__default["default"].cloneElement(child, {
+        collapsed: collapsed
+      });
+    }
+
+    return child;
+  });
   return /*#__PURE__*/React__default["default"].createElement("div", {
     className: "".concat(classes.mt_10, " ").concat(className),
     style: {
@@ -29112,7 +29194,7 @@ var BasicWrapper = function BasicWrapper(_ref) {
       marginLeft: '.5rem',
       cursor: 'help'
     }
-  })))), children, error && /*#__PURE__*/React__default["default"].createElement("div", {
+  })))), childrenWithProps, error && /*#__PURE__*/React__default["default"].createElement("div", {
     className: classNames__default["default"](classes.feedback, _defineProperty$1({}, classes.txt_red, errorDisplayed))
   }, error.message));
 };
@@ -29171,14 +29253,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 +29284,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 +29325,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 +29358,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);
 
@@ -29376,7 +29458,11 @@ var Form = /*#__PURE__*/React__default["default"].forwardRef(function (_ref8, re
         }, onError)();
       },
       trigger: trigger,
-      methods: methods
+      methods: _objectSpread2$1(_objectSpread2$1({}, methods), {}, {
+        data: function data() {
+          return cleanOutputArray(getValues(), schema);
+        }
+      })
     };
   });
   return /*#__PURE__*/React__default["default"].createElement(reactHookForm.FormProvider, methods, /*#__PURE__*/React__default["default"].createElement(Watcher, {
@@ -29487,18 +29573,19 @@ 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,
+      collapsed = _ref8.collapsed;
   var classes = useCustomStyle();
 
   var _useFormContext2 = reactHookForm.useFormContext(),
@@ -29519,7 +29606,8 @@ var Step = function Step(_ref9) {
       return !!errors[step] && (dirtyFields[step] || touchedFields[step]);
     });
     return /*#__PURE__*/React__default["default"].createElement(Collapse, _extends({}, entry, {
-      errored: errored
+      errored: errored,
+      collapsed: collapsed
     }), entry.flow.map(function (en, entryIdx) {
       var stp = schema[en];
       _typeof$1(en) === 'object' ? undefined : en.split('.').reduce(function (object, key) {
@@ -29558,11 +29646,13 @@ var Step = function Step(_ref9) {
         entry: en,
         label: functionalProperty(en, (stp === null || stp === void 0 ? void 0 : stp.label) === null ? null : (stp === null || stp === void 0 ? void 0 : stp.label) || en),
         help: stp === null || stp === void 0 ? void 0 : stp.help,
-        render: inputWrapper
+        render: inputWrapper,
+        collapsed: collapsed
       }, /*#__PURE__*/React__default["default"].createElement(Step, {
         entry: en,
         step: stp,
         schema: schema,
+        collapsed: collapsed,
         inputWrapper: inputWrapper,
         httpClient: httpClient,
         defaultValue: stp === null || stp === void 0 ? void 0 : stp.defaultValue,
@@ -29592,12 +29682,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);
@@ -29640,7 +29730,8 @@ var Step = function Step(_ref9) {
           defaultValue: (_props$defaultValue = props.defaultValue) === null || _props$defaultValue === void 0 ? void 0 : _props$defaultValue.value,
           value: props.value,
           index: idx,
-          functionalProperty: functionalProperty
+          functionalProperty: functionalProperty,
+          collapsed: collapsed
         });
       }
     }));
@@ -29801,6 +29892,7 @@ var Step = function Step(_ref9) {
             flow: flow,
             step: step,
             parent: entry,
+            collapsed: collapsed,
             inputWrapper: inputWrapper,
             maybeCustomHttpClient: httpClient,
             value: getValues(entry) || defaultValue,
@@ -29869,11 +29961,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 +30050,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 +30141,20 @@ 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,
+      props = _objectWithoutProperties(_ref12, _excluded);
 
   var _useFormContext4 = reactHookForm.useFormContext(),
       getValues = _useFormContext4.getValues,
@@ -30070,17 +30163,15 @@ var NestedForm = function NestedForm(_ref13) {
       _useFormContext4.trigger;
       _useFormContext4.formState;
 
-  var _useState7 = React.useState(!!step.collapsed),
+  var _useState7 = React.useState(!!step.collapsed || props.collapsed),
       _useState8 = _slicedToArray(_useState7, 2),
       collapsed = _useState8[0],
       setCollapsed = _useState8[1];
 
-  var classes = useCustomStyle(); // TODO - voir ce qui se passe et à quoi ça sert
-  // const v = getValues(parent);
-  // useEffect(() => {
-  //   trigger(parent)
-  // }, [JSON.stringify(v)])
-
+  React.useEffect(function () {
+    setCollapsed(props.collapsed);
+  }, [props.collapsed]);
+  var classes = useCustomStyle();
   var schemaAndFlow = option(step.conditionalSchema).map(function (condiSchema) {
     var ref = option(condiSchema.ref).map(function (ref) {
       return getValues(ref);
@@ -30172,10 +30263,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.49",
   "main": "lib/index.js",
   "module": "lib/esm/index.js",
   "types": "lib/index.js",