@maif/react-forms 1.0.47 → 1.0.50

package/lib/esm/index.js

@@ -848,7 +848,7 @@ var Collapse = function Collapse(props) {
   var classes = useCustomStyle();
 
   var toggle = function toggle(e) {
-    if (e && e.preventDefault) e.preventDefault();
+    if (e && e.preventDefault) e.stopPropagation();
     setCollapsed(!collapsed);
   };
 
@@ -861,7 +861,7 @@ var Collapse = function Collapse(props) {
     className: classNames(classes.collapse_label, _defineProperty$1({}, classes.collapse_error, props.errored))
   }, props.label), /*#__PURE__*/React.createElement("button", {
     type: "button",
-    className: classNames(classes.btn, classes.btn_sm, _defineProperty$1({}, classes.collapse_error, props.errored)),
+    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
@@ -28504,6 +28504,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 () {
@@ -29274,6 +29281,11 @@ var Form = /*#__PURE__*/React.forwardRef(function (_ref7, ref) {
     });
   };
 
+  var _useState = useState(false),
+      _useState2 = _slicedToArray(_useState, 2),
+      expandedAll = _useState2[0],
+      setExpandedAll = _useState2[1];
+
   var defaultValues = getDefaultValues(formFlow, schema, value); //FIXME: get real schema through the switch
 
   var _resolver = function resolver(rawData) {
@@ -29293,10 +29305,10 @@ var Form = /*#__PURE__*/React.forwardRef(function (_ref7, ref) {
     mode: 'onChange'
   });
 
-  var _useState = useState(false),
-      _useState2 = _slicedToArray(_useState, 2),
-      initialReseted = _useState2[0],
-      setReset = _useState2[1];
+  var _useState3 = useState(false),
+      _useState4 = _slicedToArray(_useState3, 2),
+      initialReseted = _useState4[0],
+      setReset = _useState4[1];
 
   useEffect(function () {
     _reset(cleanInputArray(value, defaultValues, flow, schema));
@@ -29342,7 +29354,11 @@ var Form = /*#__PURE__*/React.forwardRef(function (_ref7, 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, {
@@ -29358,7 +29374,19 @@ var Form = /*#__PURE__*/React.forwardRef(function (_ref7, ref) {
       var clean = cleanOutputArray(data, schema);
       onSubmit(clean);
     }, onError)
-  }, formFlow.map(function (entry, idx) {
+  }, /*#__PURE__*/React.createElement("div", {
+    className: classNames(classes.flex, classes.mt_20)
+  }, /*#__PURE__*/React.createElement("button", {
+    type: "button",
+    className: classNames(classes.btn, classes.btn_sm),
+    style: {
+      marginLeft: 'auto'
+    },
+    onClick: function onClick(e) {
+      if (e) e.stopPropagation();
+      setExpandedAll(!expandedAll);
+    }
+  }, expandedAll ? 'Expand all' : 'Collapse all')), formFlow.map(function (entry, idx) {
     var step = schema[entry];
 
     if (!step && typeof entry === 'string') {
@@ -29406,7 +29434,8 @@ var Form = /*#__PURE__*/React.forwardRef(function (_ref7, ref) {
       schema: schema,
       inputWrapper: inputWrapper,
       httpClient: maybeCustomHttpClient,
-      functionalProperty: functionalProperty
+      functionalProperty: functionalProperty,
+      expandedAll: expandedAll
     }));
   }), /*#__PURE__*/React.createElement(Footer, {
     render: footer,
@@ -29464,7 +29493,8 @@ var Step = function Step(_ref8) {
       index = _ref8.index,
       functionalProperty = _ref8.functionalProperty,
       parent = _ref8.parent,
-      onAfterChange = _ref8.onAfterChange;
+      onAfterChange = _ref8.onAfterChange,
+      expandedAll = _ref8.expandedAll;
   var classes = useCustomStyle();
 
   var _useFormContext2 = useFormContext(),
@@ -29529,6 +29559,7 @@ var Step = function Step(_ref8) {
         entry: en,
         step: stp,
         schema: schema,
+        expandedAll: expandedAll,
         inputWrapper: inputWrapper,
         httpClient: httpClient,
         defaultValue: stp === null || stp === void 0 ? void 0 : stp.defaultValue,
@@ -29606,7 +29637,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,
+          expandedAll: expandedAll
         });
       }
     }));
@@ -29772,7 +29804,8 @@ var Step = function Step(_ref8) {
             value: getValues(entry) || defaultValue,
             index: index,
             functionalProperty: functionalProperty,
-            errorDisplayed: errorDisplayed
+            errorDisplayed: errorDisplayed,
+            expandedAll: expandedAll
           }));
 
         case format.code:
@@ -29841,15 +29874,15 @@ var Step = function Step(_ref8) {
           var FileInput = function FileInput(_ref10) {
             var onChange = _ref10.onChange;
 
-            var _useState3 = useState(false),
-                _useState4 = _slicedToArray(_useState3, 2),
-                uploading = _useState4[0],
-                setUploading = _useState4[1];
-
-            var _useState5 = useState(undefined),
+            var _useState5 = useState(false),
                 _useState6 = _slicedToArray(_useState5, 2),
-                input = _useState6[0],
-                setInput = _useState6[1];
+                uploading = _useState6[0],
+                setUploading = _useState6[1];
+
+            var _useState7 = useState(undefined),
+                _useState8 = _slicedToArray(_useState7, 2),
+                input = _useState8[0],
+                setInput = _useState8[1];
 
             var setFiles = function setFiles(e) {
               var files = e.target.files;
@@ -30027,7 +30060,8 @@ var NestedForm = function NestedForm(_ref12) {
       value = _ref12.value,
       step = _ref12.step,
       functionalProperty = _ref12.functionalProperty,
-      index = _ref12.index;
+      index = _ref12.index,
+      expandedAll = _ref12.expandedAll;
 
   var _useFormContext4 = useFormContext(),
       getValues = _useFormContext4.getValues,
@@ -30036,17 +30070,15 @@ var NestedForm = function NestedForm(_ref12) {
       _useFormContext4.trigger;
       _useFormContext4.formState;
 
-  var _useState7 = useState(!!step.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)])
+  var _useState9 = useState(!!step.collapsed),
+      _useState10 = _slicedToArray(_useState9, 2),
+      collapsed = _useState10[0],
+      setCollapsed = _useState10[1];
 
+  var classes = useCustomStyle();
+  useEffect(function () {
+    if (!expandedAll || expandedAll && parent.split('.').length >= 2) setCollapsed(expandedAll);
+  }, [expandedAll]);
   var schemaAndFlow = option(step.conditionalSchema).map(function (condiSchema) {
     var ref = option(condiSchema.ref).map(function (ref) {
       return getValues(ref);
@@ -30165,7 +30197,8 @@ var NestedForm = function NestedForm(_ref12) {
       inputWrapper: inputWrapper,
       httpClient: maybeCustomHttpClient,
       defaultValue: value && value[entry],
-      functionalProperty: functionalProperty
+      functionalProperty: functionalProperty,
+      expandedAll: expandedAll
     }));
   }));
 };

package/lib/index.js

@@ -882,7 +882,7 @@ var Collapse = function Collapse(props) {
   var classes = useCustomStyle();
 
   var toggle = function toggle(e) {
-    if (e && e.preventDefault) e.preventDefault();
+    if (e && e.preventDefault) e.stopPropagation();
     setCollapsed(!collapsed);
   };
 
@@ -895,7 +895,7 @@ var Collapse = function Collapse(props) {
     className: classNames__default["default"](classes.collapse_label, _defineProperty$1({}, classes.collapse_error, props.errored))
   }, props.label), /*#__PURE__*/React__default["default"].createElement("button", {
     type: "button",
-    className: classNames__default["default"](classes.btn, classes.btn_sm, _defineProperty$1({}, classes.collapse_error, props.errored)),
+    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
@@ -28538,6 +28538,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 () {
@@ -29308,6 +29315,11 @@ var Form = /*#__PURE__*/React__default["default"].forwardRef(function (_ref7, re
     });
   };
 
+  var _useState = React.useState(false),
+      _useState2 = _slicedToArray(_useState, 2),
+      expandedAll = _useState2[0],
+      setExpandedAll = _useState2[1];
+
   var defaultValues = getDefaultValues(formFlow, schema, value); //FIXME: get real schema through the switch
 
   var _resolver = function resolver(rawData) {
@@ -29327,10 +29339,10 @@ var Form = /*#__PURE__*/React__default["default"].forwardRef(function (_ref7, re
     mode: 'onChange'
   });
 
-  var _useState = React.useState(false),
-      _useState2 = _slicedToArray(_useState, 2),
-      initialReseted = _useState2[0],
-      setReset = _useState2[1];
+  var _useState3 = React.useState(false),
+      _useState4 = _slicedToArray(_useState3, 2),
+      initialReseted = _useState4[0],
+      setReset = _useState4[1];
 
   React.useEffect(function () {
     _reset(cleanInputArray(value, defaultValues, flow, schema));
@@ -29376,7 +29388,11 @@ var Form = /*#__PURE__*/React__default["default"].forwardRef(function (_ref7, 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, {
@@ -29392,7 +29408,19 @@ var Form = /*#__PURE__*/React__default["default"].forwardRef(function (_ref7, re
       var clean = cleanOutputArray(data, schema);
       onSubmit(clean);
     }, onError)
-  }, formFlow.map(function (entry, idx) {
+  }, /*#__PURE__*/React__default["default"].createElement("div", {
+    className: classNames__default["default"](classes.flex, classes.mt_20)
+  }, /*#__PURE__*/React__default["default"].createElement("button", {
+    type: "button",
+    className: classNames__default["default"](classes.btn, classes.btn_sm),
+    style: {
+      marginLeft: 'auto'
+    },
+    onClick: function onClick(e) {
+      if (e) e.stopPropagation();
+      setExpandedAll(!expandedAll);
+    }
+  }, expandedAll ? 'Expand all' : 'Collapse all')), formFlow.map(function (entry, idx) {
     var step = schema[entry];
 
     if (!step && typeof entry === 'string') {
@@ -29440,7 +29468,8 @@ var Form = /*#__PURE__*/React__default["default"].forwardRef(function (_ref7, re
       schema: schema,
       inputWrapper: inputWrapper,
       httpClient: maybeCustomHttpClient,
-      functionalProperty: functionalProperty
+      functionalProperty: functionalProperty,
+      expandedAll: expandedAll
     }));
   }), /*#__PURE__*/React__default["default"].createElement(Footer, {
     render: footer,
@@ -29498,7 +29527,8 @@ var Step = function Step(_ref8) {
       index = _ref8.index,
       functionalProperty = _ref8.functionalProperty,
       parent = _ref8.parent,
-      onAfterChange = _ref8.onAfterChange;
+      onAfterChange = _ref8.onAfterChange,
+      expandedAll = _ref8.expandedAll;
   var classes = useCustomStyle();
 
   var _useFormContext2 = reactHookForm.useFormContext(),
@@ -29563,6 +29593,7 @@ var Step = function Step(_ref8) {
         entry: en,
         step: stp,
         schema: schema,
+        expandedAll: expandedAll,
         inputWrapper: inputWrapper,
         httpClient: httpClient,
         defaultValue: stp === null || stp === void 0 ? void 0 : stp.defaultValue,
@@ -29640,7 +29671,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,
+          expandedAll: expandedAll
         });
       }
     }));
@@ -29806,7 +29838,8 @@ var Step = function Step(_ref8) {
             value: getValues(entry) || defaultValue,
             index: index,
             functionalProperty: functionalProperty,
-            errorDisplayed: errorDisplayed
+            errorDisplayed: errorDisplayed,
+            expandedAll: expandedAll
           }));
 
         case format.code:
@@ -29875,15 +29908,15 @@ var Step = function Step(_ref8) {
           var FileInput = function FileInput(_ref10) {
             var onChange = _ref10.onChange;
 
-            var _useState3 = React.useState(false),
-                _useState4 = _slicedToArray(_useState3, 2),
-                uploading = _useState4[0],
-                setUploading = _useState4[1];
-
-            var _useState5 = React.useState(undefined),
+            var _useState5 = React.useState(false),
                 _useState6 = _slicedToArray(_useState5, 2),
-                input = _useState6[0],
-                setInput = _useState6[1];
+                uploading = _useState6[0],
+                setUploading = _useState6[1];
+
+            var _useState7 = React.useState(undefined),
+                _useState8 = _slicedToArray(_useState7, 2),
+                input = _useState8[0],
+                setInput = _useState8[1];
 
             var setFiles = function setFiles(e) {
               var files = e.target.files;
@@ -30061,7 +30094,8 @@ var NestedForm = function NestedForm(_ref12) {
       value = _ref12.value,
       step = _ref12.step,
       functionalProperty = _ref12.functionalProperty,
-      index = _ref12.index;
+      index = _ref12.index,
+      expandedAll = _ref12.expandedAll;
 
   var _useFormContext4 = reactHookForm.useFormContext(),
       getValues = _useFormContext4.getValues,
@@ -30070,17 +30104,15 @@ var NestedForm = function NestedForm(_ref12) {
       _useFormContext4.trigger;
       _useFormContext4.formState;
 
-  var _useState7 = React.useState(!!step.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)])
+  var _useState9 = React.useState(!!step.collapsed),
+      _useState10 = _slicedToArray(_useState9, 2),
+      collapsed = _useState10[0],
+      setCollapsed = _useState10[1];
 
+  var classes = useCustomStyle();
+  React.useEffect(function () {
+    if (!expandedAll || expandedAll && parent.split('.').length >= 2) setCollapsed(expandedAll);
+  }, [expandedAll]);
   var schemaAndFlow = option(step.conditionalSchema).map(function (condiSchema) {
     var ref = option(condiSchema.ref).map(function (ref) {
       return getValues(ref);
@@ -30199,7 +30231,8 @@ var NestedForm = function NestedForm(_ref12) {
       inputWrapper: inputWrapper,
       httpClient: maybeCustomHttpClient,
       defaultValue: value && value[entry],
-      functionalProperty: functionalProperty
+      functionalProperty: functionalProperty,
+      expandedAll: expandedAll
     }));
   }));
 };

package/package.json

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