@hi-ui/tree-select 4.1.5 → 4.2.1-alpha.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @hi-ui/tree-select
 
+## 4.2.0
+
+### Minor Changes
+
+- [#2823](https://github.com/XiaoMi/hiui/pull/2823) [`d2b333b6c`](https://github.com/XiaoMi/hiui/commit/d2b333b6ce737757df20149f12d5780fa19f573c) Thanks [@xiamiao1121](https://github.com/xiamiao1121)! - feat: 新增支持前置后置内容
+
+- [#2922](https://github.com/XiaoMi/hiui/pull/2922) [`362111208`](https://github.com/XiaoMi/hiui/commit/3621112089fdefe5d6add59b5da48d6bcb72602e) Thanks [@yang-x20](https://github.com/yang-x20)! - feat: 新增自定义触发器
+
 ## 4.1.5
 
 ### Patch Changes

package/lib/cjs/TreeSelect.js

@@ -73,6 +73,7 @@ var TreeSelect = /*#__PURE__*/React.forwardRef(function (_a, ref) {
     onLoadChildren = _a.onLoadChildren,
     titleRender = _a.render,
     filterOption = _a.filterOption,
+    keywordProp = _a.keyword,
     onSearchProp = _a.onSearch,
     clearable = _a.clearable,
     invalid = _a.invalid,
@@ -84,7 +85,10 @@ var TreeSelect = /*#__PURE__*/React.forwardRef(function (_a, ref) {
     height = _a.height,
     _a$size = _a.size,
     size = _a$size === void 0 ? 'md' : _a$size,
-    rest = tslib.__rest(_a, ["prefixCls", "role", "className", "data", "dataSource", "disabled", "visible", "onOpen", "onClose", "fieldNames", "defaultExpandAll", "expandedIds", "defaultExpandedIds", "onExpand", "defaultValue", "value", "onChange", "searchable", "searchMode", "onLoadChildren", "render", "filterOption", "onSearch", "clearable", "invalid", "displayRender", "placeholder", "appearance", "virtual", "itemHeight", "height", "size"]);
+    prefix = _a.prefix,
+    suffix = _a.suffix,
+    customRender = _a.customRender,
+    rest = tslib.__rest(_a, ["prefixCls", "role", "className", "data", "dataSource", "disabled", "visible", "onOpen", "onClose", "fieldNames", "defaultExpandAll", "expandedIds", "defaultExpandedIds", "onExpand", "defaultValue", "value", "onChange", "searchable", "searchMode", "onLoadChildren", "render", "filterOption", "keyword", "onSearch", "clearable", "invalid", "displayRender", "placeholder", "appearance", "virtual", "itemHeight", "height", "size", "prefix", "suffix", "customRender"]);
   var i18n = core.useLocaleContext();
   var placeholder = typeAssertion.isUndef(placeholderProp) ? i18n.get('treeSelect.placeholder') : placeholderProp;
   var _useUncontrolledToggl = useToggle.useUncontrolledToggle({
@@ -173,6 +177,7 @@ var TreeSelect = /*#__PURE__*/React.forwardRef(function (_a, ref) {
   });
   var _useSearchMode = useSearchMode.useSearchMode({
       searchable: searchableProp,
+      keyword: keywordProp,
       strategies: [dataSourceStrategy, customSearchStrategy, filterSearchStrategy, highlightSearchStrategy]
     }),
     stateInSearch = _useSearchMode.state,
@@ -228,9 +233,10 @@ var TreeSelect = /*#__PURE__*/React.forwardRef(function (_a, ref) {
     // onChange={tryChangeValue}
     // data={mergedData}
     searchable: searchable,
+    keyword: keywordProp,
     onSearch: funcUtils.callAllFuncs(onSearchProp, onSearch),
     loading: rest.loading !== undefined ? rest.loading : loading,
-    trigger: /*#__PURE__*/React__default["default"].createElement(input.MockInput
+    trigger: customRender ? typeof customRender === 'function' ? customRender(selectedItem) : customRender : ( /*#__PURE__*/React__default["default"].createElement(input.MockInput
     // disabled={disabled}
     , {
       // disabled={disabled}
@@ -238,7 +244,8 @@ var TreeSelect = /*#__PURE__*/React.forwardRef(function (_a, ref) {
       clearable: clearable,
       placeholder: placeholder,
       displayRender: displayRenderProp,
-      suffix: menuVisible ? /*#__PURE__*/React__default["default"].createElement(icons.UpOutlined, null) : /*#__PURE__*/React__default["default"].createElement(icons.DownOutlined, null),
+      prefix: prefix,
+      suffix: [menuVisible ? /*#__PURE__*/React__default["default"].createElement(icons.UpOutlined, null) : /*#__PURE__*/React__default["default"].createElement(icons.DownOutlined, null), suffix],
       focused: menuVisible,
       value: value,
       onChange: tryChangeValue,
@@ -246,7 +253,7 @@ var TreeSelect = /*#__PURE__*/React.forwardRef(function (_a, ref) {
       // @ts-ignore
       invalid: invalid,
       appearance: appearance
-    })
+    }))
   }), typeAssertion.isArrayNonEmpty(treeProps.data) ? ( /*#__PURE__*/React__default["default"].createElement(tree.Tree, Object.assign({
     size: 'md',
     className: prefixCls + "__tree",

package/lib/esm/TreeSelect.js

@@ -61,6 +61,7 @@ var TreeSelect = /*#__PURE__*/forwardRef(function (_a, ref) {
     onLoadChildren = _a.onLoadChildren,
     titleRender = _a.render,
     filterOption = _a.filterOption,
+    keywordProp = _a.keyword,
     onSearchProp = _a.onSearch,
     clearable = _a.clearable,
     invalid = _a.invalid,
@@ -72,7 +73,10 @@ var TreeSelect = /*#__PURE__*/forwardRef(function (_a, ref) {
     height = _a.height,
     _a$size = _a.size,
     size = _a$size === void 0 ? 'md' : _a$size,
-    rest = __rest(_a, ["prefixCls", "role", "className", "data", "dataSource", "disabled", "visible", "onOpen", "onClose", "fieldNames", "defaultExpandAll", "expandedIds", "defaultExpandedIds", "onExpand", "defaultValue", "value", "onChange", "searchable", "searchMode", "onLoadChildren", "render", "filterOption", "onSearch", "clearable", "invalid", "displayRender", "placeholder", "appearance", "virtual", "itemHeight", "height", "size"]);
+    prefix = _a.prefix,
+    suffix = _a.suffix,
+    customRender = _a.customRender,
+    rest = __rest(_a, ["prefixCls", "role", "className", "data", "dataSource", "disabled", "visible", "onOpen", "onClose", "fieldNames", "defaultExpandAll", "expandedIds", "defaultExpandedIds", "onExpand", "defaultValue", "value", "onChange", "searchable", "searchMode", "onLoadChildren", "render", "filterOption", "keyword", "onSearch", "clearable", "invalid", "displayRender", "placeholder", "appearance", "virtual", "itemHeight", "height", "size", "prefix", "suffix", "customRender"]);
   var i18n = useLocaleContext();
   var placeholder = isUndef(placeholderProp) ? i18n.get('treeSelect.placeholder') : placeholderProp;
   var _useUncontrolledToggl = useUncontrolledToggle({
@@ -161,6 +165,7 @@ var TreeSelect = /*#__PURE__*/forwardRef(function (_a, ref) {
   });
   var _useSearchMode = useSearchMode({
       searchable: searchableProp,
+      keyword: keywordProp,
       strategies: [dataSourceStrategy, customSearchStrategy, filterSearchStrategy, highlightSearchStrategy]
     }),
     stateInSearch = _useSearchMode.state,
@@ -216,9 +221,10 @@ var TreeSelect = /*#__PURE__*/forwardRef(function (_a, ref) {
     // onChange={tryChangeValue}
     // data={mergedData}
     searchable: searchable,
+    keyword: keywordProp,
     onSearch: callAllFuncs(onSearchProp, onSearch),
     loading: rest.loading !== undefined ? rest.loading : loading,
-    trigger: /*#__PURE__*/React.createElement(MockInput
+    trigger: customRender ? typeof customRender === 'function' ? customRender(selectedItem) : customRender : ( /*#__PURE__*/React.createElement(MockInput
     // disabled={disabled}
     , {
       // disabled={disabled}
@@ -226,7 +232,8 @@ var TreeSelect = /*#__PURE__*/forwardRef(function (_a, ref) {
       clearable: clearable,
       placeholder: placeholder,
       displayRender: displayRenderProp,
-      suffix: menuVisible ? /*#__PURE__*/React.createElement(UpOutlined, null) : /*#__PURE__*/React.createElement(DownOutlined, null),
+      prefix: prefix,
+      suffix: [menuVisible ? /*#__PURE__*/React.createElement(UpOutlined, null) : /*#__PURE__*/React.createElement(DownOutlined, null), suffix],
       focused: menuVisible,
       value: value,
       onChange: tryChangeValue,
@@ -234,7 +241,7 @@ var TreeSelect = /*#__PURE__*/forwardRef(function (_a, ref) {
       // @ts-ignore
       invalid: invalid,
       appearance: appearance
-    })
+    }))
   }), isArrayNonEmpty(treeProps.data) ? ( /*#__PURE__*/React.createElement(Tree, Object.assign({
     size: 'md',
     className: prefixCls + "__tree",

package/lib/types/TreeSelect.d.ts

@@ -124,4 +124,16 @@ export interface TreeSelectProps extends Omit<PickerProps, 'data' | 'onChange' |
      * 设置尺寸
      */
     size?: HiBaseSizeEnum;
+    /**
+     * 选择框前置内容
+     */
+    prefix?: React.ReactNode;
+    /**
+     * 选择框后置内容
+     */
+    suffix?: React.ReactNode;
+    /**
+     * 自定义触发器
+     */
+    customRender?: React.ReactNode | ((selectedItem: TreeSelectDataItem | null) => React.ReactNode);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hi-ui/tree-select",
-  "version": "4.1.5",
+  "version": "4.2.1-alpha.0",
   "description": "A sub-package for @hi-ui/hiui.",
   "keywords": [],
   "author": "HiUI <mi-hiui@xiaomi.com>",