feat: optimize search

docs/demo/multiple-search.md

@@ -0,0 +1,8 @@
+---
+title: multiple-search
+nav:
+  title: Demo
+  path: /demo
+---
+
+<code src="../../examples/multiple-search.tsx"></code>

examples/multiple-search.tsx

@@ -0,0 +1,48 @@
+import React from 'react';
+import '../assets/index.less';
+import Cascader from '../src';
+
+const options = [
+  {
+    value: 'zhejiang',
+    label: 'Zhejiang',
+    children: [
+      {
+        value: 'hangzhou',
+        label: 'Hangzhou',
+        children: [
+          {
+            value: 'xihu',
+            label: 'West Lake',
+          },
+          {
+            value: 'xiasha',
+            label: 'Xia Sha',
+          },
+        ],
+      },
+    ],
+  },
+  {
+    value: 'jiangsu',
+    label: 'Jiangsu',
+    children: [
+      {
+        value: 'nanjing',
+        label: 'Nanjing',
+        children: [
+          {
+            value: 'zhonghuamen',
+            label: 'Zhong Hua men',
+          },
+        ],
+      },
+    ],
+  },
+];
+
+const Demo = () => {
+  return <Cascader checkable showSearch options={options} />;
+};
+
+export default Demo;

src/Cascader.tsx

@@ -280,7 +280,6 @@ const Cascader = React.forwardRef<CascaderRef, InternalCascaderProps>((props, re
     mergedFieldNames,
     dropdownPrefixCls || prefixCls,
     searchConfig,
-    changeOnSelect,
   );
 
   // =========================== Values ===========================

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];
@@ -189,7 +187,7 @@ export default function Column<OptionType extends DefaultOptionType = DefaultOpt
                   halfChecked={halfChecked}
                   disabled={disabled || disableCheckbox}
                   disableCheckbox={disableCheckbox}
-                  onClick={(e: React.MouseEvent<HTMLSpanElement>) => {
+                  onClick={e => {
                     if (disableCheckbox) {
                       return;
                     }

src/OptionList/List.tsx

@@ -6,7 +6,6 @@ import * as React from 'react';
 import type { DefaultOptionType, SingleValueType } from '../Cascader';
 import CascaderContext from '../context';
 import {
-  getFullPathKeys,
   isLeaf,
   scrollIntoParentView,
   toPathKey,
@@ -128,14 +127,10 @@ const RawOptionList = React.forwardRef<RefOptionListProps, RawOptionListProps>((
     const optionList = [{ options: mergedOptions }];
     let currentList = mergedOptions;
 
-    const fullPathKeys = getFullPathKeys(currentList, fieldNames);
-
     for (let i = 0; i < activeValueCells.length; i += 1) {
       const activeValueCell = activeValueCells[i];
       const currentOption = currentList.find(
-        (option, index) =>
-          (fullPathKeys[index] ? toPathKey(fullPathKeys[index]) : option[fieldNames.value]) ===
-          activeValueCell,
+        option => option[fieldNames.value] === activeValueCell,
       );
 
       const subOptions = currentOption?.[fieldNames.children];
@@ -213,7 +208,6 @@ const RawOptionList = React.forwardRef<RefOptionListProps, RawOptionListProps>((
       <Column
         key={index}
         {...columnProps}
-        searchValue={searchValue}
         prefixCls={mergedPrefixCls}
         options={col.options}
         prevValuePath={prevValuePath}

src/hooks/useSearchOptions.ts

@@ -15,7 +15,6 @@ export default (
   fieldNames: InternalFieldNames,
   prefixCls: string,
   config: ShowSearchType,
-  changeOnSelect?: boolean,
 ) => {
   const { filter = defaultFilter, render = defaultRender, limit = 50, sort } = config;
 
@@ -42,30 +41,19 @@ export default (
         const mergedDisabled = parentDisabled || option.disabled;
 
         // If current option is filterable
-        if (
-          // If is leaf option
-          !children ||
-          children.length === 0 ||
-          // If is changeOnSelect
-          changeOnSelect
-        ) {
-          if (filter(search, connectedPathOptions, { label: fieldNames.label })) {
-            filteredOptions.push({
-              ...option,
-              disabled: mergedDisabled,
-              [fieldNames.label as 'label']: render(
-                search,
-                connectedPathOptions,
-                prefixCls,
-                fieldNames,
-              ),
-              [SEARCH_MARK]: connectedPathOptions,
-              [fieldNames.children]: undefined,
-            });
-          }
-        }
-
-        if (children) {
+        if (filter(search, connectedPathOptions, { label: fieldNames.label })) {
+          filteredOptions.push({
+            ...option,
+            disabled: mergedDisabled,
+            [fieldNames.label as 'label']: render(
+              search,
+              connectedPathOptions,
+              prefixCls,
+              fieldNames,
+            ),
+            [SEARCH_MARK]: connectedPathOptions,
+          });
+        } else if (children) {
           dig(
             option[fieldNames.children] as DefaultOptionType[],
             connectedPathOptions,
@@ -87,5 +75,5 @@ export default (
     return limit !== false && limit > 0
       ? filteredOptions.slice(0, limit as number)
       : filteredOptions;
-  }, [search, options, fieldNames, prefixCls, render, changeOnSelect, filter, sort, limit]);
+  }, [search, options, fieldNames, prefixCls, render, filter, sort, limit]);
 };