@hi-ui/check-select 4.0.0-beta.40 → 4.0.0-beta.41

package/lib/cjs/CheckSelect.js

@@ -37,7 +37,7 @@ var tagInput = require('@hi-ui/tag-input');
 
 var typeAssertion = require('@hi-ui/type-assertion');
 
-var VirtualList = require('rc-virtual-list');
+var VirtualList = require('@hi-ui/virtual-list');
 
 var picker = require('@hi-ui/picker');
 
@@ -297,6 +297,16 @@ var CheckSelect = /*#__PURE__*/React.forwardRef(function (_a, ref) {
   };
 
   var expandedViewRef = React.useRef('normal');
+  var virtualListProps = {
+    height: height,
+    itemHeight: itemHeight,
+    virtual: virtual,
+    data: dropdownItems
+  };
+
+  var _useCheckInVirtual = VirtualList.useCheckInVirtual(virtualListProps),
+      inVirtual = _useCheckInVirtual.inVirtual;
+
   var cls = classname.cx(prefixCls, className, prefixCls + "--" + (menuVisible ? 'open' : 'closed'));
   return /*#__PURE__*/React__default["default"].createElement(context.CheckSelectProvider, {
     value: context$1
@@ -309,6 +319,7 @@ var CheckSelect = /*#__PURE__*/React.forwardRef(function (_a, ref) {
     onOpen: menuVisibleAction.on,
     onClose: menuVisibleAction.off,
     searchable: searchable,
+    scrollable: inVirtual,
     onSearch: funcUtils.callAllFuncs(onSearchProp, onSearch),
     loading: loading,
     footer: renderDefaultFooter(),
@@ -370,14 +381,10 @@ var CheckSelect = /*#__PURE__*/React.forwardRef(function (_a, ref) {
         expandedViewRef.current = 'onlyChecked';
       }
     })
-  }), typeAssertion.isArrayNonEmpty(dropdownItems) ? /*#__PURE__*/React__default["default"].createElement(VirtualList__default["default"], {
+  }), typeAssertion.isArrayNonEmpty(dropdownItems) ? /*#__PURE__*/React__default["default"].createElement(VirtualList__default["default"], Object.assign({
     itemKey: "id",
-    fullHeight: false,
-    height: height,
-    itemHeight: itemHeight,
-    virtual: virtual,
-    data: dropdownItems
-  }, function (node) {
+    fullHeight: false
+  }, virtualListProps), function (node) {
     /* 反向 map，搜索删选数据时会对数据进行处理 */
     return 'groupTitle' in node ? /*#__PURE__*/React__default["default"].createElement(CheckSelectOptionGroup, {
       label: node.groupTitle

package/lib/esm/CheckSelect.js

@@ -18,7 +18,7 @@ import { useLatestRef } from '@hi-ui/use-latest';
 import Checkbox from '@hi-ui/checkbox';
 import { TagInputMock } from '@hi-ui/tag-input';
 import { isUndef, isFunction, isArrayNonEmpty } from '@hi-ui/type-assertion';
-import VirtualList from 'rc-virtual-list';
+import VirtualList, { useCheckInVirtual } from '@hi-ui/virtual-list';
 import { Picker } from '@hi-ui/picker';
 import { uniqBy } from '@hi-ui/array-utils';
 import { Highlighter } from '@hi-ui/highlighter';
@@ -255,6 +255,16 @@ var CheckSelect = /*#__PURE__*/forwardRef(function (_a, ref) {
   };
 
   var expandedViewRef = useRef('normal');
+  var virtualListProps = {
+    height: height,
+    itemHeight: itemHeight,
+    virtual: virtual,
+    data: dropdownItems
+  };
+
+  var _useCheckInVirtual = useCheckInVirtual(virtualListProps),
+      inVirtual = _useCheckInVirtual.inVirtual;
+
   var cls = cx(prefixCls, className, prefixCls + "--" + (menuVisible ? 'open' : 'closed'));
   return /*#__PURE__*/React.createElement(CheckSelectProvider, {
     value: context
@@ -267,6 +277,7 @@ var CheckSelect = /*#__PURE__*/forwardRef(function (_a, ref) {
     onOpen: menuVisibleAction.on,
     onClose: menuVisibleAction.off,
     searchable: searchable,
+    scrollable: inVirtual,
     onSearch: callAllFuncs(onSearchProp, onSearch),
     loading: loading,
     footer: renderDefaultFooter(),
@@ -328,14 +339,10 @@ var CheckSelect = /*#__PURE__*/forwardRef(function (_a, ref) {
         expandedViewRef.current = 'onlyChecked';
       }
     })
-  }), isArrayNonEmpty(dropdownItems) ? /*#__PURE__*/React.createElement(VirtualList, {
+  }), isArrayNonEmpty(dropdownItems) ? /*#__PURE__*/React.createElement(VirtualList, Object.assign({
     itemKey: "id",
-    fullHeight: false,
-    height: height,
-    itemHeight: itemHeight,
-    virtual: virtual,
-    data: dropdownItems
-  }, function (node) {
+    fullHeight: false
+  }, virtualListProps), function (node) {
     /* 反向 map，搜索删选数据时会对数据进行处理 */
     return 'groupTitle' in node ? /*#__PURE__*/React.createElement(CheckSelectOptionGroup, {
       label: node.groupTitle

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hi-ui/check-select",
-  "version": "4.0.0-beta.40",
+  "version": "4.0.0-beta.41",
   "description": "A sub-package for @hi-ui/hiui.",
   "keywords": [],
   "author": "HIUI <mi-hiui@xiaomi.com>",
@@ -54,7 +54,7 @@
     "@hi-ui/icons": "^4.0.0-beta.11",
     "@hi-ui/input": "^4.0.0-beta.18",
     "@hi-ui/locale-context": "^4.0.0-beta.19",
-    "@hi-ui/picker": "^4.0.0-beta.31",
+    "@hi-ui/picker": "^4.0.0-beta.32",
     "@hi-ui/popper": "^4.0.0-beta.19",
     "@hi-ui/tag-input": "^4.0.0-beta.20",
     "@hi-ui/times": "^4.0.0-beta.6",
@@ -67,7 +67,7 @@
     "@hi-ui/use-search-mode": "^4.0.0-beta.25",
     "@hi-ui/use-toggle": "^4.0.0-beta.5",
     "@hi-ui/use-uncontrolled-state": "^4.0.0-beta.5",
-    "rc-virtual-list": "^3.4.7"
+    "@hi-ui/virtual-list": "^4.0.0-beta.1"
   },
   "peerDependencies": {
     "react": ">=16.8.6",
@@ -78,5 +78,5 @@
     "react": "^17.0.1",
     "react-dom": "^17.0.1"
   },
-  "gitHead": "3dc9f628767f463b67ba9a7911cc57de84182b85"
+  "gitHead": "a1e8367a78c1f3fcea6a95ffc44bbf59beb58798"
 }