@bonlineza/luxity-lib 2.34.2 → 2.34.4

package/LuxityFooter.js

@@ -7,69 +7,92 @@
   var React__default = 'default' in React ? React['default'] : React;
   var styled__default = 'default' in styled ? styled['default'] : styled;
 
-  function _arrayLikeToArray(r, a) {
-    (null == a || a > r.length) && (a = r.length);
-    for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e];
-    return n;
-  }
-  function _arrayWithHoles(r) {
-    if (Array.isArray(r)) return r;
-  }
   function _extends() {
-    return _extends = Object.assign ? Object.assign.bind() : function (n) {
-      for (var e = 1; e < arguments.length; e++) {
-        var t = arguments[e];
-        for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]);
+    _extends = Object.assign ? Object.assign.bind() : function (target) {
+      for (var i = 1; i < arguments.length; i++) {
+        var source = arguments[i];
+
+        for (var key in source) {
+          if (Object.prototype.hasOwnProperty.call(source, key)) {
+            target[key] = source[key];
+          }
+        }
+      }
+
+      return target;
+    };
+    return _extends.apply(this, arguments);
+  }
+
+  function _taggedTemplateLiteral(strings, raw) {
+    if (!raw) {
+      raw = strings.slice(0);
+    }
+
+    return Object.freeze(Object.defineProperties(strings, {
+      raw: {
+        value: Object.freeze(raw)
       }
-      return n;
-    }, _extends.apply(null, arguments);
+    }));
   }
-  function _iterableToArrayLimit(r, l) {
-    var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
-    if (null != t) {
-      var e,
-        n,
-        i,
-        u,
-        a = [],
-        f = !0,
-        o = !1;
+
+  function _slicedToArray(arr, i) {
+    return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
+  }
+
+  function _arrayWithHoles(arr) {
+    if (Array.isArray(arr)) return arr;
+  }
+
+  function _iterableToArrayLimit(arr, i) {
+    var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
+
+    if (_i == null) return;
+    var _arr = [];
+    var _n = true;
+    var _d = false;
+
+    var _s, _e;
+
+    try {
+      for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) {
+        _arr.push(_s.value);
+
+        if (i && _arr.length === i) break;
+      }
+    } catch (err) {
+      _d = true;
+      _e = err;
+    } finally {
       try {
-        if (i = (t = t.call(r)).next, 0 === l) {
-          if (Object(t) !== t) return;
-          f = !1;
-        } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0);
-      } catch (r) {
-        o = !0, n = r;
+        if (!_n && _i["return"] != null) _i["return"]();
       } finally {
-        try {
-          if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return;
-        } finally {
-          if (o) throw n;
-        }
+        if (_d) throw _e;
       }
-      return a;
     }
+
+    return _arr;
   }
