chore: rename api

Author: 洋

src/Cascader.tsx

@@ -1,7 +1,7 @@
 import type { BuildInPlacements } from '@rc-component/trigger/lib/interface';
-import type { BaseSelectProps,BaseSelectPropsWithoutPrivate,BaseSelectRef } from 'rc-select';
+import type { BaseSelectProps, BaseSelectPropsWithoutPrivate, BaseSelectRef } from 'rc-select';
 import { BaseSelect } from 'rc-select';
-import type { DisplayValueType,Placement } from 'rc-select/lib/BaseSelect';
+import type { DisplayValueType, Placement } from 'rc-select/lib/BaseSelect';
 import useId from 'rc-select/lib/hooks/useId';
 import { conductCheck } from 'rc-tree/lib/utils/conductUtil';
 import useMergedState from 'rc-util/lib/hooks/useMergedState';
@@ -14,9 +14,9 @@ import useRefFunc from './hooks/useRefFunc';
 import useSearchConfig from './hooks/useSearchConfig';
 import useSearchOptions from './hooks/useSearchOptions';
 import OptionList from './OptionList';
-import { fillFieldNames,SHOW_CHILD,SHOW_PARENT,toPathKey,toPathKeys } from './utils/commonUtil';
-import { formatStrategyValues,toPathOptions } from './utils/treeUtil';
-import warningProps,{ warningNullOptions } from './utils/warningPropsUtil';
+import { fillFieldNames, SHOW_CHILD, SHOW_PARENT, toPathKey, toPathKeys } from './utils/commonUtil';
+import { formatStrategyValues, toPathOptions } from './utils/treeUtil';
+import warningProps, { warningNullOptions } from './utils/warningPropsUtil';
 
 export interface ShowSearchType<OptionType extends BaseOptionType = DefaultOptionType> {
   filter?: (inputValue: string, options: OptionType[], fieldNames: FieldNames) => boolean;
@@ -102,8 +102,8 @@ export interface BaseCascaderProps<OptionType extends BaseOptionType = DefaultOp
 
   // styles
   styles?: {
-    dropdown?: React.CSSProperties;
-    dropdownMenuColumn?: React.CSSProperties;
+    popup?: React.CSSProperties;
+    popupMenuColumn?: React.CSSProperties;
   };
 
   /** @deprecated Use `placement` instead */
@@ -458,7 +458,7 @@ const Cascader = React.forwardRef<CascaderRef, InternalCascaderProps>((props, re
       expandTrigger,
       expandIcon,
       loadingIcon,
-      dropdownMenuColumnStyle: styles?.dropdownMenuColumn ?? dropdownMenuColumnStyle,
+      dropdownMenuColumnStyle: styles?.popupMenuColumn ?? dropdownMenuColumnStyle,
     }),
     [
       mergedOptions,
@@ -475,7 +475,7 @@ const Cascader = React.forwardRef<CascaderRef, InternalCascaderProps>((props, re
       expandIcon,
       loadingIcon,
       dropdownMenuColumnStyle,
-      styles?.dropdownMenuColumn,
+      styles?.popupMenuColumn,
     ],
   );
 
@@ -486,18 +486,18 @@ const Cascader = React.forwardRef<CascaderRef, InternalCascaderProps>((props, re
 
   const mergedDropdownStyle: React.CSSProperties =
     // Search to match width
-    styles?.dropdown ??
+    styles?.popup ??
     dropdownStyle ??
     (mergedSearchValue && searchConfig.matchInputWidth) ??
     emptyOptions
       ? // Empty keep the width
         {
-          ...styles?.dropdown,
+          ...styles?.popup,
           ...dropdownStyle,
         }
       : {
           minWidth: 'auto',
-          ...styles?.dropdown,
+          ...styles?.popup,
           ...dropdownStyle,
         };
 

tests/index.spec.tsx

@@ -1069,19 +1069,23 @@ describe('Cascader.Basic', () => {
     mount(<Cascader dropdownMenuColumnStyle={{}} options={[]} />);
 
     expect(errorSpy).toHaveBeenCalledWith(
-      'Warning: `dropdownMenuColumnStyle` is deprecated. Please use `styles.dropdownMenuColumn` instead.',
+      'Warning: `dropdownMenuColumnStyle` is deprecated. Please use `styles.popupMenuColumn` instead.',
     );
     errorSpy.mockReset();
   });
 
-    it('`dropdownMenuColumnStyle`in Cascader options should throw a warning', () => {
-      const wrapper = mount(<Cascader
-        styles={{ dropdown: { backgroundColor: 'red' }, dropdownMenuColumn: { backgroundColor: 'blue' } }}
+  it('`styles` api should work correctly', () => {
+    const wrapper = mount(
+      <Cascader
+        styles={{
+          popup: { backgroundColor: 'red' },
+          popupMenuColumn: { backgroundColor: 'blue' },
+        }}
         options={[]}
         open
-      />);
-      expect(wrapper.find('.rc-cascader-dropdown').props().style.backgroundColor).toEqual('red');
-      expect(wrapper.find('.rc-cascader-menu-item').props().style.backgroundColor).toEqual('blue');
-    });
-
+      />,
+    );
+    expect(wrapper.find('.rc-cascader-dropdown').props().style.backgroundColor).toEqual('red');
+    expect(wrapper.find('.rc-cascader-menu-item').props().style.backgroundColor).toEqual('blue');
+  });
 });