rsuite 6.0.0-canary-20250103 → 6.0.0-canary-2025011413

package/cjs/Modal/ModalBody.d.ts

@@ -1,4 +1,4 @@
-import { WithAsProps, RsRefForwardingComponent } from '../internals/types';
+import type { WithAsProps } from '../internals/types';
 export type ModalBodyProps = WithAsProps;
-declare const ModalBody: RsRefForwardingComponent<'div', ModalBodyProps>;
+declare const ModalBody: import("../internals/types").InternalRefForwardingComponent<"div", ModalBodyProps, never> & Record<string, never>;
 export default ModalBody;

package/cjs/Modal/ModalBody.js

@@ -6,13 +6,14 @@ exports.__esModule = true;
 exports.default = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _react = _interopRequireWildcard(require("react"));
-var _hooks = require("../internals/hooks");
-var _ModalContext = require("./ModalContext");
 var _IconButton = _interopRequireDefault(require("../IconButton"));
 var _Close = _interopRequireDefault(require("@rsuite/icons/Close"));
+var _hooks = require("../internals/hooks");
+var _ModalContext = require("./ModalContext");
+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; }
-const ModalBody = /*#__PURE__*/_react.default.forwardRef((props, ref) => {
+const ModalBody = (0, _utils.forwardRef)((props, ref) => {
   const {
     as: Component = 'div',
     classPrefix = 'modal-body',

package/cjs/Modal/ModalDialog.d.ts

@@ -1,10 +1,10 @@
 import React from 'react';
-import { WithAsProps, RsRefForwardingComponent, TypeAttributes } from '../internals/types';
+import type { WithAsProps, SizeType } from '../internals/types';
 export interface ModalDialogProps extends WithAsProps {
     /** A modal can have different sizes */
-    size?: TypeAttributes.Size;
+    size?: SizeType;
     dialogClassName?: string;
     dialogStyle?: React.CSSProperties;
 }
-declare const ModalDialog: RsRefForwardingComponent<'div', ModalDialogProps>;
+declare const ModalDialog: import("../internals/types").InternalRefForwardingComponent<"div", ModalDialogProps, never> & Record<string, never>;
 export default ModalDialog;

package/cjs/Modal/ModalDialog.js

@@ -7,7 +7,8 @@ exports.default = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _react = _interopRequireDefault(require("react"));
 var _hooks = require("../internals/hooks");
-const ModalDialog = /*#__PURE__*/_react.default.forwardRef((props, ref) => {
+var _utils = require("../internals/utils");
+const ModalDialog = (0, _utils.forwardRef)((props, ref) => {
   const {
     as: Component = 'div',
     style,
@@ -19,10 +20,6 @@ const ModalDialog = /*#__PURE__*/_react.default.forwardRef((props, ref) => {
     size,
     ...rest
   } = props;
-  const modalStyle = {
-    display: 'block',
-    ...style
-  };
   const {
     merge,
     withClassPrefix,
@@ -30,6 +27,9 @@ const ModalDialog = /*#__PURE__*/_react.default.forwardRef((props, ref) => {
   } = (0, _hooks.useClassNames)(classPrefix);
   const classes = merge(className, withClassPrefix(size));
   const dialogClasses = merge(dialogClassName, prefix('dialog'));
+  const modalStyle = (0, _utils.mergeStyles)({
+    display: 'block'
+  }, style);
   return /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({
     role: "dialog",
     "aria-modal": true

package/cjs/Modal/ModalFooter.d.ts

@@ -1,4 +1,6 @@
 import { ComponentProps } from '../internals/utils';
 export type ModalFooterProps = ComponentProps;
-declare const ModalFooter: import("../internals/types").RsRefForwardingComponent<"div", ComponentProps, false>;
+declare const ModalFooter: import("../internals/types").InternalRefForwardingComponent<"div", Partial<{
+    name: string;
+}>, never> & Record<string, never>;
 export default ModalFooter;

package/cjs/Modal/ModalHeader.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { WithAsProps, RsRefForwardingComponent } from '../internals/types';
+import type { WithAsProps } from '../internals/types';
 export interface ModalHeaderProps extends WithAsProps {
     /** Primary content */
     children?: React.ReactNode;
@@ -8,5 +8,5 @@ export interface ModalHeaderProps extends WithAsProps {
     /** Called when Modal is hidden */
     onClose?: (event: React.MouseEvent) => void;
 }
-declare const ModalHeader: RsRefForwardingComponent<'div', ModalHeaderProps>;
+declare const ModalHeader: import("../internals/types").InternalRefForwardingComponent<"div", ModalHeaderProps, never> & Record<string, never>;
 export default ModalHeader;

package/cjs/Modal/ModalHeader.js

@@ -6,15 +6,14 @@ exports.__esModule = true;
 exports.default = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _react = _interopRequireWildcard(require("react"));
-var _hooks = require("../internals/hooks");
-var _utils = require("../internals/utils");
-var _ModalContext = require("./ModalContext");
 var _CloseButton = _interopRequireDefault(require("../internals/CloseButton"));
-var _Close = _interopRequireDefault(require("@rsuite/icons/Close"));
 var _IconButton = _interopRequireDefault(require("../IconButton"));
+var _utils = require("../internals/utils");
+var _hooks = require("../internals/hooks");
+var _ModalContext = require("./ModalContext");
 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; }
-const ModalHeader = /*#__PURE__*/_react.default.forwardRef((props, ref) => {
+const ModalHeader = (0, _utils.forwardRef)((props, ref) => {
   const {
     as: Component = 'div',
     classPrefix = 'modal-header',
@@ -35,20 +34,14 @@ const ModalHeader = /*#__PURE__*/_react.default.forwardRef((props, ref) => {
     isDrawer,
     onModalClose
   } = context || {};
-  const buttonElement = isDrawer ? /*#__PURE__*/_react.default.createElement(_IconButton.default, {
-    icon: /*#__PURE__*/_react.default.createElement(_Close.default, null),
-    appearance: "subtle",
-    size: "sm",
-    className: prefix('close'),
-    onClick: (0, _utils.createChainedFunction)(onClose, onModalClose)
-  }) : /*#__PURE__*/_react.default.createElement(_CloseButton.default, {
-    className: prefix('close'),
-    onClick: (0, _utils.createChainedFunction)(onClose, onModalClose)
-  });
   return /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({}, rest, {
     ref: ref,
     className: classes
-  }), closeButton && buttonElement, children);
+  }), closeButton && /*#__PURE__*/_react.default.createElement(_CloseButton.default, {
+    as: isDrawer ? _IconButton.default : 'button',
+    className: prefix('close'),
+    onClick: (0, _utils.createChainedFunction)(onClose, onModalClose)
+  }), children);
 });
 ModalHeader.displayName = 'ModalHeader';
 var _default = exports.default = ModalHeader;

package/cjs/Modal/ModalTitle.d.ts

@@ -1,5 +1,4 @@
 import type { ComponentProps } from '../internals/utils';
-import type { RsRefForwardingComponent } from '../internals/types';
 export type ModalTitleProps = ComponentProps;
-declare const ModalTitle: RsRefForwardingComponent<'h4', ComponentProps>;
+declare const ModalTitle: import("../internals/types").InternalRefForwardingComponent<"h4", ComponentProps, never> & Record<string, never>;
 export default ModalTitle;

package/cjs/Modal/ModalTitle.js

@@ -8,9 +8,10 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 var _react = _interopRequireWildcard(require("react"));
 var _ModalContext = require("./ModalContext");
 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; }
-const ModalTitle = /*#__PURE__*/_react.default.forwardRef((props, ref) => {
+const ModalTitle = (0, _utils.forwardRef)((props, ref) => {
   const {
     as: Component = 'h4',
     classPrefix = 'modal-title',

package/cjs/Modal/index.d.ts

@@ -1,4 +1,9 @@
 import Modal from './Modal';
+import ModalBody from './ModalBody';
+import ModalDialog from './ModalDialog';
+import ModalFooter from './ModalFooter';
+import ModalHeader from './ModalHeader';
+import ModalTitle from './ModalTitle';
 export type { ModalProps } from './Modal';
 export type { ModalBodyProps } from './ModalBody';
 export type { ModalDialogProps } from './ModalDialog';
@@ -6,4 +11,5 @@ export type { ModalFooterProps } from './ModalFooter';
 export type { ModalHeaderProps } from './ModalHeader';
 export type { ModalTitleProps } from './ModalTitle';
 export type { ModalSize } from './utils';
+export { Modal, ModalBody, ModalDialog, ModalFooter, ModalHeader, ModalTitle };
 export default Modal;

package/cjs/Modal/index.js

@@ -5,4 +5,17 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports.default = void 0;
 var _Modal = _interopRequireDefault(require("./Modal"));
+exports.Modal = _Modal.default;
+var _ModalBody = _interopRequireDefault(require("./ModalBody"));
+exports.ModalBody = _ModalBody.default;
+var _ModalDialog = _interopRequireDefault(require("./ModalDialog"));
+exports.ModalDialog = _ModalDialog.default;
+var _ModalFooter = _interopRequireDefault(require("./ModalFooter"));
+exports.ModalFooter = _ModalFooter.default;
+var _ModalHeader = _interopRequireDefault(require("./ModalHeader"));
+exports.ModalHeader = _ModalHeader.default;
+var _ModalTitle = _interopRequireDefault(require("./ModalTitle"));
+exports.ModalTitle = _ModalTitle.default;
+// export types
+// export components
 var _default = exports.default = _Modal.default;

package/cjs/Modal/utils.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
-import { TypeAttributes } from '../internals/types';
-export type ModalSize = TypeAttributes.Size | 'full' | number | string;
+import type { SizeType } from '../internals/types';
+export type ModalSize = SizeType | 'full' | number | string;
 export declare const useBodyStyles: (ref: React.RefObject<HTMLElement>, options: {
     overflow: boolean;
     size?: ModalSize | undefined;

package/cjs/Modal/utils.js

@@ -4,9 +4,9 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 exports.__esModule = true;
 exports.useBodyStyles = void 0;
-var _react = require("react");
 var _getHeight = _interopRequireDefault(require("dom-lib/getHeight"));
 var _on = _interopRequireDefault(require("dom-lib/on"));
+var _react = require("react");
 var _resizeObserver = require("@juggle/resize-observer");
 const useBodyStyles = (ref, options) => {
   const [bodyStyles, setBodyStyles] = (0, _react.useState)({});

package/cjs/MultiCascadeTree/MultiCascadeTree.d.ts

@@ -1,9 +1,7 @@
-import React from 'react';
-import type { DataItemValue } from '../internals/types';
 import type { MultiCascadeTreeProps } from './types';
 /**
  * The `MultiCascadeTree` component is used to select multiple values from cascading options.
  * @see https://rsuitejs.com/components/multi-cascade-tree/
  */
-declare const MultiCascadeTree: React.ForwardRefExoticComponent<MultiCascadeTreeProps<DataItemValue, DataItemValue[], any> & React.RefAttributes<unknown>>;
+declare const MultiCascadeTree: import("../internals/types").InternalRefForwardingComponent<"div", MultiCascadeTreeProps<any, any[], any>, never> & Record<string, never>;
 export default MultiCascadeTree;

package/cjs/MultiCascadeTree/MultiCascadeTree.js

@@ -8,6 +8,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 var _react = _interopRequireDefault(require("react"));
 var _TreeView = _interopRequireDefault(require("./TreeView"));
 var _SearchView = _interopRequireDefault(require("./SearchView"));
+var _utils = require("../internals/utils");
 var _hooks = require("./hooks");
 var _hooks2 = require("../internals/hooks");
 var _CustomProvider = require("../CustomProvider");
@@ -17,7 +18,7 @@ const emptyArray = [];
  * The `MultiCascadeTree` component is used to select multiple values from cascading options.
  * @see https://rsuitejs.com/components/multi-cascade-tree/
  */
-const MultiCascadeTree = /*#__PURE__*/_react.default.forwardRef((props, ref) => {
+const MultiCascadeTree = (0, _utils.forwardRef)((props, ref) => {
   const {
     propsWithDefaults
   } = (0, _CustomProvider.useCustom)('MultiCascadeTree', props);

package/cjs/MultiCascadeTree/TreeView.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import type { ItemDataType, WithAsProps, RsRefForwardingComponent } from '../internals/types';
+import type { ItemDataType, WithAsProps } from '../internals/types';
 import type { CascadeColumn } from '../CascadeTree/types';
 export interface TreeViewProps<T = any> extends WithAsProps {
     disabledItemValues?: T[];
@@ -18,5 +18,5 @@ export interface TreeViewProps<T = any> extends WithAsProps {
     onCheck?: (node: ItemDataType<T>, event: React.SyntheticEvent, checked: boolean) => void;
     onSelect?: (node: ItemDataType<T>, cascadePaths: ItemDataType<T>[], event: React.SyntheticEvent) => void;
 }
-declare const TreeView: RsRefForwardingComponent<'div', TreeViewProps>;
+declare const TreeView: import("../internals/types").InternalRefForwardingComponent<"div", TreeViewProps<any>, never> & Record<string, never>;
 export default TreeView;

package/cjs/MultiCascadeTree/TreeView.js

@@ -15,7 +15,7 @@ var _Picker = require("../internals/Picker");
 var _utils2 = require("./utils");
 var _CustomProvider = require("../CustomProvider");
 const emptyArray = [];
-const TreeView = /*#__PURE__*/_react.default.forwardRef((props, ref) => {
+const TreeView = (0, _utils.forwardRef)((props, ref) => {
   const {
     as: Component = 'div',
     classPrefix = 'tree',

package/cjs/MultiCascadeTree/index.d.ts

@@ -1,4 +1,5 @@
 import MultiCascadeTree from './MultiCascadeTree';
 export type { ItemDataType } from '../internals/types';
 export type { MultiCascadeTreeProps } from './types';
+export { MultiCascadeTree };
 export default MultiCascadeTree;

package/cjs/MultiCascadeTree/index.js

@@ -5,4 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports.default = void 0;
 var _MultiCascadeTree = _interopRequireDefault(require("./MultiCascadeTree"));
+exports.MultiCascadeTree = _MultiCascadeTree.default;
+// export types
+// export components
 var _default = exports.default = _MultiCascadeTree.default;

package/cjs/MultiCascader/MultiCascader.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
-import { PickerLocale } from '../locales';
-import { PickerComponent, PickerToggleProps } from '../internals/Picker';
-import { FormControlPickerProps, ItemDataType, DataItemValue } from '../internals/types';
+import { PickerToggleProps } from '../internals/Picker';
+import type { FormControlPickerProps, ItemDataType, DataItemValue } from '../internals/types';
+import type { PickerLocale } from '../locales';
 import type { MultiCascadeTreeProps } from '../MultiCascadeTree';
 export interface MultiCascaderProps<T extends DataItemValue = any> extends FormControlPickerProps<T[], PickerLocale, ItemDataType<T>, T>, MultiCascadeTreeProps<T, T[], PickerLocale>, Pick<PickerToggleProps, 'loading'> {
     /**
@@ -66,5 +66,5 @@ export interface MultiCascaderProps<T extends DataItemValue = any> extends FormC
  * The `MultiCascader` component is used to select multiple values from cascading options.
  * @see https://rsuitejs.com/components/multi-cascader/
  */
-declare const MultiCascader: PickerComponent<MultiCascaderProps<DataItemValue>>;
+declare const MultiCascader: import("../internals/types").InternalRefForwardingComponent<"div", MultiCascaderProps<DataItemValue>, never> & Record<string, never>;
 export default MultiCascader;

package/cjs/MultiCascader/MultiCascader.js

@@ -10,16 +10,16 @@ var _pick = _interopRequireDefault(require("lodash/pick"));
 var _omit = _interopRequireDefault(require("lodash/omit"));
 var _isFunction = _interopRequireDefault(require("lodash/isFunction"));
 var _isNil = _interopRequireDefault(require("lodash/isNil"));
+var _TreeView = _interopRequireDefault(require("../MultiCascadeTree/TreeView"));
+var _SearchView = _interopRequireDefault(require("../MultiCascadeTree/SearchView"));
+var _useActive = _interopRequireDefault(require("../Cascader/useActive"));
 var _utils = require("../internals/Tree/utils");
 var _hooks = require("../internals/hooks");
 var _utils2 = require("../CascadeTree/utils");
 var _utils3 = require("../internals/utils");
-var _Picker = require("../internals/Picker");
 var _hooks2 = require("../MultiCascadeTree/hooks");
-var _TreeView = _interopRequireDefault(require("../MultiCascadeTree/TreeView"));
-var _SearchView = _interopRequireDefault(require("../MultiCascadeTree/SearchView"));
-var _useActive = _interopRequireDefault(require("../Cascader/useActive"));
 var _CustomProvider = require("../CustomProvider");
+var _Picker = require("../internals/Picker");
 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; }
 const emptyArray = [];
@@ -28,7 +28,7 @@ const emptyArray = [];
  * The `MultiCascader` component is used to select multiple values from cascading options.
  * @see https://rsuitejs.com/components/multi-cascader/
  */
-const MultiCascader = /*#__PURE__*/_react.default.forwardRef((props, ref) => {
+const MultiCascader = (0, _utils3.forwardRef)((props, ref) => {
   var _selectedPaths;
   const {
     propsWithDefaults,

package/cjs/MultiCascader/index.d.ts

@@ -1,3 +1,4 @@
 import MultiCascader from './MultiCascader';
 export type { MultiCascaderProps } from './MultiCascader';
+export { MultiCascader };
 export default MultiCascader;

package/cjs/MultiCascader/index.js

@@ -5,4 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports.default = void 0;
 var _MultiCascader = _interopRequireDefault(require("./MultiCascader"));
+exports.MultiCascader = _MultiCascader.default;
+// export types
+// export components
 var _default = exports.default = _MultiCascader.default;

package/cjs/Nav/AdaptiveNavItem.d.ts

@@ -1,9 +1,8 @@
-import React from 'react';
 import { NavItemProps } from './NavItem';
 /**
  * The <Nav.Item> API
  * When used as direct child of <Nav>, render the NavItem
  * When used within a <Nav.Menu>, render the NavDropdownItem
  */
-declare const AdaptiveNavItem: React.ForwardRefExoticComponent<NavItemProps<string | number> & React.RefAttributes<any>>;
+declare const AdaptiveNavItem: import("../internals/types").InternalRefForwardingComponent<"a", NavItemProps<string | number>, never> & Record<string, never>;
 export default AdaptiveNavItem;

package/cjs/Nav/AdaptiveNavItem.js

@@ -7,16 +7,17 @@ exports.default = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _react = _interopRequireWildcard(require("react"));
 var _NavItem = _interopRequireDefault(require("./NavItem"));
-var _hooks = require("../internals/hooks");
-var _Navbar = require("../Navbar/Navbar");
-var _Sidenav = require("../Sidenav/Sidenav");
-var _NavContext = _interopRequireDefault(require("./NavContext"));
-var _NavMenu = require("./NavMenu");
 var _NavDropdownItem = _interopRequireDefault(require("./NavDropdownItem"));
 var _NavbarDropdownItem = _interopRequireDefault(require("../Navbar/NavbarDropdownItem"));
-var _SidenavDropdownItem = _interopRequireDefault(require("../Sidenav/SidenavDropdownItem"));
 var _NavbarItem = _interopRequireDefault(require("../Navbar/NavbarItem"));
+var _NavContext = _interopRequireDefault(require("./NavContext"));
+var _SidenavDropdownItem = _interopRequireDefault(require("../Sidenav/SidenavDropdownItem"));
 var _SidenavItem = _interopRequireDefault(require("../Sidenav/SidenavItem"));
+var _utils = require("../internals/utils");
+var _hooks = require("../internals/hooks");
+var _NavbarContext = require("../Navbar/NavbarContext");
+var _Sidenav = require("../Sidenav/Sidenav");
+var _NavMenu = require("./NavMenu");
 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; }
 /**
@@ -24,13 +25,13 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
  * When used as direct child of <Nav>, render the NavItem
  * When used within a <Nav.Menu>, render the NavDropdownItem
  */
-const AdaptiveNavItem = /*#__PURE__*/_react.default.forwardRef((props, ref) => {
+const AdaptiveNavItem = (0, _utils.forwardRef)((props, ref) => {
   const nav = (0, _react.useContext)(_NavContext.default);
   if (!nav) {
     throw new Error('<Nav.Item> must be rendered within a <Nav> component.');
   }
   const parentNavMenu = (0, _react.useContext)(_NavMenu.NavMenuContext);
-  const navbar = (0, _react.useContext)(_Navbar.NavbarContext);
+  const navbar = (0, _react.useContext)(_NavbarContext.NavbarContext);
   const sidenav = (0, _react.useContext)(_Sidenav.SidenavContext);
   const [, dispatch] = parentNavMenu !== null && parentNavMenu !== void 0 ? parentNavMenu : [];
   const _id = (0, _hooks.useInternalId)('Nav.Item');

package/cjs/Nav/Nav.d.ts

@@ -1,8 +1,5 @@
 import React from 'react';
-import NavItem from './NavItem';
-import NavDropdown from './NavDropdown';
-import NavMenu from './NavMenu';
-import { WithAsProps, RsRefForwardingComponent } from '../internals/types';
+import type { WithAsProps } from '../internals/types';
 export interface NavProps<T = any> extends WithAsProps, Omit<React.HTMLAttributes<HTMLElement>, 'onSelect'> {
     /**
      * The appearance style of the Nav component.
@@ -25,6 +22,8 @@ export interface NavProps<T = any> extends WithAsProps, Omit<React.HTMLAttribute
     vertical?: boolean;
     /**
      * Whether the Nav component is pulled to the right.
+     *
+     * @deprecated Use `Navbar.Content` instead.
      */
     pullRight?: boolean;
     /**
@@ -40,17 +39,23 @@ export interface NavProps<T = any> extends WithAsProps, Omit<React.HTMLAttribute
      */
     onSelect?: (eventKey: T | undefined, event: React.SyntheticEvent) => void;
 }
-interface NavComponent extends RsRefForwardingComponent<'div', NavProps> {
-    /**
-     * @deprecated Use <Nav.Menu> instead.
-     */
-    Dropdown: typeof NavDropdown;
-    Item: typeof NavItem;
-    Menu: typeof NavMenu;
-}
 /**
  * The `Nav` component is used to create navigation links.
  * @see https://rsuitejs.com/components/nav
  */
-declare const Nav: NavComponent;
+declare const Nav: import("../internals/types").InternalRefForwardingComponent<"div", NavProps<any>, never> & {
+    /**
+     * @deprecated Use <Nav.Menu> instead.
+     */
+    Dropdown: import("../internals/types").InternalRefForwardingComponent<"div", import("./NavDropdown").NavDropdownProps<any>, never> & {
+        Item: import("../internals/types").InternalRefForwardingComponent<"li", import("./NavDropdownItem").NavDropdownItemProps<any>, never> & Record<string, never>;
+        /**
+         * The `Nav` component is used to create navigation links.
+         * @see https://rsuitejs.com/components/nav
+         */
+        Menu: React.ForwardRefExoticComponent<import("./NavDropdownMenu").NavDropdownMenuProps<any> & Omit<React.HTMLAttributes<HTMLUListElement>, "title" | "onSelect" | "onToggle"> & React.RefAttributes<HTMLElement>>;
+    };
+    Item: import("../internals/types").InternalRefForwardingComponent<"a", import("./NavItem").NavItemProps<string | number>, never> & Record<string, never>;
+    Menu: React.ForwardRefExoticComponent<import("./NavMenu").NavMenuProps & React.RefAttributes<any>>;
+};
 export default Nav;

package/cjs/Nav/Nav.js

@@ -13,18 +13,30 @@ var _NavMenu = _interopRequireDefault(require("./NavMenu"));
 var _NavDropdownItem = _interopRequireDefault(require("./NavDropdownItem"));
 var _NavDropdownMenu = _interopRequireDefault(require("./NavDropdownMenu"));
 var _AdaptiveNavItem = _interopRequireDefault(require("./AdaptiveNavItem"));
+var _utils = require("../internals/utils");
 var _hooks = require("../internals/hooks");
-var _Navbar = require("../Navbar/Navbar");
+var _NavbarContext = require("../Navbar/NavbarContext");
 var _Sidenav = require("../Sidenav/Sidenav");
-var _utils = require("../internals/utils");
 var _CustomProvider = require("../CustomProvider");
 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; }
+const DeprecatedNavDropdown = (0, _utils.deprecateComponent)(_NavDropdown.default, '<Nav.Dropdown> is deprecated, use <Nav.Menu> instead.');
+DeprecatedNavDropdown.Menu = (0, _utils.deprecateComponent)(_NavDropdownMenu.default, '<Nav.Dropdown.Menu> is deprecated, use <Nav.Menu> instead');
+DeprecatedNavDropdown.Item = (0, _utils.deprecateComponent)(_NavDropdownItem.default, '<Nav.Dropdown.Item> is deprecated, use <Nav.Item> instead');
+const Subcomponents = {
+  /**
+   * @deprecated Use <Nav.Menu> instead.
+   */
+  Dropdown: DeprecatedNavDropdown,
+  Item: _AdaptiveNavItem.default,
+  Menu: _NavMenu.default
+};
+
 /**
  * The `Nav` component is used to create navigation links.
  * @see https://rsuitejs.com/components/nav
  */
-const Nav = /*#__PURE__*/_react.default.forwardRef(function Nav(props, ref) {
+const Nav = (0, _utils.forwardRef)((props, ref) => {
   const {
     propsWithDefaults
   } = (0, _CustomProvider.useCustom)('Nav', props);
@@ -35,7 +47,6 @@ const Nav = /*#__PURE__*/_react.default.forwardRef(function Nav(props, ref) {
     vertical,
     justified,
     reversed,
-    pullRight,
     className,
     children,
     activeKey: activeKeyProp,
@@ -46,7 +57,7 @@ const Nav = /*#__PURE__*/_react.default.forwardRef(function Nav(props, ref) {
   const sidenav = (0, _react.useContext)(_Sidenav.SidenavContext);
 
   // Whether inside a <Navbar>
-  const navbar = (0, _react.useContext)(_Navbar.NavbarContext);
+  const navbar = (0, _react.useContext)(_NavbarContext.NavbarContext);
   const menubarRef = (0, _hooks.useEnsuredRef)(ref);
   const {
     withClassPrefix,
@@ -56,10 +67,9 @@ const Nav = /*#__PURE__*/_react.default.forwardRef(function Nav(props, ref) {
   } = (0, _hooks.useClassNames)(classPrefix);
   const classes = merge(className, rootPrefix({
     'navbar-nav': navbar,
-    'navbar-right': pullRight,
     'sidenav-nav': sidenav
   }), withClassPrefix(appearance, {
-    horizontal: navbar || !vertical && !sidenav,
+    horizontal: (navbar || !sidenav) && !vertical,
     vertical: vertical || sidenav,
     justified,
     reversed
@@ -107,12 +117,6 @@ const Nav = /*#__PURE__*/_react.default.forwardRef(function Nav(props, ref) {
   }), children, hasWaterline && /*#__PURE__*/_react.default.createElement("div", {
     className: prefix('bar')
   })));
-});
-const DeprecatedNavDropdown = (0, _utils.deprecateComponent)(_NavDropdown.default, '<Nav.Dropdown> is deprecated, use <Nav.Menu> instead.');
-DeprecatedNavDropdown.Menu = (0, _utils.deprecateComponent)(_NavDropdownMenu.default, '<Nav.Dropdown.Menu> is deprecated, use <Nav.Menu> instead');
-DeprecatedNavDropdown.Item = (0, _utils.deprecateComponent)(_NavDropdownItem.default, '<Nav.Dropdown.Item> is deprecated, use <Nav.Item> instead');
-Nav.Dropdown = DeprecatedNavDropdown;
-Nav.Item = _AdaptiveNavItem.default;
-Nav.Menu = _NavMenu.default;
+}, Subcomponents);
 Nav.displayName = 'Nav';
 var _default = exports.default = Nav;

package/cjs/Nav/NavDropdown.d.ts

@@ -1,9 +1,6 @@
 import React from 'react';
-import { PlacementCorners, WithAsProps, RsRefForwardingComponent } from '../internals/types';
-import Button from '../Button';
-import NavDropdownItem from './NavDropdownItem';
-import NavDropdownMenu from './NavDropdownMenu';
 import { NavDropdownToggleProps } from './NavDropdownToggle';
+import type { PlacementCorners, WithAsProps } from '../internals/types';
 export type NavDropdownTrigger = 'click' | 'hover' | 'contextMenu';
 export interface NavDropdownProps<T = any> extends WithAsProps, Omit<React.HTMLAttributes<HTMLElement>, 'onSelect' | 'onToggle' | 'title'> {
     /** Define the title as a submenu */
@@ -44,20 +41,6 @@ export interface NavDropdownProps<T = any> extends WithAsProps, Omit<React.HTMLA
     /** Callback function for menu state switching */
     onToggle?: (open: boolean, eventKey?: T | undefined, event?: React.SyntheticEvent) => void;
 }
-export interface NavDropdownComponent extends RsRefForwardingComponent<'div', NavDropdownProps> {
-    <ToggleAs extends React.ElementType = typeof Button>(props: NavDropdownProps & {
-        ref?: React.Ref<any>;
-        toggleAs?: ToggleAs;
-    } & React.ComponentProps<ToggleAs>, context: any): JSX.Element | null;
-    /**
-     * @deprecated Use <Nav.Item> instead.
-     */
-    Item: typeof NavDropdownItem;
-    /**
-     * @deprecated Use <Nav.Menu> instead.
-     */
-    Menu: typeof NavDropdownMenu;
-}
 /**
  * @private this component is not supposed to be used directly
  *          Instead it's rendered by a `<Nav.Menu>` call
@@ -68,5 +51,8 @@ export interface NavDropdownComponent extends RsRefForwardingComponent<'div', Na
  *   </Nav.Menu>
  * </Nav>
  */
-declare const NavDropdown: NavDropdownComponent;
+declare const NavDropdown: import("../internals/types").InternalRefForwardingComponent<"div", NavDropdownProps<any>, never> & {
+    Item: import("../internals/types").InternalRefForwardingComponent<"li", import("./NavDropdownItem").NavDropdownItemProps<any>, never> & Record<string, never>;
+    Menu: React.ForwardRefExoticComponent<import("./NavDropdownMenu").NavDropdownMenuProps<any> & Omit<React.HTMLAttributes<HTMLUListElement>, "title" | "onSelect" | "onToggle"> & React.RefAttributes<HTMLElement>>;
+};
 export default NavDropdown;