@maif/react-forms 1.0.48 → 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) {
@@ -29009,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
@@ -29028,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;
@@ -29057,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: {
@@ -29085,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));
 };
@@ -29475,7 +29550,8 @@ var Step = function Step(_ref8) {
       index = _ref8.index,
       functionalProperty = _ref8.functionalProperty,
       parent = _ref8.parent,
-      onAfterChange = _ref8.onAfterChange;
+      onAfterChange = _ref8.onAfterChange,
+      collapsed = _ref8.collapsed;
   var classes = useCustomStyle();
 
   var _useFormContext2 = useFormContext(),
@@ -29496,7 +29572,8 @@ var Step = function Step(_ref8) {
       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) {
@@ -29535,11 +29612,13 @@ var Step = function Step(_ref8) {
         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,
@@ -29617,7 +29696,8 @@ var Step = function Step(_ref8) {
           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
         });
       }
     }));
@@ -29778,6 +29858,7 @@ var Step = function Step(_ref8) {
             flow: flow,
             step: step,
             parent: entry,
+            collapsed: collapsed,
             inputWrapper: inputWrapper,
             maybeCustomHttpClient: httpClient,
             value: getValues(entry) || defaultValue,
@@ -30038,7 +30119,8 @@ var NestedForm = function NestedForm(_ref12) {
       value = _ref12.value,
       step = _ref12.step,
       functionalProperty = _ref12.functionalProperty,
-      index = _ref12.index;
+      index = _ref12.index,
+      props = _objectWithoutProperties(_ref12, _excluded);
 
   var _useFormContext4 = useFormContext(),
       getValues = _useFormContext4.getValues,
@@ -30047,17 +30129,15 @@ var NestedForm = function NestedForm(_ref12) {
       _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);

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) {
@@ -29043,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
@@ -29062,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;
@@ -29091,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: {
@@ -29119,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));
 };
@@ -29509,7 +29584,8 @@ var Step = function Step(_ref8) {
       index = _ref8.index,
       functionalProperty = _ref8.functionalProperty,
       parent = _ref8.parent,
-      onAfterChange = _ref8.onAfterChange;
+      onAfterChange = _ref8.onAfterChange,
+      collapsed = _ref8.collapsed;
   var classes = useCustomStyle();
 
   var _useFormContext2 = reactHookForm.useFormContext(),
@@ -29530,7 +29606,8 @@ var Step = function Step(_ref8) {
       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) {
@@ -29569,11 +29646,13 @@ var Step = function Step(_ref8) {
         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,
@@ -29651,7 +29730,8 @@ var Step = function Step(_ref8) {
           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
         });
       }
     }));
@@ -29812,6 +29892,7 @@ var Step = function Step(_ref8) {
             flow: flow,
             step: step,
             parent: entry,
+            collapsed: collapsed,
             inputWrapper: inputWrapper,
             maybeCustomHttpClient: httpClient,
             value: getValues(entry) || defaultValue,
@@ -30072,7 +30153,8 @@ var NestedForm = function NestedForm(_ref12) {
       value = _ref12.value,
       step = _ref12.step,
       functionalProperty = _ref12.functionalProperty,
-      index = _ref12.index;
+      index = _ref12.index,
+      props = _objectWithoutProperties(_ref12, _excluded);
 
   var _useFormContext4 = reactHookForm.useFormContext(),
       getValues = _useFormContext4.getValues,
@@ -30081,17 +30163,15 @@ var NestedForm = function NestedForm(_ref12) {
       _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);

package/package.json

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