From 769262666ecf03fb4ca4b1d2c7c7333f10dc0a2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=B1=AA?= <aojunhao@cai-inc.com>
Date: Wed, 16 Oct 2024 22:57:24 +0800
Subject: [PATCH 01/12] feat: add disabled api for panel

---
 src/OptionList/Column.tsx | 12 ++++++++----
 src/OptionList/List.tsx   | 27 +++++++++++++++++++++++----
 src/Panel.tsx             |  5 ++++-
 3 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/src/OptionList/Column.tsx b/src/OptionList/Column.tsx
index 5805ab1c..1acaedfe 100644
--- a/src/OptionList/Column.tsx
+++ b/src/OptionList/Column.tsx
@@ -23,6 +23,7 @@ export interface ColumnProps<OptionType extends DefaultOptionType = DefaultOptio
   halfCheckedSet: Set<React.Key>;
   loadingKeys: React.Key[];
   isSelectable: (option: DefaultOptionType) => boolean;
+  panelDisabled?: boolean;
 }
 
 export default function Column<OptionType extends DefaultOptionType = DefaultOptionType>({
@@ -38,6 +39,7 @@ export default function Column<OptionType extends DefaultOptionType = DefaultOpt
   halfCheckedSet,
   loadingKeys,
   isSelectable,
+  panelDisabled,
 }: ColumnProps<OptionType>) {
   const menuPrefixCls = `${prefixCls}-menu`;
   const menuItemPrefixCls = `${prefixCls}-menu-item`;
@@ -54,6 +56,8 @@ export default function Column<OptionType extends DefaultOptionType = DefaultOpt
 
   const hoverOpen = expandTrigger === 'hover';
 
+  const isOptionDisabled = (optionDisabled?: boolean) => panelDisabled || optionDisabled;
+
   // ============================ Option ============================
   const optionInfoList = React.useMemo(
     () =>
@@ -115,7 +119,7 @@ export default function Column<OptionType extends DefaultOptionType = DefaultOpt
         }) => {
           // >>>>> Open
           const triggerOpenPath = () => {
-            if (disabled) {
+            if (isOptionDisabled(disabled)) {
               return;
             }
             const nextValueCells = [...fullPath];
@@ -127,7 +131,7 @@ export default function Column<OptionType extends DefaultOptionType = DefaultOpt
 
           // >>>>> Selection
           const triggerSelect = () => {
-            if (isSelectable(option)) {
+            if (isSelectable(option) && !isOptionDisabled(disabled)) {
               onSelect(fullPath, isMergedLeaf);
             }
           };
@@ -148,7 +152,7 @@ export default function Column<OptionType extends DefaultOptionType = DefaultOpt
                 [`${menuItemPrefixCls}-expand`]: !isMergedLeaf,
                 [`${menuItemPrefixCls}-active`]:
                   activeValue === value || activeValue === fullPathKey,
-                [`${menuItemPrefixCls}-disabled`]: disabled,
+                [`${menuItemPrefixCls}-disabled`]: isOptionDisabled(disabled),
                 [`${menuItemPrefixCls}-loading`]: isLoading,
               })}
               style={dropdownMenuColumnStyle}
@@ -185,7 +189,7 @@ export default function Column<OptionType extends DefaultOptionType = DefaultOpt
                   prefixCls={`${prefixCls}-checkbox`}
                   checked={checked}
                   halfChecked={halfChecked}
-                  disabled={disabled || disableCheckbox}
+                  disabled={isOptionDisabled(disabled) || disableCheckbox}
                   disableCheckbox={disableCheckbox}
                   onClick={(e: React.MouseEvent<HTMLSpanElement>) => {
                     if (disableCheckbox) {
diff --git a/src/OptionList/List.tsx b/src/OptionList/List.tsx
index 0850b016..3512c517 100644
--- a/src/OptionList/List.tsx
+++ b/src/OptionList/List.tsx
@@ -21,11 +21,27 @@ import useKeyboard from './useKeyboard';
 
 export type RawOptionListProps = Pick<
   ReturnType<typeof useBaseProps>,
-  'prefixCls' | 'multiple' | 'searchValue' | 'toggleOpen' | 'notFoundContent' | 'direction' | 'open'
+  | 'prefixCls'
+  | 'multiple'
+  | 'searchValue'
+  | 'toggleOpen'
+  | 'notFoundContent'
+  | 'direction'
+  | 'open'
+  | 'disabled'
 >;
 
 const RawOptionList = React.forwardRef<RefOptionListProps, RawOptionListProps>((props, ref) => {
-  const { prefixCls, multiple, searchValue, toggleOpen, notFoundContent, direction, open } = props;
+  const {
+    prefixCls,
+    multiple,
+    searchValue,
+    toggleOpen,
+    notFoundContent,
+    direction,
+    open,
+    disabled: panelDisabled,
+  } = props;
 
   const containerRef = React.useRef<HTMLDivElement>(null);
   const rtl = direction === 'rtl';
@@ -100,10 +116,11 @@ const RawOptionList = React.forwardRef<RefOptionListProps, RawOptionListProps>((
   };
 
   const isSelectable = (option: DefaultOptionType) => {
-    const { disabled } = option;
+    if (panelDisabled) return false;
 
+    const { disabled: optionDisabled } = option;
     const isMergedLeaf = isLeaf(option, fieldNames);
-    return !disabled && (isMergedLeaf || changeOnSelect || multiple);
+    return !optionDisabled && (isMergedLeaf || changeOnSelect || multiple);
   };
 
   const onPathSelect = (valuePath: SingleValueType, leaf: boolean, fromKeyboard = false) => {
@@ -203,6 +220,7 @@ const RawOptionList = React.forwardRef<RefOptionListProps, RawOptionListProps>((
     halfCheckedSet,
     loadingKeys,
     isSelectable,
+    panelDisabled,
   };
 
   // >>>>> Columns
@@ -220,6 +238,7 @@ const RawOptionList = React.forwardRef<RefOptionListProps, RawOptionListProps>((
         options={col.options}
         prevValuePath={prevValuePath}
         activeValue={activeValue}
+        panelDisabled={panelDisabled}
       />
     );
   });
diff --git a/src/Panel.tsx b/src/Panel.tsx
index 9fa7e6dd..15e36b83 100644
--- a/src/Panel.tsx
+++ b/src/Panel.tsx
@@ -35,7 +35,8 @@ export type PickType =
   | 'className'
   | 'style'
   | 'direction'
-  | 'notFoundContent';
+  | 'notFoundContent'
+  | 'disabled';
 
 export type PanelProps<
   OptionType extends DefaultOptionType = DefaultOptionType,
@@ -68,6 +69,7 @@ export default function Panel<
     loadingIcon,
     direction,
     notFoundContent = 'Not Found',
+    disabled,
   } = props as Pick<InternalCascaderProps, PickType>;
 
   // ======================== Multiple ========================
@@ -200,6 +202,7 @@ export default function Panel<
             toggleOpen={noop}
             open
             direction={direction}
+            disabled={disabled}
           />
         )}
       </div>

From 75fdf3163cb6ac72dc308b510431c0c8e4aec586 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=B1=AA?= <aojunhao@cai-inc.com>
Date: Wed, 16 Oct 2024 23:20:31 +0800
Subject: [PATCH 02/12] feat: add test case

---
 tests/Panel.spec.tsx | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/tests/Panel.spec.tsx b/tests/Panel.spec.tsx
index 452f1be4..be76d679 100644
--- a/tests/Panel.spec.tsx
+++ b/tests/Panel.spec.tsx
@@ -97,4 +97,17 @@ describe('Cascader.Panel', () => {
     const checkedLi = container.querySelector('[aria-checked="true"]');
     expect(checkedLi?.textContent).toEqual('Little');
   });
+
+  it('disabled', () => {
+    const onChange = jest.fn();
+    const { container } = render(
+      <Cascader.Panel options={options} onChange={onChange} disabled={true} />,
+    );
+
+    expect(container.querySelector('.rc-cascader-panel-disabled')).toBeTruthy();
+
+    const selectOption = container.querySelector('.rc-cascader-menu-item')!;
+    fireEvent.click(selectOption);
+    expect(onChange).not.toHaveBeenCalled();
+  });
 });

From 3f41343824b96bfd6a55512a7dbe530862d1f10f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=B1=AA?= <aojunhao@cai-inc.com>
Date: Wed, 16 Oct 2024 23:36:34 +0800
Subject: [PATCH 03/12] docs: add demo

---
 examples/panel.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/examples/panel.tsx b/examples/panel.tsx
index 1f985476..5adcb438 100644
--- a/examples/panel.tsx
+++ b/examples/panel.tsx
@@ -92,6 +92,8 @@ export default () => {
 
       <Cascader.Panel options={addressOptions} direction="rtl" />
 
+      <Cascader.Panel disabled options={addressOptions} />
+
       <Cascader.Panel notFoundContent="Empty!!!" />
     </>
   );

From 62d5c1885a6d3c3f74b85e268fc31353d00f7ecd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=B1=AA?= <aojunhao@cai-inc.com>
Date: Thu, 17 Oct 2024 10:15:38 +0800
Subject: [PATCH 04/12] fix: test case fixed

---
 tests/Panel.spec.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Panel.spec.tsx b/tests/Panel.spec.tsx
index be76d679..c830a9aa 100644
--- a/tests/Panel.spec.tsx
+++ b/tests/Panel.spec.tsx
@@ -104,7 +104,7 @@ describe('Cascader.Panel', () => {
       <Cascader.Panel options={options} onChange={onChange} disabled={true} />,
     );
 
-    expect(container.querySelector('.rc-cascader-panel-disabled')).toBeTruthy();
+    expect(container.querySelector('.rc-cascader-menu-item-disabled')).toBeTruthy();
 
     const selectOption = container.querySelector('.rc-cascader-menu-item')!;
     fireEvent.click(selectOption);

From cb771fe0b40390b7b36243f6a5c653a46b1de471 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=B1=AA?= <aojunhao@cai-inc.com>
Date: Thu, 17 Oct 2024 11:12:28 +0800
Subject: [PATCH 05/12] feat: adjust demo position

---
 examples/panel.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/panel.tsx b/examples/panel.tsx
index 5adcb438..8bc8617b 100644
--- a/examples/panel.tsx
+++ b/examples/panel.tsx
@@ -90,10 +90,10 @@ export default () => {
         }}
       />
 
-      <Cascader.Panel options={addressOptions} direction="rtl" />
-
       <Cascader.Panel disabled options={addressOptions} />
 
+      <Cascader.Panel options={addressOptions} direction="rtl" />
+
       <Cascader.Panel notFoundContent="Empty!!!" />
     </>
   );

From 243125acee31979a3484c1b525df88601cda507f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=B1=AA?= <aojunhao@cai-inc.com>
Date: Thu, 17 Oct 2024 11:15:33 +0800
Subject: [PATCH 06/12] feat: improve demo

---
 examples/panel.tsx | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/examples/panel.tsx b/examples/panel.tsx
index 8bc8617b..0e846099 100644
--- a/examples/panel.tsx
+++ b/examples/panel.tsx
@@ -61,6 +61,8 @@ export default () => {
 
   const [value2, setValue2] = React.useState<string[][]>([]);
 
+  const [disabled, setDisabled] = React.useState(false);
+
   return (
     <>
       <h1>Panel</h1>
@@ -71,6 +73,13 @@ export default () => {
       >
         Set Value
       </button>
+      <button
+        onClick={() => {
+          setDisabled(prev => !prev);
+        }}
+      >
+        {disabled ? 'enable panel' : 'disable panel'}
+      </button>
       <Cascader.Panel
         value={value}
         options={addressOptions}
@@ -78,6 +87,7 @@ export default () => {
           console.log('Change:', nextValue);
           setValue(nextValue);
         }}
+        disabled={disabled}
       />
 
       <Cascader.Panel
@@ -88,10 +98,9 @@ export default () => {
           console.log('Change:', nextValue);
           setValue2(nextValue);
         }}
+        disabled={disabled}
       />
 
-      <Cascader.Panel disabled options={addressOptions} />
-
       <Cascader.Panel options={addressOptions} direction="rtl" />
 
       <Cascader.Panel notFoundContent="Empty!!!" />

From ef96118c9c89985e62fc7fef9bec1ee658dc511d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=B1=AA?= <aojunhao@cai-inc.com>
Date: Sat, 26 Oct 2024 14:14:35 +0800
Subject: [PATCH 07/12] chore: reorganize code for better readability

---
 examples/panel.tsx        | 2 +-
 src/OptionList/Column.tsx | 6 +++---
 src/OptionList/List.tsx   | 7 +++----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/examples/panel.tsx b/examples/panel.tsx
index 0e846099..c0c51353 100644
--- a/examples/panel.tsx
+++ b/examples/panel.tsx
@@ -101,7 +101,7 @@ export default () => {
         disabled={disabled}
       />
 
-      <Cascader.Panel options={addressOptions} direction="rtl" />
+      <Cascader.Panel options={addressOptions} disabled={disabled} direction="rtl" />
 
       <Cascader.Panel notFoundContent="Empty!!!" />
     </>
diff --git a/src/OptionList/Column.tsx b/src/OptionList/Column.tsx
index 1acaedfe..37a2de8c 100644
--- a/src/OptionList/Column.tsx
+++ b/src/OptionList/Column.tsx
@@ -23,7 +23,7 @@ export interface ColumnProps<OptionType extends DefaultOptionType = DefaultOptio
   halfCheckedSet: Set<React.Key>;
   loadingKeys: React.Key[];
   isSelectable: (option: DefaultOptionType) => boolean;
-  panelDisabled?: boolean;
+  disabled?: boolean;
 }
 
 export default function Column<OptionType extends DefaultOptionType = DefaultOptionType>({
@@ -39,7 +39,7 @@ export default function Column<OptionType extends DefaultOptionType = DefaultOpt
   halfCheckedSet,
   loadingKeys,
   isSelectable,
-  panelDisabled,
+  disabled,
 }: ColumnProps<OptionType>) {
   const menuPrefixCls = `${prefixCls}-menu`;
   const menuItemPrefixCls = `${prefixCls}-menu-item`;
@@ -56,7 +56,7 @@ export default function Column<OptionType extends DefaultOptionType = DefaultOpt
 
   const hoverOpen = expandTrigger === 'hover';
 
-  const isOptionDisabled = (optionDisabled?: boolean) => panelDisabled || optionDisabled;
+  const isOptionDisabled = (optionDisabled?: boolean) => disabled || optionDisabled;
 
   // ============================ Option ============================
   const optionInfoList = React.useMemo(
diff --git a/src/OptionList/List.tsx b/src/OptionList/List.tsx
index 3512c517..676ecfcb 100644
--- a/src/OptionList/List.tsx
+++ b/src/OptionList/List.tsx
@@ -40,7 +40,7 @@ const RawOptionList = React.forwardRef<RefOptionListProps, RawOptionListProps>((
     notFoundContent,
     direction,
     open,
-    disabled: panelDisabled,
+    disabled,
   } = props;
 
   const containerRef = React.useRef<HTMLDivElement>(null);
@@ -116,10 +116,11 @@ const RawOptionList = React.forwardRef<RefOptionListProps, RawOptionListProps>((
   };
 
   const isSelectable = (option: DefaultOptionType) => {
-    if (panelDisabled) return false;
+    if (disabled) return false;
 
     const { disabled: optionDisabled } = option;
     const isMergedLeaf = isLeaf(option, fieldNames);
+
     return !optionDisabled && (isMergedLeaf || changeOnSelect || multiple);
   };
 
@@ -220,7 +221,6 @@ const RawOptionList = React.forwardRef<RefOptionListProps, RawOptionListProps>((
     halfCheckedSet,
     loadingKeys,
     isSelectable,
-    panelDisabled,
   };
 
   // >>>>> Columns
@@ -238,7 +238,6 @@ const RawOptionList = React.forwardRef<RefOptionListProps, RawOptionListProps>((
         options={col.options}
         prevValuePath={prevValuePath}
         activeValue={activeValue}
-        panelDisabled={panelDisabled}
       />
     );
   });

From 9e1323286bfb5c89797615b705b6dc288743c536 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=B1=AA?= <1844749591@qq.com>
Date: Sun, 27 Oct 2024 21:07:40 +0800
Subject: [PATCH 08/12] test: update snapshot

---
 tests/__snapshots__/search.spec.tsx.snap | 38 +++++++++++-------------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/tests/__snapshots__/search.spec.tsx.snap b/tests/__snapshots__/search.spec.tsx.snap
index a08aaac7..8fa4d0e4 100644
--- a/tests/__snapshots__/search.spec.tsx.snap
+++ b/tests/__snapshots__/search.spec.tsx.snap
@@ -8,30 +8,26 @@ exports[`Cascader.Search should correct render Cascader with same field name of
     class="rc-cascader-selector"
   >
     <span
-      class="rc-cascader-selection-wrap"
+      class="rc-cascader-selection-search"
     >
-      <span
-        class="rc-cascader-selection-search"
-      >
-        <input
-          aria-autocomplete="list"
-          aria-controls="rc_select_TEST_OR_SSR_list"
-          aria-expanded="true"
-          aria-haspopup="listbox"
-          aria-owns="rc_select_TEST_OR_SSR_list"
-          autocomplete="off"
-          class="rc-cascader-selection-search-input"
-          id="rc_select_TEST_OR_SSR"
-          role="combobox"
-          type="search"
-          value="z"
-        />
-      </span>
-      <span
-        class="rc-cascader-selection-placeholder"
-        style="visibility: hidden;"
+      <input
+        aria-autocomplete="list"
+        aria-controls="rc_select_TEST_OR_SSR_list"
+        aria-expanded="true"
+        aria-haspopup="listbox"
+        aria-owns="rc_select_TEST_OR_SSR_list"
+        autocomplete="off"
+        class="rc-cascader-selection-search-input"
+        id="rc_select_TEST_OR_SSR"
+        role="combobox"
+        type="search"
+        value="z"
       />
     </span>
+    <span
+      class="rc-cascader-selection-placeholder"
+      style="visibility: hidden;"
+    />
   </div>
   <div
     class="rc-cascader-dropdown rc-cascader-dropdown-placement-bottomLeft"

From 9201339aa18d6e2a16dd3751192e00145fba1b31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=B1=AA?= <1844749591@qq.com>
Date: Mon, 28 Oct 2024 10:01:04 +0800
Subject: [PATCH 09/12] fix: lint fix

---
 src/OptionList/Column.tsx | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/OptionList/Column.tsx b/src/OptionList/Column.tsx
index 37a2de8c..14cc1451 100644
--- a/src/OptionList/Column.tsx
+++ b/src/OptionList/Column.tsx
@@ -62,7 +62,7 @@ export default function Column<OptionType extends DefaultOptionType = DefaultOpt
   const optionInfoList = React.useMemo(
     () =>
       options.map(option => {
-        const { disabled, disableCheckbox } = option;
+        const { disabled: optionDisabled, disableCheckbox } = option;
         const searchOptions: Record<string, any>[] = option[SEARCH_MARK];
         const label = option[FIX_LABEL] ?? option[fieldNames.label];
         const value = option[fieldNames.value];
@@ -84,7 +84,7 @@ export default function Column<OptionType extends DefaultOptionType = DefaultOpt
         const halfChecked = halfCheckedSet.has(fullPathKey);
 
         return {
-          disabled,
+          disabled: optionDisabled,
           label,
           value,
           isLeaf: isMergedLeaf,
@@ -105,7 +105,7 @@ export default function Column<OptionType extends DefaultOptionType = DefaultOpt
     <ul className={menuPrefixCls} role="menu">
       {optionInfoList.map(
         ({
-          disabled,
+          disabled: optionDisabled,
           label,
           value,
           isLeaf: isMergedLeaf,
@@ -119,7 +119,7 @@ export default function Column<OptionType extends DefaultOptionType = DefaultOpt
         }) => {
           // >>>>> Open
           const triggerOpenPath = () => {
-            if (isOptionDisabled(disabled)) {
+            if (isOptionDisabled(optionDisabled)) {
               return;
             }
             const nextValueCells = [...fullPath];
@@ -131,7 +131,7 @@ export default function Column<OptionType extends DefaultOptionType = DefaultOpt
 
           // >>>>> Selection
           const triggerSelect = () => {
-            if (isSelectable(option) && !isOptionDisabled(disabled)) {
+            if (isSelectable(option) && !isOptionDisabled(optionDisabled)) {
               onSelect(fullPath, isMergedLeaf);
             }
           };
@@ -152,7 +152,7 @@ export default function Column<OptionType extends DefaultOptionType = DefaultOpt
                 [`${menuItemPrefixCls}-expand`]: !isMergedLeaf,
                 [`${menuItemPrefixCls}-active`]:
                   activeValue === value || activeValue === fullPathKey,
-                [`${menuItemPrefixCls}-disabled`]: isOptionDisabled(disabled),
+                [`${menuItemPrefixCls}-disabled`]: isOptionDisabled(optionDisabled),
                 [`${menuItemPrefixCls}-loading`]: isLoading,
               })}
               style={dropdownMenuColumnStyle}
@@ -189,7 +189,7 @@ export default function Column<OptionType extends DefaultOptionType = DefaultOpt
                   prefixCls={`${prefixCls}-checkbox`}
                   checked={checked}
                   halfChecked={halfChecked}
-                  disabled={isOptionDisabled(disabled) || disableCheckbox}
+                  disabled={isOptionDisabled(optionDisabled) || disableCheckbox}
                   disableCheckbox={disableCheckbox}
                   onClick={(e: React.MouseEvent<HTMLSpanElement>) => {
                     if (disableCheckbox) {

From 393749aad961fc1d38c1f9cb2426358766325e27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=B1=AA?= <1844749591@qq.com>
Date: Mon, 28 Oct 2024 20:50:35 +0800
Subject: [PATCH 10/12] chore: adjust code structure

---
 src/OptionList/List.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/OptionList/List.tsx b/src/OptionList/List.tsx
index 676ecfcb..d495af23 100644
--- a/src/OptionList/List.tsx
+++ b/src/OptionList/List.tsx
@@ -116,7 +116,9 @@ const RawOptionList = React.forwardRef<RefOptionListProps, RawOptionListProps>((
   };
 
   const isSelectable = (option: DefaultOptionType) => {
-    if (disabled) return false;
+    if (disabled) {
+      return false;
+    }
 
     const { disabled: optionDisabled } = option;
     const isMergedLeaf = isLeaf(option, fieldNames);

From 6610a9bc89a564d4e249cb7a6596554351e149ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=B1=AA?= <1844749591@qq.com>
Date: Tue, 29 Oct 2024 17:53:50 +0800
Subject: [PATCH 11/12] test: update snapshot

---
 tests/__snapshots__/search.spec.tsx.snap | 38 +++++++++++++-----------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/tests/__snapshots__/search.spec.tsx.snap b/tests/__snapshots__/search.spec.tsx.snap
index 8fa4d0e4..a08aaac7 100644
--- a/tests/__snapshots__/search.spec.tsx.snap
+++ b/tests/__snapshots__/search.spec.tsx.snap
@@ -8,26 +8,30 @@ exports[`Cascader.Search should correct render Cascader with same field name of
     class="rc-cascader-selector"
   >
     <span
-      class="rc-cascader-selection-search"
+      class="rc-cascader-selection-wrap"
     >
-      <input
-        aria-autocomplete="list"
-        aria-controls="rc_select_TEST_OR_SSR_list"
-        aria-expanded="true"
-        aria-haspopup="listbox"
-        aria-owns="rc_select_TEST_OR_SSR_list"
-        autocomplete="off"
-        class="rc-cascader-selection-search-input"
-        id="rc_select_TEST_OR_SSR"
-        role="combobox"
-        type="search"
-        value="z"
+      <span
+        class="rc-cascader-selection-search"
+      >
+        <input
+          aria-autocomplete="list"
+          aria-controls="rc_select_TEST_OR_SSR_list"
+          aria-expanded="true"
+          aria-haspopup="listbox"
+          aria-owns="rc_select_TEST_OR_SSR_list"
+          autocomplete="off"
+          class="rc-cascader-selection-search-input"
+          id="rc_select_TEST_OR_SSR"
+          role="combobox"
+          type="search"
+          value="z"
+        />
+      </span>
+      <span
+        class="rc-cascader-selection-placeholder"
+        style="visibility: hidden;"
       />
     </span>
-    <span
-      class="rc-cascader-selection-placeholder"
-      style="visibility: hidden;"
-    />
   </div>
   <div
     class="rc-cascader-dropdown rc-cascader-dropdown-placement-bottomLeft"

From 7691896597d457fdce1eb6ea30172a13de8a12fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=B1=AA?= <1844749591@qq.com>
Date: Tue, 29 Oct 2024 19:06:29 +0800
Subject: [PATCH 12/12] chore: code optimization

---
 src/OptionList/Column.tsx | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/OptionList/Column.tsx b/src/OptionList/Column.tsx
index 14cc1451..c46cc457 100644
--- a/src/OptionList/Column.tsx
+++ b/src/OptionList/Column.tsx
@@ -39,7 +39,7 @@ export default function Column<OptionType extends DefaultOptionType = DefaultOpt
   halfCheckedSet,
   loadingKeys,
   isSelectable,
-  disabled,
+  disabled: propsDisabled,
 }: ColumnProps<OptionType>) {
   const menuPrefixCls = `${prefixCls}-menu`;
   const menuItemPrefixCls = `${prefixCls}-menu-item`;
@@ -56,13 +56,13 @@ export default function Column<OptionType extends DefaultOptionType = DefaultOpt
 
   const hoverOpen = expandTrigger === 'hover';
 
-  const isOptionDisabled = (optionDisabled?: boolean) => disabled || optionDisabled;
+  const isOptionDisabled = (disabled?: boolean) => propsDisabled || disabled;
 
   // ============================ Option ============================
   const optionInfoList = React.useMemo(
     () =>
       options.map(option => {
-        const { disabled: optionDisabled, disableCheckbox } = option;
+        const { disabled, disableCheckbox } = option;
         const searchOptions: Record<string, any>[] = option[SEARCH_MARK];
         const label = option[FIX_LABEL] ?? option[fieldNames.label];
         const value = option[fieldNames.value];
@@ -84,7 +84,7 @@ export default function Column<OptionType extends DefaultOptionType = DefaultOpt
         const halfChecked = halfCheckedSet.has(fullPathKey);
 
         return {
-          disabled: optionDisabled,
+          disabled,
           label,
           value,
           isLeaf: isMergedLeaf,
@@ -105,7 +105,7 @@ export default function Column<OptionType extends DefaultOptionType = DefaultOpt
     <ul className={menuPrefixCls} role="menu">
       {optionInfoList.map(
         ({
-          disabled: optionDisabled,
+          disabled,
           label,
           value,
           isLeaf: isMergedLeaf,
@@ -119,7 +119,7 @@ export default function Column<OptionType extends DefaultOptionType = DefaultOpt
         }) => {
           // >>>>> Open
           const triggerOpenPath = () => {
-            if (isOptionDisabled(optionDisabled)) {
+            if (isOptionDisabled(disabled)) {
               return;
             }
             const nextValueCells = [...fullPath];
@@ -131,7 +131,7 @@ export default function Column<OptionType extends DefaultOptionType = DefaultOpt
 
           // >>>>> Selection
           const triggerSelect = () => {
-            if (isSelectable(option) && !isOptionDisabled(optionDisabled)) {
+            if (isSelectable(option) && !isOptionDisabled(disabled)) {
               onSelect(fullPath, isMergedLeaf);
             }
           };
@@ -152,7 +152,7 @@ export default function Column<OptionType extends DefaultOptionType = DefaultOpt
                 [`${menuItemPrefixCls}-expand`]: !isMergedLeaf,
                 [`${menuItemPrefixCls}-active`]:
                   activeValue === value || activeValue === fullPathKey,
-                [`${menuItemPrefixCls}-disabled`]: isOptionDisabled(optionDisabled),
+                [`${menuItemPrefixCls}-disabled`]: isOptionDisabled(disabled),
                 [`${menuItemPrefixCls}-loading`]: isLoading,
               })}
               style={dropdownMenuColumnStyle}
@@ -189,7 +189,7 @@ export default function Column<OptionType extends DefaultOptionType = DefaultOpt
                   prefixCls={`${prefixCls}-checkbox`}
                   checked={checked}
                   halfChecked={halfChecked}
-                  disabled={isOptionDisabled(optionDisabled) || disableCheckbox}
+                  disabled={isOptionDisabled(disabled) || disableCheckbox}
                   disableCheckbox={disableCheckbox}
                   onClick={(e: React.MouseEvent<HTMLSpanElement>) => {
                     if (disableCheckbox) {