Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@
"father": "^2.13.2",
"gh-pages": "^3.1.0",
"glob": "^7.1.6",
"jest": "^27.1.0",
"np": "^6.0.0",
"rc-form": "^2.4.0",
"react": "^16.0.0",
Expand All @@ -65,7 +64,7 @@
"dependencies": {
"@babel/runtime": "^7.12.5",
"array-tree-filter": "^2.1.0",
"rc-tree-select": "~4.4.0-alpha.5",
"rc-tree-select": "~4.5.0-alpha.0",
"rc-trigger": "^5.0.4",
"rc-util": "^5.0.1",
"warning": "^4.0.1"
Expand Down
15 changes: 14 additions & 1 deletion src/Cascader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import useMergedState from 'rc-util/lib/hooks/useMergedState';
import type { TreeSelectProps } from 'rc-tree-select';
import generate from 'rc-tree-select/lib/generate';
import type { FlattenDataNode } from 'rc-tree-select/lib/interface';
import type { RefSelectProps } from 'rc-select/lib/generate';
import type { RefSelectProps, Placement } from 'rc-select/lib/generate';
import OptionList from './OptionList';
import type { CascaderValueType, DataNode, FieldNames, ShowSearchType } from './interface';
import CascaderContext from './context';
Expand Down Expand Up @@ -98,6 +98,10 @@ interface BaseCascaderProps
popupClassName?: string;
dropdownClassName?: string;

/** @deprecated Use `placement` instead */
popupPlacement?: Placement;
placement?: Placement;

/** @deprecated Use `onDropdownVisibleChange` instead */
onPopupVisibleChange?: (open: boolean) => void;
onDropdownVisibleChange?: (open: boolean) => void;
Expand Down Expand Up @@ -153,6 +157,8 @@ const Cascader = React.forwardRef((props: CascaderProps, ref: React.Ref<Cascader
popupClassName,
onDropdownVisibleChange,
onPopupVisibleChange,
popupPlacement,
placement,

searchValue,
onSearch,
Expand Down Expand Up @@ -295,12 +301,18 @@ const Cascader = React.forwardRef((props: CascaderProps, ref: React.Ref<Cascader
popupClassName === undefined,
'`popupClassName` is deprecated. Please use `dropdownClassName` instead.',
);
warning(
popupPlacement === undefined,
'`popupPlacement` is deprecated. Please use `placement` instead.',
);
}

const mergedOpen = open !== undefined ? open : popupVisible;

const mergedDropdownClassName = dropdownClassName || popupClassName;

const mergedPlacement = placement || popupPlacement;

const onInternalDropdownVisibleChange = (nextVisible: boolean) => {
onDropdownVisibleChange?.(nextVisible);
onPopupVisibleChange?.(nextVisible);
Expand Down Expand Up @@ -349,6 +361,7 @@ const Cascader = React.forwardRef((props: CascaderProps, ref: React.Ref<Cascader
ref={cascaderRef}
{...restProps}
value={checkable ? internalValue : internalValue[0]}
placement={mergedPlacement}
dropdownMatchSelectWidth={false}
dropdownStyle={dropdownStyle}
dropdownClassName={mergedDropdownClassName}
Expand Down
5 changes: 5 additions & 0 deletions tests/index.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -452,6 +452,7 @@ describe('Cascader.Basic', () => {
popupVisible
onPopupVisibleChange={onPopupVisibleChange}
popupClassName="legacy-cls"
popupPlacement="topRight"
/>,
);

Expand All @@ -464,8 +465,12 @@ describe('Cascader.Basic', () => {
expect(errorSpy).toHaveBeenCalledWith(
'Warning: `popupClassName` is deprecated. Please use `dropdownClassName` instead.',
);
expect(errorSpy).toHaveBeenCalledWith(
'Warning: `popupPlacement` is deprecated. Please use `placement` instead.',
);

expect(wrapper.exists('.legacy-cls')).toBeTruthy();
expect(wrapper.find('Trigger').prop('popupPlacement')).toEqual('topRight');

errorSpy.mockRestore();
});
Expand Down