@maif/react-forms 1.0.53 → 1.0.54

package/lib/esm/index.js

@@ -28863,18 +28863,28 @@ var buildSubResolver = function buildSubResolver(props, key, dependencies, rawDa
           return s.condition === ref;
         }
       });
-      return option(filterSwitch).getOrElse(condiSchema["switch"].find(function (s) {
+      return option(filterSwitch).orElse(condiSchema["switch"].find(function (s) {
         return s["default"];
-      }));
-    }).getOrElse({}),
+      })).getOrElse({
+        schema: {},
+        flow: []
+      });
+    }).getOrElse({
+      schema: {},
+      flow: []
+    }),
         schema = _option$map$getOrElse.schema,
         flow = _option$map$getOrElse.flow;
 
-    var _subResolver2 = getShapeAndDependencies(flow || Object.keys(schema), schema, dependencies, rawData);
+    var realFlow = flow || Object.keys(schema);
 
-    return constraints.reduce(function (resolver, constraint) {
-      return jsonOrFunctionConstraint(constraint, resolver, key, dependencies);
-    }, yup.object().shape(_subResolver2.shape, dependencies));
+    if (realFlow.length) {
+      var _subResolver2 = getShapeAndDependencies(flow || Object.keys(schema), schema, dependencies, rawData);
+
+      return constraints.reduce(function (resolver, constraint) {
+        return jsonOrFunctionConstraint(constraint, resolver, key, dependencies);
+      }, yup.object().shape(_subResolver2.shape, dependencies));
+    }
   } else {
     return constraints.reduce(function (resolver, constraint) {
       return jsonOrFunctionConstraint(constraint, resolver, key, dependencies);
@@ -28928,7 +28938,7 @@ var CustomizableInput$1 = /*#__PURE__*/React.memo(function (props) {
 
   return props.children;
 }, function (prev, next) {
-  if (next.render) {
+  if (next.render || next.conditionalSchema) {
     return false;
   }
 
@@ -29317,9 +29327,9 @@ var Form = /*#__PURE__*/React.forwardRef(function (_ref7, ref) {
     initialReseted && trigger();
   }, [trigger, initialReseted]);
   var _handleSubmit = methods.handleSubmit,
-      _methods$formState = methods.formState,
-      errors = _methods$formState.errors,
-      dirtyFields = _methods$formState.dirtyFields,
+      _methods$formState = methods.formState;
+      _methods$formState.errors;
+      var dirtyFields = _methods$formState.dirtyFields,
       _reset = methods.reset,
       trigger = methods.trigger,
       getValues = methods.getValues,
@@ -29380,9 +29390,6 @@ var Form = /*#__PURE__*/React.forwardRef(function (_ref7, ref) {
       return null;
     }
 
-    _typeof$1(entry) === 'object' ? undefined : entry.split('.').reduce(function (object, key) {
-      return object && object[key];
-    }, errors);
     var visibleStep = option(step).map(function (s) {
       return s.visible;
     }).map(function (visible) {
@@ -30032,7 +30039,7 @@ var ArrayStep = function ArrayStep(_ref11) {
 };
 
 var NestedForm = function NestedForm(_ref12) {
-  var _classNames17;
+  var _step$conditionalSche, _classNames17;
 
   var schema = _ref12.schema,
       flow = _ref12.flow,
@@ -30049,8 +30056,6 @@ var NestedForm = function NestedForm(_ref12) {
       getValues = _useFormContext4.getValues,
       setValue = _useFormContext4.setValue,
       watch = _useFormContext4.watch;
-      _useFormContext4.trigger;
-      _useFormContext4.formState;
 
   var _useState7 = useState(!!step.collapsed),
       _useState8 = _slicedToArray(_useState7, 2),
@@ -30058,6 +30063,7 @@ var NestedForm = function NestedForm(_ref12) {
       setCollapsed = _useState8[1];
 
   var classes = useCustomStyle();
+  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);
@@ -30073,9 +30079,16 @@ var NestedForm = function NestedForm(_ref12) {
         return s.condition === ref;
       }
     });
-    return option(filterSwitch).getOrElse(condiSchema["switch"].find(function (s) {
+    var schemaAndFlow = option(filterSwitch).orElse(condiSchema["switch"].find(function (s) {
       return s["default"];
-    }));
+    })).getOrElse({
+      schema: {},
+      flow: []
+    });
+    return {
+      schema: schemaAndFlow.schema,
+      flow: schemaAndFlow.flow || Object.keys(schemaAndFlow.schema)
+    };
   }).getOrElse({
     schema: schema,
     flow: flow
@@ -30117,7 +30130,7 @@ var NestedForm = function NestedForm(_ref12) {
   }, []);
   var bordered = computedSandF.filter(function (x) {
     return x.visibleStep;
-  }).length > 1 && step.label !== null;
+  }).length >= 1 && step.label !== null;
   return /*#__PURE__*/React.createElement("div", {
     className: classNames((_classNames17 = {}, _defineProperty$1(_classNames17, classes.nestedform__border, bordered), _defineProperty$1(_classNames17, classes.border__error, !!errorDisplayed), _classNames17)),
     style: {

package/lib/index.js

@@ -28897,18 +28897,28 @@ var buildSubResolver = function buildSubResolver(props, key, dependencies, rawDa
           return s.condition === ref;
         }
       });
-      return option(filterSwitch).getOrElse(condiSchema["switch"].find(function (s) {
+      return option(filterSwitch).orElse(condiSchema["switch"].find(function (s) {
         return s["default"];
-      }));
-    }).getOrElse({}),
+      })).getOrElse({
+        schema: {},
+        flow: []
+      });
+    }).getOrElse({
+      schema: {},
+      flow: []
+    }),
         schema = _option$map$getOrElse.schema,
         flow = _option$map$getOrElse.flow;
 
-    var _subResolver2 = getShapeAndDependencies(flow || Object.keys(schema), schema, dependencies, rawData);
+    var realFlow = flow || Object.keys(schema);
 
-    return constraints.reduce(function (resolver, constraint) {
-      return jsonOrFunctionConstraint(constraint, resolver, key, dependencies);
-    }, yup__namespace.object().shape(_subResolver2.shape, dependencies));
+    if (realFlow.length) {
+      var _subResolver2 = getShapeAndDependencies(flow || Object.keys(schema), schema, dependencies, rawData);
+
+      return constraints.reduce(function (resolver, constraint) {
+        return jsonOrFunctionConstraint(constraint, resolver, key, dependencies);
+      }, yup__namespace.object().shape(_subResolver2.shape, dependencies));
+    }
   } else {
     return constraints.reduce(function (resolver, constraint) {
       return jsonOrFunctionConstraint(constraint, resolver, key, dependencies);
@@ -28962,7 +28972,7 @@ var CustomizableInput$1 = /*#__PURE__*/React__default["default"].memo(function (
 
   return props.children;
 }, function (prev, next) {
-  if (next.render) {
+  if (next.render || next.conditionalSchema) {
     return false;
   }
 
@@ -29351,9 +29361,9 @@ var Form = /*#__PURE__*/React__default["default"].forwardRef(function (_ref7, re
     initialReseted && trigger();
   }, [trigger, initialReseted]);
   var _handleSubmit = methods.handleSubmit,
-      _methods$formState = methods.formState,
-      errors = _methods$formState.errors,
-      dirtyFields = _methods$formState.dirtyFields,
+      _methods$formState = methods.formState;
+      _methods$formState.errors;
+      var dirtyFields = _methods$formState.dirtyFields,
       _reset = methods.reset,
       trigger = methods.trigger,
       getValues = methods.getValues,
@@ -29414,9 +29424,6 @@ var Form = /*#__PURE__*/React__default["default"].forwardRef(function (_ref7, re
       return null;
     }
 
-    _typeof$1(entry) === 'object' ? undefined : entry.split('.').reduce(function (object, key) {
-      return object && object[key];
-    }, errors);
     var visibleStep = option(step).map(function (s) {
       return s.visible;
     }).map(function (visible) {
@@ -30066,7 +30073,7 @@ var ArrayStep = function ArrayStep(_ref11) {
 };
 
 var NestedForm = function NestedForm(_ref12) {
-  var _classNames17;
+  var _step$conditionalSche, _classNames17;
 
   var schema = _ref12.schema,
       flow = _ref12.flow,
@@ -30083,8 +30090,6 @@ var NestedForm = function NestedForm(_ref12) {
       getValues = _useFormContext4.getValues,
       setValue = _useFormContext4.setValue,
       watch = _useFormContext4.watch;
-      _useFormContext4.trigger;
-      _useFormContext4.formState;
 
   var _useState7 = React.useState(!!step.collapsed),
       _useState8 = _slicedToArray(_useState7, 2),
@@ -30092,6 +30097,7 @@ var NestedForm = function NestedForm(_ref12) {
       setCollapsed = _useState8[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);
@@ -30107,9 +30113,16 @@ var NestedForm = function NestedForm(_ref12) {
         return s.condition === ref;
       }
     });
-    return option(filterSwitch).getOrElse(condiSchema["switch"].find(function (s) {
+    var schemaAndFlow = option(filterSwitch).orElse(condiSchema["switch"].find(function (s) {
       return s["default"];
-    }));
+    })).getOrElse({
+      schema: {},
+      flow: []
+    });
+    return {
+      schema: schemaAndFlow.schema,
+      flow: schemaAndFlow.flow || Object.keys(schemaAndFlow.schema)
+    };
   }).getOrElse({
     schema: schema,
     flow: flow
@@ -30151,7 +30164,7 @@ var NestedForm = function NestedForm(_ref12) {
   }, []);
   var bordered = computedSandF.filter(function (x) {
     return x.visibleStep;
-  }).length > 1 && step.label !== null;
+  }).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)),
     style: {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@maif/react-forms",
   "description": "Build react safe forms as fast as possible",
-  "version": "1.0.53",
+  "version": "1.0.54",
   "main": "lib/index.js",
   "module": "lib/esm/index.js",
   "types": "lib/index.js",
@@ -56,7 +56,7 @@
     ]
   },
   "peerDependencies": {
-    "react": "^17.0.2"
+    "react": "^17.0.2 || 18"
   },
   "devDependencies": {
     "@babel/cli": "^7.17.6",
@@ -98,7 +98,6 @@
     "@codemirror/theme-one-dark": "^0.19.1",
     "@fortawesome/fontawesome-free": "^5.15.3",
     "@hookform/resolvers": "2.4.0",
-    "@maif/react-forms": "^1.0.37-rc.1",
     "@popperjs/core": "^2.11.2",
     "@testing-library/jest-dom": "^5.11.4",
     "@testing-library/react": "^11.1.0",