@underverse-ui/underverse 0.2.19 → 0.2.20

package/dist/index.cjs

@@ -10467,25 +10467,23 @@ var isPlainObject = (tempObject) => {
 };
 var isWeb = typeof window !== "undefined" && typeof window.HTMLElement !== "undefined" && typeof document !== "undefined";
 function cloneObject(data) {
-  let copy;
-  const isArray = Array.isArray(data);
-  const isFileListInstance = typeof FileList !== "undefined" ? data instanceof FileList : false;
   if (data instanceof Date) {
-    copy = new Date(data);
-  } else if (!(isWeb && (data instanceof Blob || isFileListInstance)) && (isArray || isObject(data))) {
-    copy = isArray ? [] : Object.create(Object.getPrototypeOf(data));
-    if (!isArray && !isPlainObject(data)) {
-      copy = data;
-    } else {
-      for (const key in data) {
-        if (data.hasOwnProperty(key)) {
-          copy[key] = cloneObject(data[key]);
-        }
-      }
-    }
-  } else {
+    return new Date(data);
+  }
+  const isFileListInstance = typeof FileList !== "undefined" && data instanceof FileList;
+  if (isWeb && (data instanceof Blob || isFileListInstance)) {
+    return data;
+  }
+  const isArray = Array.isArray(data);
+  if (!isArray && !(isObject(data) && isPlainObject(data))) {
     return data;
   }
+  const copy = isArray ? [] : Object.create(Object.getPrototypeOf(data));
+  for (const key in data) {
+    if (Object.prototype.hasOwnProperty.call(data, key)) {
+      copy[key] = cloneObject(data[key]);
+    }
+  }
   return copy;
 }
 var isKey = (value) => /^\w*$/.test(value);
@@ -10500,6 +10498,7 @@ var get = (object, path, defaultValue) => {
   return isUndefined(result) || result === object ? isUndefined(object[path]) ? defaultValue : object[path] : result;
 };
 var isBoolean = (value) => typeof value === "boolean";
