@hi-ui/cascader 4.0.0-alpha.28 → 4.0.0-alpha.29

package/lib/esm/use-cascader.js

@@ -10,13 +10,12 @@
 import { __rest } from 'tslib';
 import { useMemo, useCallback } from 'react';
 import { useUncontrolledState } from '@hi-ui/use-uncontrolled-state';
+import { useCache } from './hooks/use-cache/lib/esm/index.js';
 import { flattenTreeData, getActiveNodePaths, checkCanLoadChildren, getFlattedMenus, getActiveMenus } from './utils/index.js';
-import { useSearch } from './hooks/use-search.js';
 import { useSelect } from './hooks/use-select.js';
-import { useCache } from './hooks/use-cache.js';
 import { useAsyncSwitch } from './hooks/use-async-switch.js';
 var NOOP_ARRAY = [];
-var NOOP_VALUE = '';
+var NOOP_VALUE = [];
 
 var useCascader = function useCascader(_a) {
   var _a$defaultValue = _a.defaultValue,
@@ -30,25 +29,13 @@ var useCascader = function useCascader(_a) {
       _a$changeOnSelect = _a.changeOnSelect,
       changeOnSelect = _a$changeOnSelect === void 0 ? false : _a$changeOnSelect,
       _a$flatted = _a.flatted,
-      flattedProp = _a$flatted === void 0 ? false : _a$flatted,
-      _a$upMatch = _a.upMatch,
-      upMatch = _a$upMatch === void 0 ? false : _a$upMatch,
-      _a$expandTrigger = _a.expandTrigger,
-      expandTrigger = _a$expandTrigger === void 0 ? 'click' : _a$expandTrigger,
-      _a$emptyContent = _a.emptyContent,
-      emptyContent = _a$emptyContent === void 0 ? '无匹配选项' : _a$emptyContent,
-      placeholder = _a.placeholder,
-      searchPlaceholder = _a.searchPlaceholder,
-      onSelect = _a.onSelect,
-      titleRender = _a.titleRender,
-      displayRender = _a.displayRender,
+      flatted = _a$flatted === void 0 ? false : _a$flatted,
+      onSelectProp = _a.onSelect,
       onLoadChildren = _a.onLoadChildren,
       cascaderDataProp = _a.cascaderData,
       setCascaderDataProp = _a.setCascaderData,
       flattedDataProp = _a.flattedData,
-      matchedItemsProp = _a.matchedItems,
-      inSearchProp = _a.inSearch,
-      rest = __rest(_a, ["defaultValue", "value", "onChange", "data", "disabled", "changeOnSelect", "flatted", "upMatch", "expandTrigger", "emptyContent", "placeholder", "searchPlaceholder", "onSelect", "titleRender", "displayRender", "onLoadChildren", "cascaderData", "setCascaderData", "flattedData", "matchedItems", "inSearch"]);
+      rest = __rest(_a, ["defaultValue", "value", "onChange", "data", "disabled", "changeOnSelect", "flatted", "onSelect", "onLoadChildren", "cascaderData", "setCascaderData", "flattedData"]);
 
   var _useCache = useCache(data),
       cacheData = _useCache[0],
@@ -64,20 +51,24 @@ var useCascader = function useCascader(_a) {
       value = _useUncontrolledState[0],
       tryChangeValue = _useUncontrolledState[1];
 
-  var proxyTryChangeValue = useCallback(function (value, item, itemPaths) {
-    tryChangeValue(value, item, itemPaths);
-    onSelect === null || onSelect === void 0 ? void 0 : onSelect(value, item, itemPaths);
-  }, [tryChangeValue, onSelect]); // 单击选中某项
+  var onSelect = function onSelect(value, item, itemPaths) {
+    tryChangeValue(itemPaths.map(function (_ref) {
+      var id = _ref.id;
+      return id;
+    }));
+    onSelectProp === null || onSelectProp === void 0 ? void 0 : onSelectProp(value, item, itemPaths);
+  }; // 单击选中某项
+
 
-  var _useSelect = useSelect(disabled, proxyTryChangeValue, changeOnSelect, onLoadChildren),
+  var _useSelect = useSelect(disabled, onSelect, changeOnSelect, onLoadChildren),
       selectedId = _useSelect[0],
       onOptionSelect = _useSelect[1],
       setSelectedId = _useSelect[2]; // 选中 id 路径
 
 
   var selectedIds = useMemo(function () {
-    return getActiveNodePaths(flattedData, selectedId).map(function (_ref) {
-      var id = _ref.id;
+    return getActiveNodePaths(flattedData, selectedId).map(function (_ref2) {
+      var id = _ref2.id;
       return id;
     });
   }, [flattedData, selectedId]); // 存在异步加载数据的情况时，单击选中时需要控制异步加载状态
@@ -93,28 +84,12 @@ var useCascader = function useCascader(_a) {
   var isCanLoadChildren = useCallback(function (option) {
     return checkCanLoadChildren(option, onLoadChildren);
   }, [onLoadChildren]);
-
-  var _useSearch = useSearch(flattedData, upMatch, isCanLoadChildren),
-      inSearchInner = _useSearch[0],
-      matchedItemsInner = _useSearch[1],
-      inputProps = _useSearch[2],
-      isEmpty = _useSearch[3],
-      resetSearch = _useSearch[4];
-
-  var inSearch = inSearchProp !== null && inSearchProp !== void 0 ? inSearchProp : inSearchInner;
-  var matchedItems = matchedItemsProp !== null && matchedItemsProp !== void 0 ? matchedItemsProp : matchedItemsInner;
   var menuList = useMemo(function () {
-    if (inSearch) {
-      return [matchedItems];
-    }
-
-    return flattedProp ? getFlattedMenus(flattedData, isCanLoadChildren) : getActiveMenus(flattedData, selectedId);
-  }, [inSearch, flattedProp, matchedItems, flattedData, selectedId, isCanLoadChildren]); // 搜索的结果列表也采用 flatted 模式进行展示
-
-  var flatted = flattedProp || inSearch;
-  var getCascaderItemRequiredProps = useCallback(function (_ref2) {
-    var id = _ref2.id,
-        depth = _ref2.depth;
+    return flatted ? getFlattedMenus(flattedData, isCanLoadChildren) : getActiveMenus(flattedData, selectedId);
+  }, [flatted, flattedData, selectedId, isCanLoadChildren]);
+  var getCascaderItemRequiredProps = useCallback(function (_ref3) {
+    var id = _ref3.id,
+        depth = _ref3.depth;
     return {
       selected: flatted ? selectedId === id : selectedIds[depth] === id,
       loading: isLoadingId(id),
@@ -122,17 +97,9 @@ var useCascader = function useCascader(_a) {
       focused: false
     };
   }, [flatted, selectedId, selectedIds, isLoadingId]);
-  var getSearchInputProps = useCallback(function () {
-    return {
-      placeholder: searchPlaceholder,
-      value: inputProps.value,
-      onChange: inputProps.onChange
-    };
-  }, [searchPlaceholder, inputProps]);
   var reset = useCallback(function () {
-    resetSearch();
-    setSelectedId(value);
-  }, [setSelectedId, value, resetSearch]);
+    setSelectedId(value[value.length - 1]);
+  }, [setSelectedId, value]);
   return {
     rootProps: rest,
     reset: reset,
@@ -140,21 +107,13 @@ var useCascader = function useCascader(_a) {
     value: value,
     tryChangeValue: tryChangeValue,
     getCascaderItemRequiredProps: getCascaderItemRequiredProps,
-    expandTrigger: expandTrigger,
     flatted: flatted,
     onItemClick: onItemExpand,
     onItemHover: onItemHover,
     changeOnSelect: changeOnSelect,
     onLoadChildren: onLoadChildren,
-    keyword: inputProps.value,
     disabled: disabled,
-    menuList: menuList,
-    isEmpty: isEmpty,
-    placeholder: placeholder,
-    displayRender: displayRender,
-    titleRender: titleRender,
-    emptyContent: emptyContent,
-    getSearchInputProps: getSearchInputProps
+    menuList: menuList
   };
 };
 

package/lib/esm/use-cascader.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-cascader.js","sources":["../../src/use-cascader.ts"],"sourcesContent":[null],"names":["NOOP_ARRAY","NOOP_VALUE","useCascader","_a","defaultValue","valueProp","value","onChangeProp","onChange","data","disabled","changeOnSelect","flatted","flattedProp","upMatch","expandTrigger","emptyContent","placeholder","searchPlaceholder","onSelect","titleRender","displayRender","onLoadChildren","cascaderDataProp","cascaderData","setCascaderDataProp","setCascaderData","flattedDataProp","flattedData","matchedItemsProp","matchedItems","inSearchProp","inSearch","rest","useCache","cacheData","setCacheData","useMemo","flattenTreeData","useUncontrolledState","tryChangeValue","proxyTryChangeValue","useCallback","item","itemPaths","useSelect","selectedId","onOptionSelect","setSelectedId","selectedIds","getActiveNodePaths","map","id","useAsyncSwitch","isLoadingId","onItemExpand","onItemHover","option","isCanLoadChildren","checkCanLoadChildren","useSearch","inSearchInner","matchedItemsInner","inputProps","isEmpty","resetSearch","menuList","getFlattedMenus","getActiveMenus","getCascaderItemRequiredProps","depth","selected","loading","focused","getSearchInputProps","reset","rootProps","onItemClick","keyword"],"mappings":"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"}
+{"version":3,"file":"use-cascader.js","sources":["../../src/use-cascader.ts"],"sourcesContent":[null],"names":["NOOP_ARRAY","NOOP_VALUE","useCascader","_a","defaultValue","valueProp","value","onChangeProp","onChange","data","disabled","changeOnSelect","flatted","onSelectProp","onSelect","onLoadChildren","cascaderDataProp","cascaderData","setCascaderDataProp","setCascaderData","flattedDataProp","flattedData","rest","useCache","cacheData","setCacheData","useMemo","flattenTreeData","useUncontrolledState","tryChangeValue","item","itemPaths","map","id","useSelect","selectedId","onOptionSelect","setSelectedId","selectedIds","getActiveNodePaths","useAsyncSwitch","isLoadingId","onItemExpand","onItemHover","useCallback","option","isCanLoadChildren","checkCanLoadChildren","menuList","getFlattedMenus","getActiveMenus","getCascaderItemRequiredProps","depth","selected","loading","focused","reset","length","rootProps","onItemClick"],"mappings":"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"}

package/lib/esm/utils/index.js

@@ -7,7 +7,8 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import { flattenTree, getNodeAncestorsWithMe } from '@hi-ui/tree-utils';
+import { flattenTree, getTopDownAncestors } from '@hi-ui/tree-utils';
+import { isArrayNonEmpty } from '@hi-ui/type-assertion';
 /**
  * 扁平化树数据结构，基于前序遍历
  */
@@ -27,14 +28,6 @@ var flattenTreeData = function flattenTreeData(treeData) {
     return flattedNode;
   });
 };
-/**
- * 获取自顶向下的祖先节点，包括自己
- */
-
-
-var getTopDownAncestors = function getTopDownAncestors(node) {
-  return getNodeAncestorsWithMe(node).reverse();
-};
 /**
  * 获取选中节点的节点路径，包含选中节点
  */
@@ -86,13 +79,13 @@ var getFlattedMenus = function getFlattedMenus(data, filter) {
 };
 
 var checkCanLoadChildren = function checkCanLoadChildren(node, onLoadChildren) {
-  var hasChildren = node.children && node.children.length > 0;
-  return hasChildren || onLoadChildren && !node.children && !node.isLeaf;
+  var hasChildren = isArrayNonEmpty(node.children);
+  return hasChildren || onLoadChildren && !node.isLeaf && !node.children;
 };
 
 function getCascaderItemEventData(node, requiredProps) {
   return Object.assign(Object.assign({}, node), requiredProps);
 }
 
-export { checkCanLoadChildren, flattenTreeData, getActiveMenus, getActiveNodePaths, getCascaderItemEventData, getFlattedMenus, getTopDownAncestors };
+export { checkCanLoadChildren, flattenTreeData, getActiveMenus, getActiveNodePaths, getCascaderItemEventData, getFlattedMenus };
 //# sourceMappingURL=index.js.map

package/lib/esm/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../../src/utils/index.ts"],"sourcesContent":[null],"names":["flattenTreeData","treeData","flattenTree","node","flattedNode","raw","title","isLeaf","disabled","getTopDownAncestors","getNodeAncestorsWithMe","reverse","getActiveNodePaths","flattedData","selectedId","length","selectedOption","find","id","getActiveMenus","root","parent","menu","children","push","getFlattedMenus","data","filter","item","checkCanLoadChildren","onLoadChildren","hasChildren","getCascaderItemEventData","requiredProps"],"mappings":";;;;;;;;;;AASA;;;;IAGaA,eAAe,GAAG,SAAlBA,eAAkB,CAACC,QAAD;SACtBC,WAAW,CAAeD,QAAf,EAAyB,UAACE,IAAD;QACnCC,WAAW,GAAwBD;oBACWA,IAAI,CAACE;QAAjDC,KAAR,aAAQA;qCAAOC;QAAAA,MAAf,iCAAwB;uCAAOC;QAAAA,QAA/B,mCAA0C;AAC1CJ,IAAAA,WAAW,CAACE,KAAZF,GAAoBE,KAApBF;AACAA,IAAAA,WAAW,CAACG,MAAZH,GAAqBG,MAArBH;AACAA,IAAAA,WAAW,CAACI,QAAZJ,GAAuBI,QAAvBJ;WACOA;AANS,GAAA;;AAUpB;;;;;IAGaK,mBAAmB,GAAG,SAAtBA,mBAAsB,CAACN,IAAD;SAC1BO,sBAAsB,CAACP,IAAD,CAAtBO,CAA6BC,OAA7BD;;AAGT;;;;;IAGaE,kBAAkB,GAAG,SAArBA,kBAAqB,CAChCC,WADgC,EAEhCC,UAFgC;MAI5BD,WAAW,CAACE,MAAZF,KAAuB,GAAG,OAAO,EAAP;MAExBG,cAAc,GAAGH,WAAW,CAACI,IAAZJ,CAAiB,cAAA;QAAGK,EAAH,QAAGA;WAASJ,UAAU,KAAKI;AAA5C,GAAAL;MACnB,CAACG,gBAAgB,OAAO,EAAP;SAEdP,mBAAmB,CAACO,cAAD;;AAG5B;;;;;IAGaG,cAAc,GAAG,SAAjBA,cAAiB,CAC5BN,WAD4B,EAE5BC,UAF4B;MAIxBD,WAAW,CAACE,MAAZF,KAAuB,GAAG,OAAO,EAAP;MAExBO,IAAI,GAAGP,WAAW,CAAC,CAAD,CAAXA,CAAeQ;MACxBC,IAAI,GAA4B,CAACF,IAAK,CAACG,QAAP;MAEhC,OAAOT,UAAP,KAAsB,aAAa,OAAOQ,IAAP;MAEnCN,cAAc,GAAGH,WAAW,CAACI,IAAZJ,CAAiB,eAAA;QAAGK,EAAH,SAAGA;WAASJ,UAAU,KAAKI;AAA5C,GAAAL;MACjB,CAACG,gBAAgB,OAAOM,IAAP;;MAEjBN,cAAc,CAACO,UAAU;AAC3BD,IAAAA,IAAI,GAAG,CAACN,cAAc,CAACO,QAAhB,CAAPD;AADF,SAEO;AACLA,IAAAA,IAAI,GAAG,EAAPA;;;SAGKN,cAAc,CAACK,QAAQ;AAC5BC,IAAAA,IAAI,CAACE,IAALF,CAAUN,cAAc,CAACK,MAAfL,CAAsBO,QAAhCD;AACAN,IAAAA,cAAc,GAAGA,cAAc,CAACK,MAAhCL;;;SAGKM,IAAI,CAACX,OAALW;;;IAGIG,eAAe,GAAG,SAAlBA,eAAkB,CAC7BC,IAD6B,EAE7BC,MAF6B;SAItB,CAACD,IAAI,CAACC,MAALD,CAAY,UAACE,IAAD;WAAU,CAACD,MAAM,CAACC,IAAD;AAA7B,GAAAF,CAAD;;;IAGIG,oBAAoB,GAAG,SAAvBA,oBAAuB,CAAC1B,IAAD,EAA4B2B,cAA5B;MAC5BC,WAAW,GAAG5B,IAAI,CAACoB,QAALpB,IAAiBA,IAAI,CAACoB,QAALpB,CAAcY,MAAdZ,GAAuB;SACrD4B,WAAW,IAAKD,cAAc,IAAI,CAAC3B,IAAI,CAACoB,QAAxBO,IAAoC,CAAC3B,IAAI,CAACI;;;SAGnDyB,yBACd7B,MACA8B;yCAGK9B,OACA8B;;;"}
+{"version":3,"file":"index.js","sources":["../../../src/utils/index.ts"],"sourcesContent":[null],"names":["flattenTreeData","treeData","flattenTree","node","flattedNode","raw","title","isLeaf","disabled","getActiveNodePaths","flattedData","selectedId","length","selectedOption","find","id","getTopDownAncestors","getActiveMenus","root","parent","menu","children","push","reverse","getFlattedMenus","data","filter","item","checkCanLoadChildren","onLoadChildren","hasChildren","isArrayNonEmpty","getCascaderItemEventData","requiredProps"],"mappings":";;;;;;;;;;;AAUA;;;;IAGaA,eAAe,GAAG,SAAlBA,eAAkB,CAACC,QAAD;SACtBC,WAAW,CAAeD,QAAf,EAAyB,UAACE,IAAD;QACnCC,WAAW,GAAwBD;oBACWA,IAAI,CAACE;QAAjDC,KAAR,aAAQA;qCAAOC;QAAAA,MAAf,iCAAwB;uCAAOC;QAAAA,QAA/B,mCAA0C;AAC1CJ,IAAAA,WAAW,CAACE,KAAZF,GAAoBE,KAApBF;AACAA,IAAAA,WAAW,CAACG,MAAZH,GAAqBG,MAArBH;AACAA,IAAAA,WAAW,CAACI,QAAZJ,GAAuBI,QAAvBJ;WACOA;AANS,GAAA;;AAUpB;;;;;IAGaK,kBAAkB,GAAG,SAArBA,kBAAqB,CAChCC,WADgC,EAEhCC,UAFgC;MAI5BD,WAAW,CAACE,MAAZF,KAAuB,GAAG,OAAO,EAAP;MAExBG,cAAc,GAAGH,WAAW,CAACI,IAAZJ,CAAiB,cAAA;QAAGK,EAAH,QAAGA;WAASJ,UAAU,KAAKI;AAA5C,GAAAL;MACnB,CAACG,gBAAgB,OAAO,EAAP;SAEdG,mBAAmB,CAACH,cAAD;;AAG5B;;;;;IAGaI,cAAc,GAAG,SAAjBA,cAAiB,CAC5BP,WAD4B,EAE5BC,UAF4B;MAIxBD,WAAW,CAACE,MAAZF,KAAuB,GAAG,OAAO,EAAP;MAExBQ,IAAI,GAAGR,WAAW,CAAC,CAAD,CAAXA,CAAeS;MACxBC,IAAI,GAA4B,CAACF,IAAK,CAACG,QAAP;MAEhC,OAAOV,UAAP,KAAsB,aAAa,OAAOS,IAAP;MAEnCP,cAAc,GAAGH,WAAW,CAACI,IAAZJ,CAAiB,eAAA;QAAGK,EAAH,SAAGA;WAASJ,UAAU,KAAKI;AAA5C,GAAAL;MACjB,CAACG,gBAAgB,OAAOO,IAAP;;MAEjBP,cAAc,CAACQ,UAAU;AAC3BD,IAAAA,IAAI,GAAG,CAACP,cAAc,CAACQ,QAAhB,CAAPD;AADF,SAEO;AACLA,IAAAA,IAAI,GAAG,EAAPA;;;SAGKP,cAAc,CAACM,QAAQ;AAC5BC,IAAAA,IAAI,CAACE,IAALF,CAAUP,cAAc,CAACM,MAAfN,CAAsBQ,QAAhCD;AACAP,IAAAA,cAAc,GAAGA,cAAc,CAACM,MAAhCN;;;SAGKO,IAAI,CAACG,OAALH;;;IAGII,eAAe,GAAG,SAAlBA,eAAkB,CAC7BC,IAD6B,EAE7BC,MAF6B;SAItB,CAACD,IAAI,CAACC,MAALD,CAAY,UAACE,IAAD;WAAU,CAACD,MAAM,CAACC,IAAD;AAA7B,GAAAF,CAAD;;;IAGIG,oBAAoB,GAAG,SAAvBA,oBAAuB,CAACzB,IAAD,EAA4B0B,cAA5B;MAC5BC,WAAW,GAAGC,eAAe,CAAC5B,IAAI,CAACkB,QAAN;SAC5BS,WAAW,IAAKD,cAAc,IAAI,CAAC1B,IAAI,CAACI,MAAxBsB,IAAkC,CAAC1B,IAAI,CAACkB;;;SAGjDW,yBACd7B,MACA8B;yCAGK9B,OACA8B;;;"}

package/lib/types/Cascader.d.ts

@@ -1,36 +1,15 @@
 import React from 'react';
 import type { HiBaseHTMLProps } from '@hi-ui/core';
+import { UseCascaderProps } from './use-cascader';
 import { PopperProps } from '@hi-ui/popper';
-import { CascaderItem, ExpandTrigger, FlattedCascaderItem, CascaderItemEventData } from './types';
+import { ExpandTrigger, FlattedCascaderItem, CascaderItemEventData } from './types';
 import { PickerProps } from '@hi-ui/picker';
-import { UseDataSource } from '@hi-ui/use-data-source';
 /**
  * TODO: What is Cascader
  * Trigger + MenuList + Search
  */
 export declare const Cascader: React.ForwardRefExoticComponent<CascaderProps & React.RefAttributes<HTMLDivElement | null>>;
-export interface CascaderProps extends Omit<PickerProps, 'data' | 'onChange' | 'trigger'> {
-    /**
-     * 设置选择项数据源
-     */
-    data: CascaderItem[];
-    /**
-     * 设置当前选中值
-     */
-    value?: React.ReactText;
-    /**
-     * 设置当前选中值默认值
-     */
-    defaultValue?: React.ReactText;
-    /**
-     * 选中值改变时的回调
-     */
-    onChange?: (value: React.ReactText, targetOption?: CascaderItemEventData, optionPaths?: FlattedCascaderItem[]) => void;
-    /**
-     * 选中选项时触发，仅供内部使用
-     * @private
-     */
-    onSelect?: (value: React.ReactText, targetOption: CascaderItemEventData, optionPaths: FlattedCascaderItem[]) => void;
+export interface CascaderProps extends Omit<PickerProps, 'data' | 'onChange' | 'trigger'>, UseCascaderProps {
     /**
      * 次级菜单的展开方式
      */
@@ -43,34 +22,18 @@ export interface CascaderProps extends Omit<PickerProps, 'data' | 'onChange' | '
      * 是否可清空
      */
     clearable?: boolean;
-    /**
-     * 是否禁止使用
-     */
-    disabled?: boolean;
     /**
      * 设置选项为空时展示的内容
      */
     emptyContent?: React.ReactNode;
-    /**
-     * 是否启用选择即改变功能
-     */
-    changeOnSelect?: boolean;
     /**
      * 自定义渲染节点的 title 内容
      */
-    titleRender?: (item: CascaderItemEventData, flatted: boolean) => React.ReactNode;
+    titleRender?: (item: CascaderItemEventData) => React.ReactNode;
     /**
      * 自定义选择后触发器所展示的内容，只在 title 为字符串时有效
      */
     displayRender?: (checkedOption: FlattedCascaderItem, checkedOptionPaths: FlattedCascaderItem[]) => React.ReactNode;
-    /**
-     * 将选项拍平展示，不支持 `onLoadChildren` 异步加载交互
-     */
-    flatted?: boolean;
-    /**
-     * 开启全量搜索，默认只对开启 checkable 的选项进行搜索，不向上查找路径
-     */
-    upMatch?: boolean;
     /**
      * 触发器输入框占位符
      */
@@ -80,9 +43,11 @@ export interface CascaderProps extends Omit<PickerProps, 'data' | 'onChange' | '
      */
     searchPlaceholder?: string;
     /**
-     * 异步请求更新数据
+     * 自定义搜索过滤器，仅在 searchable 为 true 时有效
+     * 第一个参数为输入的关键字，
+     * 第二个为数据项，返回值为 true 时将出现在结果项
      */
-    onLoadChildren?: (item: CascaderItemEventData) => Promise<CascaderItem[] | void> | void;
+    filterOption?: (keyword: string, item: CascaderItemEventData) => boolean;
     /**
      * 自定义控制 popper 行为
      */
@@ -91,19 +56,6 @@ export interface CascaderProps extends Omit<PickerProps, 'data' | 'onChange' | '
      * 设置展现形式
      */
     appearance?: 'outline' | 'unset' | 'filled';
-    /**
-     * 自定义搜索过滤器，仅在 searchable 为 true 时有效
-     * 第一个参数为输入的关键字，
-     * 第二个为数据项，返回值为 true 时将出现在结果项
-     */
-    filterOption?: (keyword: string, item: CascaderItemEventData) => boolean;
-    /**
-     * 异步加载数据
-     */
-    dataSource?: UseDataSource<CascaderItemEventData>;
-}
-export declare const CascaderSearch: React.ForwardRefExoticComponent<Pick<CascaderSearchProps, string | number> & React.RefAttributes<HTMLInputElement | null>>;
-export interface CascaderSearchProps extends HiBaseHTMLProps {
 }
 export declare const CascaderMenuList: React.ForwardRefExoticComponent<Pick<CascaderMenuListProps, string | number> & React.RefAttributes<HTMLDivElement | null>>;
 export interface CascaderMenuListProps extends HiBaseHTMLProps {