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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -37,7 +37,7 @@ var tagInput = require('@hi-ui/tag-input');
37
37
 
38
38
  var typeAssertion = require('@hi-ui/type-assertion');
39
39
 
40
- var VirtualList = require('rc-virtual-list');
40
+ var VirtualList = require('@hi-ui/virtual-list');
41
41
 
42
42
  var picker = require('@hi-ui/picker');
43
43
 
@@ -102,6 +102,7 @@ var CheckSelect = /*#__PURE__*/React.forwardRef(function (_a, ref) {
102
102
  itemHeight = _a$itemHeight === void 0 ? 40 : _a$itemHeight,
103
103
  _a$virtual = _a.virtual,
104
104
  virtual = _a$virtual === void 0 ? true : _a$virtual,
105
+ visible = _a.visible,
105
106
  onOpen = _a.onOpen,
106
107
  onClose = _a.onClose,
107
108
  appearance = _a.appearance,
@@ -114,12 +115,13 @@ var CheckSelect = /*#__PURE__*/React.forwardRef(function (_a, ref) {
114
115
  onSearchProp = _a.onSearch,
115
116
  _a$fieldNames = _a.fieldNames,
116
117
  fieldNames = _a$fieldNames === void 0 ? DEFAULT_FIELD_NAMES : _a$fieldNames,
117
- rest = tslib.__rest(_a, ["prefixCls", "role", "className", "children", "disabled", "clearable", "showCheckAll", "showOnlyShowChecked", "placeholder", "displayRender", "onSelect", "height", "itemHeight", "virtual", "onOpen", "onClose", "appearance", "invalid", "dataSource", "filterOption", "searchable", "render", "renderExtraFooter", "onSearch", "fieldNames"]);
118
+ rest = tslib.__rest(_a, ["prefixCls", "role", "className", "children", "disabled", "clearable", "showCheckAll", "showOnlyShowChecked", "placeholder", "displayRender", "onSelect", "height", "itemHeight", "virtual", "visible", "onOpen", "onClose", "appearance", "invalid", "dataSource", "filterOption", "searchable", "render", "renderExtraFooter", "onSearch", "fieldNames"]);
118
119
 
119
120
  var i18n = localeContext.useLocaleContext();
120
121
  var placeholder = typeAssertion.isUndef(placeholderProp) ? i18n.get('checkSelect.placeholder') : placeholderProp; // ************************** Picker ************************* //
121
122
 
122
123
  var _useUncontrolledToggl = useToggle.useUncontrolledToggle({
124
+ visible: visible,
123
125
  disabled: disabled,
124
126
  onOpen: onOpen,
125
127
  onClose: onClose
@@ -295,6 +297,16 @@ var CheckSelect = /*#__PURE__*/React.forwardRef(function (_a, ref) {
295
297
  };
296
298
 
297
299
  var expandedViewRef = React.useRef('normal');
300
+ var virtualListProps = {
301
+ height: height,
302
+ itemHeight: itemHeight,
303
+ virtual: virtual,
304
+ data: dropdownItems
305
+ };
306
+
307
+ var _useCheckInVirtual = VirtualList.useCheckInVirtual(virtualListProps),
308
+ inVirtual = _useCheckInVirtual.inVirtual;
309
+
298
310
  var cls = classname.cx(prefixCls, className, prefixCls + "--" + (menuVisible ? 'open' : 'closed'));
299
311
  return /*#__PURE__*/React__default["default"].createElement(context.CheckSelectProvider, {
300
312
  value: context$1
@@ -307,6 +319,7 @@ var CheckSelect = /*#__PURE__*/React.forwardRef(function (_a, ref) {
307
319
  onOpen: menuVisibleAction.on,
308
320
  onClose: menuVisibleAction.off,
309
321
  searchable: searchable,
322
+ scrollable: inVirtual,
310
323
  onSearch: funcUtils.callAllFuncs(onSearchProp, onSearch),
311
324
  loading: loading,
312
325
  footer: renderDefaultFooter(),
@@ -368,14 +381,10 @@ var CheckSelect = /*#__PURE__*/React.forwardRef(function (_a, ref) {
368
381
  expandedViewRef.current = 'onlyChecked';
369
382
  }
370
383
  })
371
- }), typeAssertion.isArrayNonEmpty(dropdownItems) ? /*#__PURE__*/React__default["default"].createElement(VirtualList__default["default"], {
384
+ }), typeAssertion.isArrayNonEmpty(dropdownItems) ? /*#__PURE__*/React__default["default"].createElement(VirtualList__default["default"], Object.assign({
372
385
  itemKey: "id",
373
- fullHeight: false,
374
- height: height,
375
- itemHeight: itemHeight,
376
- virtual: virtual,
377
- data: dropdownItems
378
- }, function (node) {
386
+ fullHeight: false
387
+ }, virtualListProps), function (node) {
379
388
  /* 反向 map,搜索删选数据时会对数据进行处理 */
380
389
  return 'groupTitle' in node ? /*#__PURE__*/React__default["default"].createElement(CheckSelectOptionGroup, {
381
390
  label: node.groupTitle
@@ -18,7 +18,7 @@ import { useLatestRef } from '@hi-ui/use-latest';
18
18
  import Checkbox from '@hi-ui/checkbox';
19
19
  import { TagInputMock } from '@hi-ui/tag-input';
20
20
  import { isUndef, isFunction, isArrayNonEmpty } from '@hi-ui/type-assertion';
21
- import VirtualList from 'rc-virtual-list';
21
+ import VirtualList, { useCheckInVirtual } from '@hi-ui/virtual-list';
22
22
  import { Picker } from '@hi-ui/picker';
23
23
  import { uniqBy } from '@hi-ui/array-utils';
24
24
  import { Highlighter } from '@hi-ui/highlighter';
@@ -60,6 +60,7 @@ var CheckSelect = /*#__PURE__*/forwardRef(function (_a, ref) {
60
60
  itemHeight = _a$itemHeight === void 0 ? 40 : _a$itemHeight,
61
61
  _a$virtual = _a.virtual,
62
62
  virtual = _a$virtual === void 0 ? true : _a$virtual,
63
+ visible = _a.visible,
63
64
  onOpen = _a.onOpen,
64
65
  onClose = _a.onClose,
65
66
  appearance = _a.appearance,
@@ -72,12 +73,13 @@ var CheckSelect = /*#__PURE__*/forwardRef(function (_a, ref) {
72
73
  onSearchProp = _a.onSearch,
73
74
  _a$fieldNames = _a.fieldNames,
74
75
  fieldNames = _a$fieldNames === void 0 ? DEFAULT_FIELD_NAMES : _a$fieldNames,
75
- rest = __rest(_a, ["prefixCls", "role", "className", "children", "disabled", "clearable", "showCheckAll", "showOnlyShowChecked", "placeholder", "displayRender", "onSelect", "height", "itemHeight", "virtual", "onOpen", "onClose", "appearance", "invalid", "dataSource", "filterOption", "searchable", "render", "renderExtraFooter", "onSearch", "fieldNames"]);
76
+ rest = __rest(_a, ["prefixCls", "role", "className", "children", "disabled", "clearable", "showCheckAll", "showOnlyShowChecked", "placeholder", "displayRender", "onSelect", "height", "itemHeight", "virtual", "visible", "onOpen", "onClose", "appearance", "invalid", "dataSource", "filterOption", "searchable", "render", "renderExtraFooter", "onSearch", "fieldNames"]);
76
77
 
77
78
  var i18n = useLocaleContext();
78
79
  var placeholder = isUndef(placeholderProp) ? i18n.get('checkSelect.placeholder') : placeholderProp; // ************************** Picker ************************* //
79
80
 
80
81
  var _useUncontrolledToggl = useUncontrolledToggle({
82
+ visible: visible,
81
83
  disabled: disabled,
82
84
  onOpen: onOpen,
83
85
  onClose: onClose
@@ -253,6 +255,16 @@ var CheckSelect = /*#__PURE__*/forwardRef(function (_a, ref) {
253
255
  };
254
256
 
255
257
  var expandedViewRef = useRef('normal');
258
+ var virtualListProps = {
259
+ height: height,
260
+ itemHeight: itemHeight,
261
+ virtual: virtual,
262
+ data: dropdownItems
263
+ };
264
+
265
+ var _useCheckInVirtual = useCheckInVirtual(virtualListProps),
266
+ inVirtual = _useCheckInVirtual.inVirtual;
267
+
256
268
  var cls = cx(prefixCls, className, prefixCls + "--" + (menuVisible ? 'open' : 'closed'));
257
269
  return /*#__PURE__*/React.createElement(CheckSelectProvider, {
258
270
  value: context
@@ -265,6 +277,7 @@ var CheckSelect = /*#__PURE__*/forwardRef(function (_a, ref) {
265
277
  onOpen: menuVisibleAction.on,
266
278
  onClose: menuVisibleAction.off,
267
279
  searchable: searchable,
280
+ scrollable: inVirtual,
268
281
  onSearch: callAllFuncs(onSearchProp, onSearch),
269
282
  loading: loading,
270
283
  footer: renderDefaultFooter(),
@@ -326,14 +339,10 @@ var CheckSelect = /*#__PURE__*/forwardRef(function (_a, ref) {
326
339
  expandedViewRef.current = 'onlyChecked';
327
340
  }
328
341
  })
329
- }), isArrayNonEmpty(dropdownItems) ? /*#__PURE__*/React.createElement(VirtualList, {
342
+ }), isArrayNonEmpty(dropdownItems) ? /*#__PURE__*/React.createElement(VirtualList, Object.assign({
330
343
  itemKey: "id",
331
- fullHeight: false,
332
- height: height,
333
- itemHeight: itemHeight,
334
- virtual: virtual,
335
- data: dropdownItems
336
- }, function (node) {
344
+ fullHeight: false
345
+ }, virtualListProps), function (node) {
337
346
  /* 反向 map,搜索删选数据时会对数据进行处理 */
338
347
  return 'groupTitle' in node ? /*#__PURE__*/React.createElement(CheckSelectOptionGroup, {
339
348
  label: node.groupTitle
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@hi-ui/check-select",
3
- "version": "4.0.0-beta.39",
3
+ "version": "4.0.0-beta.41",
4
4
  "description": "A sub-package for @hi-ui/hiui.",
5
5
  "keywords": [],
6
6
  "author": "HIUI <mi-hiui@xiaomi.com>",
@@ -52,10 +52,10 @@
52
52
  "@hi-ui/func-utils": "^4.0.0-beta.13",
53
53
  "@hi-ui/highlighter": "^4.0.0-beta.11",
54
54
  "@hi-ui/icons": "^4.0.0-beta.11",
55
- "@hi-ui/input": "^4.0.0-beta.17",
55
+ "@hi-ui/input": "^4.0.0-beta.18",
56
56
  "@hi-ui/locale-context": "^4.0.0-beta.19",
57
- "@hi-ui/picker": "^4.0.0-beta.30",
58
- "@hi-ui/popper": "^4.0.0-beta.18",
57
+ "@hi-ui/picker": "^4.0.0-beta.32",
58
+ "@hi-ui/popper": "^4.0.0-beta.19",
59
59
  "@hi-ui/tag-input": "^4.0.0-beta.20",
60
60
  "@hi-ui/times": "^4.0.0-beta.6",
61
61
  "@hi-ui/tree-utils": "^4.0.0-beta.5",
@@ -67,7 +67,7 @@
67
67
  "@hi-ui/use-search-mode": "^4.0.0-beta.25",
68
68
  "@hi-ui/use-toggle": "^4.0.0-beta.5",
69
69
  "@hi-ui/use-uncontrolled-state": "^4.0.0-beta.5",
70
- "rc-virtual-list": "^3.4.7"
70
+ "@hi-ui/virtual-list": "^4.0.0-beta.1"
71
71
  },
72
72
  "peerDependencies": {
73
73
  "react": ">=16.8.6",
@@ -78,5 +78,5 @@
78
78
  "react": "^17.0.1",
79
79
  "react-dom": "^17.0.1"
80
80
  },
81
- "gitHead": "29f4d9450879b9bffe83ea928fc2491b70d1bcce"
81
+ "gitHead": "a1e8367a78c1f3fcea6a95ffc44bbf59beb58798"
82
82
  }