@hi-ui/check-tree-select 4.7.5 → 4.7.6

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @hi-ui/check-tree-select
 
+## 4.7.6
+
+### Patch Changes
+
+- [#3409](https://github.com/XiaoMi/hiui/pull/3409) [`467701f`](https://github.com/XiaoMi/hiui/commit/467701f925d0bb0709e3fd17ca6e178fa1ca01c6) Thanks [@zyprepare](https://github.com/zyprepare)! - refactor(check-tree-select): 搜索和全选勾选逻辑调整，过滤后的结果勾选态还是按照全量数据进行计算，全选态根据过滤后的数据进行计算 (#3398)
+
+- Updated dependencies [[`b2de718e9`](https://github.com/XiaoMi/hiui/commit/b2de718e9fd12dbe8fa1d762c6924696c19bc924)]:
+  - @hi-ui/core@4.0.11
+
 ## 4.7.5
 
 ### Patch Changes

package/lib/cjs/CheckTreeSelect.js

@@ -192,11 +192,7 @@ var CheckTreeSelect = /*#__PURE__*/React.forwardRef(function (_a, ref) {
     searchMode = _useSearchMode.searchMode,
     onSearch = _useSearchMode.onSearch,
     searchValue = _useSearchMode.keyword;
-  var dataMemo = React.useMemo(function () {
-    var flattedStateData = flatData(stateInSearch.data);
-    return typeAssertion.isArrayNonEmpty(flattedStateData) ? flattedStateData : flattedData;
-  }, [flatData, stateInSearch.data, flattedData]);
-  var _useCheck = useCheck.useCheck(checkedMode, disabled, dataMemo, defaultValue, valueProp, onChange),
+  var _useCheck = useCheck.useCheck(checkedMode, disabled, flattedData, defaultValue, valueProp, onChange),
     value = _useCheck[0],
     tryChangeValue = _useCheck[1],
     onNodeCheck = _useCheck[2],
@@ -249,13 +245,14 @@ var CheckTreeSelect = /*#__PURE__*/React.forwardRef(function (_a, ref) {
     return arrayUtils.uniqBy(nextData, 'id');
   }, [checkedNodes, flattedData]);
   var toggleCheckAll = React.useCallback(function () {
-    var _getAllCheckedStatus = index.getAllCheckedStatus(dataMemo, parsedCheckedIds),
+    var flattedData = flatData(showData);
+    var _getAllCheckedStatus = index.getAllCheckedStatus(flattedData, parsedCheckedIds),
       currentAllChecked = _getAllCheckedStatus[0],
       hasCheckedAll = _getAllCheckedStatus[2];
     var shouldChecked = !currentAllChecked;
     // 全选操作
     if (!currentAllChecked && !hasCheckedAll) {
-      tryChangeValue(dataMemo.filter(function (item) {
+      tryChangeValue(flattedData.filter(function (item) {
         if (!item.disabled) {
           // 根据 checkedMode 类型过滤出已选项，保证全选操作下 onChange 回调的值是符合 checkedMode 的规则
           if (checkedMode === 'CHILD') {
@@ -274,10 +271,11 @@ var CheckTreeSelect = /*#__PURE__*/React.forwardRef(function (_a, ref) {
     } else {
       tryChangeValue([], null, shouldChecked, []);
     }
-  }, [checkedMode, dataMemo, parsedCheckedIds, tryChangeValue]);
+  }, [checkedMode, flatData, parsedCheckedIds, showData, tryChangeValue]);
   var _useMemo = React.useMemo(function () {
-      return index.getAllCheckedStatus(dataMemo, parsedCheckedIds);
-    }, [dataMemo, parsedCheckedIds]),
+      var flattedData = flatData(showData);
+      return index.getAllCheckedStatus(flattedData, parsedCheckedIds);
+    }, [flatData, parsedCheckedIds, showData]),
     showAllChecked = _useMemo[0],
     showIndeterminate = _useMemo[1];
   var renderDefaultFooter = function renderDefaultFooter() {

package/lib/esm/CheckTreeSelect.js

@@ -179,11 +179,7 @@ var CheckTreeSelect = /*#__PURE__*/forwardRef(function (_a, ref) {
     searchMode = _useSearchMode.searchMode,
     onSearch = _useSearchMode.onSearch,
     searchValue = _useSearchMode.keyword;
-  var dataMemo = useMemo(function () {
-    var flattedStateData = flatData(stateInSearch.data);
-    return isArrayNonEmpty(flattedStateData) ? flattedStateData : flattedData;
-  }, [flatData, stateInSearch.data, flattedData]);
-  var _useCheck = useCheck(checkedMode, disabled, dataMemo, defaultValue, valueProp, onChange),
+  var _useCheck = useCheck(checkedMode, disabled, flattedData, defaultValue, valueProp, onChange),
     value = _useCheck[0],
     tryChangeValue = _useCheck[1],
     onNodeCheck = _useCheck[2],
@@ -236,13 +232,14 @@ var CheckTreeSelect = /*#__PURE__*/forwardRef(function (_a, ref) {
     return uniqBy(nextData, 'id');
   }, [checkedNodes, flattedData]);
   var toggleCheckAll = useCallback(function () {
-    var _getAllCheckedStatus = getAllCheckedStatus(dataMemo, parsedCheckedIds),
+    var flattedData = flatData(showData);
+    var _getAllCheckedStatus = getAllCheckedStatus(flattedData, parsedCheckedIds),
       currentAllChecked = _getAllCheckedStatus[0],
       hasCheckedAll = _getAllCheckedStatus[2];
     var shouldChecked = !currentAllChecked;
     // 全选操作
     if (!currentAllChecked && !hasCheckedAll) {
-      tryChangeValue(dataMemo.filter(function (item) {
+      tryChangeValue(flattedData.filter(function (item) {
         if (!item.disabled) {
           // 根据 checkedMode 类型过滤出已选项，保证全选操作下 onChange 回调的值是符合 checkedMode 的规则
           if (checkedMode === 'CHILD') {
@@ -261,10 +258,11 @@ var CheckTreeSelect = /*#__PURE__*/forwardRef(function (_a, ref) {
     } else {
       tryChangeValue([], null, shouldChecked, []);
     }
-  }, [checkedMode, dataMemo, parsedCheckedIds, tryChangeValue]);
+  }, [checkedMode, flatData, parsedCheckedIds, showData, tryChangeValue]);
   var _useMemo = useMemo(function () {
-      return getAllCheckedStatus(dataMemo, parsedCheckedIds);
-    }, [dataMemo, parsedCheckedIds]),
+      var flattedData = flatData(showData);
+      return getAllCheckedStatus(flattedData, parsedCheckedIds);
+    }, [flatData, parsedCheckedIds, showData]),
     showAllChecked = _useMemo[0],
     showIndeterminate = _useMemo[1];
   var renderDefaultFooter = function renderDefaultFooter() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hi-ui/check-tree-select",
-  "version": "4.7.5",
+  "version": "4.7.6",
   "description": "A sub-package for @hi-ui/hiui.",
   "keywords": [],
   "author": "HiUI <mi-hiui@xiaomi.com>",
@@ -63,12 +63,12 @@
     "@hi-ui/use-uncontrolled-state": "^4.0.4"
   },
   "peerDependencies": {
-    "@hi-ui/core": ">=4.0.8",
+    "@hi-ui/core": ">=4.0.11",
     "react": ">=16.8.6",
     "react-dom": ">=16.8.6"
   },
   "devDependencies": {
-    "@hi-ui/core": "^4.0.8",
+    "@hi-ui/core": "^4.0.11",
     "@hi-ui/core-css": "^4.1.5",
     "react": "^17.0.1",
     "react-dom": "^17.0.1"