11import type { BuildInPlacements } from '@rc-component/trigger/lib/interface' ;
2- import type { BaseSelectProps , BaseSelectPropsWithoutPrivate , BaseSelectRef } from 'rc-select' ;
3- import { BaseSelect } from 'rc-select' ;
4- import type { DisplayValueType , Placement } from 'rc-select/lib/BaseSelect' ;
5- import useId from 'rc-select/lib/hooks/useId' ;
6- import useEvent from 'rc-util/lib/hooks/useEvent' ;
7- import useMergedState from 'rc-util/lib/hooks/useMergedState' ;
2+ import type { BaseSelectProps , BaseSelectPropsWithoutPrivate , BaseSelectRef } from '@ rc-component/ select' ;
3+ import { BaseSelect } from '@ rc-component/ select' ;
4+ import type { DisplayValueType , Placement } from '@ rc-component/ select/lib/BaseSelect' ;
5+ import useId from '@ rc-component/ select/lib/hooks/useId' ;
6+ import useEvent from '@ rc-component/ util/lib/hooks/useEvent' ;
7+ import useMergedState from '@ rc-component/ util/lib/hooks/useMergedState' ;
88import * as React from 'react' ;
99import CascaderContext from './context' ;
1010import useDisplayValues from './hooks/useDisplayValues' ;
@@ -102,19 +102,15 @@ interface BaseCascaderProps<
102102 /** @deprecated Use `open` instead */
103103 popupVisible ?: boolean ;
104104
105- /** @deprecated Use `dropdownClassName` instead */
106105 popupClassName ?: string ;
107- dropdownClassName ?: string ;
108106 dropdownMenuColumnStyle ?: React . CSSProperties ;
109107
110108 /** @deprecated Use `placement` instead */
111109 popupPlacement ?: Placement ;
112110 placement ?: Placement ;
113111 builtinPlacements ?: BuildInPlacements ;
114112
115- /** @deprecated Use `onDropdownVisibleChange` instead */
116113 onPopupVisibleChange ?: ( open : boolean ) => void ;
117- onDropdownVisibleChange ?: ( open : boolean ) => void ;
118114
119115 // Icon
120116 expandIcon ?: React . ReactNode ;
@@ -213,14 +209,12 @@ const Cascader = React.forwardRef<CascaderRef, InternalCascaderProps>((props, re
213209 open,
214210
215211 popupClassName,
216- dropdownClassName,
217212 dropdownMenuColumnStyle,
218- dropdownStyle : customDropdownStyle ,
213+ popupStyle : customPopupStyle ,
219214
220215 popupPlacement,
221216 placement,
222217
223- onDropdownVisibleChange,
224218 onPopupVisibleChange,
225219
226220 // Icon
@@ -229,7 +223,7 @@ const Cascader = React.forwardRef<CascaderRef, InternalCascaderProps>((props, re
229223
230224 // Children
231225 children,
232- dropdownMatchSelectWidth = false ,
226+ popupMatchSelectWidth = false ,
233227 showCheckedStrategy = SHOW_PARENT ,
234228 optionRender,
235229 ...restProps
@@ -374,12 +368,10 @@ const Cascader = React.forwardRef<CascaderRef, InternalCascaderProps>((props, re
374368 // ============================ Open ============================
375369 const mergedOpen = open !== undefined ? open : popupVisible ;
376370
377- const mergedDropdownClassName = dropdownClassName || popupClassName ;
378371
379372 const mergedPlacement = placement || popupPlacement ;
380373
381- const onInternalDropdownVisibleChange = ( nextVisible : boolean ) => {
382- onDropdownVisibleChange ?.( nextVisible ) ;
374+ const onInternalPopupVisibleChange = ( nextVisible : boolean ) => {
383375 onPopupVisibleChange ?.( nextVisible ) ;
384376 } ;
385377
@@ -432,7 +424,7 @@ const Cascader = React.forwardRef<CascaderRef, InternalCascaderProps>((props, re
432424 // ==============================================================
433425 const emptyOptions = ! ( mergedSearchValue ? searchOptions : mergedOptions ) . length ;
434426
435- const dropdownStyle : React . CSSProperties =
427+ const popupStyle : React . CSSProperties =
436428 // Search to match width
437429 ( mergedSearchValue && searchConfig . matchInputWidth ) ||
438430 // Empty keep the width
@@ -451,10 +443,10 @@ const Cascader = React.forwardRef<CascaderRef, InternalCascaderProps>((props, re
451443 id = { mergedId }
452444 prefixCls = { prefixCls }
453445 autoClearSearchValue = { autoClearSearchValue }
454- dropdownMatchSelectWidth = { dropdownMatchSelectWidth }
455- dropdownStyle = { {
456- ...dropdownStyle ,
457- ...customDropdownStyle ,
446+ popupMatchSelectWidth = { popupMatchSelectWidth }
447+ popupStyle = { {
448+ ...popupStyle ,
449+ ...customPopupStyle ,
458450 } }
459451 // Value
460452 displayValues = { displayValues }
@@ -469,9 +461,9 @@ const Cascader = React.forwardRef<CascaderRef, InternalCascaderProps>((props, re
469461 emptyOptions = { emptyOptions }
470462 // Open
471463 open = { mergedOpen }
472- dropdownClassName = { mergedDropdownClassName }
464+ popupClassName = { popupClassName }
473465 placement = { mergedPlacement }
474- onDropdownVisibleChange = { onInternalDropdownVisibleChange }
466+ onPopupVisibleChange = { onInternalPopupVisibleChange }
475467 // Children
476468 getRawInputElement = { ( ) => children as React . ReactElement }
477469 />
0 commit comments