+var isFunction = (value) => typeof value === "function";
 var set = (object, path, value) => {
   let index = -1;
   const tempPath = isKey(path) ? [path] : stringToPath(path);
@@ -10611,7 +10610,7 @@ var generateWatchOutput = (names, _names, formValues, isGlobal, defaultValue) =>
 var isPrimitive = (value) => isNullOrUndefined(value) || !isObjectType(value);
 function deepEqual(object1, object2, _internal_visited = /* @__PURE__ */ new WeakSet()) {
   if (isPrimitive(object1) || isPrimitive(object2)) {
-    return object1 === object2;
+    return Object.is(object1, object2);
   }
   if (isDateObject(object1) && isDateObject(object2)) {
     return object1.getTime() === object2.getTime();
@@ -10633,7 +10632,7 @@ function deepEqual(object1, object2, _internal_visited = /* @__PURE__ */ new Wea
     }
     if (key !== "ref") {
       const val2 = object2[key];
-      if (isDateObject(val1) && isDateObject(val2) || isObject(val1) && isObject(val2) || Array.isArray(val1) && Array.isArray(val2) ? !deepEqual(val1, val2, _internal_visited) : val1 !== val2) {
+      if (isDateObject(val1) && isDateObject(val2) || isObject(val1) && isObject(val2) || Array.isArray(val1) && Array.isArray(val2) ? !deepEqual(val1, val2, _internal_visited) : !Object.is(val1, val2)) {
         return false;
       }
     }
@@ -10646,48 +10645,76 @@ function useWatch(props) {
   const _defaultValue = import_react24.default.useRef(defaultValue);
   const _compute = import_react24.default.useRef(compute);
   const _computeFormValues = import_react24.default.useRef(void 0);
+  const _prevControl = import_react24.default.useRef(control);
+  const _prevName = import_react24.default.useRef(name);
   _compute.current = compute;
-  const defaultValueMemo = import_react24.default.useMemo(() => control._getWatch(name, _defaultValue.current), [control, name]);
-  const [value, updateValue] = import_react24.default.useState(_compute.current ? _compute.current(defaultValueMemo) : defaultValueMemo);
-  useIsomorphicLayoutEffect(() => control._subscribe({
-    name,
-    formState: {
-      values: true
-    },
-    exact,
-    callback: (formState) => {
-      if (!disabled) {
-        const formValues = generateWatchOutput(name, control._names, formState.values || control._formValues, false, _defaultValue.current);
-        if (_compute.current) {
-          const computedFormValues = _compute.current(formValues);
-          if (!deepEqual(computedFormValues, _computeFormValues.current)) {
-            updateValue(computedFormValues);
-            _computeFormValues.current = computedFormValues;
-          }
-        } else {
-          updateValue(formValues);
+  const [value, updateValue] = import_react24.default.useState(() => {
+    const defaultValue2 = control._getWatch(name, _defaultValue.current);
+    return _compute.current ? _compute.current(defaultValue2) : defaultValue2;
+  });
+  const getCurrentOutput = import_react24.default.useCallback((values) => {
+    const formValues = generateWatchOutput(name, control._names, values || control._formValues, false, _defaultValue.current);
+    return _compute.current ? _compute.current(formValues) : formValues;
+  }, [control._formValues, control._names, name]);
+  const refreshValue = import_react24.default.useCallback((values) => {
+    if (!disabled) {
+      const formValues = generateWatchOutput(name, control._names, values || control._formValues, false, _defaultValue.current);
+      if (_compute.current) {
+        const computedFormValues = _compute.current(formValues);
+        if (!deepEqual(computedFormValues, _computeFormValues.current)) {
+          updateValue(computedFormValues);
+          _computeFormValues.current = computedFormValues;
         }
+      } else {
+        updateValue(formValues);
       }
     }
-  }), [control, disabled, name, exact]);
+  }, [control._formValues, control._names, disabled, name]);
+  useIsomorphicLayoutEffect(() => {
+    if (_prevControl.current !== control || !deepEqual(_prevName.current, name)) {
+      _prevControl.current = control;
+      _prevName.current = name;
+      refreshValue();
+    }
+    return control._subscribe({
+      name,
+      formState: {
+        values: true
+      },
+      exact,
+      callback: (formState) => {
+        refreshValue(formState.values);
+      }
+    });
+  }, [control, exact, name, refreshValue]);
   import_react24.default.useEffect(() => control._removeUnmounted());
-  return value;
+  const controlChanged = _prevControl.current !== control;
+  const prevName = _prevName.current;
+  const computedOutput = import_react24.default.useMemo(() => {
+    if (disabled) {
+      return null;
+    }
+    const nameChanged = !controlChanged && !deepEqual(prevName, name);
+    const shouldReturnImmediate = controlChanged || nameChanged;
+    return shouldReturnImmediate ? getCurrentOutput() : null;
+  }, [disabled, controlChanged, name, prevName, getCurrentOutput]);
+  return computedOutput !== null ? computedOutput : value;
 }
 function useController(props) {
   const methods = useFormContext();
-  const { name, disabled, control = methods.control, shouldUnregister, defaultValue } = props;
+  const { name, disabled, control = methods.control, shouldUnregister, defaultValue, exact = true } = props;
   const isArrayField = isNameInFieldArray(control._names.array, name);
   const defaultValueMemo = import_react24.default.useMemo(() => get(control._formValues, name, get(control._defaultValues, name, defaultValue)), [control, name, defaultValue]);
   const value = useWatch({
     control,
     name,
     defaultValue: defaultValueMemo,
-    exact: true
+    exact
   });
   const formState = useFormState({
     control,
     name,
-    exact: true
+    exact
   });
   const _props = import_react24.default.useRef(props);
   const _previousNameRef = import_react24.default.useRef(void 0);
@@ -10735,12 +10762,12 @@ function useController(props) {
   }), [name, control._formValues]);
   const ref = import_react24.default.useCallback((elm) => {
     const field2 = get(control._fields, name);
-    if (field2 && elm) {
+    if (field2 && field2._f && elm) {
       field2._f.ref = {
-        focus: () => elm.focus && elm.focus(),
-        select: () => elm.select && elm.select(),
-        setCustomValidity: (message) => elm.setCustomValidity(message),
-        reportValidity: () => elm.reportValidity()
+        focus: () => isFunction(elm.focus) && elm.focus(),
+        select: () => isFunction(elm.select) && elm.select(),
+        setCustomValidity: (message) => isFunction(elm.setCustomValidity) && elm.setCustomValidity(message),
+        reportValidity: () => isFunction(elm.reportValidity) && elm.reportValidity()
       };
     }
   }, [control._fields, name]);
@@ -10850,7 +10877,6 @@ function extractFormValues(fieldsState, formValues) {
 }
 var isEmptyObject = (value) => isObject(value) && !Object.keys(value).length;
 var isFileInput = (element) => element.type === "file";
-var isFunction = (value) => typeof value === "function";
 var isHTMLElement = (value) => {
   if (!isWeb) {
     return false;
@@ -10904,10 +10930,11 @@ function isTraversable(value) {
 }
 function markFieldsDirty(data, fields = {}) {
   for (const key in data) {
-    if (isTraversable(data[key])) {
-      fields[key] = Array.isArray(data[key]) ? [] : {};
-      markFieldsDirty(data[key], fields[key]);
-    } else if (!isUndefined(data[key])) {
+    const value = data[key];
+    if (isTraversable(value)) {
+      fields[key] = Array.isArray(value) ? [] : {};
+      markFieldsDirty(value, fields[key]);
+    } else if (!isUndefined(value)) {
       fields[key] = true;
     }
   }
@@ -10918,14 +10945,16 @@ function getDirtyFields(data, formValues, dirtyFieldsFromValues) {
     dirtyFieldsFromValues = markFieldsDirty(formValues);
   }
   for (const key in data) {
-    if (isTraversable(data[key])) {
+    const value = data[key];
+    if (isTraversable(value)) {
       if (isUndefined(formValues) || isPrimitive(dirtyFieldsFromValues[key])) {
-        dirtyFieldsFromValues[key] = markFieldsDirty(data[key], Array.isArray(data[key]) ? [] : {});
+        dirtyFieldsFromValues[key] = markFieldsDirty(value, Array.isArray(value) ? [] : {});
       } else {
-        getDirtyFields(data[key], isNullOrUndefined(formValues) ? {} : formValues[key], dirtyFieldsFromValues[key]);
+        getDirtyFields(value, isNullOrUndefined(formValues) ? {} : formValues[key], dirtyFieldsFromValues[key]);
       }
     } else {
-      dirtyFieldsFromValues[key] = !deepEqual(data[key], formValues[key]);
+      const formValue = formValues[key];
+      dirtyFieldsFromValues[key] = !deepEqual(value, formValue);
     }
   }
   return dirtyFieldsFromValues;
@@ -11277,7 +11306,8 @@ function createFormControl(props = {}) {
   let _state = {
     action: false,
     mount: false,
-    watch: false
+    watch: false,
+    keepIsValid: false
   };
   let _names = {
     mount: /* @__PURE__ */ new Set(),
@@ -11288,7 +11318,7 @@ function createFormControl(props = {}) {
   };
   let delayErrorCallback;
   let timer = 0;
-  const _proxyFormState = {
+  const defaultProxyFormState = {
     isDirty: false,
     dirtyFields: false,
     validatingFields: false,
@@ -11297,6 +11327,9 @@ function createFormControl(props = {}) {
     isValid: false,
     errors: false
   };
+  const _proxyFormState = {
+    ...defaultProxyFormState
+  };
   let _proxySubscribeFormState = {
     ..._proxyFormState
   };
@@ -11310,8 +11343,17 @@ function createFormControl(props = {}) {
     timer = setTimeout(callback, wait);
   };
   const _setValid = async (shouldUpdateValid) => {
+    if (_state.keepIsValid) {
+      return;
+    }
     if (!_options.disabled && (_proxyFormState.isValid || _proxySubscribeFormState.isValid || shouldUpdateValid)) {
-      const isValid = _options.resolver ? isEmptyObject((await _runSchema()).errors) : await executeBuiltInValidation(_fields, true);
+      let isValid;
+      if (_options.resolver) {
+        isValid = isEmptyObject((await _runSchema()).errors);
+        _updateIsValidating();
+      } else {
+        isValid = await executeBuiltInValidation(_fields, true);
+      }
       if (isValid !== _formState.isValid) {
         _subjects.state.next({
           isValid
@@ -11380,7 +11422,7 @@ function createFormControl(props = {}) {
     if (field) {
       const defaultValue = get(_formValues, name, isUndefined(value) ? get(_defaultValues, name) : value);
       isUndefined(defaultValue) || ref && ref.defaultChecked || shouldSkipSetValueAs ? set(_formValues, name, shouldSkipSetValueAs ? defaultValue : getFieldValue(field._f)) : setFieldValue(name, defaultValue);
-      _state.mount && _setValid();
+      _state.mount && !_state.action && _setValid();
     }
   };
   const updateTouchAndDirty = (name, fieldValue, isBlurEvent, shouldDirty, shouldRender) => {
@@ -11442,11 +11484,11 @@ function createFormControl(props = {}) {
   const _runSchema = 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 executeSchemaAndUpdateState = async (names) => {
     const { errors } = await _runSchema(names);
+    _updateIsValidating(names);
     if (names) {
       for (const name of names) {
         const error = get(errors, name);
@@ -11625,6 +11667,7 @@ function createFormControl(props = {}) {
       !isBlurEvent && watched && _subjects.state.next({ ..._formState });
       if (_options.resolver) {
         const { errors } = await _runSchema([name]);
+        _updateIsValidating([name]);
         _updateIsFieldValueUpdated(fieldValue);
         if (isFieldValueUpdated) {
           const previousErrorLookupResult = schemaErrorLookup(_formState.errors, _fields, name);
@@ -11745,7 +11788,10 @@ function createFormControl(props = {}) {
     };
     return _subscribe({
       ...props2,
-      formState: _proxySubscribeFormState
+      formState: {
+        ...defaultProxyFormState,
+        ...props2.formState
+      }
     });
   };
   const unregister = (name, options = {}) => {
@@ -11873,6 +11919,7 @@ function createFormControl(props = {}) {
     });
     if (_options.resolver) {
       const { errors, values } = await _runSchema();
+      _updateIsValidating();
       _formState.errors = errors;
       fieldValues = cloneObject(values);
     } else {
@@ -11991,8 +12038,13 @@ function createFormControl(props = {}) {
       watchAll: false,
       focus: ""
     };
-    _state.mount = !_proxyFormState.isValid || !!keepStateOptions.keepIsValid || !!keepStateOptions.keepDirtyValues;
+    _state.mount = !_proxyFormState.isValid || !!keepStateOptions.keepIsValid || !!keepStateOptions.keepDirtyValues || !_options.shouldUnregister && !isEmptyObject(values);
     _state.watch = !!_options.shouldUnregister;
+    _state.keepIsValid = !!keepStateOptions.keepIsValid;
+    _state.action = false;
+    if (!keepStateOptions.keepErrors) {
+      _formState.errors = {};
+    }
     _subjects.state.next({
       submitCount: keepStateOptions.keepSubmitCount ? _formState.submitCount : 0,
       isDirty: isEmptyResetValues ? false : keepStateOptions.keepDirty ? _formState.isDirty : !!(keepStateOptions.keepDefaultValues && !deepEqual(formValues, _defaultValues)),
@@ -12005,15 +12057,17 @@ function createFormControl(props = {}) {
       defaultValues: _defaultValues
     });
   };
-  const reset = (formValues, keepStateOptions) => _reset(isFunction(formValues) ? formValues(_formValues) : formValues, keepStateOptions);
+  const reset = (formValues, keepStateOptions) => _reset(isFunction(formValues) ? formValues(_formValues) : formValues, { ..._options.resetOptions, ...keepStateOptions });
   const setFocus = (name, options = {}) => {
     const field = get(_fields, name);
     const fieldReference = field && field._f;
     if (fieldReference) {
       const fieldRef = fieldReference.refs ? fieldReference.refs[0] : fieldReference.ref;
       if (fieldRef.focus) {
-        fieldRef.focus();
-        options.shouldSelect && isFunction(fieldRef.select) && fieldRef.select();
+        setTimeout(() => {
+          fieldRef.focus();
+          options.shouldSelect && isFunction(fieldRef.select) && fieldRef.select();
+        });
       }
     }
   };
@@ -12038,6 +12092,7 @@ function createFormControl(props = {}) {
       setError,
       _subscribe,
       _runSchema,
+      _updateIsValidating,
       _focusError,
       _getWatch,
       _getDirty,
@@ -12189,11 +12244,15 @@ function useForm(props = {}) {
     }
   }, [control, formState.isDirty]);
   import_react24.default.useEffect(() => {
+    var _a;
     if (props.values && !deepEqual(props.values, _values.current)) {
       control._reset(props.values, {
         keepFieldsRef: true,
         ...control._options.resetOptions
       });
+      if (!((_a = control._options.resetOptions) === null || _a === void 0 ? void 0 : _a.keepIsValid)) {
+        control._setValid();
+      }
       _values.current = props.values;
       updateFormState((state) => ({ ...state }));
     } else {