ab-ui-library 1.42.9 → 1.43.0

package/components/FormContainer/FormContainer.js

@@ -64,9 +64,9 @@ var FormContainer = function FormContainer(props) {
     getValues = _useForm.getValues,
     watch = _useForm.watch,
     reset = _useForm.reset,
+    trigger = _useForm.trigger,
     clearErrors = _useForm.clearErrors,
     setError = _useForm.setError,
-    trigger = _useForm.trigger,
     getFieldState = _useForm.getFieldState,
     unregister = _useForm.unregister;
   var errors = formState.errors,
@@ -74,54 +74,100 @@ var FormContainer = function FormContainer(props) {
     isSubmitted = formState.isSubmitted,
     isSubmitting = formState.isSubmitting,
     dirtyFields = formState.dirtyFields;
-  var customSubmit = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator(/*#__PURE__*/regenerator.mark(function _callee(data) {
+  var validateForm = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator(/*#__PURE__*/regenerator.mark(function _callee() {
       return regenerator.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            _context.prev = 0;
-            if (!validationScheme) {
-              _context.next = 4;
+            if (validationScheme) {
+              _context.next = 2;
               break;
             }
-            _context.next = 4;
-            return validationScheme.validate(data, {
+            return _context.abrupt("return", true);
+          case 2:
+            _context.prev = 2;
+            _context.next = 5;
+            return validationScheme.validate(getValues(), {
               abortEarly: false
             });
-          case 4:
-            if (onSubmit) {
-              onSubmit(data, formState, dirtyFields);
-            }
-            _context.next = 10;
-            break;
-          case 7:
-            _context.prev = 7;
-            _context.t0 = _context["catch"](0);
+          case 5:
+            return _context.abrupt("return", true);
+          case 8:
+            _context.prev = 8;
+            _context.t0 = _context["catch"](2);
             if (_context.t0 instanceof yup.ValidationError) {
               _context.t0.inner.forEach(function (err) {
-                setError(err.path, {
-                  type: 'manual',
-                  message: err.message
-                });
+                if (err.path) {
+                  setError(err.path, {
+                    type: 'manual',
+                    message: err.message
+                  });
+                }
               });
             }
-          case 10:
+            return _context.abrupt("return", false);
+          case 12:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0, 7]]);
+      }, _callee, null, [[2, 8]]);
     }));
-    return function customSubmit(_x) {
+    return function validateForm() {
       return _ref.apply(this, arguments);
     };
   }();
+  var customTrigger = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator(/*#__PURE__*/regenerator.mark(function _callee2() {
+      return regenerator.wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            return _context2.abrupt("return", validateForm());
+          case 1:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function customTrigger() {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+  var customSubmit = /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator(/*#__PURE__*/regenerator.mark(function _callee3(data) {
+      var isValid;
+      return regenerator.wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            _context3.next = 2;
+            return validateForm();
+          case 2:
+            isValid = _context3.sent;
+            if (isValid) {
+              _context3.next = 5;
+              break;
+            }
+            return _context3.abrupt("return");
+          case 5:
+            if (onSubmit) {
+              onSubmit(data, formState, dirtyFields);
+            }
+          case 6:
+          case "end":
+            return _context3.stop();
+        }
+      }, _callee3);
+    }));
+    return function customSubmit(_x) {
+      return _ref3.apply(this, arguments);
+    };
+  }();
   return /*#__PURE__*/React.createElement("form", {
     onSubmit: handleSubmit(customSubmit),
     id: formId,
     className: classNames('form-container', className)
   }, /*#__PURE__*/React.createElement(FormContext.Provider, {
     value: {
-      trigger: trigger,
+      trigger: mode === 'onSubmit' ? customTrigger : trigger,
       register: register,
       errors: errors,
       control: control,
@@ -132,6 +178,7 @@ var FormContainer = function FormContainer(props) {
       isDirty: isDirty,
       isSubmitted: isSubmitted,
       isSubmitting: isSubmitting,
+      isValid: formState.isValid,
       clearErrors: clearErrors,
       setError: setError,
       dirtyFields: dirtyFields,

package/context/types.d.ts

@@ -17,5 +17,6 @@ export type TFormContextProps = {
     trigger?: UseFormTrigger<TFormData>;
     getFieldState?: UseFormGetFieldState<TFormData>;
     unregister?: UseFormUnregister<TFormData>;
+    isValid: boolean;
 };
 export declare const FormContext: import("react").Context<TFormContextProps>;

package/context/types.js

@@ -6,7 +6,8 @@ var FormContext = /*#__PURE__*/createContext({
   setValue: noop,
   isSubmitted: false,
   isSubmitting: false,
-  dirtyFields: {}
+  dirtyFields: {},
+  isValid: false
 });
 
 export { FormContext };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ab-ui-library",
-  "version": "1.42.9",
+  "version": "1.43.0",
   "description": "UI library for AM",
   "main": "./index.js",
   "module": "./index.js",