diff --git a/components/breadcrumb/BreadcrumbItem.tsx b/components/breadcrumb/BreadcrumbItem.tsx index 14a3838705..9977d8682e 100644 --- a/components/breadcrumb/BreadcrumbItem.tsx +++ b/components/breadcrumb/BreadcrumbItem.tsx @@ -1,15 +1,15 @@ import * as React from 'react'; import DownOutlined from '@ant-design/icons/DownOutlined'; -import DropDown, { DropDownProps } from '../dropdown/dropdown'; +import Dropdown, { DropdownProps } from '../dropdown/dropdown'; import { ConfigContext } from '../config-provider'; export interface BreadcrumbItemProps { prefixCls?: string; separator?: React.ReactNode; href?: string; - overlay?: DropDownProps['overlay']; - dropdownProps?: DropDownProps; + overlay?: DropdownProps['overlay']; + dropdownProps?: DropdownProps; onClick?: React.MouseEventHandler; className?: string; children?: React.ReactNode; @@ -27,16 +27,16 @@ const BreadcrumbItem: BreadcrumbItemInterface = ({ }) => { const { getPrefixCls } = React.useContext(ConfigContext); const prefixCls = getPrefixCls('breadcrumb', customizePrefixCls); - /** If overlay is have Wrap a DropDown */ + /** If overlay is have Wrap a Dropdown */ const renderBreadcrumbNode = (breadcrumbItem: React.ReactNode) => { if (overlay) { return ( - + {breadcrumbItem} - + ); } return breadcrumbItem; diff --git a/components/dropdown/dropdown-button.tsx b/components/dropdown/dropdown-button.tsx index 010dff1cd1..373e641783 100644 --- a/components/dropdown/dropdown-button.tsx +++ b/components/dropdown/dropdown-button.tsx @@ -5,13 +5,13 @@ import Button, { ButtonProps } from '../button'; import { ButtonHTMLType } from '../button/button'; import { ButtonGroupProps } from '../button/button-group'; import { ConfigContext } from '../config-provider'; -import Dropdown, { DropDownProps } from './dropdown'; +import Dropdown, { DropdownProps } from './dropdown'; const ButtonGroup = Button.Group; export type DropdownButtonType = 'default' | 'primary' | 'ghost' | 'dashed' | 'link' | 'text'; -export interface DropdownButtonProps extends ButtonGroupProps, DropDownProps { +export interface DropdownButtonProps extends ButtonGroupProps, DropdownProps { type?: DropdownButtonType; htmlType?: ButtonHTMLType; disabled?: boolean; @@ -76,7 +76,7 @@ const DropdownButton: DropdownButtonInterface = props => { overlayClassName, overlayStyle, destroyPopupOnHide, - } as DropDownProps; + } as DropdownProps; if ('visible' in props) { dropdownProps.visible = visible; diff --git a/components/dropdown/dropdown.tsx b/components/dropdown/dropdown.tsx index 15b555b84e..217e0682f4 100644 --- a/components/dropdown/dropdown.tsx +++ b/components/dropdown/dropdown.tsx @@ -41,7 +41,7 @@ export type DropdownArrowOptions = { pointAtCenter?: boolean; }; -export interface DropDownProps { +export interface DropdownProps { arrow?: boolean | DropdownArrowOptions; trigger?: ('click' | 'hover' | 'contextMenu')[]; overlay: React.ReactElement | OverlayFunc; @@ -64,7 +64,7 @@ export interface DropDownProps { children?: React.ReactNode; } -interface DropdownInterface extends React.FC { +interface DropdownInterface extends React.FC { Button: typeof DropdownButton; } diff --git a/components/dropdown/index.tsx b/components/dropdown/index.tsx index cd9278b430..65b29a3f66 100644 --- a/components/dropdown/index.tsx +++ b/components/dropdown/index.tsx @@ -1,5 +1,10 @@ import Dropdown from './dropdown'; -export { DropDownProps } from './dropdown'; -export { DropdownButtonProps, DropdownButtonType } from './dropdown-button'; +export type { + DropdownProps, + // typo, but we need to support it for backwards compatibility + // https://github.com/ant-design/ant-design/pull/35161 + DropdownProps as DropDownProps, +} from './dropdown'; +export type { DropdownButtonProps, DropdownButtonType } from './dropdown-button'; export default Dropdown; diff --git a/components/index.tsx b/components/index.tsx index 3915e62f22..f62bf9e05b 100644 --- a/components/index.tsx +++ b/components/index.tsx @@ -78,7 +78,12 @@ export { default as Descriptions } from './descriptions'; export type { DividerProps } from './divider'; export { default as Divider } from './divider'; -export type { DropDownProps } from './dropdown'; +export type { + DropdownProps, + // typo, but we need to support it for backwards compatibility + // https://github.com/ant-design/ant-design/pull/35161 + DropdownProps as DropDownProps, +} from './dropdown'; export { default as Dropdown } from './dropdown'; export type { DrawerProps } from './drawer'; diff --git a/components/select/index.tsx b/components/select/index.tsx index 35c76c05ad..f43cd2d0bc 100755 --- a/components/select/index.tsx +++ b/components/select/index.tsx @@ -130,7 +130,7 @@ const InternalSelect = ); diff --git a/components/table/__tests__/Table.filter.test.js b/components/table/__tests__/Table.filter.test.js index 23fc1f97ce..310abaec5f 100644 --- a/components/table/__tests__/Table.filter.test.js +++ b/components/table/__tests__/Table.filter.test.js @@ -2198,7 +2198,7 @@ describe('Table.filter', () => { }); }); - it('filterDropDown should support filterResetToDefaultFilteredValue', () => { + it('filterDropdown should support filterResetToDefaultFilteredValue', () => { jest.useFakeTimers(); jest.spyOn(console, 'error').mockImplementation(() => undefined);