rsuite 6.0.0-canary-20250424 → 6.0.0-canary-20250620

package/cjs/DateRangePicker/disabledDateUtils.js

@@ -12,8 +12,7 @@ exports.beforeToday = beforeToday;
 exports.combine = combine;
 var _utils = require("../internals/utils");
 var DateUtils = _interopRequireWildcard(require("../internals/utils/date"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function isAfterDay(date1, date2) {
   return DateUtils.isAfter(new Date(date1.getFullYear(), date1.getMonth(), date1.getDate()), new Date(date2.getFullYear(), date2.getMonth(), date2.getDate()));
 }
@@ -74,10 +73,7 @@ function allowedRange(startDate, endDate) {
 /**
  Disable dates after the specified date.
  */
-function before(beforeDate) {
-  if (beforeDate === void 0) {
-    beforeDate = new Date();
-  }
+function before(beforeDate = new Date()) {
   return date => {
     if (isBeforeDay(date, new Date(beforeDate))) {
       return true;
@@ -89,10 +85,7 @@ function before(beforeDate) {
 /**
  Disable dates before the specified date.
  */
-function after(afterDate) {
-  if (afterDate === void 0) {
-    afterDate = new Date();
-  }
+function after(afterDate = new Date()) {
   return date => {
     if (isAfterDay(date, new Date(afterDate))) {
       return true;
@@ -118,14 +111,8 @@ function afterToday() {
 /**
  Used to combine multiple conditions.
  */
-function combine() {
-  for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-    args[_key] = arguments[_key];
-  }
-  return function () {
-    for (var _len2 = arguments.length, disabledDateArgs = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-      disabledDateArgs[_key2] = arguments[_key2];
-    }
+function combine(...args) {
+  return (...disabledDateArgs) => {
     return args.reduce((a, b) => a(...disabledDateArgs) || b(...disabledDateArgs));
   };
 }

package/cjs/DateRangePicker/hooks/useCalendarHandlers.js

@@ -7,14 +7,13 @@ exports.useCalendarHandlers = useCalendarHandlers;
 var _react = require("react");
 var _hooks = require("../../internals/hooks");
 var _date = require("../../internals/utils/date");
-function useCalendarHandlers(_ref) {
-  let {
-    index,
-    calendarDateRange,
-    onChangeCalendarMonth,
-    onChangeCalendarTime,
-    onSelect
-  } = _ref;
+function useCalendarHandlers({
+  index,
+  calendarDateRange,
+  onChangeCalendarMonth,
+  onChangeCalendarTime,
+  onSelect
+}) {
   const calendarDate = (0, _react.useMemo)(() => calendarDateRange[index], [calendarDateRange, index]);
   const handleSelect = (0, _hooks.useEventCallback)((date, event) => {
     onSelect === null || onSelect === void 0 || onSelect(index, date, event);

package/cjs/DateRangePicker/utils.js

@@ -6,13 +6,12 @@ exports.getMonthHoverRange = void 0;
 exports.getSafeCalendarDate = getSafeCalendarDate;
 exports.isSameRange = exports.getWeekHoverRange = void 0;
 var _date = require("../internals/utils/date");
-function getSafeCalendarDate(_ref) {
+function getSafeCalendarDate({
+  value,
+  calendarKey = 'start',
+  allowSameMonth
+}) {
   var _value;
-  let {
-    value,
-    calendarKey = 'start',
-    allowSameMonth
-  } = _ref;
   // Update calendarDate if the value is not null
   value = (_value = value) !== null && _value !== void 0 ? _value : [];
   const gap = allowSameMonth ? 0 : 1;

package/cjs/Dropdown/Dropdown.js

@@ -19,8 +19,7 @@ var _Nav = _interopRequireDefault(require("../Nav"));
 var _hooks = require("../internals/hooks");
 var _utils = require("../internals/utils");
 var _DropdownState = require("./DropdownState");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 const Subcomponents = {
   Item: _DropdownItem.default,
   Menu: _DropdownMenu.default,
@@ -122,11 +121,10 @@ const Dropdown = (0, _utils.forwardRef)((props, ref) => {
     renderMenuButton: renderMenuButton,
     disabled: disabled,
     openMenuOn: menuButtonTriggers,
-    renderMenuPopup: (_ref, popupRef) => {
-      let {
-        open,
-        ...popupProps
-      } = _ref;
+    renderMenuPopup: ({
+      open,
+      ...popupProps
+    }, popupRef) => {
       const menuClassName = mergeMenuClassName(className, withMenuClassPrefix({}));
       return /*#__PURE__*/_react.default.createElement("ul", (0, _extends2.default)({
         ref: popupRef,
@@ -143,11 +141,10 @@ const Dropdown = (0, _utils.forwardRef)((props, ref) => {
         onClose === null || onClose === void 0 || onClose();
       }
     }
-  }, (_ref2, menuContainerRef) => {
-    let {
-      open,
-      ...menuContainer
-    } = _ref2;
+  }, ({
+    open,
+    ...menuContainer
+  }, menuContainerRef) => {
     const classes = merge(className, withPrefix({
       disabled,
       open

package/cjs/Dropdown/DropdownItem.js

@@ -19,8 +19,7 @@ var _useRenderMenuItem = require("../internals/Menu/useRenderMenuItem");
 var _hooks = require("../internals/hooks");
 var _utils = require("../internals/utils");
 var _DropdownState = require("./DropdownState");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 /**
  * The `<Dropdown.Item>` API
  * - When used inside `<Sidenav>`, renders a `<TreeviewItem>`
@@ -106,12 +105,11 @@ const DropdownItem = (0, _utils.forwardRef)((props, ref) => {
     selected: selected,
     disabled: disabled,
     onActivate: handleSelectItem
-  }, (_ref, menuitemRef) => {
-    let {
-      selected,
-      active,
-      ...menuitem
-    } = _ref;
+  }, ({
+    selected,
+    active,
+    ...menuitem
+  }, menuitemRef) => {
     const classes = merge(className, withPrefix({
       'with-icon': icon,
       active: selected,

package/cjs/Dropdown/DropdownMenu.js

@@ -17,8 +17,7 @@ var _Nav = _interopRequireDefault(require("../Nav"));
 var _NavContext = _interopRequireDefault(require("../Nav/NavContext"));
 var _hooks = require("../internals/hooks");
 var _utils = require("../internals/utils");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 /**
  * The `<Dropdown.Menu>` API
  *
@@ -109,43 +108,38 @@ const DropdownMenu = /*#__PURE__*/_react.default.forwardRef((props, ref) => {
   const Icon = rtl ? _PagePrevious.default : _PageNext.default;
   return /*#__PURE__*/_react.default.createElement(_Menu.default, {
     openMenuOn: ['mouseover', 'click'],
-    renderMenuButton: (_ref, buttonRef) => {
-      let {
-        open,
-        ...menuButtonProps
-      } = _ref;
-      return /*#__PURE__*/_react.default.createElement(_MenuItem.default, {
-        disabled: disabled
-      }, (_ref2, menuitemRef) => {
-        let {
-          selected,
-          active,
-          ...menuitem
-        } = _ref2;
-        const classes = mergeItemClassNames(className, prefixItemClassName`toggle`, withItemClassPrefix({
-          'with-icon': icon,
-          open,
-          active: selected,
-          disabled,
-          focus: active
-        }));
-        return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({
-          ref: (0, _utils.mergeRefs)(buttonRef, menuitemRef),
-          className: classes,
-          "data-event-key": eventKey,
-          "data-event-key-type": typeof eventKey
-        }, menuitem, (0, _omit.default)(menuButtonProps, ['role'])), icon && /*#__PURE__*/_react.default.cloneElement(icon, {
-          className: prefix('menu-icon')
-        }), title, /*#__PURE__*/_react.default.createElement(Icon, {
-          className: prefix`toggle-icon`
-        }));
-      });
-    },
-    renderMenuPopup: (_ref3, popupRef) => {
-      let {
+    renderMenuButton: ({
+      open,
+      ...menuButtonProps
+    }, buttonRef) => /*#__PURE__*/_react.default.createElement(_MenuItem.default, {
+      disabled: disabled
+    }, ({
+      selected,
+      active,
+      ...menuitem
+    }, menuitemRef) => {
+      const classes = mergeItemClassNames(className, prefixItemClassName`toggle`, withItemClassPrefix({
+        'with-icon': icon,
         open,
-        ...popupProps
-      } = _ref3;
+        active: selected,
+        disabled,
+        focus: active
+      }));
+      return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({
+        ref: (0, _utils.mergeRefs)(buttonRef, menuitemRef),
+        className: classes,
+        "data-event-key": eventKey,
+        "data-event-key-type": typeof eventKey
+      }, menuitem, (0, _omit.default)(menuButtonProps, ['role'])), icon && /*#__PURE__*/_react.default.cloneElement(icon, {
+        className: prefix('menu-icon')
+      }), title, /*#__PURE__*/_react.default.createElement(Icon, {
+        className: prefix`toggle-icon`
+      }));
+    }),
+    renderMenuPopup: ({
+      open,
+      ...popupProps
+    }, popupRef) => {
       const menuClassName = mergeMenuClassName(className, withMenuClassPrefix());
       return /*#__PURE__*/_react.default.createElement("ul", (0, _extends2.default)({
         ref: popupRef,
@@ -154,11 +148,10 @@ const DropdownMenu = /*#__PURE__*/_react.default.forwardRef((props, ref) => {
       }, popupProps, menuProps), children);
     },
     onToggleMenu: handleToggleSubmenu
-  }, (_ref4, menuContainerRef) => {
-    let {
-      open,
-      ...menuContainer
-    } = _ref4;
+  }, ({
+    open,
+    ...menuContainer
+  }, menuContainerRef) => {
     const classes = mergeItemClassNames(className, withItemClassPrefix({
       disabled,
       open,

package/cjs/Dropdown/DropdownState.js

@@ -13,10 +13,7 @@ let DropdownActionType = exports.DropdownActionType = /*#__PURE__*/function (Dro
   DropdownActionType[DropdownActionType["UpdateItem"] = 2] = "UpdateItem";
   return DropdownActionType;
 }({});
-function reducer(state, action) {
-  if (state === void 0) {
-    state = initialState;
-  }
+function reducer(state = initialState, action) {
   switch (action.type) {
     case DropdownActionType.RegisterItem:
       if (state.items.find(item => item.id === action.payload.id)) {

package/cjs/Form/Form.js

@@ -21,8 +21,7 @@ var _utils = require("../internals/utils");
 var _schemaTyped = require("schema-typed");
 var _hooks = require("../internals/hooks");
 var _FormContext = require("./FormContext");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 const defaultSchema = (0, _schemaTyped.SchemaModel)({});
 const Subcomponents = {
   Stack: _FormStack.default,

package/cjs/Form/FormContext.d.ts

@@ -11,7 +11,7 @@ interface TrulyFormContextValue<T = RecordAny, M = any, E = {
     removeFieldError: (name: string) => void;
     removeFieldRule: (name: string) => void;
     pushFieldRule: (name: string, fieldRule: FieldRuleType) => void;
-    onFieldChange: (name: string, value: any, event: React.SyntheticEvent) => void;
+    onFieldChange: (name: string, value: any, event?: React.SyntheticEvent) => void;
     checkFieldForNextValue: (name: string, nextValue: Record<string, unknown>, callback?: (checkResult: Record<string, unknown>) => void) => boolean;
     checkFieldAsyncForNextValue: (name: string, nextValue: Record<string, unknown>) => Promise<Record<string, unknown>>;
 }

package/cjs/Form/FormContext.js

@@ -5,8 +5,7 @@ exports.__esModule = true;
 exports.default = exports.FormValueProvider = exports.FormValueContext = exports.FormProvider = exports.FormContext = void 0;
 exports.useFormContext = useFormContext;
 var _react = _interopRequireWildcard(require("react"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 const FormContext = exports.FormContext = /*#__PURE__*/_react.default.createContext({});
 const FormValueContext = exports.FormValueContext = /*#__PURE__*/_react.default.createContext({});
 const FormProvider = exports.FormProvider = FormContext.Provider;

package/cjs/Form/hooks/useFormValidate.js

@@ -8,7 +8,7 @@ var _react = require("react");
 var _omit = _interopRequireDefault(require("lodash/omit"));
 var _set = _interopRequireDefault(require("lodash/set"));
 var _hooks = require("../../internals/hooks");
-var _utils = require("../../FormControl/utils");
+var _nameToPath = require("../../useFormControl/utils/nameToPath");
 function useFormValidate(_formError, props) {
   const {
     formValue,
@@ -43,8 +43,7 @@ function useFormValidate(_formError, props) {
 
       // Check nested object
       if (type !== null && type !== void 0 && type.objectTypeSchemaSpec) {
-        Object.entries(type.objectTypeSchemaSpec).forEach(_ref => {
-          let [nestedKey, nestedType] = _ref;
+        Object.entries(type.objectTypeSchemaSpec).forEach(([nestedKey, nestedType]) => {
           formErrorObj[key] = formErrorObj[key] || {
             object: {}
           };
@@ -52,8 +51,7 @@ function useFormValidate(_formError, props) {
         });
       }
     };
-    Object.entries(model.getSchemaSpec()).forEach(_ref2 => {
-      let [key, type] = _ref2;
+    Object.entries(model.getSchemaSpec()).forEach(([key, type]) => {
       checkField(key, type, formValue[key], formError);
     });
     setFormError(formError);
@@ -77,7 +75,7 @@ function useFormValidate(_formError, props) {
      * so nestedField does not support proxy here
      */
     if (nestedField) {
-      nextFormError = (0, _set.default)(nextFormError, (0, _utils.nameToPath)(fieldName), resultOfCurrentField);
+      nextFormError = (0, _set.default)(nextFormError, (0, _nameToPath.nameToPath)(fieldName), resultOfCurrentField);
       setFormError(nextFormError);
       onCheck === null || onCheck === void 0 || onCheck(nextFormError);
       callback === null || callback === void 0 || callback(resultOfCurrentField);
@@ -164,7 +162,7 @@ function useFormValidate(_formError, props) {
        */
 
       if (nestedField) {
-        nextFormError = (0, _set.default)(nextFormError, (0, _utils.nameToPath)(fieldName), resultOfCurrentField);
+        nextFormError = (0, _set.default)(nextFormError, (0, _nameToPath.nameToPath)(fieldName), resultOfCurrentField);
         onCheck === null || onCheck === void 0 || onCheck(nextFormError);
         setFormError(nextFormError);
         if (resultOfCurrentField.hasError) {
@@ -210,7 +208,7 @@ function useFormValidate(_formError, props) {
      * when this function is called when the children component is unmount,
      * it's an old render frame so use Ref to get future error
      */
-    const formError = (0, _omit.default)(realFormErrorRef.current, [nestedField ? (0, _utils.nameToPath)(name) : name]);
+    const formError = (0, _omit.default)(realFormErrorRef.current, [nestedField ? (0, _nameToPath.nameToPath)(name) : name]);
     realFormErrorRef.current = formError;
     setFormError(formError);
     onCheck === null || onCheck === void 0 || onCheck(formError);
@@ -219,14 +217,11 @@ function useFormValidate(_formError, props) {
   const cleanErrors = (0, _hooks.useEventCallback)(() => {
     setFormError({});
   });
-  const resetErrors = (0, _hooks.useEventCallback)(function (formError) {
-    if (formError === void 0) {
-      formError = {};
-    }
+  const resetErrors = (0, _hooks.useEventCallback)((formError = {}) => {
     setFormError(formError);
   });
   const cleanErrorForField = (0, _hooks.useEventCallback)(fieldName => {
-    setFormError((0, _omit.default)(realFormError, [nestedField ? (0, _utils.nameToPath)(fieldName) : fieldName]));
+    setFormError((0, _omit.default)(realFormError, [nestedField ? (0, _nameToPath.nameToPath)(fieldName) : fieldName]));
   });
   return {
     formError: realFormError,

package/cjs/Form/hooks/useSchemaModel.js

@@ -25,15 +25,12 @@ function useSchemaModel(formModel, nestedField) {
     if (realSubRules.length === 0) {
       return formModel;
     }
-    const subRuleObject = realSubRules.map(_ref => {
-      let {
-        name,
-        fieldRule
-      } = _ref;
-      return {
-        [name]: fieldRule.current
-      };
-    }).reduce((a, b) => Object.assign(a, b), {});
+    const subRuleObject = realSubRules.map(({
+      name,
+      fieldRule
+    }) => ({
+      [name]: fieldRule.current
+    })).reduce((a, b) => Object.assign(a, b), {});
     return _schemaTyped.SchemaModel.combine(formModel, (0, _schemaTyped.SchemaModel)(nestedField ? (0, _constructFlatSchema.constructFlatSchema)(subRuleObject) : subRuleObject));
   }, [formModel, nestedField]);
   return {

package/cjs/FormControl/FormControl.d.ts

@@ -2,7 +2,7 @@ import React from 'react';
 import Input from '../Input';
 import { BoxProps } from '../internals/Box';
 import type { CheckType } from 'schema-typed';
-import type { PlacementCorners, FormControlBaseProps, CheckTriggerType } from '../internals/types';
+import type { ErrorMessagePlacement, FormControlBaseProps, CheckTriggerType } from '../internals/types';
 /**
  * Props that FormControl passes to its accepter
  */
@@ -29,7 +29,7 @@ export interface FormControlProps<ValueType = any> extends BoxProps, Omit<React.
     /** Show error messages */
     errorMessage?: React.ReactNode;
     /** The placement of error messages */
-    errorPlacement?: PlacementCorners;
+    errorPlacement?: ErrorMessagePlacement;
     /** Make the control readonly */
     readOnly?: boolean;
     /** Render the control as plain text */

package/cjs/FormControl/FormControl.js

@@ -5,19 +5,15 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports.default = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 var _Input = _interopRequireDefault(require("../Input"));
 var _FormErrorMessage = _interopRequireDefault(require("../FormErrorMessage"));
-var _FormContext = _interopRequireWildcard(require("../Form/FormContext"));
-var _useRegisterModel = _interopRequireDefault(require("./hooks/useRegisterModel"));
-var _useField = _interopRequireDefault(require("./hooks/useField"));
 var _Toggle = _interopRequireDefault(require("../Toggle"));
 var _Box = _interopRequireDefault(require("../internals/Box"));
 var _utils = require("../internals/utils");
 var _hooks = require("../internals/hooks");
 var _FormGroup = require("../FormGroup");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+var _useFormControl = require("../useFormControl");
 /**
  * Props that FormControl passes to its accepter
  */
@@ -30,37 +26,23 @@ const FormControl = (0, _utils.forwardRef)((props, ref) => {
   const {
     propsWithDefaults
   } = (0, _hooks.useCustom)('FormControl', props);
-  const {
-    readOnly: readOnlyContext,
-    plaintext: plaintextContext,
-    disabled: disabledContext,
-    errorFromContext,
-    formError,
-    nestedField,
-    removeFieldValue,
-    removeFieldError,
-    onFieldChange,
-    checkTrigger: contextCheckTrigger,
-    checkFieldForNextValue,
-    checkFieldAsyncForNextValue
-  } = (0, _react.useContext)(_FormContext.default);
   const {
     as,
     accepter: AccepterComponent = _Input.default,
     classPrefix = 'form-control',
-    checkAsync,
-    checkTrigger,
-    errorPlacement = 'bottomStart',
-    errorMessage,
     name,
     value,
-    readOnly = readOnlyContext,
-    plaintext = plaintextContext,
-    disabled = disabledContext,
-    onChange,
-    onBlur,
+    readOnly,
+    plaintext,
+    disabled,
+    onChange: propsOnChange,
+    onBlur: propsOnBlur,
     defaultValue,
-    shouldResetWithUnmount = false,
+    checkTrigger,
+    errorMessage,
+    errorPlacement = 'bottomStart',
+    checkAsync,
+    shouldResetWithUnmount,
     rule,
     id,
     ...rest
@@ -71,61 +53,47 @@ const FormControl = (0, _utils.forwardRef)((props, ref) => {
     labelId,
     errorMessageId
   } = (0, _FormGroup.useFormGroup)(id);
-  if (!onFieldChange) {
-    throw new Error(`
-      <FormControl> must be inside a component decorated with <Form>.
-      And need to update React to 16.6.0 +.
-    `);
-  }
-  (0, _useRegisterModel.default)(name, rule);
-  (0, _hooks.useWillUnmount)(() => {
-    if (shouldResetWithUnmount) {
-      removeFieldValue === null || removeFieldValue === void 0 || removeFieldValue(name);
-      removeFieldError === null || removeFieldError === void 0 || removeFieldError(name);
-    }
-  });
-  const trigger = checkTrigger || contextCheckTrigger;
-  const formValue = (0, _react.useContext)(_FormContext.FormValueContext);
+
+  // Use the useFormControl hook to handle form control logic
   const {
-    fieldValue,
-    fieldError,
-    setFieldValue
-  } = (0, _useField.default)({
+    value: fieldValue,
+    error: fieldError,
+    plaintext: contextPlaintext,
+    readOnly: contextReadOnly,
+    disabled: contextDisabled,
+    onChange: handleFieldChange,
+    onBlur: handleFieldBlur
+  } = (0, _useFormControl.useFormControl)({
     name,
-    errorMessage,
-    formValue,
-    formError,
     value,
-    nestedField,
-    errorFromContext
+    checkTrigger,
+    errorMessage,
+    checkAsync,
+    shouldResetWithUnmount,
+    rule
   });
+
+  // Combine props and context values
+  const resolvedReadOnly = readOnly !== null && readOnly !== void 0 ? readOnly : contextReadOnly;
+  const resolvedPlaintext = plaintext !== null && plaintext !== void 0 ? plaintext : contextPlaintext;
+  const resolvedDisabled = disabled !== null && disabled !== void 0 ? disabled : contextDisabled;
   const {
     withPrefix,
     prefix
   } = (0, _hooks.useStyles)(classPrefix);
   const classes = withPrefix('wrapper');
-  const handleFieldChange = (0, _hooks.useEventCallback)((value, event) => {
-    if (trigger === 'change') {
-      handleFieldCheck(value);
-    }
-    onFieldChange === null || onFieldChange === void 0 || onFieldChange(name, value, event);
-    onChange === null || onChange === void 0 || onChange(value, event);
-  });
-  const handleFieldBlur = (0, _hooks.useEventCallback)(event => {
-    if (trigger === 'blur') {
-      handleFieldCheck(fieldValue);
-    }
-    onBlur === null || onBlur === void 0 || onBlur(event);
-  });
-  const handleFieldCheck = (0, _hooks.useEventCallback)(value => {
-    const nextFormValue = setFieldValue(name, value);
-    if (checkAsync) {
-      checkFieldAsyncForNextValue(name, nextFormValue);
-    } else {
-      checkFieldForNextValue(name, nextFormValue);
-    }
-  });
-  const fieldHasError = Boolean(fieldError);
+
+  // Handle onChange with both hook's implementation and prop callback
+  const handleChange = (value, event) => {
+    handleFieldChange(value, event);
+    propsOnChange === null || propsOnChange === void 0 || propsOnChange(value, event);
+  };
+
+  // Handle onBlur with both hook's implementation and prop callback
+  const handleBlur = event => {
+    handleFieldBlur(); // onBlur doesn't take parameters in the hook
+    propsOnBlur === null || propsOnBlur === void 0 || propsOnBlur(event);
+  };
 
   // Toggle component is a special case that uses `checked` and `defaultChecked` instead of `value` and `defaultValue` props.
   const valueKey = AccepterComponent === _Toggle.default ? 'checked' : 'value';
@@ -133,6 +101,7 @@ const FormControl = (0, _utils.forwardRef)((props, ref) => {
     // need to distinguish between undefined and null
     [valueKey]: fieldValue === undefined ? defaultValue : fieldValue
   };
+  const hasError = Boolean(fieldError);
   return /*#__PURE__*/_react.default.createElement(_Box.default, {
     as: as,
     className: classes,
@@ -142,20 +111,20 @@ const FormControl = (0, _utils.forwardRef)((props, ref) => {
     id: controlId,
     "aria-labelledby": labelId,
     "aria-describedby": helpTextId,
-    "aria-invalid": fieldHasError || undefined,
-    "aria-errormessage": fieldHasError ? errorMessageId : undefined
+    "aria-invalid": hasError || undefined,
+    "aria-errormessage": hasError ? errorMessageId : undefined
   }, accepterProps, rest, {
-    readOnly: readOnly,
-    plaintext: plaintext,
-    disabled: disabled,
+    readOnly: resolvedReadOnly,
+    plaintext: resolvedPlaintext,
+    disabled: resolvedDisabled,
     name: name,
-    onChange: handleFieldChange,
-    onBlur: handleFieldBlur
+    onChange: handleChange,
+    onBlur: handleBlur
   })), /*#__PURE__*/_react.default.createElement(_FormErrorMessage.default, {
     id: errorMessageId,
     role: "alert",
     "aria-relevant": "all",
-    show: fieldHasError,
+    show: hasError,
     className: prefix`message-wrapper`,
     placement: errorPlacement
   }, fieldError));

package/cjs/FormErrorMessage/FormErrorMessage.d.ts

@@ -1,10 +1,10 @@
 import { BoxProps } from '../internals/Box';
-import type { PlacementCorners } from '../internals/types';
+import type { ErrorMessagePlacement } from '../internals/types';
 export interface FormErrorMessageProps extends BoxProps {
     /** Show error messages */
     show?: boolean;
     /** The placement of error messages */
-    placement?: PlacementCorners;
+    placement?: ErrorMessagePlacement;
 }
 /**
  * The `<Form.ErrorMessage>` component is used to display error messages in the form.