rsuite 6.0.0-canary-20250416 → 6.0.0-canary-20250507

package/esm/FormControl/FormControl.js

@@ -1,18 +1,14 @@
 'use client';
 import _extends from "@babel/runtime/helpers/esm/extends";
-import React, { useContext } from 'react';
+import React from 'react';
 import Input from "../Input/index.js";
 import FormErrorMessage from "../FormErrorMessage/index.js";
-import FormContext, { FormValueContext } from "../Form/FormContext.js";
-import useRegisterModel from "./hooks/useRegisterModel.js";
-import useField from "./hooks/useField.js";
 import Toggle from "../Toggle/index.js";
 import Box from "../internals/Box/index.js";
 import { forwardRef } from "../internals/utils/index.js";
-import { useStyles } from "../internals/hooks/index.js";
+import { useStyles, useCustom } from "../internals/hooks/index.js";
 import { useFormGroup } from "../FormGroup/index.js";
-import { useWillUnmount, useEventCallback } from "../internals/hooks/index.js";
-import { useCustom } from "../CustomProvider/index.js";
+import { useFormControl } from "../useFormControl/index.js";
 
 /**
  * Props that FormControl passes to its accepter
@@ -26,37 +22,23 @@ const FormControl = forwardRef((props, ref) => {
   const {
     propsWithDefaults
   } = useCustom('FormControl', props);
-  const {
-    readOnly: readOnlyContext,
-    plaintext: plaintextContext,
-    disabled: disabledContext,
-    errorFromContext,
-    formError,
-    nestedField,
-    removeFieldValue,
-    removeFieldError,
-    onFieldChange,
-    checkTrigger: contextCheckTrigger,
-    checkFieldForNextValue,
-    checkFieldAsyncForNextValue
-  } = useContext(FormContext);
   const {
     as,
     accepter: AccepterComponent = Input,
     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,
+    checkAsync,
+    shouldResetWithUnmount,
     rule,
     id,
     ...rest
@@ -67,61 +49,47 @@ const FormControl = forwardRef((props, ref) => {
     labelId,
     errorMessageId
   } = 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 +.
-    `);
-  }
-  useRegisterModel(name, rule);
-  useWillUnmount(() => {
-    if (shouldResetWithUnmount) {
-      removeFieldValue === null || removeFieldValue === void 0 || removeFieldValue(name);
-      removeFieldError === null || removeFieldError === void 0 || removeFieldError(name);
-    }
-  });
-  const trigger = checkTrigger || contextCheckTrigger;
-  const formValue = useContext(FormValueContext);
+
+  // Use the useFormControl hook to handle form control logic
   const {
-    fieldValue,
-    fieldError,
-    setFieldValue
-  } = useField({
+    value: fieldValue,
+    error: fieldError,
+    plaintext: contextPlaintext,
+    readOnly: contextReadOnly,
+    disabled: contextDisabled,
+    onChange: handleFieldChange,
+    onBlur: handleFieldBlur
+  } = 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
   } = useStyles(classPrefix);
   const classes = withPrefix('wrapper');
-  const handleFieldChange = 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 = useEventCallback(event => {
-    if (trigger === 'blur') {
-      handleFieldCheck(fieldValue);
-    }
-    onBlur === null || onBlur === void 0 || onBlur(event);
-  });
-  const handleFieldCheck = 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 ? 'checked' : 'value';
@@ -129,6 +97,7 @@ const FormControl = forwardRef((props, ref) => {
     // need to distinguish between undefined and null
     [valueKey]: fieldValue === undefined ? defaultValue : fieldValue
   };
+  const hasError = Boolean(fieldError);
   return /*#__PURE__*/React.createElement(Box, {
     as: as,
     className: classes,
@@ -138,20 +107,20 @@ const FormControl = 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.createElement(FormErrorMessage, {
     id: errorMessageId,
     role: "alert",
     "aria-relevant": "all",
-    show: fieldHasError,
+    show: hasError,
     className: prefix`message-wrapper`,
     placement: errorPlacement
   }, fieldError));

package/esm/FormControlLabel/FormControlLabel.js

@@ -2,9 +2,8 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import React from 'react';
 import Box from "../internals/Box/index.js";
-import { useStyles } from "../internals/hooks/index.js";
+import { useStyles, useCustom } from "../internals/hooks/index.js";
 import { forwardRef } from "../internals/utils/index.js";
-import { useCustom } from "../CustomProvider/index.js";
 import { useFormGroup } from "../FormGroup/index.js";
 /**
  * The `<Form.ControlLabel>` component renders a label with required indicator, for form controls.

package/esm/FormErrorMessage/FormErrorMessage.js

@@ -2,9 +2,8 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import React from 'react';
 import Box from "../internals/Box/index.js";
-import { useStyles } from "../internals/hooks/index.js";
+import { useStyles, useCustom } from "../internals/hooks/index.js";
 import { forwardRef, kebabPlace } from "../internals/utils/index.js";
-import { useCustom } from "../CustomProvider/index.js";
 /**
  * The `<Form.ErrorMessage>` component is used to display error messages in the form.
  * @see https://rsuitejs.com/components/form/

package/esm/FormGroup/FormGroup.js

@@ -3,8 +3,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import React, { useMemo } from 'react';
 import Box from "../internals/Box/index.js";
 import { forwardRef } from "../internals/utils/index.js";
-import { useStyles, useUniqueId } from "../internals/hooks/index.js";
-import { useCustom } from "../CustomProvider/index.js";
+import { useStyles, useCustom, useUniqueId } from "../internals/hooks/index.js";
 const FormGroupContext = /*#__PURE__*/React.createContext({});
 export const useFormGroup = controlId => {
   const context = React.useContext(FormGroupContext);

package/esm/FormHelpText/FormHelpText.js

@@ -6,9 +6,8 @@ import Tooltip from "../Tooltip/index.js";
 import Whisper from "../Whisper/index.js";
 import Box from "../internals/Box/index.js";
 import { forwardRef } from "../internals/utils/index.js";
-import { useStyles } from "../internals/hooks/index.js";
+import { useStyles, useCustom } from "../internals/hooks/index.js";
 import { useFormGroup } from "../FormGroup/index.js";
-import { useCustom } from "../CustomProvider/index.js";
 /**
  * The `<Form.HelpText>` component is used to display help information in the form.
  * @see https://rsuitejs.com/components/form/

package/esm/FormStack/FormStack.js

@@ -3,8 +3,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import React from 'react';
 import Box from "../internals/Box/index.js";
 import { forwardRef, mergeStyles, getCssValue } from "../internals/utils/index.js";
-import { useStyles } from "../internals/hooks/index.js";
-import { useCustom } from "../CustomProvider/index.js";
+import { useStyles, useCustom } from "../internals/hooks/index.js";
 /**
  * The `<Form.Stack>` component is a quick layout component through Flexbox,
  * supporting vertical and horizontal stacking, custom spacing and line wrapping.

package/esm/Grid/Col.js

@@ -5,8 +5,7 @@ import omit from 'lodash/omit';
 import Box from "../internals/Box/index.js";
 import { forwardRef } from "../internals/utils/index.js";
 import { BREAKPOINTS } from "../internals/constants/index.js";
-import { useStyles } from "../internals/hooks/index.js";
-import { useCustom } from "../CustomProvider/index.js";
+import { useStyles, useCustom } from "../internals/hooks/index.js";
 /**
  * The `Col` component is used for layout and grids.
  * @see https://rsuitejs.com/en/components/grid

package/esm/Grid/Grid.js

@@ -3,8 +3,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import React from 'react';
 import Box from "../internals/Box/index.js";
 import { forwardRef } from "../internals/utils/index.js";
-import { useStyles } from "../internals/hooks/index.js";
-import { useCustom } from "../CustomProvider/index.js";
+import { useStyles, useCustom } from "../internals/hooks/index.js";
 /**
  * The Grid component is used to specify the layout of child elements in rows and columns.
  * @see https://rsuitejs.com/components/grid

package/esm/Grid/Row.js

@@ -2,8 +2,7 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import React from 'react';
 import Box from "../internals/Box/index.js";
-import { useStyles } from "../internals/hooks/index.js";
-import { useCustom } from "../CustomProvider/index.js";
+import { useStyles, useCustom } from "../internals/hooks/index.js";
 import { forwardRef, mergeStyles } from "../internals/utils/index.js";
 import { getResponsiveGutterStyles } from "./utils/styles.js";
 /**

package/esm/Heading/Heading.js

@@ -3,8 +3,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import React from 'react';
 import Box from "../internals/Box/index.js";
 import { forwardRef } from "../internals/utils/index.js";
-import { useStyles } from "../internals/hooks/index.js";
-import { useCustom } from "../CustomProvider/index.js";
+import { useStyles, useCustom } from "../internals/hooks/index.js";
 /**
  *
  * The `Heading` component is used to display a heading.

package/esm/Highlight/Highlight.js

@@ -2,10 +2,9 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import React from 'react';
 import Box from "../internals/Box/index.js";
-import { useStyles } from "../internals/hooks/index.js";
-import { highlightText } from "./utils/highlightText.js";
 import { forwardRef, stringifyReactNode } from "../internals/utils/index.js";
-import { useCustom } from "../CustomProvider/index.js";
+import { useStyles, useCustom } from "../internals/hooks/index.js";
+import { highlightText } from "./utils/highlightText.js";
 function defaultRenderMark(match, index) {
   return /*#__PURE__*/React.createElement("mark", {
     key: index,

package/esm/IconButton/IconButton.js

@@ -3,8 +3,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import React from 'react';
 import Button from "../Button/index.js";
 import { forwardRef } from "../internals/utils/index.js";
-import { useStyles } from "../internals/hooks/index.js";
-import { useCustom } from "../CustomProvider/index.js";
+import { useStyles, useCustom } from "../internals/hooks/index.js";
 /**
  * The `IconButton` component is used to specify a button with icon.
  * @see https://rsuitejs.com/components/button

package/esm/Image/Image.js

@@ -2,11 +2,10 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import React from 'react';
 import Box from "../internals/Box/index.js";
-import { useStyles } from "../internals/hooks/index.js";
+import { useStyles, useCustom } from "../internals/hooks/index.js";
+import { forwardRef } from "../internals/utils/index.js";
 import { ImageWrapper } from "./ImageWrapper.js";
 import { useImage } from "./hooks/useImage.js";
-import { useCustom } from "../CustomProvider/index.js";
-import { forwardRef } from "../internals/utils/index.js";
 const Image = forwardRef((props, ref) => {
   const {
     propsWithDefaults

package/esm/InlineEdit/InlineEdit.js

@@ -5,10 +5,9 @@ import EditableControls from "./EditableControls.js";
 import useFocusEvent from "./useFocusEvent.js";
 import useEditState from "./useEditState.js";
 import Box from "../internals/Box/index.js";
-import { useStyles } from "../internals/hooks/index.js";
+import { useStyles, useCustom } from "../internals/hooks/index.js";
 import { forwardRef, mergeRefs } from "../internals/utils/index.js";
 import { renderChildren, defaultRenderInput } from "./renderChildren.js";
-import { useCustom } from "../CustomProvider/index.js";
 const InlineEdit = forwardRef((props, ref) => {
   const {
     propsWithDefaults

package/esm/Input/Input.js

@@ -1,10 +1,10 @@
 'use client';
 import _extends from "@babel/runtime/helpers/esm/extends";
 import React, { useContext } from 'react';
-import { forwardRef } from "../internals/utils/index.js";
 import InputBase from "../internals/InputBase/index.js";
+import { forwardRef } from "../internals/utils/index.js";
 import { InputGroupContext } from "../InputGroup/InputGroup.js";
-import { useCustom } from "../CustomProvider/index.js";
+import { useCustom } from "../internals/hooks/index.js";
 /**
  * The `<Input>` component is used to get user input in a text field.
  *

package/esm/InputGroup/InputGroup.js

@@ -5,8 +5,7 @@ import Box from "../internals/Box/index.js";
 import InputGroupAddon from "./InputGroupAddon.js";
 import InputGroupButton from "./InputGroupButton.js";
 import { forwardRef } from "../internals/utils/index.js";
-import { useStyles } from "../internals/hooks/index.js";
-import { useCustom } from "../CustomProvider/index.js";
+import { useStyles, useCustom } from "../internals/hooks/index.js";
 export const InputGroupContext = /*#__PURE__*/React.createContext(null);
 const Subcomponents = {
   Addon: InputGroupAddon,

package/esm/InputNumber/index.d.ts

@@ -1,4 +1,14 @@
-import InputNumber from './InputNumber';
-export type { InputNumberProps } from './InputNumber';
+/// <reference types="react" />
+import { NumberInputProps as InputNumberProps } from '../NumberInput';
+/**
+ * The `InputNumber` component is used to enter a numerical value.
+ * @see https://rsuitejs.com/components/number-input
+ * @deprecated Use `NumberInput` instead.
+ */
+declare const InputNumber: import("../internals/types").InternalRefForwardingComponent<import("../internals/types").InternalRefForwardingComponent<"div", import("..").InputGroupProps, never> & {
+    Addon: import("../internals/types").InternalRefForwardingComponent<"span", import("..").InputGroupAddonProps, never> & Record<string, never>;
+    Button: import("react").ForwardRefExoticComponent<import("..").ButtonProps & import("react").RefAttributes<any>>;
+}, InputNumberProps<string | number | null>, never> & Record<string, never>;
+export type { InputNumberProps };
 export { InputNumber };
 export default InputNumber;

package/esm/InputNumber/index.js

@@ -1,5 +1,12 @@
 'use client';
-import InputNumber from "./InputNumber.js";
+import NumberInput from "../NumberInput/index.js";
+
+/**
+ * The `InputNumber` component is used to enter a numerical value.
+ * @see https://rsuitejs.com/components/number-input
+ * @deprecated Use `NumberInput` instead.
+ */
+const InputNumber = NumberInput;
 
 // export types
 

package/esm/InputPicker/InputPicker.js

@@ -14,11 +14,10 @@ import useInput from "./hooks/useInput.js";
 import useData from "./hooks/useData.js";
 import Plaintext from "../internals/Plaintext/index.js";
 import { filterNodesOfTree } from "../internals/Tree/utils/index.js";
-import { useStyles, useControlled, useEventCallback } from "../internals/hooks/index.js";
+import { useStyles, useCustom, useControlled, useEventCallback } from "../internals/hooks/index.js";
 import { KEY_VALUES } from "../internals/constants/index.js";
 import { useTagContext } from "./InputPickerContext.js";
 import { convertSize } from "./utils.js";
-import { useCustom } from "../CustomProvider/index.js";
 import { forwardRef, shallowEqual, getDataGroupBy, createChainedFunction, tplTransform, mergeRefs, isOneOf, mergeStyles } from "../internals/utils/index.js";
 import { Listbox, ListItem, ListCheckItem, PickerToggle, PickerPopup, PickerToggleTrigger, useFocusItemValue, useSearch, usePickerRef, useToggleKeyDownEvent, triggerPropKeys } from "../internals/Picker/index.js";
 import { getPositionStyle } from "../internals/Overlay/Position.js";

package/esm/InputPicker/utils.d.ts

@@ -1 +1 @@
-export declare const convertSize: (size?: string) => "sm" | "md" | "lg";
+export declare const convertSize: (size?: string) => "lg" | "md" | "sm";

package/esm/Kbd/Kbd.js

@@ -3,8 +3,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import React from 'react';
 import Box from "../internals/Box/index.js";
 import { forwardRef } from "../internals/utils/index.js";
-import { useStyles } from "../internals/hooks/index.js";
-import { useCustom } from "../CustomProvider/index.js";
+import { useStyles, useCustom } from "../internals/hooks/index.js";
 /**
  *
  * The `Kbd` component is used to display a Kbd.

package/esm/Link/Link.js

@@ -2,8 +2,7 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import React from 'react';
 import { forwardRef } from "../internals/utils/index.js";
-import { useStyles } from "../internals/hooks/index.js";
-import { useCustom } from "../CustomProvider/index.js";
+import { useStyles, useCustom } from "../internals/hooks/index.js";
 import SafeAnchor from "../internals/SafeAnchor/index.js";
 import ExternalLinkIcon from "./ExternalLinkIcon.js";
 const Link = forwardRef((props, ref) => {

package/esm/List/List.js

@@ -5,9 +5,8 @@ import useSortHelper from "./helper/useSortHelper.js";
 import ListContext from "./ListContext.js";
 import ListItem from "./ListItem.js";
 import Box from "../internals/Box/index.js";
-import { useStyles } from "../internals/hooks/index.js";
+import { useStyles, useCustom } from "../internals/hooks/index.js";
 import { forwardRef, mergeRefs } from "../internals/utils/index.js";
-import { useCustom } from "../CustomProvider/index.js";
 const Subcomponents = {
   Item: ListItem
 };

package/esm/Loader/Loader.js

@@ -3,8 +3,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import React from 'react';
 import Box from "../internals/Box/index.js";
 import { forwardRef } from "../internals/utils/index.js";
-import { useStyles, useUniqueId } from "../internals/hooks/index.js";
-import { useCustom } from "../CustomProvider/index.js";
+import { useStyles, useCustom, useUniqueId } from "../internals/hooks/index.js";
 /**
  * The `Loader` component is used to indicate the loading state of a page or a section.
  * @see https://rsuitejs.com/components/loader

package/esm/MaskedInput/MaskedInput.js

@@ -4,7 +4,7 @@ import React from 'react';
 import TextMask from "./TextMask.js";
 import Input from "../Input/index.js";
 import { forwardRef } from "../internals/utils/index.js";
-import { useCustom } from "../CustomProvider/index.js";
+import { useCustom } from "../internals/hooks/index.js";
 const MaskedInput = forwardRef((props, ref) => {
   const {
     propsWithDefaults

package/esm/Message/Message.js

@@ -6,8 +6,7 @@ import useDelayedClosure from "../toaster/hooks/useDelayedClosure.js";
 import Box from "../internals/Box/index.js";
 import { mergeRefs, forwardRef } from "../internals/utils/index.js";
 import { MESSAGE_STATUS_ICONS } from "../internals/constants/statusIcons.js";
-import { useStyles, useIsMounted, useEventCallback } from "../internals/hooks/index.js";
-import { useCustom } from "../CustomProvider/index.js";
+import { useStyles, useCustom, useIsMounted, useEventCallback } from "../internals/hooks/index.js";
 /**
  * The `Message` component is used to display important messages to users.
  * @see https://rsuitejs.com/components/message

package/esm/Modal/Modal.js

@@ -11,11 +11,10 @@ import ModalBody from "./ModalBody.js";
 import ModalHeader from "./ModalHeader.js";
 import ModalTitle from "./ModalTitle.js";
 import ModalFooter from "./ModalFooter.js";
-import { useStyles, useWillUnmount, useUniqueId } from "../internals/hooks/index.js";
+import { useStyles, useCustom, useWillUnmount, useUniqueId } from "../internals/hooks/index.js";
 import { mergeRefs, forwardRef } from "../internals/utils/index.js";
 import { ModalContext } from "./ModalContext.js";
 import { useBodyStyles } from "./utils.js";
-import { useCustom } from "../CustomProvider/index.js";
 const modalSizes = ['xs', 'sm', 'md', 'lg', 'full'];
 const Subcomponents = {
   Body: ModalBody,

package/esm/Modal/ModalHeader.js

@@ -25,7 +25,6 @@ const ModalHeader = forwardRef((props, ref) => {
   const classes = merge(className, withPrefix());
   const context = useContext(ModalContext);
   const {
-    isDrawer,
     onModalClose
   } = context || {};
   return /*#__PURE__*/React.createElement(Box, _extends({
@@ -34,7 +33,7 @@ const ModalHeader = forwardRef((props, ref) => {
     ref: ref,
     className: classes
   }), closeButton && /*#__PURE__*/React.createElement(CloseButton, {
-    as: isDrawer ? IconButton : 'button',
+    as: IconButton,
     className: prefix('close'),
     onClick: createChainedFunction(onClose, onModalClose)
   }), children);

package/esm/MultiCascadeTree/MultiCascadeTree.js

@@ -6,8 +6,7 @@ import SearchView from "./SearchView.js";
 import Box from "../internals/Box/index.js";
 import { forwardRef } from "../internals/utils/index.js";
 import { useCascadeValue, useSelect, useSearch } from "./hooks/index.js";
-import { useStyles, useControlled } from "../internals/hooks/index.js";
-import { useCustom } from "../CustomProvider/index.js";
+import { useStyles, useCustom, useControlled } from "../internals/hooks/index.js";
 const emptyArray = [];
 
 /**

package/esm/MultiCascadeTree/SearchView.js

@@ -4,8 +4,7 @@ import React from 'react';
 import SearchBox from "../internals/SearchBox/index.js";
 import Checkbox from "../Checkbox/index.js";
 import Highlight from "../Highlight/index.js";
-import { useStyles } from "../internals/hooks/index.js";
-import { useCustom } from "../CustomProvider/index.js";
+import { useStyles, useCustom } from "../internals/hooks/index.js";
 import { isSomeChildChecked, getNodeParents } from "./utils.js";
 function SearchView(props) {
   const {

package/esm/MultiCascadeTree/TreeView.js

@@ -4,11 +4,10 @@ import React from 'react';
 import SpinnerIcon from '@rsuite/icons/Spinner';
 import ArrowLeftLineIcon from '@rsuite/icons/ArrowLeftLine';
 import ArrowRightLineIcon from '@rsuite/icons/ArrowRightLine';
-import { useStyles, useEventCallback } from "../internals/hooks/index.js";
+import { useStyles, useCustom, useEventCallback } from "../internals/hooks/index.js";
 import { forwardRef, shallowEqual, mergeStyles } from "../internals/utils/index.js";
 import { ListCheckItem, useCombobox } from "../internals/Picker/index.js";
 import { isSomeParentChecked, isSomeChildChecked } from "./utils.js";
-import { useCustom } from "../CustomProvider/index.js";
 const emptyArray = [];
 const TreeView = forwardRef((props, ref) => {
   const {

package/esm/MultiCascader/MultiCascader.js

@@ -8,11 +8,10 @@ import TreeView from "../MultiCascadeTree/TreeView.js";
 import SearchView from "../MultiCascadeTree/SearchView.js";
 import useActive from "../Cascader/useActive.js";
 import { findNodeOfTree } from "../internals/Tree/utils/index.js";
-import { useStyles, useControlled, useEventCallback } from "../internals/hooks/index.js";
+import { useStyles, useCustom, useControlled, useEventCallback } from "../internals/hooks/index.js";
 import { getColumnsAndPaths } from "../CascadeTree/utils.js";
 import { forwardRef, createChainedFunction, mergeRefs } from "../internals/utils/index.js";
 import { useCascadeValue, useSearch, useSelect } from "../MultiCascadeTree/hooks/index.js";
-import { useCustom } from "../CustomProvider/index.js";
 import { PickerToggle, PickerPopup, SelectedElement, PickerToggleTrigger, usePickerRef, useToggleKeyDownEvent, useFocusItemValue, triggerPropKeys } from "../internals/Picker/index.js";
 const emptyArray = [];
 

package/esm/Nav/Nav.js

@@ -11,10 +11,9 @@ import NavDropdownMenu from "./NavDropdownMenu.js";
 import AdaptiveNavItem from "./AdaptiveNavItem.js";
 import Box from "../internals/Box/index.js";
 import { forwardRef, deprecateComponent } from "../internals/utils/index.js";
-import { useStyles, useEnsuredRef, useControlled } from "../internals/hooks/index.js";
+import { useStyles, useCustom, useEnsuredRef, useControlled } from "../internals/hooks/index.js";
 import { NavbarContext } from "../Navbar/NavbarContext.js";
 import { SidenavContext } from "../Sidenav/Sidenav.js";
-import { useCustom } from "../CustomProvider/index.js";
 const DeprecatedNavDropdown = deprecateComponent(NavDropdown, '<Nav.Dropdown> is deprecated, use <Nav.Menu> instead.');
 DeprecatedNavDropdown.Menu = deprecateComponent(NavDropdownMenu, '<Nav.Dropdown.Menu> is deprecated, use <Nav.Menu> instead');
 DeprecatedNavDropdown.Item = deprecateComponent(NavDropdownItem, '<Nav.Dropdown.Item> is deprecated, use <Nav.Item> instead');

package/esm/Nav/NavDropdownMenu.js

@@ -7,9 +7,8 @@ import MenuItem from "../internals/Menu/MenuItem.js";
 import PagePreviousIcon from '@rsuite/icons/PagePrevious';
 import PageNextIcon from '@rsuite/icons/PageNext';
 import NavContext from "./NavContext.js";
-import { useStyles } from "../internals/hooks/index.js";
+import { useStyles, useCustom } from "../internals/hooks/index.js";
 import { mergeRefs } from "../internals/utils/index.js";
-import { useCustom } from "../CustomProvider/index.js";
 /**
  * @private
  */

package/esm/Navbar/Navbar.d.ts

@@ -17,7 +17,7 @@ export interface NavbarProps extends BoxProps {
 declare const Navbar: import("../internals/types").InternalRefForwardingComponent<"div", NavbarProps, never> & {
     Brand: import("../internals/types").InternalRefForwardingComponent<"a", Partial<import("../internals/utils").ComponentProps>, never> & Record<string, never>;
     Content: import("../internals/types").InternalRefForwardingComponent<import("../internals/types").InternalRefForwardingComponent<"div", BoxProps, never> & Record<string, never>, Partial<import("./NavbarContent").NavbarContentProps>, never> & Record<string, never>;
-    Toggle: React.ForwardRefExoticComponent<import("..").IconButtonProps & React.RefAttributes<any>>;
+    Toggle: React.ForwardRefExoticComponent<import("./NavbarToggle").NavbarToggleProps & React.RefAttributes<any>>;
     Drawer: React.ForwardRefExoticComponent<import("..").DrawerProps & React.RefAttributes<any>>;
 };
 export default Navbar;