@sheinx/hooks 3.5.0-beta.9 → 3.5.0-fix.1

package/cjs/common/use-input-able/use-Input-able.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-Input-able.d.ts","sourceRoot":"","sources":["use-Input-able.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEnE,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,CAAC,EAAE,CAAC,SAAS,UAAU,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC;;;;EAwE3F"}
+{"version":3,"file":"use-Input-able.d.ts","sourceRoot":"","sources":["use-Input-able.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEnE,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,CAAC,EAAE,CAAC,SAAS,UAAU,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC;;;;EAuE3F"}

package/cjs/common/use-input-able/use-Input-able.js

@@ -45,19 +45,18 @@ function useInputAble(props) {
   var render = (0, _useRender.useRender)(syncValue);
   var shouldUseState = delay || !control;
   var value = shouldUseState ? stateValue : valuePo;
-  (0, _react.useEffect)(function () {
-    if (context.timer) {
-      clearTimeout(context.timer);
-      context.timer = null;
-    }
+  (0, _react.useLayoutEffect)(function () {
     if (delay && control && props.value !== stateValue) {
       changeStateValue(props.value);
+    } else if (context.timer) {
+      clearTimeout(context.timer);
+      context.timer = null;
     }
   }, [props.value, delay, control]);
   var forceDelayChange = (0, _usePersistFn.default)(function () {
-    if (context.timer && context.delayChange) {
+    if (context.delayChange) context.delayChange();
+    if (context.timer) {
       clearTimeout(context.timer);
-      context.delayChange();
       context.timer = null;
       context.delayChange = null;
     }

package/cjs/components/use-image/use-image.type.d.ts

@@ -101,13 +101,13 @@ export interface BaseImageProps {
     /**
      * @en The width of the image
      * @cn 图片宽度
-     * @default '100%'
+     * @default 100%
      */
     width?: number | string;
     /**
      * @en The height of the image
      * @cn 图片高度
-     * @default '100%'
+     * @default 100%
      */
     height?: number | string;
     /**

package/cjs/components/use-table/use-table-tree.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-table-tree.d.ts","sourceRoot":"","sources":["use-table-tree.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAoCvD,MAAM,WAAW,iBACf,SAAQ,IAAI,CACV,kBAAkB,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,EACvC,cAAc,GAAG,gBAAgB,GAAG,uBAAuB,GAAG,QAAQ,CACvE;IACD,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,IAAI,EAAE,GAAG,EAAE,CAAC;CACb;AAED,eAAO,MAAM,YAAY,UAAW,iBAAiB;;;;;;+BA6BR,GAAG,SAAS,MAAM;iCAjBhB,GAAG,SAAS,MAAM;;CA2ChE,CAAC;AAEF,eAAe,YAAY,CAAC"}
+{"version":3,"file":"use-table-tree.d.ts","sourceRoot":"","sources":["use-table-tree.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AA8CvD,MAAM,WAAW,iBACf,SAAQ,IAAI,CACV,kBAAkB,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,EACvC,cAAc,GAAG,gBAAgB,GAAG,uBAAuB,GAAG,QAAQ,CACvE;IACD,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,IAAI,EAAE,GAAG,EAAE,CAAC;CACb;AAED,eAAO,MAAM,YAAY,UAAW,iBAAiB;;;;;;+BA6BR,GAAG,SAAS,MAAM;iCAjBhB,GAAG,SAAS,MAAM;;CAuDhE,CAAC;AAEF,eAAe,YAAY,CAAC"}

package/cjs/components/use-table/use-table-tree.js

@@ -19,35 +19,47 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-var getExpandData = function getExpandData(data, keys, keygen, treeColumnsName) {
+var getExpandData = function getExpandData(_treeData, keys, keygen, treeColumnsName) {
   var expandKeys = keys;
   var expandSet = new Set(expandKeys);
-  var expandLevel = new Map();
+  var unmatchExpandKeys = [];
+  var treeExpandLevel = new Map();
   if (expandSet.size === 0 || !treeColumnsName) {
-    return [data, expandLevel];
+    return {
+      treeData: _treeData,
+      treeExpandLevel: treeExpandLevel,
+      unmatchExpandKeys: unmatchExpandKeys
+    };
   }
-  var newData = _toConsumableArray(data || []);
+  var treeData = _toConsumableArray(_treeData || []);
   var _loop = function _loop() {
     if (expandSet.size === 0) return 1; // break
-    var item = newData[i];
+    var item = treeData[i];
     var key = (0, _render.getKey)(keygen, item, i);
-    var parentLevel = expandLevel.get(key) || 0;
+    var parentLevel = treeExpandLevel.get(key) || 0;
     var children = (0, _is.isObject)(item) && item[treeColumnsName];
-    if (expandSet.has(key) && children) {
-      children.forEach(function (child) {
-        expandLevel.set((0, _render.getKey)(keygen, child), parentLevel + 1);
-      });
-      newData.splice.apply(newData, [i + 1, 0].concat(_toConsumableArray(children)));
-      expandSet.delete(key);
+    if (expandSet.has(key)) {
+      if (children && children.length > 0) {
+        children.forEach(function (child) {
+          treeExpandLevel.set((0, _render.getKey)(keygen, child), parentLevel + 1);
+        });
+        treeData.splice.apply(treeData, [i + 1, 0].concat(_toConsumableArray(children)));
+        expandSet.delete(key);
+      } else {
+        unmatchExpandKeys.push(key);
+      }
     }
   };
-  for (var i = 0; i < newData.length; i++) {
+  for (var i = 0; i < treeData.length; i++) {
     if (_loop()) break;
   }
-  return [newData, expandLevel];
+  return {
+    treeData: treeData,
+    treeExpandLevel: treeExpandLevel,
+    unmatchExpandKeys: unmatchExpandKeys
+  };
 };
 var useTableTree = exports.useTableTree = function useTableTree(props) {
-  var _props$data$filter;
   var _useState = (0, _react.useState)(props.defaultTreeExpandKeys || []),
     _useState2 = _slicedToArray(_useState, 2),
     expandKeysState = _useState2[0],
@@ -88,13 +100,27 @@ var useTableTree = exports.useTableTree = function useTableTree(props) {
   var _useMemo = (0, _react.useMemo)(function () {
       return getExpandData(props.data, expandKeys, props.keygen, props.treeColumnsName);
     }, [props.data, expandKeys, props.treeColumnsName]),
-    _useMemo2 = _slicedToArray(_useMemo, 2),
-    treeData = _useMemo2[0],
-    treeExpandLevel = _useMemo2[1];
-  var isEmptyTree = ((_props$data$filter = props.data.filter(function (item) {
-    var _item;
-    return (_item = item[props.treeColumnsName]) === null || _item === void 0 ? void 0 : _item.length;
-  })) === null || _props$data$filter === void 0 ? void 0 : _props$data$filter.length) === 0;
+    treeData = _useMemo.treeData,
+    treeExpandLevel = _useMemo.treeExpandLevel,
+    unmatchExpandKeys = _useMemo.unmatchExpandKeys;
+  var isEmptyTree = (0, _react.useMemo)(function () {
+    var _props$data$filter;
+    return ((_props$data$filter = props.data.filter(function (item) {
+      var _item;
+      return (_item = item[props.treeColumnsName]) === null || _item === void 0 ? void 0 : _item.length;
+    })) === null || _props$data$filter === void 0 ? void 0 : _props$data$filter.length) === 0;
+  }, [props.data, props.treeColumnsName]);
+  (0, _react.useEffect)(function () {
+    if (!unmatchExpandKeys.length || !expandKeysState.length) {
+      return;
+    }
+
+    // 检查treeData中的每一项，对比expandKeysState，如果expandKeysState有但是children是空的，则需要修正expandKeysState
+    var newExpandKeys = expandKeysState.filter(function (key) {
+      return !unmatchExpandKeys.includes(key);
+    });
+    setExpandKeysState(newExpandKeys);
+  }, [unmatchExpandKeys, expandKeysState]);
   return {
     data: treeData,
     treeExpandLevel: treeExpandLevel,

package/esm/common/use-input-able/use-Input-able.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-Input-able.d.ts","sourceRoot":"","sources":["use-Input-able.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEnE,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,CAAC,EAAE,CAAC,SAAS,UAAU,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC;;;;EAwE3F"}
+{"version":3,"file":"use-Input-able.d.ts","sourceRoot":"","sources":["use-Input-able.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEnE,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,CAAC,EAAE,CAAC,SAAS,UAAU,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC;;;;EAuE3F"}

package/esm/common/use-input-able/use-Input-able.js

@@ -4,7 +4,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { useEffect, useRef, useState } from 'react';
+import { useLayoutEffect, useRef, useState } from 'react';
 import { isFunc } from "../../utils/is";
 import { shallowEqual } from "../../utils/shallow-equal";
 import usePersistFn from "../use-persist-fn";
@@ -38,19 +38,18 @@ export default function useInputAble(props) {
   var render = useRender(syncValue);
   var shouldUseState = delay || !control;
   var value = shouldUseState ? stateValue : valuePo;
-  useEffect(function () {
-    if (context.timer) {
-      clearTimeout(context.timer);
-      context.timer = null;
-    }
+  useLayoutEffect(function () {
     if (delay && control && props.value !== stateValue) {
       changeStateValue(props.value);
+    } else if (context.timer) {
+      clearTimeout(context.timer);
+      context.timer = null;
     }
   }, [props.value, delay, control]);
   var forceDelayChange = usePersistFn(function () {
-    if (context.timer && context.delayChange) {
+    if (context.delayChange) context.delayChange();
+    if (context.timer) {
       clearTimeout(context.timer);
-      context.delayChange();
       context.timer = null;
       context.delayChange = null;
     }

package/esm/components/use-image/use-image.type.d.ts

@@ -101,13 +101,13 @@ export interface BaseImageProps {
     /**
      * @en The width of the image
      * @cn 图片宽度
-     * @default '100%'
+     * @default 100%
      */
     width?: number | string;
     /**
      * @en The height of the image
      * @cn 图片高度
-     * @default '100%'
+     * @default 100%
      */
     height?: number | string;
     /**

package/esm/components/use-table/use-table-tree.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-table-tree.d.ts","sourceRoot":"","sources":["use-table-tree.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAoCvD,MAAM,WAAW,iBACf,SAAQ,IAAI,CACV,kBAAkB,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,EACvC,cAAc,GAAG,gBAAgB,GAAG,uBAAuB,GAAG,QAAQ,CACvE;IACD,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,IAAI,EAAE,GAAG,EAAE,CAAC;CACb;AAED,eAAO,MAAM,YAAY,UAAW,iBAAiB;;;;;;+BA6BR,GAAG,SAAS,MAAM;iCAjBhB,GAAG,SAAS,MAAM;;CA2ChE,CAAC;AAEF,eAAe,YAAY,CAAC"}
+{"version":3,"file":"use-table-tree.d.ts","sourceRoot":"","sources":["use-table-tree.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AA8CvD,MAAM,WAAW,iBACf,SAAQ,IAAI,CACV,kBAAkB,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,EACvC,cAAc,GAAG,gBAAgB,GAAG,uBAAuB,GAAG,QAAQ,CACvE;IACD,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,IAAI,EAAE,GAAG,EAAE,CAAC;CACb;AAED,eAAO,MAAM,YAAY,UAAW,iBAAiB;;;;;;+BA6BR,GAAG,SAAS,MAAM;iCAjBhB,GAAG,SAAS,MAAM;;CAuDhE,CAAC;AAEF,eAAe,YAAY,CAAC"}

package/esm/components/use-table/use-table-tree.js

@@ -13,35 +13,47 @@ import { usePersistFn } from "../../common/use-persist-fn";
 import { getKey } from "../../utils/render";
 import { isObject } from "../../utils/is";
 import { useLatestObj } from "../../common/use-latest-obj";
-var getExpandData = function getExpandData(data, keys, keygen, treeColumnsName) {
+var getExpandData = function getExpandData(_treeData, keys, keygen, treeColumnsName) {
   var expandKeys = keys;
   var expandSet = new Set(expandKeys);
-  var expandLevel = new Map();
+  var unmatchExpandKeys = [];
+  var treeExpandLevel = new Map();
   if (expandSet.size === 0 || !treeColumnsName) {
-    return [data, expandLevel];
+    return {
+      treeData: _treeData,
+      treeExpandLevel: treeExpandLevel,
+      unmatchExpandKeys: unmatchExpandKeys
+    };
   }
-  var newData = _toConsumableArray(data || []);
+  var treeData = _toConsumableArray(_treeData || []);
   var _loop = function _loop() {
     if (expandSet.size === 0) return 1; // break
-    var item = newData[i];
+    var item = treeData[i];
     var key = getKey(keygen, item, i);
-    var parentLevel = expandLevel.get(key) || 0;
+    var parentLevel = treeExpandLevel.get(key) || 0;
     var children = isObject(item) && item[treeColumnsName];
-    if (expandSet.has(key) && children) {
-      children.forEach(function (child) {
-        expandLevel.set(getKey(keygen, child), parentLevel + 1);
-      });
-      newData.splice.apply(newData, [i + 1, 0].concat(_toConsumableArray(children)));
-      expandSet.delete(key);
+    if (expandSet.has(key)) {
+      if (children && children.length > 0) {
+        children.forEach(function (child) {
+          treeExpandLevel.set(getKey(keygen, child), parentLevel + 1);
+        });
+        treeData.splice.apply(treeData, [i + 1, 0].concat(_toConsumableArray(children)));
+        expandSet.delete(key);
+      } else {
+        unmatchExpandKeys.push(key);
+      }
     }
   };
-  for (var i = 0; i < newData.length; i++) {
+  for (var i = 0; i < treeData.length; i++) {
     if (_loop()) break;
   }
-  return [newData, expandLevel];
+  return {
+    treeData: treeData,
+    treeExpandLevel: treeExpandLevel,
+    unmatchExpandKeys: unmatchExpandKeys
+  };
 };
 export var useTableTree = function useTableTree(props) {
-  var _props$data$filter;
   var _useState = useState(props.defaultTreeExpandKeys || []),
     _useState2 = _slicedToArray(_useState, 2),
     expandKeysState = _useState2[0],
@@ -82,13 +94,27 @@ export var useTableTree = function useTableTree(props) {
   var _useMemo = useMemo(function () {
       return getExpandData(props.data, expandKeys, props.keygen, props.treeColumnsName);
     }, [props.data, expandKeys, props.treeColumnsName]),
-    _useMemo2 = _slicedToArray(_useMemo, 2),
-    treeData = _useMemo2[0],
-    treeExpandLevel = _useMemo2[1];
-  var isEmptyTree = ((_props$data$filter = props.data.filter(function (item) {
-    var _item;
-    return (_item = item[props.treeColumnsName]) === null || _item === void 0 ? void 0 : _item.length;
-  })) === null || _props$data$filter === void 0 ? void 0 : _props$data$filter.length) === 0;
+    treeData = _useMemo.treeData,
+    treeExpandLevel = _useMemo.treeExpandLevel,
+    unmatchExpandKeys = _useMemo.unmatchExpandKeys;
+  var isEmptyTree = useMemo(function () {
+    var _props$data$filter;
+    return ((_props$data$filter = props.data.filter(function (item) {
+      var _item;
+      return (_item = item[props.treeColumnsName]) === null || _item === void 0 ? void 0 : _item.length;
+    })) === null || _props$data$filter === void 0 ? void 0 : _props$data$filter.length) === 0;
+  }, [props.data, props.treeColumnsName]);
+  useEffect(function () {
+    if (!unmatchExpandKeys.length || !expandKeysState.length) {
+      return;
+    }
+
+    // 检查treeData中的每一项，对比expandKeysState，如果expandKeysState有但是children是空的，则需要修正expandKeysState
+    var newExpandKeys = expandKeysState.filter(function (key) {
+      return !unmatchExpandKeys.includes(key);
+    });
+    setExpandKeysState(newExpandKeys);
+  }, [unmatchExpandKeys, expandKeysState]);
   return {
     data: treeData,
     treeExpandLevel: treeExpandLevel,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sheinx/hooks",
-  "version": "3.5.0-beta.9",
+  "version": "3.5.0-fix.1",
   "description": "",
   "keywords": [],
   "license": "MIT",