@hi-ui/tree-select 4.3.0 → 4.4.0

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @hi-ui/tree-select
 
+## 4.4.0
+
+### Minor Changes
+
+- [#3472](https://github.com/XiaoMi/hiui/pull/3472) [`1fae66f2d`](https://github.com/XiaoMi/hiui/commit/1fae66f2d10e4b3eba30e2af74bc793af91061d0) Thanks [@zyprepare](https://github.com/zyprepare)! - feat(tree): add shouldShowSwitcher prop for custom switcher display logic (#3471)
+
+### Patch Changes
+
+- Updated dependencies [[`1fae66f2d`](https://github.com/XiaoMi/hiui/commit/1fae66f2d10e4b3eba30e2af74bc793af91061d0)]:
+  - @hi-ui/tree@4.7.0
+
+## 4.3.1
+
+### Patch Changes
+
+- [#3196](https://github.com/XiaoMi/hiui/pull/3196) [`80a909d2d`](https://github.com/XiaoMi/hiui/commit/80a909d2dae99d68d71f2ec6f4b210080d032ec0) Thanks [@KEH3](https://github.com/KEH3)! - fix(popper): ref 中增加更新位置方法解决上游组件弹窗被遮挡问题 (#3195)
+
+- Updated dependencies [[`80a909d2d`](https://github.com/XiaoMi/hiui/commit/80a909d2dae99d68d71f2ec6f4b210080d032ec0)]:
+  - @hi-ui/picker@4.1.8
+  - @hi-ui/popper@4.1.7
+
 ## 4.3.0
 
 ### Minor Changes

package/lib/cjs/TreeSelect.js

@@ -89,8 +89,10 @@ var TreeSelect = /*#__PURE__*/React.forwardRef(function (_a, ref) {
     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", "onClear", "invalid", "displayRender", "placeholder", "appearance", "virtual", "itemHeight", "height", "size", "prefix", "suffix", "customRender"]);
+    shouldShowSwitcher = _a.shouldShowSwitcher,
+    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", "onClear", "invalid", "displayRender", "placeholder", "appearance", "virtual", "itemHeight", "height", "size", "prefix", "suffix", "customRender", "shouldShowSwitcher"]);
   var i18n = core.useLocaleContext();
+  var pickerInnerRef = React.useRef(null);
   var placeholder = typeAssertion.isUndef(placeholderProp) ? i18n.get('treeSelect.placeholder') : placeholderProp;
   var _useUncontrolledToggl = useToggle.useUncontrolledToggle({
       visible: visible,
@@ -222,8 +224,16 @@ var TreeSelect = /*#__PURE__*/React.forwardRef(function (_a, ref) {
     return flattedData;
   }, [selectedItem, flattedData]);
   var cls = classname.cx(prefixCls, className);
+  React.useEffect(function () {
+    var _a;
+    if (menuVisible) {
+      // 数据改变时更新弹窗显示位置，避免弹窗内容被遮挡
+      (_a = pickerInnerRef.current) === null || _a === void 0 ? void 0 : _a.update();
+    }
+  }, [menuVisible, treeProps.expandedIds]);
   return /*#__PURE__*/React__default["default"].createElement(picker.Picker, Object.assign({
     ref: ref,
+    innerRef: pickerInnerRef,
     className: cls
   }, rest, {
     visible: menuVisible,
@@ -268,7 +278,8 @@ var TreeSelect = /*#__PURE__*/React.forwardRef(function (_a, ref) {
     onLoadChildren: onLoadChildren,
     virtual: virtual,
     itemHeight: itemHeight,
-    height: height
+    height: height,
+    shouldShowSwitcher: shouldShowSwitcher
   }, treeProps))) : null);
 });
 if (env.__DEV__) {

package/lib/esm/TreeSelect.js

@@ -8,7 +8,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 import { __rest } from 'tslib';
-import React, { forwardRef, useCallback, useMemo, useState } from 'react';
+import React, { forwardRef, useRef, useCallback, useMemo, useState, useEffect } from 'react';
 import { getPrefixCls, cx } from '@hi-ui/classname';
 import { __DEV__ } from '@hi-ui/env';
 import { useUncontrolledToggle } from '@hi-ui/use-toggle';
@@ -77,8 +77,10 @@ var TreeSelect = /*#__PURE__*/forwardRef(function (_a, ref) {
     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", "onClear", "invalid", "displayRender", "placeholder", "appearance", "virtual", "itemHeight", "height", "size", "prefix", "suffix", "customRender"]);
+    shouldShowSwitcher = _a.shouldShowSwitcher,
+    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", "onClear", "invalid", "displayRender", "placeholder", "appearance", "virtual", "itemHeight", "height", "size", "prefix", "suffix", "customRender", "shouldShowSwitcher"]);
   var i18n = useLocaleContext();
+  var pickerInnerRef = useRef(null);
   var placeholder = isUndef(placeholderProp) ? i18n.get('treeSelect.placeholder') : placeholderProp;
   var _useUncontrolledToggl = useUncontrolledToggle({
       visible: visible,
@@ -210,8 +212,16 @@ var TreeSelect = /*#__PURE__*/forwardRef(function (_a, ref) {
     return flattedData;
   }, [selectedItem, flattedData]);
   var cls = cx(prefixCls, className);
+  useEffect(function () {
+    var _a;
+    if (menuVisible) {
+      // 数据改变时更新弹窗显示位置，避免弹窗内容被遮挡
+      (_a = pickerInnerRef.current) === null || _a === void 0 ? void 0 : _a.update();
+    }
+  }, [menuVisible, treeProps.expandedIds]);
   return /*#__PURE__*/React.createElement(Picker, Object.assign({
     ref: ref,
+    innerRef: pickerInnerRef,
     className: cls
   }, rest, {
     visible: menuVisible,
@@ -256,7 +266,8 @@ var TreeSelect = /*#__PURE__*/forwardRef(function (_a, ref) {
     onLoadChildren: onLoadChildren,
     virtual: virtual,
     itemHeight: itemHeight,
-    height: height
+    height: height,
+    shouldShowSwitcher: shouldShowSwitcher
   }, treeProps))) : null);
 });
 if (__DEV__) {

package/lib/types/TreeSelect.d.ts

@@ -140,4 +140,8 @@ export interface TreeSelectProps extends Omit<PickerProps, 'data' | 'onChange' |
      * 自定义触发器
      */
     customRender?: React.ReactNode | ((selectedItem: TreeSelectDataItem | null) => React.ReactNode);
+    /**
+     * 自定义切换器显示逻辑
+     */
+    shouldShowSwitcher?: (node: TreeNodeEventData) => boolean;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hi-ui/tree-select",
-  "version": "4.3.0",
+  "version": "4.4.0",
   "description": "A sub-package for @hi-ui/hiui.",
   "keywords": [],
   "author": "HiUI <mi-hiui@xiaomi.com>",
@@ -50,9 +50,9 @@
     "@hi-ui/highlighter": "^4.1.2",
     "@hi-ui/icons": "^4.0.19",
     "@hi-ui/input": "^4.4.0",
-    "@hi-ui/picker": "^4.1.6",
-    "@hi-ui/popper": "^4.1.5",
-    "@hi-ui/tree": "^4.6.1",
+    "@hi-ui/picker": "^4.1.8",
+    "@hi-ui/popper": "^4.1.7",
+    "@hi-ui/tree": "^4.7.0",
     "@hi-ui/tree-utils": "^4.1.4",
     "@hi-ui/type-assertion": "^4.0.4",
     "@hi-ui/use-data-source": "^4.0.4",