From 9fe67514a6ffa42a6eb68259747bae23db45c895 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B4=8B?= <hetongyang@bytedance.com>
Date: Wed, 21 Jun 2023 16:15:52 +0800
Subject: [PATCH] chore: rename popupColumn

---
 src/Cascader.tsx              | 8 ++++----
 src/utils/warningPropsUtil.ts | 2 +-
 tests/index.spec.tsx          | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Cascader.tsx b/src/Cascader.tsx
index e0ed183b..0b3e8be7 100644
--- a/src/Cascader.tsx
+++ b/src/Cascader.tsx
@@ -97,13 +97,13 @@ export interface BaseCascaderProps<OptionType extends BaseOptionType = DefaultOp
   /** @deprecated Use `dropdownClassName` instead */
   popupClassName?: string;
   dropdownClassName?: string;
-  /** @deprecated Use `styles.dropdownMenuColumn` instead */
+  /** @deprecated Use `styles.popupMenuColumn` instead */
   dropdownMenuColumnStyle?: React.CSSProperties;
 
   // styles
   styles?: {
     popup?: React.CSSProperties;
-    popupMenuColumn?: React.CSSProperties;
+    popupColumn?: React.CSSProperties;
   };
 
   /** @deprecated Use `placement` instead */
@@ -458,7 +458,7 @@ const Cascader = React.forwardRef<CascaderRef, InternalCascaderProps>((props, re
       expandTrigger,
       expandIcon,
       loadingIcon,
-      dropdownMenuColumnStyle: styles?.popupMenuColumn ?? dropdownMenuColumnStyle,
+      dropdownMenuColumnStyle: styles?.popupColumn ?? dropdownMenuColumnStyle,
     }),
     [
       mergedOptions,
@@ -475,7 +475,7 @@ const Cascader = React.forwardRef<CascaderRef, InternalCascaderProps>((props, re
       expandIcon,
       loadingIcon,
       dropdownMenuColumnStyle,
-      styles?.popupMenuColumn,
+      styles?.popupColumn,
     ],
   );
 
diff --git a/src/utils/warningPropsUtil.ts b/src/utils/warningPropsUtil.ts
index dd321812..254a28ba 100644
--- a/src/utils/warningPropsUtil.ts
+++ b/src/utils/warningPropsUtil.ts
@@ -19,7 +19,7 @@ function warningProps(props: BaseCascaderProps) {
   );
   warning(
     dropdownMenuColumnStyle === undefined,
-    '`dropdownMenuColumnStyle` is deprecated. Please use `styles.popupMenuColumn` instead.',
+    '`dropdownMenuColumnStyle` is deprecated. Please use `styles.popupColumn` instead.',
   );
 }
 
diff --git a/tests/index.spec.tsx b/tests/index.spec.tsx
index f13314cb..228261fb 100644
--- a/tests/index.spec.tsx
+++ b/tests/index.spec.tsx
@@ -1069,7 +1069,7 @@ describe('Cascader.Basic', () => {
     mount(<Cascader dropdownMenuColumnStyle={{}} options={[]} />);
 
     expect(errorSpy).toHaveBeenCalledWith(
-      'Warning: `dropdownMenuColumnStyle` is deprecated. Please use `styles.popupMenuColumn` instead.',
+      'Warning: `dropdownMenuColumnStyle` is deprecated. Please use `styles.popupColumn` instead.',
     );
     errorSpy.mockReset();
   });
@@ -1079,7 +1079,7 @@ describe('Cascader.Basic', () => {
       <Cascader
         styles={{
           popup: { backgroundColor: 'red' },
-          popupMenuColumn: { backgroundColor: 'blue' },
+          popupColumn: { backgroundColor: 'blue' },
         }}
         options={[]}
         open