@maif/react-forms 1.0.54 → 1.0.57

package/lib/index.js

@@ -2,19 +2,20 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+require('fs');
 var yup = require('yup');
 var React = require('react');
 var yup$1 = require('@hookform/resolvers/yup');
 var classNames = require('classnames');
+var deepEqual = require('fast-deep-equal');
 var reactFeather = require('react-feather');
 var reactHookForm = require('react-hook-form');
 var reactRainbowComponents = require('react-rainbow-components');
 var ReactToolTip = require('react-tooltip');
 var uuid = require('uuid');
-var reactJss = require('react-jss');
 var CreatableSelect = require('react-select/creatable');
 var Select = require('react-select');
-var deepEqual = require('fast-deep-equal');
+var hash$1 = require('object-hash');
 var showdown = require('showdown');
 require('@fortawesome/fontawesome-free/css/all.css');
 require('highlight.js/styles/monokai.css');
@@ -43,10 +44,11 @@ function _interopNamespace(e) {
 var yup__namespace = /*#__PURE__*/_interopNamespace(yup);
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var classNames__default = /*#__PURE__*/_interopDefaultLegacy(classNames);
+var deepEqual__default = /*#__PURE__*/_interopDefaultLegacy(deepEqual);
 var ReactToolTip__default = /*#__PURE__*/_interopDefaultLegacy(ReactToolTip);
 var CreatableSelect__default = /*#__PURE__*/_interopDefaultLegacy(CreatableSelect);
 var Select__default = /*#__PURE__*/_interopDefaultLegacy(Select);
-var deepEqual__default = /*#__PURE__*/_interopDefaultLegacy(deepEqual);
+var hash__default = /*#__PURE__*/_interopDefaultLegacy(hash$1);
 var showdown__default = /*#__PURE__*/_interopDefaultLegacy(showdown);
 var hljs__default = /*#__PURE__*/_interopDefaultLegacy(hljs);
 
@@ -108,7 +110,8 @@ var _matches = function matches() {
   var message = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "This field does not match the pattern";
   return function (r) {
     return r.matches(regexp, {
-      message: message
+      message: message,
+      excludeEmptyString: true
     });
   };
 }; //string & number
@@ -249,7 +252,7 @@ var _oneOf = function oneOf(arrayOfValues) {
   return function (r) {
     return r.oneOf(arrayOfValues.map(maybeRef), message);
   };
-};
+}; //todo: rename by notOneOf
 
 var _blacklist = function blacklist(arrayOfValues) {
   var message = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "This value can't include the following values ".concat(arrayOfValues.join(', '));
@@ -565,279 +568,12 @@ function _nonIterableRest() {
   throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
 
-var _switch_button_on, _style;
-
-var buttonOutline = function buttonOutline(color, darker) {
-  return {
-    color: color,
-    borderColor: color,
-    "&:hover": {
-      color: '#fff',
-      backgroundColor: color,
-      borderColor: darker
-    },
-    "&.active": {
-      color: '#fff',
-      backgroundColor: color,
-      borderColor: darker
-    }
-  };
-};
-
-var style = (_style = {
-  input: {
-    display: "block",
-    width: "100%",
-    padding: "8px 12px",
-    fontSize: "1rem",
-    color: "#495057",
-    border: "1px solid #ced4da",
-    borderRadius: 4,
-    "&[readonly]": {
-      backgroundColor: "#e9ecef",
-      opacity: 1
-    }
-  },
-  btn: {
-    borderRadius: 5,
-    padding: 10,
-    fontSize: "1rem",
-    cursor: "pointer",
-    borderWidth: '1px',
-    backgroundColor: '#fff',
-    '&:disabled': {
-      opacity: .6,
-      cursor: 'not-allowed'
-    }
-  },
-  btn_sm: {
-    fontSize: "0.875rem",
-    padding: ".25rem .5rem",
-    lineHeight: "1.5",
-    borderRadius: ".2rem"
-  },
-  btn_group: {
-    "& > button:not(:last-child)": {
-      borderTopRightRadius: 0,
-      borderBottomRightRadius: 0
-    },
-    "& > button:not(:first-child)": {
-      borderTopLeftRadius: 0,
-      borderBottomLeftRadius: 0
-    }
-  },
-  btn_red: buttonOutline("#dc3545", "#bd2130"),
-  btn_green: buttonOutline("#28a745", "#1e7e34"),
-  btn_blue: buttonOutline("#007bff", "#0069d9"),
-  btn_grey: buttonOutline("#6c757d", "#5c636a"),
-  txt_red: {
-    color: "#dc3545"
-  },
-  ml_5: {
-    marginLeft: 5
-  },
-  ml_10: {
-    marginLeft: 10
-  },
-  mr_5: {
-    marginRight: 5
-  },
-  mr_10: {
-    marginRight: 10
-  },
-  mt_5: {
-    marginTop: 5
-  },
-  mt_10: {
-    marginTop: 10
-  },
-  mt_20: {
-    marginTop: 20
-  },
-  mb_5: {
-    marginBottom: 5
-  },
-  mb_10: {
-    marginBottom: 10
-  },
-  mb_20: {
-    marginBottom: 20
-  },
-  pt_15: {
-    paddingTop: 15
-  },
-  p_15: {
-    padding: 15
-  },
-  pr_15: {
-    paddingRight: 15
-  },
-  w_100: {
-    width: '100%'
-  },
-  w_50: {
-    width: '50%'
-  },
-  d_none: {
-    display: "none"
-  },
-  flexWrap: {
-    flexWrap: 'wrap'
-  },
-  flex: {
-    display: "flex"
-  },
-  flexColumn: {
-    flexDirection: "column"
-  },
-  flex_grow_1: {
-    flexGrow: 1
-  },
-  jc_between: {
-    justifyContent: "space-between"
-  },
-  jc_end: {
-    justifyContent: "end"
-  },
-  jc_flex_end: {
-    justifyContent: "flex-end"
-  },
-  jc_flex_start: {
-    justifyContent: "flex-start"
-  },
-  ac_center: {
-    alignContent: "center"
-  },
-  ai_center: {
-    alignItems: "center"
-  },
-  cursor_pointer: {
-    cursor: "pointer"
-  },
-  cursor_not_allowed: {
-    cursor: "not-allowed"
-  },
-  collapse: {
-    display: "flex",
-    justifyContent: "space-between",
-    cursor: "pointer"
-  },
-  collapse_label: {
-    fontWeight: "bold",
-    marginTop: 7
-  }
-}, _defineProperty$1(_style, "collapse_label", {
-  fontWeight: "bold",
-  marginTop: 7
-}), _defineProperty$1(_style, "collapse_error", {
-  color: '#dc3545'
-}), _defineProperty$1(_style, "datepicker", {
-  "& input": {
-    borderRadius: "4px"
-  }
-}), _defineProperty$1(_style, "code", {}), _defineProperty$1(_style, "input__boolean__on", {
-  color: "MediumSeaGreen"
-}), _defineProperty$1(_style, "input__boolean__off", {
-  color: "tomato"
-}), _defineProperty$1(_style, "input__invalid", {
-  borderColor: '#dc3545 !important'
-}), _defineProperty$1(_style, "feedback", {
-  width: "100%",
-  marginTop: ".25rem",
-  fontSize: "80%"
-}), _defineProperty$1(_style, "display__none", {
-  display: "none"
-}), _defineProperty$1(_style, "collapse__inline", {
-  "& .form-group+.form-group": {
-    marginLeft: '20px'
-  }
-}), _defineProperty$1(_style, "nestedform__border", {
-  borderLeft: '2px solid lightGray',
-  paddingLeft: '0.5rem',
-  marginLeft: '0.5rem',
-  marginBottom: '.5rem',
-  paddingBottom: '1rem',
-  marginRight: '.5rem',
-  paddingRight: '2.5rem'
-}), _defineProperty$1(_style, "border__error", {
-  borderColor: "#dc3545"
-}), _defineProperty$1(_style, "btn_for_descriptionToolbar", {
-  textAlign: "left",
-  cursor: "pointer",
-  height: "22px",
-  padding: "4px",
-  border: "none",
-  background: "none",
-  color: "#242729",
-  marginRight: "5px",
-  marginLeft: "5px"
-}), _defineProperty$1(_style, "content_switch_button_on", {
-  width: "35px",
-  height: "22px",
-  borderRadius: "20px",
-  display: "flex",
-  marginTop: "10px",
-  backgroundColor: "green",
-  border: "1px solid green",
-  justifyContent: "flex-end"
-}), _defineProperty$1(_style, "content_switch_button_off", {
-  width: "35px",
-  height: "22px",
-  borderRadius: "20px",
-  display: "flex",
-  marginTop: "10px",
-  backgroundColor: "#dc3545",
-  border: "1px solid #dc3545",
-  justifyContent: "flex-start"
-}), _defineProperty$1(_style, "content_switch_button_null", {
-  width: "35px",
-  height: "22px",
-  borderRadius: "20px",
-  display: "flex",
-  marginTop: "10px",
-  backgroundColor: "#fff",
-  border: "1px solid #dfdfdf",
-  justifyContent: "flex-start"
-}), _defineProperty$1(_style, "switch_button_on", (_switch_button_on = {
-  backgroundColor: "#fff",
-  borderRadius: "20px",
-  cursor: "pointer",
-  width: "20px",
-  height: "20px"
-}, _defineProperty$1(_switch_button_on, "backgroundColor", "#fff"), _defineProperty$1(_switch_button_on, "borderRadius", "20px"), _switch_button_on)), _defineProperty$1(_style, "switch_button_off", {
-  backgroundColor: "#fff",
-  borderRadius: "20px",
-  cursor: "pointer",
-  width: "20px",
-  height: "20px",
-  border: "1px solid #dfdfdf",
-  boxShadow: "1px 0px 5px 0px rgba(0, 0, 0, 0.3)"
-}), _defineProperty$1(_style, "switch_button_null", {
-  backgroundColor: "#fff",
-  borderRadius: "20px",
-  cursor: "pointer",
-  width: "22px",
-  height: "22px",
-  marginTop: "-1px",
-  marginLeft: "-1px",
-  border: "1px solid #dfdfdf",
-  boxShadow: "1px 0px 5px 0px rgba(0, 0, 0, 0.3)"
-}), _style);
-
-var useCustomStyle = function useCustomStyle() {
-  var overrideStyle = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  var useStyle = reactJss.createUseStyles(_objectSpread2$1(_objectSpread2$1({}, style), overrideStyle));
-  var classes = useStyle();
-  return classes;
-};
-
 var BooleanInput = /*#__PURE__*/React__default["default"].forwardRef(function (_ref, ref) {
   var _classNames;
 
   var onChange = _ref.onChange,
       value = _ref.value,
       readOnly = _ref.readOnly;
-  var classes = useCustomStyle();
 
   var handleClick = function handleClick(value) {
     if (!readOnly) {
@@ -846,28 +582,28 @@ var BooleanInput = /*#__PURE__*/React__default["default"].forwardRef(function (_
   };
 
   return /*#__PURE__*/React__default["default"].createElement("div", {
-    className: classNames__default["default"]((_classNames = {}, _defineProperty$1(_classNames, classes.cursor_pointer, !readOnly), _defineProperty$1(_classNames, classes.cursor_not_allowed, readOnly), _classNames))
+    className: classNames__default["default"]((_classNames = {}, _defineProperty$1(_classNames, 'cursor_pointer', !readOnly), _defineProperty$1(_classNames, 'cursor_not_allowed', readOnly), _classNames))
   }, !!value && /*#__PURE__*/React__default["default"].createElement("div", {
-    className: classNames__default["default"](classes.content_switch_button_on),
+    className: classNames__default["default"]('content_switch_button_on'),
     onClick: function onClick() {
       return handleClick(false);
     }
   }, /*#__PURE__*/React__default["default"].createElement("div", {
-    className: classNames__default["default"](classes.switch_button_on)
+    className: classNames__default["default"]('switch_button_on')
   })), !value && value !== null && /*#__PURE__*/React__default["default"].createElement("div", {
-    className: classNames__default["default"](classes.content_switch_button_off),
+    className: classNames__default["default"]('content_switch_button_off'),
     onClick: function onClick() {
       return handleClick(true);
     }
   }, /*#__PURE__*/React__default["default"].createElement("div", {
-    className: classNames__default["default"](classes.switch_button_off)
+    className: classNames__default["default"]('switch_button_off')
   })), value === null && /*#__PURE__*/React__default["default"].createElement("div", {
-    className: classNames__default["default"](classes.content_switch_button_null),
+    className: classNames__default["default"]('content_switch_button_null'),
     onClick: function onClick() {
       return handleClick(true);
     }
   }, /*#__PURE__*/React__default["default"].createElement("div", {
-    className: classNames__default["default"](classes.switch_button_null)
+    className: classNames__default["default"]('switch_button_null')
   })));
 });
 
@@ -879,30 +615,28 @@ var Collapse = function Collapse(props) {
       collapsed = _useState2[0],
       setCollapsed = _useState2[1];
 
-  var classes = useCustomStyle();
-
   var toggle = function toggle(e) {
     if (e && e.preventDefault) e.stopPropagation();
     setCollapsed(!collapsed);
   };
 
   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))
+    className: classNames__default["default"](_defineProperty$1({}, 'collapse_error', props.errored))
   }), /*#__PURE__*/React__default["default"].createElement("div", {
-    className: "".concat(classes.cursor_pointer, " ").concat(classes.flex, " ").concat(classes.jc_between),
+    className: "cursor_pointer flex jc_between",
     onClick: toggle
   }, /*#__PURE__*/React__default["default"].createElement("span", {
-    className: classNames__default["default"](classes.collapse_label, _defineProperty$1({}, classes.collapse_error, props.errored))
+    className: classNames__default["default"]('collapse_label', _defineProperty$1({}, 'collapse_error', props.errored))
   }, props.label), /*#__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)),
+    className: classNames__default["default"]('btn', 'btn_sm', 'ml_5', _defineProperty$1({}, '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))
+    className: classNames__default["default"]('ml_10', (_classNames4 = {}, _defineProperty$1(_classNames4, 'display__none', !!collapsed), _defineProperty$1(_classNames4, 'flex', !!props.inline), _defineProperty$1(_classNames4, 'collapse__inline', !!props.inline), _classNames4))
   }, props.children), props.lineEnd && /*#__PURE__*/React__default["default"].createElement("hr", null));
 };
 
@@ -970,6 +704,28 @@ var arrayFlatten = function arrayFlatten(array) {
 
   return array;
 };
+var isDefined = function isDefined(value) {
+  return value !== null && value !== undefined;
+};
+var useHashEffect = function useHashEffect(func, deps) {
+  var isFirst = React.useRef(true);
+  var prevDeps = React.useRef(deps);
+  React.useEffect(function () {
+    if (isFirst.current) {
+      func();
+      isFirst.current = false;
+      return;
+    }
+
+    var depsHash = hash__default["default"](deps);
+    var prevDepsHash = hash__default["default"](prevDeps.current);
+
+    if (depsHash !== prevDepsHash) {
+      prevDeps.current = deps;
+      func();
+    }
+  }, [deps]);
+};
 
 var valueToSelectOption = function valueToSelectOption(value) {
   var possibleValues = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
@@ -1004,7 +760,9 @@ var valueToSelectOption = function valueToSelectOption(value) {
 };
 
 var SelectInput = /*#__PURE__*/React__default["default"].forwardRef(function (props, _) {
-  var classes = useCustomStyle();
+  var _useFormContext = reactHookForm.useFormContext(),
+      getValues = _useFormContext.getValues;
+
   var possibleValues = (props.possibleValues || []).map(function (v) {
     return props.transformer ? typeof props.transformer === 'function' ? props.transformer(v) : {
       label: v[props.transformer.label],
@@ -1043,9 +801,24 @@ var SelectInput = /*#__PURE__*/React__default["default"].forwardRef(function (pr
 
       if (cond) {
         setLoading(true);
-        var promise = isPromise(props.optionsFrom) ? props.optionsFrom : props.httpClient(props.optionsFrom, 'GET').then(function (r) {
-          return r.json();
-        });
+        var promise;
+
+        if (isPromise(props.optionsFrom)) {
+          promise = props.optionsFrom;
+        } else if (typeof props.optionsFrom === 'function') {
+          var result = props.optionsFrom({
+            rawValues: getValues(),
+            value: getValues(props.id)
+          });
+          promise = isPromise(result) ? result : props.httpClient(result, 'GET').then(function (r) {
+            return r.json();
+          });
+        } else {
+          promise = props.httpClient(props.optionsFrom, 'GET').then(function (r) {
+            return r.json();
+          });
+        }
+
         promise.then(function (values) {
           return values.map(function (x) {
             return props.transformer ? props.transformer(x) : valueToSelectOption(x, values, props.isMulti, props.transformer);
@@ -1115,7 +888,7 @@ var SelectInput = /*#__PURE__*/React__default["default"].forwardRef(function (pr
         key: idx,
         type: "button",
         disabled: props.disabled,
-        className: classNames__default["default"](props.className, classes.btn, classes.btn_grey, classes.ml_5, {
+        className: classNames__default["default"](props.className, 'btn btn_grey ml_5', {
           active: active
         }),
         onClick: function onClick() {
@@ -1132,7 +905,6 @@ var SelectInput = /*#__PURE__*/React__default["default"].forwardRef(function (pr
       value: value,
       isDisabled: props.disabled,
       placeholder: props.placeholder,
-      isClearable: true,
       onChange: onChange,
       options: values,
       onCreateOption: function onCreateOption(option) {
@@ -1147,7 +919,6 @@ var SelectInput = /*#__PURE__*/React__default["default"].forwardRef(function (pr
       name: "".concat(props.label, "-search"),
       isLoading: loading,
       value: value,
-      isClearable: true,
       defaultValue: value,
       isDisabled: props.disabled,
       placeholder: props.placeholder,
@@ -1264,13 +1035,12 @@ var ObjectInput = function ObjectInput(props) {
     onChange(newState);
   };
 
-  var classes = useCustomStyle();
   return /*#__PURE__*/React__default["default"].createElement("div", {
     className: props.className
   }, Object.keys(internalState || {}).length === 0 && /*#__PURE__*/React__default["default"].createElement("button", {
     disabled: props.disabled,
     type: "button",
-    className: classNames__default["default"](classes.flex, classes.btn, classes.btn_blue, classes.btn_sm),
+    className: "flex btn btn_blue btn_sm",
     onClick: addFirst
   }, /*#__PURE__*/React__default["default"].createElement(reactFeather.PlusCircle, null)), Object.entries(internalState || {}).map(function (_ref9, idx) {
     var _ref10 = _slicedToArray(_ref9, 2),
@@ -1280,12 +1050,12 @@ var ObjectInput = function ObjectInput(props) {
         value = _ref10$.value;
 
     return /*#__PURE__*/React__default["default"].createElement("div", {
-      className: classNames__default["default"](classes.flex, classes.mt_5),
+      className: "flex mt_5",
       key: idx
     }, /*#__PURE__*/React__default["default"].createElement("input", {
       disabled: props.disabled,
       type: "text",
-      className: classNames__default["default"](classes.w_50, classes.input),
+      className: "w_50 input",
       placeholder: props.placeholderKey,
       value: key,
       onChange: function onChange(e) {
@@ -1294,7 +1064,7 @@ var ObjectInput = function ObjectInput(props) {
     }), /*#__PURE__*/React__default["default"].createElement("input", {
       disabled: props.disabled,
       type: "text",
-      className: classNames__default["default"](classes.w_50, classes.input),
+      className: "w_50 input",
       placeholder: props.placeholderValue,
       value: value,
       onChange: function onChange(e) {
@@ -1303,14 +1073,14 @@ var ObjectInput = function ObjectInput(props) {
     }), /*#__PURE__*/React__default["default"].createElement("button", {
       disabled: props.disabled,
       type: "button",
-      className: classNames__default["default"](classes.flex, classes.btn, classes.btn_red, classes.btn_sm, classes.ml_10),
+      className: "flex btn btn_red btn_sm ml_10",
       onClick: function onClick() {
         return remove(id);
       }
     }, /*#__PURE__*/React__default["default"].createElement(reactFeather.MinusCircle, null)), idx === Object.keys(internalState).length - 1 && /*#__PURE__*/React__default["default"].createElement("button", {
       disabled: props.disabled,
       type: "button",
-      className: classNames__default["default"](classes.flex, classes.btn, classes.btn_blue, classes.btn_sm, classes.ml_5),
+      className: "flex btn btn_blue btn_sm ml_5",
       onClick: addNext
     }, /*#__PURE__*/React__default["default"].createElement(reactFeather.PlusCircle, null)));
   }));
@@ -28715,7 +28485,6 @@ var MarkdownInput = function MarkdownInput(props) {
   };
 
   var injectButtons = function injectButtons() {
-    var classes = useCustomStyle();
     return commands.map(function (command, idx) {
       if (command.component) {
         return command.component(idx);
@@ -28723,7 +28492,7 @@ var MarkdownInput = function MarkdownInput(props) {
 
       return /*#__PURE__*/React__default["default"].createElement("button", {
         type: "button",
-        className: classNames__default["default"](classes.btn_for_descriptionToolbar),
+        className: classNames__default["default"]('btn_for_descriptionToolbar'),
         "aria-label": command.name,
         title: command.name,
         key: "toolbar-btn-".concat(idx),
@@ -28751,7 +28520,6 @@ var MarkdownInput = function MarkdownInput(props) {
     });
   };
 
-  var classes = useCustomStyle();
   return /*#__PURE__*/React__default["default"].createElement("div", {
     className: classNames__default["default"](props.className)
   }, !props.readOnly && /*#__PURE__*/React__default["default"].createElement("div", {
@@ -28760,7 +28528,7 @@ var MarkdownInput = function MarkdownInput(props) {
     }
   }, /*#__PURE__*/React__default["default"].createElement("div", null, /*#__PURE__*/React__default["default"].createElement("div", null, /*#__PURE__*/React__default["default"].createElement("button", {
     type: "button",
-    className: classNames__default["default"](classes.btn, classes.btn_sm),
+    className: "btn btn_sm",
     style: {
       color: !preview ? '#7f96af' : 'white',
       backgroundColor: preview ? '#7f96af' : 'white'
@@ -28770,7 +28538,7 @@ var MarkdownInput = function MarkdownInput(props) {
     }
   }, "Write"), /*#__PURE__*/React__default["default"].createElement("button", {
     type: "button",
-    className: classNames__default["default"](classes.btn, classes.btn_sm, classes.ml_5),
+    className: "btn btn_sm ml_5",
     style: {
       color: preview ? '#7f96af' : 'white',
       backgroundColor: preview ? 'white' : '#7f96af'
@@ -28779,7 +28547,7 @@ var MarkdownInput = function MarkdownInput(props) {
       return setPreview(true);
     }
   }, "Preview"))), /*#__PURE__*/React__default["default"].createElement("div", {
-    className: classNames__default["default"](classes.flex, classes.flexWrap)
+    className: "flex flexWrap"
   }, injectButtons())), !preview && /*#__PURE__*/React__default["default"].createElement(CodeInput, _extends({}, props, {
     setRef: function setRef(e) {
       return ref.current = e;
@@ -28979,15 +28747,14 @@ var CustomizableInput$1 = /*#__PURE__*/React__default["default"].memo(function (
   return prev.field.value === next.field.value && next.errorDisplayed === prev.errorDisplayed;
 });
 var ControlledInput = function ControlledInput(_ref) {
-  var defaultValue = _ref.defaultValue,
-      step = _ref.step,
+  var step = _ref.step,
       entry = _ref.entry,
       children = _ref.children,
       component = _ref.component,
       errorDisplayed = _ref.errorDisplayed;
 
   var _useController = reactHookForm.useController({
-    defaultValue: defaultValue || null,
+    defaultValue: isDefined(step.defaultValue) ? step.defaultValue : null,
     name: entry
   }),
       field = _useController.field;
@@ -29070,9 +28837,9 @@ var usePrevious = function usePrevious(value) {
 };
 
 var BasicWrapper = function BasicWrapper(_ref) {
-  var entry = _ref.entry,
-      className = _ref.className,
-      label = _ref.label,
+  var entry = _ref.entry;
+      _ref.className;
+      var label = _ref.label,
       help = _ref.help,
       children = _ref.children,
       render = _ref.render;
@@ -29081,7 +28848,6 @@ var BasicWrapper = function BasicWrapper(_ref) {
     return children;
   }
 
-  var classes = useCustomStyle();
   var id = uuid.v4();
 
   var _useFormContext = reactHookForm.useFormContext(),
@@ -29109,19 +28875,19 @@ var BasicWrapper = function BasicWrapper(_ref) {
   }
 
   return /*#__PURE__*/React__default["default"].createElement("div", {
-    className: "".concat(classes.mt_10, " ").concat(className),
+    className: "mt_10",
     style: {
       position: 'relative'
     }
   }, label && /*#__PURE__*/React__default["default"].createElement("label", {
-    className: "".concat(classes.flex, " ").concat(classes.ai_center, " ").concat(classes.mb_5),
+    className: "flex ai_center mb_5",
     htmlFor: entry
   }, /*#__PURE__*/React__default["default"].createElement("span", null, label), help && /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement(ReactToolTip__default["default"], {
     html: true,
     place: 'bottom',
     id: id
   }), /*#__PURE__*/React__default["default"].createElement("span", {
-    className: "".concat(classes.flex, " ").concat(classes.ai_center),
+    className: "flex ai_center",
     "data-html": true,
     "data-tip": help,
     "data-for": id
@@ -29133,7 +28899,7 @@ var BasicWrapper = function BasicWrapper(_ref) {
       cursor: 'help'
     }
   })))), children, error && /*#__PURE__*/React__default["default"].createElement("div", {
-    className: classNames__default["default"](classes.feedback, _defineProperty$1({}, classes.txt_red, errorDisplayed))
+    className: classNames__default["default"]('feedback', _defineProperty$1({}, 'txt_red', errorDisplayed))
   }, error.message));
 };
 
@@ -29147,8 +28913,8 @@ var CustomizableInput = function CustomizableInput(props) {
   return props.children;
 };
 
-var defaultVal = function defaultVal(value, array, defaultValue) {
-  if (!!defaultValue) return defaultValue;
+var defaultVal = function defaultVal(value, array, defaultValue, type) {
+  if (isDefined(defaultValue)) return defaultValue;
   if (!!array) return [];
   return value;
 };
@@ -29185,9 +28951,17 @@ var cleanInputArray = function cleanInputArray(obj, defaultValues, flow, subSche
         key = _ref5[0],
         step = _ref5[1];
 
-    var v;
-    if (obj) v = obj[key];
-    if ((step.type === type.bool && v === null || step.type !== type.bool && !v) && defaultValues) v = defaultValues[key];
+    var v = null;
+
+    if (obj) {
+      v = obj[key];
+    }
+
+    var maybeDefaultValue = defaultValues[key];
+
+    if (!v && isDefined(maybeDefaultValue)) {
+      v = maybeDefaultValue;
+    }
 
     if (step.array && !step.render) {
       return _objectSpread2$1(_objectSpread2$1({}, acc), {}, _defineProperty$1({}, key, (v || []).map(function (value) {
@@ -29269,15 +29043,12 @@ var Watcher = function Watcher(_ref6) {
       schema = _ref6.schema,
       onSubmit = _ref6.onSubmit,
       handleSubmit = _ref6.handleSubmit;
-      _ref6.getValues;
-      _ref6.watch;
   var data = reactHookForm.useWatch({
     control: control
   });
-  var prev = usePrevious(data);
-  React.useEffect(function () {
+  useHashEffect(function () {
     if (!!options.autosubmit) {
-      if (!deepEqual__default["default"](data, prev)) handleSubmit(function () {
+      handleSubmit(function () {
         onSubmit(cleanOutputArray(data, schema));
       })();
     }
@@ -29304,14 +29075,19 @@ var Form = /*#__PURE__*/React__default["default"].forwardRef(function (_ref7, re
       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,
+      footer = _ref7.footer;
+      _ref7.style;
+      var className = _ref7.className,
       _ref7$options = _ref7.options,
       options = _ref7$options === void 0 ? {} : _ref7$options;
-  var classes = useCustomStyle(style);
-  var formFlow = flow || Object.keys(schema);
+      _ref7.nostyle;
+
+  var _useState = React.useState(schema),
+      _useState2 = _slicedToArray(_useState, 2),
+      calcSchema = _useState2[0];
+      _useState2[1];
+
+  var formFlow = flow || Object.keys(calcSchema);
 
   var maybeCustomHttpClient = function maybeCustomHttpClient(url, method) {
     //todo: if present props.resolve()
@@ -29328,7 +29104,7 @@ var Form = /*#__PURE__*/React__default["default"].forwardRef(function (_ref7, re
     });
   };
 
-  var defaultValues = getDefaultValues(formFlow, schema, value); //FIXME: get real schema through the switch
+  var defaultValues = getDefaultValues(formFlow, calcSchema, value); //FIXME: get real schema through the switch
 
   var _resolver = function resolver(rawData) {
     var _getShapeAndDependenc2 = getShapeAndDependencies(formFlow, schema, [], rawData),
@@ -29347,18 +29123,17 @@ 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];
+      _useState4[1]; // useEffect(() => {
+  //   reset(cleanInputArray(value, defaultValues, flow, schema))
+  //   setReset(true)
+  // }, [reset])
 
-  React.useEffect(function () {
-    _reset(cleanInputArray(value, defaultValues, flow, schema));
 
-    setReset(true);
-  }, [_reset]);
   React.useEffect(function () {
-    initialReseted && trigger();
+    trigger();
   }, [trigger, initialReseted]);
   var _handleSubmit = methods.handleSubmit,
       _methods$formState = methods.formState;
@@ -29368,13 +29143,9 @@ var Form = /*#__PURE__*/React__default["default"].forwardRef(function (_ref7, re
       trigger = methods.trigger,
       getValues = methods.getValues,
       watch = methods.watch;
-  var prev = usePrevious(value);
-  var prevSchema = usePrevious(schema);
-  React.useEffect(function () {
-    if (!deepEqual__default["default"](value, prev) || !deepEqual__default["default"](schema, prevSchema)) {
-      _reset(_objectSpread2$1({}, cleanInputArray(value, defaultValues, flow, schema)));
-    }
-  }, [value, schema]);
+  useHashEffect(function () {
+    _reset(_objectSpread2$1({}, cleanInputArray(value, defaultValues, flow, schema)));
+  }, [value, calcSchema]);
 
   var functionalProperty = function functionalProperty(entry, prop) {
     if (typeof prop === 'function') {
@@ -29411,7 +29182,7 @@ var Form = /*#__PURE__*/React__default["default"].forwardRef(function (_ref7, re
     handleSubmit: _handleSubmit,
     watch: methods.watch
   }), /*#__PURE__*/React__default["default"].createElement("form", {
-    className: className || "".concat(classes.pr_15, " ").concat(classes.w_100),
+    className: className || "pr_15 w_100",
     onSubmit: _handleSubmit(function (data) {
       var clean = cleanOutputArray(data, schema);
       onSubmit(clean);
@@ -29478,8 +29249,6 @@ var Form = /*#__PURE__*/React__default["default"].forwardRef(function (_ref7, re
 var Footer = function Footer(props) {
   var _props$actions, _props$actions$submit, _props$actions2, _props$actions2$submi, _props$actions3, _props$actions3$cance, _props$actions5, _props$actions5$cance, _props$actions6, _props$actions6$reset, _props$actions7, _props$actions7$reset, _props$actions8, _props$actions8$submi;
 
-  var classes = useCustomStyle();
-
   if (props.render) {
     return props.render({
       reset: props.reset,
@@ -29489,9 +29258,9 @@ var Footer = function Footer(props) {
 
   var isSubmitDisplayed = ((_props$actions = props.actions) === null || _props$actions === void 0 ? void 0 : (_props$actions$submit = _props$actions.submit) === null || _props$actions$submit === void 0 ? void 0 : _props$actions$submit.display) === undefined ? true : !!((_props$actions2 = props.actions) !== null && _props$actions2 !== void 0 && (_props$actions2$submi = _props$actions2.submit) !== null && _props$actions2$submi !== void 0 && _props$actions2$submi.display);
   return /*#__PURE__*/React__default["default"].createElement("div", {
-    className: "".concat(classes.flex, " ").concat(classes.jc_end, " ").concat(classes.mt_5)
+    className: "flex jc_end mt_5"
   }, ((_props$actions3 = props.actions) === null || _props$actions3 === void 0 ? void 0 : (_props$actions3$cance = _props$actions3.cancel) === null || _props$actions3$cance === void 0 ? void 0 : _props$actions3$cance.display) && /*#__PURE__*/React__default["default"].createElement("button", {
-    className: "".concat(classes.btn, " ").concat(classes.btn_red),
+    className: "btn btn_red",
     type: "button",
     onClick: function onClick() {
       var _props$actions4;
@@ -29499,11 +29268,11 @@ var Footer = function Footer(props) {
       return (_props$actions4 = props.actions) === null || _props$actions4 === void 0 ? void 0 : _props$actions4.cancel.action();
     }
   }, ((_props$actions5 = props.actions) === null || _props$actions5 === void 0 ? void 0 : (_props$actions5$cance = _props$actions5.cancel) === null || _props$actions5$cance === void 0 ? void 0 : _props$actions5$cance.label) || 'Cancel'), ((_props$actions6 = props.actions) === null || _props$actions6 === void 0 ? void 0 : (_props$actions6$reset = _props$actions6.reset) === null || _props$actions6$reset === void 0 ? void 0 : _props$actions6$reset.display) && /*#__PURE__*/React__default["default"].createElement("button", {
-    className: "".concat(classes.btn, " ").concat(classes.btn_red),
+    className: "btn btn_red",
     type: "button",
     onClick: props.reset
   }, ((_props$actions7 = props.actions) === null || _props$actions7 === void 0 ? void 0 : (_props$actions7$reset = _props$actions7.reset) === null || _props$actions7$reset === void 0 ? void 0 : _props$actions7$reset.label) || 'Reset'), isSubmitDisplayed && /*#__PURE__*/React__default["default"].createElement("button", {
-    className: "".concat(classes.btn, " ").concat(classes.btn_green, " ").concat(classes.ml_10),
+    className: "btn btn_green ml_10",
     type: "submit"
   }, ((_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'));
 };
@@ -29520,7 +29289,6 @@ var Step = function Step(_ref8) {
       functionalProperty = _ref8.functionalProperty,
       parent = _ref8.parent,
       onAfterChange = _ref8.onAfterChange;
-  var classes = useCustomStyle();
 
   var _useFormContext2 = reactHookForm.useFormContext(),
       _useFormContext2$form = _useFormContext2.formState,
@@ -29678,7 +29446,7 @@ var Step = function Step(_ref8) {
             errorDisplayed: errorDisplayed
           }, /*#__PURE__*/React__default["default"].createElement("textarea", {
             type: "text",
-            className: classNames__default["default"](classes.input, _defineProperty$1({}, classes.input__invalid, errorDisplayed))
+            className: classNames__default["default"]('input', step.className, _defineProperty$1({}, 'input__invalid', errorDisplayed))
           }));
 
         case format.code:
@@ -29690,7 +29458,7 @@ var Step = function Step(_ref8) {
             entry: entry,
             errorDisplayed: errorDisplayed
           }, /*#__PURE__*/React__default["default"].createElement(Component, {
-            className: classNames__default["default"](_defineProperty$1({}, classes.input__invalid, errorDisplayed))
+            className: classNames__default["default"](step.className, _defineProperty$1({}, 'input__invalid', errorDisplayed))
           }));
 
         case format.markdown:
@@ -29700,7 +29468,7 @@ var Step = function Step(_ref8) {
             entry: entry,
             errorDisplayed: errorDisplayed
           }, /*#__PURE__*/React__default["default"].createElement(MarkdownInput, {
-            className: classNames__default["default"](_defineProperty$1({}, classes.input__invalid, errorDisplayed))
+            className: classNames__default["default"](step.className, _defineProperty$1({}, 'input__invalid', errorDisplayed))
           }));
 
         case format.buttonsSelect:
@@ -29711,9 +29479,10 @@ var Step = function Step(_ref8) {
               step: step,
               entry: entry,
               errorDisplayed: errorDisplayed
-            }, /*#__PURE__*/React__default["default"].createElement(SelectInput, {
-              className: classNames__default["default"](classes.flex_grow_1, _defineProperty$1({}, classes.input__invalid, errorDisplayed)),
-              disabled: functionalProperty(entry, step.disabled),
+            }, /*#__PURE__*/React__default["default"].createElement(SelectInput, _extends({
+              className: classNames__default["default"]('flex_grow_1', step.className, _defineProperty$1({}, 'input__invalid', errorDisplayed)),
+              disabled: functionalProperty(entry, step.disabled)
+            }, step.props, {
               possibleValues: step.options,
               httpClient: httpClient,
               isMulti: step.isMulti,
@@ -29721,7 +29490,7 @@ var Step = function Step(_ref8) {
               transformer: step.transformer,
               buttons: step.format === format.buttonsSelect,
               optionsFrom: step.optionsFrom
-            }));
+            })));
           }
 
         default:
@@ -29732,7 +29501,7 @@ var Step = function Step(_ref8) {
             errorDisplayed: errorDisplayed
           }, /*#__PURE__*/React__default["default"].createElement("input", {
             type: step.format || 'text',
-            className: classNames__default["default"](classes.input, _defineProperty$1({}, classes.input__invalid, errorDisplayed))
+            className: classNames__default["default"]('input', step.className, _defineProperty$1({}, 'input__invalid', errorDisplayed))
           }));
       }
 
@@ -29745,8 +29514,9 @@ var Step = function Step(_ref8) {
             step: step,
             entry: entry,
             errorDisplayed: errorDisplayed
-          }, /*#__PURE__*/React__default["default"].createElement(SelectInput, {
-            className: classNames__default["default"](classes.content, _defineProperty$1({}, classes.input__invalid, errorDisplayed)),
+          }, /*#__PURE__*/React__default["default"].createElement(SelectInput, _extends({
+            className: classNames__default["default"]('content', step.className, _defineProperty$1({}, 'input__invalid', errorDisplayed))
+          }, step.props, {
             possibleValues: step.options,
             httpClient: httpClient,
             isMulti: step.isMulti,
@@ -29755,7 +29525,7 @@ var Step = function Step(_ref8) {
             transformer: step.transformer,
             buttons: step.format === format.buttonsSelect,
             optionsFrom: step.optionsFrom
-          }));
+          })));
 
         default:
           return /*#__PURE__*/React__default["default"].createElement(ControlledInput, {
@@ -29765,18 +29535,17 @@ var Step = function Step(_ref8) {
             errorDisplayed: errorDisplayed
           }, /*#__PURE__*/React__default["default"].createElement("input", {
             type: step.format || 'number',
-            className: classNames__default["default"](classes.input, _defineProperty$1({}, classes.input__invalid, errorDisplayed))
+            className: classNames__default["default"]('input', step.className, _defineProperty$1({}, 'input__invalid', errorDisplayed))
           }));
       }
 
     case type.bool:
       return /*#__PURE__*/React__default["default"].createElement(ControlledInput, {
-        defaultValue: defaultValue,
         step: step,
         entry: entry,
         errorDisplayed: errorDisplayed
       }, /*#__PURE__*/React__default["default"].createElement(BooleanInput, {
-        className: classNames__default["default"](_defineProperty$1({}, classes.input__invalid, errorDisplayed))
+        className: classNames__default["default"](steop.className, _defineProperty$1({}, 'input__invalid', errorDisplayed))
       }));
 
     case type.object:
@@ -29788,8 +29557,9 @@ var Step = function Step(_ref8) {
             step: step,
             entry: entry,
             errorDisplayed: errorDisplayed
-          }, /*#__PURE__*/React__default["default"].createElement(SelectInput, {
-            className: classNames__default["default"](classes.flex_grow_1, _defineProperty$1({}, classes.input__invalid, errorDisplayed)),
+          }, /*#__PURE__*/React__default["default"].createElement(SelectInput, _extends({
+            className: classNames__default["default"]('flex_grow_1', step.className, _defineProperty$1({}, 'input__invalid', errorDisplayed))
+          }, step.props, {
             possibleValues: step.options,
             httpClient: httpClient,
             isMulti: step.isMulti,
@@ -29798,7 +29568,7 @@ var Step = function Step(_ref8) {
             transformer: step.transformer,
             buttons: step.format === format.buttonsSelect,
             optionsFrom: step.optionsFrom
-          }));
+          })));
 
         case format.form:
           //todo: disabled ?
@@ -29841,7 +29611,7 @@ var Step = function Step(_ref8) {
             errorDisplayed: errorDisplayed,
             component: function component(field, props) {
               return /*#__PURE__*/React__default["default"].createElement(CodeInput, _extends({}, props, {
-                className: classNames__default["default"](_defineProperty$1({}, classes.input__invalid, error)),
+                className: classNames__default["default"](step.className, _defineProperty$1({}, 'input__invalid', error)),
                 onChange: function onChange(e) {
                   _readOnlyError("errorDisplayed");
                   var v;
@@ -29873,7 +29643,7 @@ var Step = function Step(_ref8) {
             entry: entry,
             errorDisplayed: errorDisplayed
           }, /*#__PURE__*/React__default["default"].createElement(ObjectInput, {
-            className: classNames__default["default"](_defineProperty$1({}, classes.input__invalid, errorDisplayed))
+            className: classNames__default["default"](step.className, _defineProperty$1({}, 'input__invalid', errorDisplayed))
           }));
       }
 
@@ -29884,7 +29654,7 @@ var Step = function Step(_ref8) {
         entry: entry,
         errorDisplayed: errorDisplayed
       }, /*#__PURE__*/React__default["default"].createElement(reactRainbowComponents.DatePicker, {
-        className: classNames__default["default"](classes.datepicker, _defineProperty$1({}, classes.input__invalid, errorDisplayed)),
+        className: classNames__default["default"]('datepicker', step.className, _defineProperty$1({}, 'input__invalid', errorDisplayed)),
         formatStyle: "large"
       }));
 
@@ -29898,15 +29668,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;
@@ -29921,24 +29691,24 @@ var Step = function Step(_ref8) {
 
             var files = field.value || [];
             return /*#__PURE__*/React__default["default"].createElement("div", {
-              className: classNames__default["default"](classes.flex, classes.ai_center, _defineProperty$1({}, classes.input__invalid, error))
+              className: classNames__default["default"]('flex', 'ai_center', step.className, _defineProperty$1({}, 'input__invalid', error))
             }, /*#__PURE__*/React__default["default"].createElement("input", {
               ref: function ref(r) {
                 return setInput(r);
               },
               type: "file",
               multiple: true,
-              className: classes.d_none,
+              className: 'd_none',
               onChange: setFiles
             }), /*#__PURE__*/React__default["default"].createElement("button", {
               type: "button",
-              className: "".concat(classes.btn, " ").concat(classes.btn_sm, " ").concat(classes.flex, " ").concat(classes.ai_center),
+              className: "btn btn_sm flex ai_center",
               disabled: uploading || functionalProperty(entry, step.disabled),
               onClick: trigger
             }, uploading && /*#__PURE__*/React__default["default"].createElement(reactFeather.Loader, null), !uploading && /*#__PURE__*/React__default["default"].createElement(reactFeather.Upload, null), /*#__PURE__*/React__default["default"].createElement("span", {
-              className: "".concat(classes.ml_5)
+              className: "ml_5"
             }, "Select file(s)")), /*#__PURE__*/React__default["default"].createElement("span", {
-              className: "".concat(classes.ml_5)
+              className: "ml_5"
             }, files.length <= 0 ? 'No files selected' : files.map(function (r) {
               return r.name;
             }).join(" , ")));
@@ -29960,7 +29730,7 @@ var Step = function Step(_ref8) {
         entry: entry,
         component: function component(field, props) {
           return /*#__PURE__*/React__default["default"].createElement(CodeInput, _extends({}, props, {
-            className: classNames__default["default"](_defineProperty$1({}, classes.input__invalid, error)),
+            className: classNames__default["default"](_defineProperty$1({}, 'input__invalid', error)),
             onChange: function onChange(v) {
               field.onChange(v);
               option(step.onChange).map(function (onChange) {
@@ -29986,7 +29756,6 @@ var ArrayStep = function ArrayStep(_ref11) {
       step = _ref11.step,
       component = _ref11.component,
       disabled = _ref11.disabled;
-  var classes = useCustomStyle();
 
   var _useFormContext3 = reactHookForm.useFormContext(),
       getValues = _useFormContext3.getValues,
@@ -30019,7 +29788,7 @@ var ArrayStep = function ArrayStep(_ref11) {
     return /*#__PURE__*/React__default["default"].createElement("div", {
       key: field.id
     }, /*#__PURE__*/React__default["default"].createElement("div", {
-      className: classNames__default["default"](classes.ai_center, classes.mt_5),
+      className: classNames__default["default"]('ai_center', 'mt_5'),
       style: {
         position: 'relative'
       }
@@ -30038,7 +29807,7 @@ var ArrayStep = function ArrayStep(_ref11) {
         top: '2px',
         right: 0
       },
-      className: classNames__default["default"](classes.btn, classes.btn_red, classes.btn_sm, classes.ml_5),
+      className: classNames__default["default"]('btn', 'btn_red', 'btn_sm', 'ml_5'),
       disabled: disabled,
       onClick: function onClick() {
         remove(idx);
@@ -30048,10 +29817,10 @@ var ArrayStep = function ArrayStep(_ref11) {
       size: 16
     }))));
   }), /*#__PURE__*/React__default["default"].createElement("div", {
-    className: classNames__default["default"](classes.flex, classes.jc_flex_end)
+    className: classNames__default["default"]('flex', 'jc_flex_end')
   }, /*#__PURE__*/React__default["default"].createElement("button", {
     type: "button",
-    className: classNames__default["default"](classes.btn, classes.btn_blue, classes.btn_sm, classes.mt_5, _defineProperty$1({}, classes.input__invalid, errorDisplayed)),
+    className: classNames__default["default"]('btn', 'btn_blue', 'btn_sm', 'mt_5', _defineProperty$1({}, 'input__invalid', errorDisplayed)),
     onClick: function onClick() {
       var newValue = cleanInputArray({}, getValues(entry), step.flow, step.schema);
       append({
@@ -30091,22 +29860,21 @@ var NestedForm = function NestedForm(_ref12) {
       setValue = _useFormContext4.setValue,
       watch = _useFormContext4.watch;
 
-  var _useState7 = React.useState(!!step.collapsed),
-      _useState8 = _slicedToArray(_useState7, 2),
-      collapsed = _useState8[0],
-      setCollapsed = _useState8[1];
+  var _useState9 = React.useState(!!step.collapsed),
+      _useState10 = _slicedToArray(_useState9, 2),
+      collapsed = _useState10[0],
+      setCollapsed = _useState10[1];
 
-  var classes = useCustomStyle();
   reactHookForm.useWatch(step === null || step === void 0 ? void 0 : (_step$conditionalSche = step.conditionalSchema) === null || _step$conditionalSche === void 0 ? void 0 : _step$conditionalSche.ref);
   var schemaAndFlow = option(step.conditionalSchema).map(function (condiSchema) {
     var ref = option(condiSchema.ref).map(function (ref) {
       return getValues(ref);
     }).getOrNull();
-    var rawData = getValues();
+    var rawValues = getValues();
     var filterSwitch = condiSchema["switch"].find(function (s) {
       if (typeof s.condition === 'function') {
         return s.condition({
-          rawData: rawData,
+          rawValues: rawValues,
           ref: ref
         });
       } else {
@@ -30127,15 +29895,12 @@ var NestedForm = function NestedForm(_ref12) {
     schema: schema,
     flow: flow
   });
-  var prevSchema = usePrevious(schemaAndFlow.schema);
-  React.useEffect(function () {
-    if (!!prevSchema && !deepEqual__default["default"](prevSchema, schemaAndFlow.schema)) {
-      var def = getDefaultValues(schemaAndFlow.flow, schemaAndFlow.schema, getValues(parent));
-      setValue(parent, def, {
-        shouldValidate: false
-      });
-    }
-  }, [prevSchema, schemaAndFlow.schema]);
+  useHashEffect(function () {
+    var def = getDefaultValues(schemaAndFlow.flow, schemaAndFlow.schema, getValues(parent));
+    setValue(parent, def, {
+      shouldValidate: false
+    });
+  }, [schemaAndFlow.schema]);
   var computedSandF = schemaAndFlow.flow.reduce(function (acc, entry) {
     var step = schemaAndFlow.schema[entry];
     var visibleStep = option(step).map(function (s) {
@@ -30166,13 +29931,13 @@ var NestedForm = function NestedForm(_ref12) {
     return x.visibleStep;
   }).length >= 1 && step.label !== null;
   return /*#__PURE__*/React__default["default"].createElement("div", {
-    className: classNames__default["default"]((_classNames17 = {}, _defineProperty$1(_classNames17, classes.nestedform__border, bordered), _defineProperty$1(_classNames17, classes.border__error, !!errorDisplayed), _classNames17)),
+    className: classNames__default["default"]((_classNames17 = {}, _defineProperty$1(_classNames17, 'nestedform__border', bordered), _defineProperty$1(_classNames17, 'border__error', !!errorDisplayed), _classNames17)),
     style: {
       position: 'relative'
     }
   }, !!step.collapsable && schemaAndFlow.flow.length > 1 && collapsed && /*#__PURE__*/React__default["default"].createElement(reactFeather.ChevronDown, {
     size: 30,
-    className: classes.cursor_pointer,
+    className: 'cursor_pointer',
     style: {
       position: 'absolute',
       top: -35,
@@ -30185,7 +29950,7 @@ var NestedForm = function NestedForm(_ref12) {
     }
   }), !!step.collapsable && schemaAndFlow.flow.length > 1 && !collapsed && /*#__PURE__*/React__default["default"].createElement(reactFeather.ChevronUp, {
     size: 30,
-    className: classes.cursor_pointer,
+    className: 'cursor_pointer',
     style: {
       position: 'absolute',
       top: -35,
@@ -30208,7 +29973,7 @@ var NestedForm = function NestedForm(_ref12) {
 
     return /*#__PURE__*/React__default["default"].createElement(BasicWrapper, {
       key: "".concat(entry, ".").concat(idx),
-      className: classNames__default["default"](_defineProperty$1({}, classes.display__none, collapsed && !step.visibleOnCollapse || !visibleStep)),
+      className: classNames__default["default"](_defineProperty$1({}, 'display__none', collapsed && !step.visibleOnCollapse || !visibleStep)),
       entry: "".concat(parent, ".").concat(entry),
       label: functionalProperty(entry, (step === null || step === void 0 ? void 0 : step.label) === null ? null : (step === null || step === void 0 ? void 0 : step.label) || entry),
       help: step.help,