-  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.");
-  }
-  function _slicedToArray(r, e) {
-    return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest();
+
+  function _unsupportedIterableToArray(o, minLen) {
+    if (!o) return;
+    if (typeof o === "string") return _arrayLikeToArray(o, minLen);
+    var n = Object.prototype.toString.call(o).slice(8, -1);
+    if (n === "Object" && o.constructor) n = o.constructor.name;
+    if (n === "Map" || n === "Set") return Array.from(o);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
   }
-  function _taggedTemplateLiteral(e, t) {
-    return t || (t = e.slice(0)), Object.freeze(Object.defineProperties(e, {
-      raw: {
-        value: Object.freeze(t)
-      }
-    }));
+
+  function _arrayLikeToArray(arr, len) {
+    if (len == null || len > arr.length) len = arr.length;
+
+    for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
+
+    return arr2;
   }
-  function _unsupportedIterableToArray(r, a) {
-    if (r) {
-      if ("string" == typeof r) return _arrayLikeToArray(r, a);
-      var t = {}.toString.call(r).slice(8, -1);
-      return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0;
-    }
+
+  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 isCheckBoxInput = (element) => element.type === 'checkbox';
@@ -136,50 +159,18 @@
 
   var isUndefined = (val) => val === undefined;
 
-  var get = (object, path, defaultValue) => {
-      if (!path || !isObject(object)) {
+  var get = (obj, path, defaultValue) => {
+      if (!path || !isObject(obj)) {
           return defaultValue;
       }
-      const result = compact(path.split(/[,[\].]+?/)).reduce((result, key) => isNullOrUndefined(result) ? result : result[key], object);
-      return isUndefined(result) || result === object
-          ? isUndefined(object[path])
+      const result = compact(path.split(/[,[\].]+?/)).reduce((result, key) => isNullOrUndefined(result) ? result : result[key], obj);
+      return isUndefined(result) || result === obj
+          ? isUndefined(obj[path])
               ? defaultValue
-              : object[path]
+              : obj[path]
           : result;
   };
 
-  var isBoolean = (value) => typeof value === 'boolean';
-
-  var isKey = (value) => /^\w*$/.test(value);
-
-  var stringToPath = (input) => compact(input.replace(/["|']|\]/g, '').split(/\.|\[/));
-
-  var set = (object, path, value) => {
-      let index = -1;
-      const tempPath = isKey(path) ? [path] : stringToPath(path);
-      const length = tempPath.length;
-      const lastIndex = length - 1;
-      while (++index < length) {
-          const key = tempPath[index];
-          let newValue = value;
-          if (index !== lastIndex) {
-              const objValue = object[key];
-              newValue =
-                  isObject(objValue) || Array.isArray(objValue)
-                      ? objValue
-                      : !isNaN(+tempPath[index + 1])
-                          ? []
-                          : {};
-          }
-          if (key === '__proto__') {
-              return;
-          }
-          object[key] = newValue;
-          object = object[key];
-      }
-      return object;
-  };
-
   const EVENTS = {
       BLUR: 'blur',
       FOCUS_OUT: 'focusout',
@@ -265,6 +256,33 @@
       return formValues;
   };
 
+  var isKey = (value) => /^\w*$/.test(value);
+
+  var stringToPath = (input) => compact(input.replace(/["|']|\]/g, '').split(/\.|\[/));
+
+  function set(object, path, value) {
+      let index = -1;
+      const tempPath = isKey(path) ? [path] : stringToPath(path);
+      const length = tempPath.length;
+      const lastIndex = length - 1;
+      while (++index < length) {
+          const key = tempPath[index];
+          let newValue = value;
+          if (index !== lastIndex) {
+              const objValue = object[key];
+              newValue =
+                  isObject(objValue) || Array.isArray(objValue)
+                      ? objValue
+                      : !isNaN(+tempPath[index + 1])
+                          ? []
+                          : {};
+          }
+          object[key] = newValue;
+          object = object[key];
+      }
+      return object;
+  }
+
   var appendErrors = (name, validateAllFieldCriteria, errors, type, message) => validateAllFieldCriteria
       ? {
           ...errors[name],
@@ -275,6 +293,28 @@
       }
       : {};
 
+  const focusFieldBy = (fields, callback, fieldsNames) => {
+      for (const key of fieldsNames || Object.keys(fields)) {
+          const field = get(fields, key);
+          if (field) {
+              const { _f, ...currentField } = field;
+              if (_f && callback(_f.name)) {
+                  if (_f.ref.focus) {
+                      _f.ref.focus();
+                      break;
+                  }
+                  else if (_f.refs && _f.refs[0].focus) {
+                      _f.refs[0].focus();
+                      break;
+                  }
+              }
+              else if (isObject(currentField)) {
+                  focusFieldBy(currentField, callback);
+              }
+          }
+      }
+  };
+
   var getValidationModes = (mode) => ({
       isOnSubmit: !mode || mode === VALIDATION_MODE.onSubmit,
       isOnBlur: mode === VALIDATION_MODE.onBlur,
@@ -289,41 +329,15 @@
           [..._names.watch].some((watchName) => name.startsWith(watchName) &&
               /^\.\w+/.test(name.slice(watchName.length))));
 
-  const iterateFieldsByAction = (fields, action, fieldsNames, abortEarly) => {
-      for (const key of fieldsNames || Object.keys(fields)) {
-          const field = get(fields, key);
-          if (field) {
-              const { _f, ...currentField } = field;
-              if (_f) {
-                  if (_f.refs && _f.refs[0] && action(_f.refs[0], key) && !abortEarly) {
-                      return true;
-                  }
-                  else if (_f.ref && action(_f.ref, _f.name) && !abortEarly) {
-                      return true;
-                  }
-                  else {
-                      if (iterateFieldsByAction(currentField, action)) {
-                          break;
-                      }
-                  }
-              }
-              else if (isObject(currentField)) {
-                  if (iterateFieldsByAction(currentField, action)) {
-                      break;
-                  }
-              }
-          }
-      }
-      return;
-  };
-
   var updateFieldArrayRootError = (errors, error, name) => {
-      const fieldArrayErrors = convertToArrayPayload(get(errors, name));
+      const fieldArrayErrors = compact(get(errors, name));
       set(fieldArrayErrors, 'root', error[name]);
       set(errors, name, fieldArrayErrors);
       return errors;
   };
 
+  var isBoolean = (value) => typeof value === 'boolean';
+
   var isFileInput = (element) => element.type === 'file';
 
   var isFunction = (value) => typeof value === 'function';
@@ -615,7 +629,7 @@
       return object;
   }
 
-  var createSubject = () => {
+  function createSubject() {
       let _observers = [];
       const next = (value) => {
           for (const observer of _observers) {
@@ -641,7 +655,7 @@
           subscribe,
           unsubscribe,
       };
-  };
+  }
 
   var isPrimitive = (value) => isNullOrUndefined(value) || !isObjectType(value);
 
@@ -790,13 +804,6 @@
                   : rule.value
               : rule;
 
-  const ASYNC_FUNCTION = 'AsyncFunction';
-  var hasPromiseValidation = (fieldReference) => (!fieldReference || !fieldReference.validate) &&
-      !!((isFunction(fieldReference.validate) &&
-          fieldReference.validate.constructor.name === ASYNC_FUNCTION) ||
-          (isObject(fieldReference.validate) &&
-              Object.values(fieldReference.validate).find((validateFunction) => validateFunction.constructor.name === ASYNC_FUNCTION)));
-
   var hasValidation = (options) => options.mount &&
       (options.required ||
           options.min ||
@@ -858,7 +865,7 @@
       reValidateMode: VALIDATION_MODE.onChange,
       shouldFocusError: true,
   };
-  function createFormControl(props = {}) {
+  function createFormControl(props = {}, flushRootRender) {
       let _options = {
           ...defaultOptions,
           ...props,
@@ -874,9 +881,7 @@
           isValid: false,
           touchedFields: {},
           dirtyFields: {},
-          validatingFields: {},
-          errors: _options.errors || {},
-          disabled: _options.disabled || false,
+          errors: {},
       };
       let _fields = {};
       let _defaultValues = isObject(_options.defaultValues) || isObject(_options.values)
@@ -901,7 +906,6 @@
       const _proxyFormState = {
           isDirty: false,
           dirtyFields: false,
-          validatingFields: false,
           touchedFields: false,
           isValidating: false,
           isValid: false,
@@ -912,6 +916,7 @@
           array: createSubject(),
           state: createSubject(),
       };
+      const shouldCaptureDirtyFields = props.resetOptions && props.resetOptions.keepDirtyValues;
       const validationModeBeforeSubmit = getValidationModes(_options.mode);
       const validationModeAfterSubmit = getValidationModes(_options.reValidateMode);
       const shouldDisplayAllAssociatedErrors = _options.criteriaMode === VALIDATION_MODE.all;
@@ -931,21 +936,10 @@
               }
           }
       };
-      const _updateIsValidating = (names, isValidating) => {
-          if (_proxyFormState.isValidating || _proxyFormState.validatingFields) {
-              (names || Array.from(_names.mount)).forEach((name) => {
-                  if (name) {
-                      isValidating
-                          ? set(_formState.validatingFields, name, isValidating)
-                          : unset(_formState.validatingFields, name);
-                  }
-              });
-              _subjects.state.next({
-                  validatingFields: _formState.validatingFields,
-                  isValidating: !isEmptyObject(_formState.validatingFields),
-              });
-          }
-      };
+      const _updateIsValidating = (value) => _proxyFormState.isValidating &&
+          _subjects.state.next({
+              isValidating: value,
+          });
       const _updateFieldArray = (name, values = [], method, args, shouldSetValues = true, shouldUpdateFieldsAndState = true) => {
           if (args && method) {
               _state.action = true;
@@ -986,13 +980,6 @@
               errors: _formState.errors,
           });
       };
-      const _setErrors = (errors) => {
-          _formState.errors = errors;
-          _subjects.state.next({
-              errors: _formState.errors,
-              isValid: false,
-          });
-      };
       const updateValidAndValue = (name, shouldSkipSetValueAs, value, ref) => {
           const field = get(_fields, name);
           if (field) {
@@ -1011,18 +998,15 @@
           const output = {
               name,
           };
-          const disabledField = !!(get(_fields, name) &&
-              get(_fields, name)._f &&
-              get(_fields, name)._f.disabled);
           if (!isBlurEvent || shouldDirty) {
               if (_proxyFormState.isDirty) {
                   isPreviousDirty = _formState.isDirty;
                   _formState.isDirty = output.isDirty = _getDirty();
                   shouldUpdateField = isPreviousDirty !== output.isDirty;
               }
-              const isCurrentFieldPristine = disabledField || deepEqual(get(_defaultValues, name), fieldValue);
-              isPreviousDirty = !!(!disabledField && get(_formState.dirtyFields, name));
-              isCurrentFieldPristine || disabledField
+              const isCurrentFieldPristine = deepEqual(get(_defaultValues, name), fieldValue);
+              isPreviousDirty = get(_formState.dirtyFields, name);
+              isCurrentFieldPristine
                   ? unset(_formState.dirtyFields, name)
                   : set(_formState.dirtyFields, name, true);
               output.dirtyFields = _formState.dirtyFields;
@@ -1076,13 +1060,9 @@
               };
               _subjects.state.next(updatedFormState);
           }
+          _updateIsValidating(false);
       };
-      const _executeSchema = async (name) => {
-          _updateIsValidating(name, true);
-          const result = await _options.resolver(_formValues, _options.context, getResolverOptions(name || _names.mount, _fields, _options.criteriaMode, _options.shouldUseNativeValidation));
-          _updateIsValidating(name);
-          return result;
-      };
+      const _executeSchema = async (name) => _options.resolver(_formValues, _options.context, getResolverOptions(name || _names.mount, _fields, _options.criteriaMode, _options.shouldUseNativeValidation));
       const executeSchemaAndUpdateState = async (names) => {
           const { errors } = await _executeSchema(names);
           if (names) {
@@ -1107,14 +1087,7 @@
                   const { _f, ...fieldValue } = field;
                   if (_f) {
                       const isFieldArrayRoot = _names.array.has(_f.name);
-                      const isPromiseFunction = field._f && hasPromiseValidation(field._f);
-                      if (isPromiseFunction && _proxyFormState.validatingFields) {
-                          _updateIsValidating([name], true);
-                      }
                       const fieldError = await validateField(field, _formValues, shouldDisplayAllAssociatedErrors, _options.shouldUseNativeValidation && !shouldOnlyCheckValid, isFieldArrayRoot);
-                      if (isPromiseFunction && _proxyFormState.validatingFields) {
-                          _updateIsValidating([name]);
-                      }
                       if (fieldError[_f.name]) {
                           context.valid = false;
                           if (shouldOnlyCheckValid) {
@@ -1128,7 +1101,7 @@
                                   : set(_formState.errors, _f.name, fieldError[_f.name])
                               : unset(_formState.errors, _f.name));
                   }
-                  !isEmptyObject(fieldValue) &&
+                  fieldValue &&
                       (await executeBuiltInValidation(fieldValue, shouldOnlyCheckValid, context));
               }
           }
@@ -1243,22 +1216,17 @@
           }
           isWatched(name, _names) && _subjects.state.next({ ..._formState });
           _subjects.values.next({
-              name: _state.mount ? name : undefined,
+              name,
               values: { ..._formValues },
           });
+          !_state.mount && flushRootRender();
       };
       const onChange = async (event) => {
-          _state.mount = true;
           const target = event.target;
           let name = target.name;
           let isFieldValueUpdated = true;
           const field = get(_fields, name);
           const getCurrentFieldValue = () => target.type ? getFieldValue(field._f) : getEventValue(event);
-          const _updateIsFieldValueUpdated = (fieldValue) => {
-              isFieldValueUpdated =
-                  Number.isNaN(fieldValue) ||
-                      deepEqual(fieldValue, get(_formValues, name, fieldValue));
-          };
           if (field) {
               let error;
               let isValid;
@@ -1287,36 +1255,25 @@
                       values: { ..._formValues },
                   });
               if (shouldSkipValidation) {
-                  if (_proxyFormState.isValid) {
-                      if (props.mode === 'onBlur') {
-                          if (isBlurEvent) {
-                              _updateValid();
-                          }
-                      }
-                      else {
-                          _updateValid();
-                      }
-                  }
+                  _proxyFormState.isValid && _updateValid();
                   return (shouldRender &&
                       _subjects.state.next({ name, ...(watched ? {} : fieldState) }));
               }
               !isBlurEvent && watched && _subjects.state.next({ ..._formState });
+              _updateIsValidating(true);
               if (_options.resolver) {
                   const { errors } = await _executeSchema([name]);
-                  _updateIsFieldValueUpdated(fieldValue);
-                  if (isFieldValueUpdated) {
-                      const previousErrorLookupResult = schemaErrorLookup(_formState.errors, _fields, name);
-                      const errorLookupResult = schemaErrorLookup(errors, _fields, previousErrorLookupResult.name || name);
-                      error = errorLookupResult.error;
-                      name = errorLookupResult.name;
-                      isValid = isEmptyObject(errors);
-                  }
+                  const previousErrorLookupResult = schemaErrorLookup(_formState.errors, _fields, name);
+                  const errorLookupResult = schemaErrorLookup(errors, _fields, previousErrorLookupResult.name || name);
+                  error = errorLookupResult.error;
+                  name = errorLookupResult.name;
+                  isValid = isEmptyObject(errors);
               }
               else {
-                  _updateIsValidating([name], true);
                   error = (await validateField(field, _formValues, shouldDisplayAllAssociatedErrors, _options.shouldUseNativeValidation))[name];
-                  _updateIsValidating([name]);
-                  _updateIsFieldValueUpdated(fieldValue);
+                  isFieldValueUpdated =
+                      isNaN(fieldValue) ||
+                          fieldValue === get(_formValues, name, fieldValue);
                   if (isFieldValueUpdated) {
                       if (error) {
                           isValid = false;
@@ -1333,17 +1290,11 @@
               }
           }
       };
-      const _focusInput = (ref, key) => {
-          if (get(_formState.errors, key) && ref.focus) {
-              ref.focus();
-              return 1;
-          }
-          return;
-      };
       const trigger = async (name, options = {}) => {
           let isValid;
           let validationResult;
           const fieldNames = convertToArrayPayload(name);
+          _updateIsValidating(true);
           if (_options.resolver) {
               const errors = await executeSchemaAndUpdateState(isUndefined(name) ? name : fieldNames);
               isValid = isEmptyObject(errors);
@@ -1368,15 +1319,17 @@
                   : { name }),
               ...(_options.resolver || !name ? { isValid } : {}),
               errors: _formState.errors,
+              isValidating: false,
           });
           options.shouldFocus &&
               !validationResult &&
-              iterateFieldsByAction(_fields, _focusInput, name ? fieldNames : _names.mount);
+              focusFieldBy(_fields, (key) => key && get(_formState.errors, key), name ? fieldNames : _names.mount);
           return validationResult;
       };
       const getValues = (fieldNames) => {
           const values = {
-              ...(_state.mount ? _formValues : _defaultValues),
+              ..._defaultValues,
+              ...(_state.mount ? _formValues : {}),
           };
           return isUndefined(fieldNames)
               ? values
@@ -1387,9 +1340,8 @@
       const getFieldState = (name, formState) => ({
           invalid: !!get((formState || _formState).errors, name),
           isDirty: !!get((formState || _formState).dirtyFields, name),
-          error: get((formState || _formState).errors, name),
-          isValidating: !!get(_formState.validatingFields, name),
           isTouched: !!get((formState || _formState).touchedFields, name),
+          error: get((formState || _formState).errors, name),
       });
       const clearErrors = (name) => {
           name &&
@@ -1400,11 +1352,7 @@
       };
       const setError = (name, error, options) => {
           const ref = (get(_fields, name, { _f: {} })._f || {}).ref;
-          const currentError = get(_formState.errors, name) || {};
-          // Don't override existing error messages elsewhere in the object tree.
-          const { ref: currentRef, message, type, ...restOfErrorTree } = currentError;
           set(_formState.errors, name, {
-              ...restOfErrorTree,
               ...error,
               ref,
           });
@@ -1431,8 +1379,6 @@
               !options.keepError && unset(_formState.errors, fieldName);
               !options.keepDirty && unset(_formState.dirtyFields, fieldName);
               !options.keepTouched && unset(_formState.touchedFields, fieldName);
-              !options.keepIsValidating &&
-                  unset(_formState.validatingFields, fieldName);
               !_options.shouldUnregister &&
                   !options.keepDefaultValue &&
                   unset(_defaultValues, fieldName);
@@ -1446,20 +1392,18 @@
           });
           !options.keepIsValid && _updateValid();
       };
-      const _updateDisabledField = ({ disabled, name, field, fields, value, }) => {
-          if ((isBoolean(disabled) && _state.mount) || !!disabled) {
-              const inputValue = disabled
+      const _updateDisabledField = ({ disabled, name, field, fields, }) => {
+          if (isBoolean(disabled)) {
+              const value = disabled
                   ? undefined
-                  : isUndefined(value)
-                      ? getFieldValue(field ? field._f : get(fields, name)._f)
-                      : value;
-              set(_formValues, name, inputValue);
-              updateTouchAndDirty(name, inputValue, false, false, true);
+                  : get(_formValues, name, getFieldValue(field ? field._f : get(fields, name)._f));
+              set(_formValues, name, value);
+              updateTouchAndDirty(name, value, false, false, true);
           }
       };
       const register = (name, options = {}) => {
           let field = get(_fields, name);
-          const disabledIsDefined = isBoolean(options.disabled) || isBoolean(props.disabled);
+          const disabledIsDefined = isBoolean(options.disabled);
           set(_fields, name, {
               ...(field || {}),
               _f: {
@@ -1473,20 +1417,15 @@
           if (field) {
               _updateDisabledField({
                   field,
-                  disabled: isBoolean(options.disabled)
-                      ? options.disabled
-                      : props.disabled,
+                  disabled: options.disabled,
                   name,
-                  value: options.value,
               });
           }
           else {
               updateValidAndValue(name, true, options.value);
           }
           return {
-              ...(disabledIsDefined
-                  ? { disabled: options.disabled || props.disabled }
-                  : {}),
+              ...(disabledIsDefined ? { disabled: options.disabled } : {}),
               ...(_options.progressive
                   ? {
                       required: !!options.required,
@@ -1546,25 +1485,8 @@
           };
       };
       const _focusError = () => _options.shouldFocusError &&
-          iterateFieldsByAction(_fields, _focusInput, _names.mount);
-      const _disableForm = (disabled) => {
-          if (isBoolean(disabled)) {
-              _subjects.state.next({ disabled });
-              iterateFieldsByAction(_fields, (ref, name) => {
-                  const currentField = get(_fields, name);
-                  if (currentField) {
-                      ref.disabled = currentField._f.disabled || disabled;
-                      if (Array.isArray(currentField._f.refs)) {
-                          currentField._f.refs.forEach((inputRef) => {
-                              inputRef.disabled = currentField._f.disabled || disabled;
-                          });
-                      }
-                  }
-              }, 0, false);
-          }
-      };
+          focusFieldBy(_fields, (key) => key && get(_formState.errors, key), _names.mount);
       const handleSubmit = (onValid, onInvalid) => async (e) => {
-          let onValidError = undefined;
           if (e) {
               e.preventDefault && e.preventDefault();
               e.persist && e.persist();
@@ -1586,12 +1508,7 @@
               _subjects.state.next({
                   errors: {},
               });
-              try {
-                  await onValid(fieldValues, e);
-              }
-              catch (error) {
-                  onValidError = error;
-              }
+              await onValid(fieldValues, e);
           }
           else {
               if (onInvalid) {
@@ -1603,22 +1520,19 @@
           _subjects.state.next({
               isSubmitted: true,
               isSubmitting: false,
-              isSubmitSuccessful: isEmptyObject(_formState.errors) && !onValidError,
+              isSubmitSuccessful: isEmptyObject(_formState.errors),
               submitCount: _formState.submitCount + 1,
               errors: _formState.errors,
           });
-          if (onValidError) {
-              throw onValidError;
-          }
       };
       const resetField = (name, options = {}) => {
           if (get(_fields, name)) {
               if (isUndefined(options.defaultValue)) {
-                  setValue(name, cloneObject(get(_defaultValues, name)));
+                  setValue(name, get(_defaultValues, name));
               }
               else {
                   setValue(name, options.defaultValue);
-                  set(_defaultValues, name, cloneObject(options.defaultValue));
+                  set(_defaultValues, name, options.defaultValue);
               }
               if (!options.keepTouched) {
                   unset(_formState.touchedFields, name);
@@ -1626,7 +1540,7 @@
               if (!options.keepDirty) {
                   unset(_formState.dirtyFields, name);
                   _formState.isDirty = options.defaultValue
-                      ? _getDirty(name, cloneObject(get(_defaultValues, name)))
+                      ? _getDirty(name, get(_defaultValues, name))
                       : _getDirty();
               }
               if (!options.keepError) {
@@ -1639,13 +1553,14 @@
       const _reset = (formValues, keepStateOptions = {}) => {
           const updatedValues = formValues ? cloneObject(formValues) : _defaultValues;
           const cloneUpdatedValues = cloneObject(updatedValues);
-          const isEmptyResetValues = isEmptyObject(formValues);
-          const values = isEmptyResetValues ? _defaultValues : cloneUpdatedValues;
+          const values = formValues && !isEmptyObject(formValues)
+              ? cloneUpdatedValues
+              : _defaultValues;
           if (!keepStateOptions.keepDefaultValues) {
               _defaultValues = updatedValues;
           }
           if (!keepStateOptions.keepValues) {
-              if (keepStateOptions.keepDirtyValues) {
+              if (keepStateOptions.keepDirtyValues || shouldCaptureDirtyFields) {
                   for (const fieldName of _names.mount) {
                       get(_formState.dirtyFields, fieldName)
                           ? set(values, fieldName, get(_formValues, fieldName))
@@ -1685,50 +1600,38 @@
               });
           }
           _names = {
-              mount: keepStateOptions.keepDirtyValues ? _names.mount : new Set(),
+              mount: new Set(),
               unMount: new Set(),
               array: new Set(),
               watch: new Set(),
               watchAll: false,
               focus: '',
           };
-          _state.mount =
-              !_proxyFormState.isValid ||
-                  !!keepStateOptions.keepIsValid ||
-                  !!keepStateOptions.keepDirtyValues;
+          !_state.mount && flushRootRender();
+          _state.mount = !_proxyFormState.isValid || !!keepStateOptions.keepIsValid;
           _state.watch = !!props.shouldUnregister;
           _subjects.state.next({
               submitCount: keepStateOptions.keepSubmitCount
                   ? _formState.submitCount
                   : 0,
-              isDirty: isEmptyResetValues
-                  ? false
-                  : keepStateOptions.keepDirty
-                      ? _formState.isDirty
-                      : !!(keepStateOptions.keepDefaultValues &&
-                          !deepEqual(formValues, _defaultValues)),
+              isDirty: keepStateOptions.keepDirty
+                  ? _formState.isDirty
+                  : !!(keepStateOptions.keepDefaultValues &&
+                      !deepEqual(formValues, _defaultValues)),
               isSubmitted: keepStateOptions.keepIsSubmitted
                   ? _formState.isSubmitted
                   : false,
-              dirtyFields: isEmptyResetValues
-                  ? {}
-                  : keepStateOptions.keepDirtyValues
-                      ? keepStateOptions.keepDefaultValues && _formValues
-                          ? getDirtyFields(_defaultValues, _formValues)
-                          : _formState.dirtyFields
-                      : keepStateOptions.keepDefaultValues && formValues
-                          ? getDirtyFields(_defaultValues, formValues)
-                          : keepStateOptions.keepDirty
-                              ? _formState.dirtyFields
-                              : {},
+              dirtyFields: keepStateOptions.keepDirtyValues
+                  ? _formState.dirtyFields
+                  : keepStateOptions.keepDefaultValues && formValues
+                      ? getDirtyFields(_defaultValues, formValues)
+                      : {},
               touchedFields: keepStateOptions.keepTouched
                   ? _formState.touchedFields
                   : {},
               errors: keepStateOptions.keepErrors ? _formState.errors : {},
-              isSubmitSuccessful: keepStateOptions.keepIsSubmitSuccessful
-                  ? _formState.isSubmitSuccessful
-                  : false,
               isSubmitting: false,
+              isSubmitSuccessful: false,
           });
       };
       const reset = (formValues, keepStateOptions) => _reset(isFunction(formValues)
@@ -1778,10 +1681,8 @@
               _reset,
               _resetDefaultValues,
               _updateFormState,
-              _disableForm,
               _subjects,
               _proxyFormState,
-              _setErrors,
               get _fields() {
                   return _fields;
               },
@@ -1878,16 +1779,14 @@
           submitCount: 0,
           dirtyFields: {},
           touchedFields: {},
-          validatingFields: {},
-          errors: props.errors || {},
-          disabled: props.disabled || false,
+          errors: {},
           defaultValues: isFunction(props.defaultValues)
               ? undefined
               : props.defaultValues,
       });
       if (!_formControl.current) {
           _formControl.current = {
-              ...createFormControl(props),
+              ...createFormControl(props, () => updateFormState((formState) => ({ ...formState }))),
               formState,
           };
       }
@@ -1901,32 +1800,15 @@
               }
           },
       });
-      React__default.useEffect(() => control._disableForm(props.disabled), [control, props.disabled]);
-      React__default.useEffect(() => {
-          if (control._proxyFormState.isDirty) {
-              const isDirty = control._getDirty();
-              if (isDirty !== formState.isDirty) {
-                  control._subjects.state.next({
-                      isDirty,
-                  });
-              }
-          }
-      }, [control, formState.isDirty]);
       React__default.useEffect(() => {
           if (props.values && !deepEqual(props.values, _values.current)) {
               control._reset(props.values, control._options.resetOptions);
               _values.current = props.values;
-              updateFormState((state) => ({ ...state }));
           }
           else {
               control._resetDefaultValues();
           }
       }, [props.values, control]);
-      React__default.useEffect(() => {
-          if (props.errors) {
-              control._setErrors(props.errors);
-          }
-      }, [props.errors, control]);
       React__default.useEffect(() => {
           if (!control._state.mount) {
               control._updateValid();
@@ -1938,12 +1820,6 @@
           }
           control._removeUnmounted();
       });
-      React__default.useEffect(() => {
-          props.shouldUnregister &&
-              control._subjects.values.next({
-                  values: control._getWatch(),
-              });
-      }, [props.shouldUnregister, control]);
       _formControl.current.formState = getProxyFormState(formState, control);
       return _formControl.current;
   }
@@ -2022,6 +1898,7 @@
     var action = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : '';
     var label = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : '';
     var value = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : '';
+
     if (track) {
       instance.event({
         category: category,
@@ -2035,10 +1912,12 @@
   var GALink = function GALink(props) {
     var gaOnClick = function gaOnClick(event) {
       Event(props.instance, props.track, 'Link', "Click on ".concat(props.href), props.label);
+
       if (typeof props.onClick === 'function') {
         props.onClick(event);
       }
     };
+
     return /*#__PURE__*/React__default.createElement("a", _extends({
       href: "/"
     }, props, {
@@ -2047,8 +1926,8 @@
   };
 
   var _templateObject$1, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
-
   /* position relative is required for the Body element to be positioned correctly */
+
   var relativeInlineStyle = styled.css(_templateObject$1 || (_templateObject$1 = _taggedTemplateLiteral(["\n  position: relative;\n"])));
   var topMiddleBodyStyle = styled.css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  position: absolute;\n  z-index: 1;\n  bottom: 50%;\n  left: 50%;\n  transform: translate(-50%, -50%);\n"])));
   var getTopMiddleArrowAfterStyle = function getTopMiddleArrowAfterStyle(props) {
@@ -2062,31 +1941,40 @@
   };
 
   var _templateObject$2;
+
   var getBodyStyle = function getBodyStyle() {
     var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     var _props$toolTipPositio = props.toolTipPosition,
-      toolTipPosition = _props$toolTipPositio === void 0 ? '' : _props$toolTipPositio;
+        toolTipPosition = _props$toolTipPositio === void 0 ? '' : _props$toolTipPositio;
+
     switch (toolTipPosition) {
       case 'top':
         return topMiddleBodyStyle;
+
       case 'bottom':
         return getBottomMiddleBodyStyle(props);
+
       default:
         return null;
     }
   };
+
   var getAfterStyling = function getAfterStyling() {
     var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     var toolTipPosition = props.toolTipPosition;
+
     switch (toolTipPosition) {
       case 'top':
         return getTopMiddleArrowAfterStyle(props);
+
       case 'bottom':
         return getBottomMiddleArrowAfterStyle(props);
+
       default:
         return '';
     }
   };
+
   var Body = styled__default.span(_templateObject$2 || (_templateObject$2 = _taggedTemplateLiteral(["\n  ", ";\n  visibility: hidden;\n  opacity: 0;\n  width: ", ";\n  transition: visibility 0.3s linear, opacity 0.3s linear;\n  background-color: ", ";\n  color: white;\n  text-align: center;\n  border-radius: 5px;\n  ", "\n  &::after {\n    content: ' ';\n    position: absolute;\n    ", "\n  }\n"])), relativeInlineStyle, function (props) {
     return props.bodyWidth;
   }, function (props) {
@@ -2102,12 +1990,12 @@
 
   var Tooltip = function Tooltip(_ref) {
     var children = _ref.children,
-      toolTipText = _ref.toolTipText,
-      toolTipPosition = _ref.toolTipPosition,
-      bodyWidth = _ref.bodyWidth,
-      apexWidth = _ref.apexWidth,
-      containerClassName = _ref.containerClassName,
-      bodyClassName = _ref.bodyClassName;
+        toolTipText = _ref.toolTipText,
+        toolTipPosition = _ref.toolTipPosition,
+        bodyWidth = _ref.bodyWidth,
+        apexWidth = _ref.apexWidth,
+        containerClassName = _ref.containerClassName,
+        bodyClassName = _ref.bodyClassName;
     return /*#__PURE__*/React__default.createElement(Container, {
       className: containerClassName
     }, children, /*#__PURE__*/React__default.createElement(Body, {
@@ -2117,6 +2005,7 @@
       className: bodyClassName
     }, toolTipText));
   };
+
   Tooltip.defaultProps = {
     children: null,
     toolTipText: '',
@@ -2130,21 +2019,25 @@
 
   var CurrencySelect = function CurrencySelect(_ref) {
     var currency = _ref.currency,
-      currencyOptions = _ref.currencyOptions,
-      onCurrencyChange = _ref.onCurrencyChange,
-      _ref$isCurrencySelect = _ref.isCurrencySelectionDisabled,
-      isCurrencySelectionDisabled = _ref$isCurrencySelect === void 0 ? false : _ref$isCurrencySelect,
-      _ref$tooltipContent = _ref.tooltipContent,
-      tooltipContent = _ref$tooltipContent === void 0 ? '' : _ref$tooltipContent;
+        currencyOptions = _ref.currencyOptions,
+        onCurrencyChange = _ref.onCurrencyChange,
+        _ref$isCurrencySelect = _ref.isCurrencySelectionDisabled,
+        isCurrencySelectionDisabled = _ref$isCurrencySelect === void 0 ? false : _ref$isCurrencySelect,
+        _ref$tooltipContent = _ref.tooltipContent,
+        tooltipContent = _ref$tooltipContent === void 0 ? '' : _ref$tooltipContent;
+
     if (!currencyOptions || currencyOptions.length === 0) {
       return null;
     }
+
     var selectedOption = currencyOptions.find(function (opt) {
       return opt.value === currency;
     });
+
     if (!selectedOption) {
       return null;
     }
+
     return /*#__PURE__*/React__default.createElement(Tooltip$1, {
       toolTipText: isCurrencySelectionDisabled ? tooltipContent : '',
       toolTipPosition: "bottom",
@@ -2173,39 +2066,41 @@
 
   var LuxityFooter = function LuxityFooter(_ref) {
     var _ref$showNewsletter = _ref.showNewsletter,
-      showNewsletter = _ref$showNewsletter === void 0 ? true : _ref$showNewsletter,
-      _ref$buyLinks = _ref.buyLinks,
-      buyLinks = _ref$buyLinks === void 0 ? [] : _ref$buyLinks,
-      _ref$sellLinks = _ref.sellLinks,
-      sellLinks = _ref$sellLinks === void 0 ? [] : _ref$sellLinks,
-      _ref$companyLinks = _ref.companyLinks,
-      companyLinks = _ref$companyLinks === void 0 ? [] : _ref$companyLinks,
-      _ref$storeLinks = _ref.storeLinks,
-      storeLinks = _ref$storeLinks === void 0 ? [] : _ref$storeLinks,
-      _ref$popularLinks = _ref.popularLinks,
-      popularLinks = _ref$popularLinks === void 0 ? [] : _ref$popularLinks,
-      _ref$socialLinks = _ref.socialLinks,
-      socialLinks = _ref$socialLinks === void 0 ? [] : _ref$socialLinks,
-      _ref$contactLinks = _ref.contactLinks,
-      contactLinks = _ref$contactLinks === void 0 ? [] : _ref$contactLinks,
-      visaImgSrc = _ref.visaImgSrc,
-      masterCardSrc = _ref.masterCardSrc,
-      paypalImgSrc = _ref.paypalImgSrc,
-      logoSrc = _ref.logoSrc,
-      formIconSrc = _ref.formIconSrc,
-      onSubmit = _ref.onSubmit,
-      currency = _ref.currency,
-      currencyOptions = _ref.currencyOptions,
-      onCurrencyChange = _ref.onCurrencyChange,
-      isCurrencySelectionDisabled = _ref.isCurrencySelectionDisabled,
-      tooltipContent = _ref.tooltipContent;
+        showNewsletter = _ref$showNewsletter === void 0 ? true : _ref$showNewsletter,
+        _ref$buyLinks = _ref.buyLinks,
+        buyLinks = _ref$buyLinks === void 0 ? [] : _ref$buyLinks,
+        _ref$sellLinks = _ref.sellLinks,
+        sellLinks = _ref$sellLinks === void 0 ? [] : _ref$sellLinks,
+        _ref$companyLinks = _ref.companyLinks,
+        companyLinks = _ref$companyLinks === void 0 ? [] : _ref$companyLinks,
+        _ref$storeLinks = _ref.storeLinks,
+        storeLinks = _ref$storeLinks === void 0 ? [] : _ref$storeLinks,
+        _ref$popularLinks = _ref.popularLinks,
+        popularLinks = _ref$popularLinks === void 0 ? [] : _ref$popularLinks,
+        _ref$socialLinks = _ref.socialLinks,
+        socialLinks = _ref$socialLinks === void 0 ? [] : _ref$socialLinks,
+        _ref$contactLinks = _ref.contactLinks,
+        contactLinks = _ref$contactLinks === void 0 ? [] : _ref$contactLinks,
+        visaImgSrc = _ref.visaImgSrc,
+        masterCardSrc = _ref.masterCardSrc,
+        paypalImgSrc = _ref.paypalImgSrc,
+        logoSrc = _ref.logoSrc,
+        formIconSrc = _ref.formIconSrc,
+        onSubmit = _ref.onSubmit,
+        currency = _ref.currency,
+        currencyOptions = _ref.currencyOptions,
+        onCurrencyChange = _ref.onCurrencyChange,
+        isCurrencySelectionDisabled = _ref.isCurrencySelectionDisabled,
+        tooltipContent = _ref.tooltipContent;
     var currentYear = new Date().getFullYear();
+
     var _useForm = useForm(),
-      handleSubmit = _useForm.handleSubmit,
-      register = _useForm.register,
-      errors = _useForm.formState.errors,
-      reset = _useForm.reset,
-      setError = _useForm.setError;
+        handleSubmit = _useForm.handleSubmit,
+        register = _useForm.register,
+        errors = _useForm.formState.errors,
+        reset = _useForm.reset,
+        setError = _useForm.setError;
+
     var renderLinks = function renderLinks(links, title) {
       return /*#__PURE__*/React__default.createElement("div", {
         className: "footer__link-container"
@@ -2234,6 +2129,7 @@
         }), link.label));
       })));
     };
+
     var renderSocialLinks = function renderSocialLinks(links) {
       return /*#__PURE__*/React__default.createElement("div", {
         className: "footer__link-container"
@@ -2270,13 +2166,16 @@
         }, link.label);
       })));
     };
+
     var AccordionSection = function AccordionSection(_ref2) {
       var title = _ref2.title,
-        links = _ref2.links;
+          links = _ref2.links;
+
       var _useState = React.useState(false),
-        _useState2 = _slicedToArray(_useState, 2),
-        isOpen = _useState2[0],
-        setIsOpen = _useState2[1];
+          _useState2 = _slicedToArray(_useState, 2),
+          isOpen = _useState2[0],
+          setIsOpen = _useState2[1];
+
       var contentRef = React.useRef(null);
       return /*#__PURE__*/React__default.createElement("div", {
         className: "border-b border-gray-200"
@@ -2302,6 +2201,7 @@
         }, link.label);
       })));
     };
+
     var submitForm = function submitForm(data) {
       onSubmit(data).then(function (res) {
         if (res.success) {
@@ -2314,6 +2214,7 @@
         }
       });
     };
+
     return /*#__PURE__*/React__default.createElement(FooterWrapper, null, showNewsletter && /*#__PURE__*/React__default.createElement("div", {
       className: "footer__newsletter-section"
     }, /*#__PURE__*/React__default.createElement("div", {
@@ -2405,6 +2306,7 @@
       className: "footer__copyright footer__copyright--mobile"
     }, "Copyright ", currentYear, " | Luxity (Pty) LTD | All Rights Reserved | Website Developed by B Online")));
   };
+
   var index = themed(LuxityFooter);
 
   return index;