fix: search no scroll

react-component · Sep 2, 2024 · 3f8ae43 · 3f8ae43
1 parent d15d83b
commit 3f8ae43
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/OptionList/Column.tsx b/src/OptionList/Column.tsx
@@ -23,7 +23,6 @@ export interface ColumnProps<OptionType extends DefaultOptionType = DefaultOptio
   halfCheckedSet: Set<React.Key>;
   loadingKeys: React.Key[];
   isSelectable: (option: DefaultOptionType) => boolean;
-  searchValue?: string;
 }
 
 export default function Column<OptionType extends DefaultOptionType = DefaultOptionType>({
@@ -39,7 +38,6 @@ export default function Column<OptionType extends DefaultOptionType = DefaultOpt
   halfCheckedSet,
   loadingKeys,
   isSelectable,
-  searchValue,
 }: ColumnProps<OptionType>) {
   const menuPrefixCls = `${prefixCls}-menu`;
   const menuItemPrefixCls = `${prefixCls}-menu-item`;
@@ -117,7 +115,7 @@ export default function Column<OptionType extends DefaultOptionType = DefaultOpt
         }) => {
           // >>>>> Open
           const triggerOpenPath = () => {
-            if (disabled || searchValue) {
+            if (disabled) {
               return;
             }
             const nextValueCells = [...fullPath];

diff --git a/src/OptionList/List.tsx b/src/OptionList/List.tsx
@@ -166,6 +166,7 @@ const RawOptionList = React.forwardRef<RefOptionListProps, RawOptionListProps>((
 
   // >>>>> Active Scroll
   React.useEffect(() => {
+    if (searchValue) return;
     for (let i = 0; i < activeValueCells.length; i += 1) {
       const cellPath = activeValueCells.slice(0, i + 1);
       const cellKeyPath = toPathKey(cellPath);
@@ -176,7 +177,7 @@ const RawOptionList = React.forwardRef<RefOptionListProps, RawOptionListProps>((
         scrollIntoParentView(ele);
       }
     }
-  }, [activeValueCells]);
+  }, [activeValueCells, searchValue]);
 
   // ========================== Render ==========================
   // >>>>> Empty
@@ -213,7 +214,6 @@ const RawOptionList = React.forwardRef<RefOptionListProps, RawOptionListProps>((
       <Column
         key={index}
         {...columnProps}
-        searchValue={searchValue}
         prefixCls={mergedPrefixCls}
         options={col.options}
         prevValuePath={prevValuePath}