@sheinx/hooks 3.3.3-beta.1 → 3.3.3-beta.3

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

@@ -1 +1 @@
-{"version":3,"file":"use-table-layout.d.ts","sourceRoot":"","sources":["use-table-layout.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA6C,MAAM,OAAO,CAAC;AAKlE,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAcrE,MAAM,WAAW,mBACf,SAAQ,IAAI,CACV,cAAc,CAAC,GAAG,CAAC,EACnB,MAAM,GAAG,kBAAkB,GAAG,iBAAiB,GAAG,gBAAgB,GAAG,OAAO,CAC7E;IACD,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IACvC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IACvC,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IACxC,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,QAAA,MAAM,cAAc,UAAW,mBAAmB;;;;;;;;;;;yBA8CX,MAAM,UAAU,MAAM;;;;;;;;CAkO5D,CAAC;AAEF,eAAe,cAAc,CAAC"}
+{"version":3,"file":"use-table-layout.d.ts","sourceRoot":"","sources":["use-table-layout.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA6C,MAAM,OAAO,CAAC;AAKlE,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAcrE,MAAM,WAAW,mBACf,SAAQ,IAAI,CACV,cAAc,CAAC,GAAG,CAAC,EACnB,MAAM,GAAG,kBAAkB,GAAG,iBAAiB,GAAG,gBAAgB,GAAG,OAAO,CAC7E;IACD,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IACvC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IACvC,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IACxC,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,QAAA,MAAM,cAAc,UAAW,mBAAmB;;;;;;;;;;;yBA8CX,MAAM,UAAU,MAAM;;;;;;;;CAmO5D,CAAC;AAEF,eAAe,cAAc,CAAC"}

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

@@ -337,12 +337,13 @@ var useTableLayout = function useTableLayout(props) {
       getColgroup(adjust === 'drag');
       setAdjust(false);
     } else {
-      checkFloat();
+      // checkFloat();
       // checkScroll();
       // 拖拽列会导致 scrollWidth 变化
       syncScrollWidth();
     }
     checkScroll();
+    checkFloat();
   }, [colgroup]);
   return {
     isScrollX: !!isScrollX,

package/cjs/components/use-table/use-table-virtual.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="react" />
+import { TableFormatColumn } from './use-table.type';
 interface UseTableVirtualProps {
     data: any[];
     rowsInView: number;
@@ -8,6 +9,7 @@ interface UseTableVirtualProps {
     scrollLeft?: number;
     disabled?: boolean;
     isRtl?: boolean;
+    columns: TableFormatColumn<any>[];
 }
 declare const useTableVirtual: (props: UseTableVirtualProps) => {
     scrollHeight: number;

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

@@ -1 +1 @@
-{"version":3,"file":"use-table-virtual.d.ts","sourceRoot":"","sources":["use-table-virtual.tsx"],"names":[],"mappings":";AAGA,UAAU,oBAAoB;IAC5B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC3C,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC1C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AACD,QAAA,MAAM,eAAe,UAAW,oBAAoB;;;;;;;oBA+GpC,MAAM;mBACP,MAAM;WACd,MAAM;gBACD,MAAM;kBACJ,OAAO;;0BAtEuB,MAAM,UAAU,MAAM;0BAxBtB,MAAM,QAAQ,MAAM;2BAkInB,MAAM;CAmElD,CAAC;AAEF,eAAe,eAAe,CAAC"}
+{"version":3,"file":"use-table-virtual.d.ts","sourceRoot":"","sources":["use-table-virtual.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,UAAU,oBAAoB;IAC5B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC3C,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC1C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;CACnC;AACD,QAAA,MAAM,eAAe,UAAW,oBAAoB;;;;;;;oBAiLpC,MAAM;mBACP,MAAM;WACd,MAAM;gBACD,MAAM;kBACJ,OAAO;;0BAnFuB,MAAM,UAAU,MAAM;0BAxBtB,MAAM,QAAQ,MAAM;2BA+InB,MAAM;CAmElD,CAAC;AAEF,eAAe,eAAe,CAAC"}

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

@@ -39,6 +39,58 @@ var useTableVirtual = function useTableVirtual(props) {
     setOffsetY = _useState10[1];
   var rowsInView = props.rowsInView === 0 ? props.data.length : props.rowsInView;
   var sleft = props.scrollLeft !== undefined ? props.scrollLeft : innerLeft;
+  var rowSpanInfos = (0, _react.useMemo)(function () {
+    var rowSpanColumns = props.columns.filter(function (col) {
+      return typeof col.rowSpan === 'function';
+    });
+    if (rowSpanColumns.length === 0) return;
+    var _rowSpanInfos = [];
+    var totalLength = props.data.length;
+    var _loop = function _loop(i) {
+      var startIndex = i;
+      var rowSpanInfo = rowSpanColumns.map(function (col) {
+        var rowSpan = col.rowSpan;
+        function getRowSpanCount(index, _count) {
+          var count = _count;
+          if (index === totalLength - 1) return count;
+          var prevRowData = props.data[index];
+          var nextRowData = props.data[index + 1];
+          if (rowSpan(prevRowData, nextRowData)) {
+            count = count + 1;
+            getRowSpanCount(index + 1, count);
+          }
+          return count;
+        }
+        var count = getRowSpanCount(i, 1);
+        return [startIndex, startIndex + count - 1];
+      });
+      _rowSpanInfos.push(rowSpanInfo);
+    };
+    for (var i = 0; i < totalLength; i++) {
+      _loop(i);
+    }
+    for (var _i = 0; _i < _rowSpanInfos.length; _i++) {
+      if (_i === _rowSpanInfos.length - 1) break;
+      var spans1 = _rowSpanInfos[_i];
+      var spans2 = _rowSpanInfos[_i + 1];
+      for (var j = 0; j < spans1.length; j++) {
+        var _spans1$j = _slicedToArray(spans1[j], 2),
+          startIndex1 = _spans1$j[0],
+          endIndex1 = _spans1$j[1];
+        var _spans2$j = _slicedToArray(spans2[j], 1),
+          startIndex2 = _spans2$j[0];
+        if (endIndex1 === startIndex2) {
+          spans2[j][0] = startIndex1;
+        }
+      }
+    }
+    return _rowSpanInfos.map(function (_rowSpanInfo) {
+      var startIndexs = _rowSpanInfo.map(function (arr) {
+        return arr[0];
+      });
+      return Math.min.apply(Math, _toConsumableArray(startIndexs));
+    });
+  }, [props.data, props.columns]);
   var _useRef = (0, _react.useRef)({
       cachedHeight: [],
       shouldUpdateHeight: true,
@@ -98,7 +150,20 @@ var useTableVirtual = function useTableVirtual(props) {
     var maxIndex = Math.max(props.data.length - rowsInView, 0);
     for (var i = 0; i <= maxIndex; i++) {
       sum += context.cachedHeight[i] || props.rowHeight;
-      if (scrollTop < sum || i === maxIndex) {
+      var rowSpanHeight = 0;
+      if (rowSpanInfos) {
+        var siblingsIndexs = [];
+        for (var k = 0; k < rowSpanInfos.length; k++) {
+          if (rowSpanInfos[k] <= i && k !== i) {
+            siblingsIndexs.push(k);
+          }
+        }
+        for (var j = 0; j < siblingsIndexs.length; j++) {
+          var index = siblingsIndexs[j];
+          rowSpanHeight += context.cachedHeight[index] || props.rowHeight;
+        }
+      }
+      if (scrollTop < sum + rowSpanHeight || i === maxIndex) {
         currentIndex = i;
         var beforeHeight = i === 0 ? 0 : sum - (context.cachedHeight[i] || props.rowHeight);
         top = scrollTop - beforeHeight;

package/cjs/utils/is.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"is.d.ts","sourceRoot":"","sources":["is.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AACxE,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,wBAAgB,SAAS,YAExB;AASD,eAAO,MAAM,OAAO,4BAAgB,CAAC;AACrC,eAAO,MAAM,QAAQ,QAAS,OAAO,sBACc,CAAC;AACpD,eAAO,MAAM,MAAM,QAAS,OAAO,gBAAqC,CAAC;AACzE,eAAO,MAAM,SAAS,QAAS,OAAO,mBAA2C,CAAC;AAClF,eAAO,MAAM,OAAO,QAAS,OAAO,KAAG,OAA+B,CAAC;AACvE,eAAO,MAAM,QAAQ,MAAO,OAAO,gBAAuC,CAAC;AAC3E,eAAO,MAAM,QAAQ,QAAS,OAAO,KAAG,OAAgC,CAAC;AACzE,eAAO,MAAM,QAAQ,MAAO,OAAO,gBAAuC,CAAC;AAC3E,eAAO,MAAM,WAAW,QAAS,GAAG,qBAAwC,CAAC;AAC7E,eAAO,MAAM,KAAK,QAjBsB,OAAO,mBAiBb,CAAC;AACnC,eAAO,MAAM,KAAK,QAlBsB,OAAO,mBAkBb,CAAC;AACnC,eAAO,MAAM,QAAQ,QAAS,OAAO,KAAG,OAUvC,CAAC;AACF,eAAO,MAAM,eAAe,QAAS,OAAO,yBAE3C,CAAC;AACF,eAAO,MAAM,WAAW,QAAS,OAAO,KAAG,OAS1C,CAAC;AAEF,eAAO,MAAM,MAAM,MAAO,OAAO,kBAA2C,CAAC;AAE7E,eAAO,MAAM,SAAS,MAAO,OAAO,YACiC,CAAC;AAGtE,eAAO,MAAM,KAAK,MAAO,OAAO,KAAG,OAAkB,CAAC;AAEtD,eAAO,MAAM,OAAO,QAAS,OAAO,KAAG,OActC,CAAC;AAEF,eAAO,MAAM,MAAM,OAAQ,OAAO,6EASjC,CAAC;AAEF,eAAO,MAAM,OAAO,QAAO,OACqC,CAAC;AAEjE,eAAO,MAAM,SAAS,QAAO,OAG5B,CAAC;AAEF,eAAO,MAAM,iBAAiB,YAAY,MAAM,KAAE,OASjD,CAAA;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,GAAG,GAAG,OAAO,IAAI,WAAW,CAQjE"}
+{"version":3,"file":"is.d.ts","sourceRoot":"","sources":["is.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AACxE,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,wBAAgB,SAAS,YAExB;AASD,eAAO,MAAM,OAAO,4BAAgB,CAAC;AACrC,eAAO,MAAM,QAAQ,QAAS,OAAO,sBACc,CAAC;AACpD,eAAO,MAAM,MAAM,QAAS,OAAO,gBAAqC,CAAC;AACzE,eAAO,MAAM,SAAS,QAAS,OAAO,mBAA2C,CAAC;AAClF,eAAO,MAAM,OAAO,QAAS,OAAO,KAAG,OAA+B,CAAC;AACvE,eAAO,MAAM,QAAQ,MAAO,OAAO,gBAAuC,CAAC;AAC3E,eAAO,MAAM,QAAQ,QAAS,OAAO,KAAG,OAAgC,CAAC;AACzE,eAAO,MAAM,QAAQ,MAAO,OAAO,gBAAuC,CAAC;AAC3E,eAAO,MAAM,WAAW,QAAS,GAAG,qBAAwC,CAAC;AAC7E,eAAO,MAAM,KAAK,QAjBsB,OAAO,mBAiBb,CAAC;AACnC,eAAO,MAAM,KAAK,QAlBsB,OAAO,mBAkBb,CAAC;AACnC,eAAO,MAAM,QAAQ,QAAS,OAAO,KAAG,OAUvC,CAAC;AACF,eAAO,MAAM,eAAe,QAAS,OAAO,yBAE3C,CAAC;AACF,eAAO,MAAM,WAAW,QAAS,OAAO,KAAG,OAS1C,CAAC;AAEF,eAAO,MAAM,MAAM,MAAO,OAAO,kBAA2C,CAAC;AAE7E,eAAO,MAAM,SAAS,MAAO,OAAO,YACiC,CAAC;AAGtE,eAAO,MAAM,KAAK,MAAO,OAAO,KAAG,OAAkB,CAAC;AAEtD,eAAO,MAAM,OAAO,QAAS,OAAO,KAAG,OActC,CAAC;AAEF,eAAO,MAAM,MAAM,OAAQ,OAAO,6EASjC,CAAC;AAEF,eAAO,MAAM,OAAO,QAAO,OACqC,CAAC;AAEjE,eAAO,MAAM,SAAS,QAAO,OAG5B,CAAC;AAEF,eAAO,MAAM,iBAAiB,YAAa,MAAM,KAAG,OASnD,CAAC;AAEF,wBAAgB,YAAY,CAAC,OAAO,EAAE,GAAG,GAAG,OAAO,IAAI,WAAW,CAQjE"}

package/cjs/utils/is.js

@@ -56,7 +56,7 @@ var isBuffer = exports.isBuffer = function isBuffer(val) {
   return false;
 };
 var isUnMatchedData = exports.isUnMatchedData = function isUnMatchedData(val) {
-  return isObject(val) && val.IS_NOT_MATCHED_VALUE;
+  return isObject(val) && val.IS_NOT_MATCHED_VALUE === true;
 };
 var isMergeable = exports.isMergeable = function isMergeable(val) {
   if (!isObject(val)) return false;

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

@@ -1 +1 @@
-{"version":3,"file":"use-table-layout.d.ts","sourceRoot":"","sources":["use-table-layout.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA6C,MAAM,OAAO,CAAC;AAKlE,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAcrE,MAAM,WAAW,mBACf,SAAQ,IAAI,CACV,cAAc,CAAC,GAAG,CAAC,EACnB,MAAM,GAAG,kBAAkB,GAAG,iBAAiB,GAAG,gBAAgB,GAAG,OAAO,CAC7E;IACD,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IACvC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IACvC,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IACxC,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,QAAA,MAAM,cAAc,UAAW,mBAAmB;;;;;;;;;;;yBA8CX,MAAM,UAAU,MAAM;;;;;;;;CAkO5D,CAAC;AAEF,eAAe,cAAc,CAAC"}
+{"version":3,"file":"use-table-layout.d.ts","sourceRoot":"","sources":["use-table-layout.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA6C,MAAM,OAAO,CAAC;AAKlE,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAcrE,MAAM,WAAW,mBACf,SAAQ,IAAI,CACV,cAAc,CAAC,GAAG,CAAC,EACnB,MAAM,GAAG,kBAAkB,GAAG,iBAAiB,GAAG,gBAAgB,GAAG,OAAO,CAC7E;IACD,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IACvC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IACvC,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IACxC,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,QAAA,MAAM,cAAc,UAAW,mBAAmB;;;;;;;;;;;yBA8CX,MAAM,UAAU,MAAM;;;;;;;;CAmO5D,CAAC;AAEF,eAAe,cAAc,CAAC"}

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

@@ -328,12 +328,13 @@ var useTableLayout = function useTableLayout(props) {
       getColgroup(adjust === 'drag');
       setAdjust(false);
     } else {
-      checkFloat();
+      // checkFloat();
       // checkScroll();
       // 拖拽列会导致 scrollWidth 变化
       syncScrollWidth();
     }
     checkScroll();
+    checkFloat();
   }, [colgroup]);
   return {
     isScrollX: !!isScrollX,

package/esm/components/use-table/use-table-virtual.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="react" />
+import { TableFormatColumn } from './use-table.type';
 interface UseTableVirtualProps {
     data: any[];
     rowsInView: number;
@@ -8,6 +9,7 @@ interface UseTableVirtualProps {
     scrollLeft?: number;
     disabled?: boolean;
     isRtl?: boolean;
+    columns: TableFormatColumn<any>[];
 }
 declare const useTableVirtual: (props: UseTableVirtualProps) => {
     scrollHeight: number;

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

@@ -1 +1 @@
-{"version":3,"file":"use-table-virtual.d.ts","sourceRoot":"","sources":["use-table-virtual.tsx"],"names":[],"mappings":";AAGA,UAAU,oBAAoB;IAC5B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC3C,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC1C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AACD,QAAA,MAAM,eAAe,UAAW,oBAAoB;;;;;;;oBA+GpC,MAAM;mBACP,MAAM;WACd,MAAM;gBACD,MAAM;kBACJ,OAAO;;0BAtEuB,MAAM,UAAU,MAAM;0BAxBtB,MAAM,QAAQ,MAAM;2BAkInB,MAAM;CAmElD,CAAC;AAEF,eAAe,eAAe,CAAC"}
+{"version":3,"file":"use-table-virtual.d.ts","sourceRoot":"","sources":["use-table-virtual.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,UAAU,oBAAoB;IAC5B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC3C,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC1C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;CACnC;AACD,QAAA,MAAM,eAAe,UAAW,oBAAoB;;;;;;;oBAiLpC,MAAM;mBACP,MAAM;WACd,MAAM;gBACD,MAAM;kBACJ,OAAO;;0BAnFuB,MAAM,UAAU,MAAM;0BAxBtB,MAAM,QAAQ,MAAM;2BA+InB,MAAM;CAmElD,CAAC;AAEF,eAAe,eAAe,CAAC"}

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

@@ -9,7 +9,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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 { usePersistFn } from "../../common/use-persist-fn";
-import { useState, useRef, useEffect } from 'react';
+import { useState, useRef, useEffect, useMemo } from 'react';
 var useTableVirtual = function useTableVirtual(props) {
   var _useState = useState(0),
     _useState2 = _slicedToArray(_useState, 2),
@@ -33,6 +33,58 @@ var useTableVirtual = function useTableVirtual(props) {
     setOffsetY = _useState10[1];
   var rowsInView = props.rowsInView === 0 ? props.data.length : props.rowsInView;
   var sleft = props.scrollLeft !== undefined ? props.scrollLeft : innerLeft;
+  var rowSpanInfos = useMemo(function () {
+    var rowSpanColumns = props.columns.filter(function (col) {
+      return typeof col.rowSpan === 'function';
+    });
+    if (rowSpanColumns.length === 0) return;
+    var _rowSpanInfos = [];
+    var totalLength = props.data.length;
+    var _loop = function _loop(i) {
+      var startIndex = i;
+      var rowSpanInfo = rowSpanColumns.map(function (col) {
+        var rowSpan = col.rowSpan;
+        function getRowSpanCount(index, _count) {
+          var count = _count;
+          if (index === totalLength - 1) return count;
+          var prevRowData = props.data[index];
+          var nextRowData = props.data[index + 1];
+          if (rowSpan(prevRowData, nextRowData)) {
+            count = count + 1;
+            getRowSpanCount(index + 1, count);
+          }
+          return count;
+        }
+        var count = getRowSpanCount(i, 1);
+        return [startIndex, startIndex + count - 1];
+      });
+      _rowSpanInfos.push(rowSpanInfo);
+    };
+    for (var i = 0; i < totalLength; i++) {
+      _loop(i);
+    }
+    for (var _i = 0; _i < _rowSpanInfos.length; _i++) {
+      if (_i === _rowSpanInfos.length - 1) break;
+      var spans1 = _rowSpanInfos[_i];
+      var spans2 = _rowSpanInfos[_i + 1];
+      for (var j = 0; j < spans1.length; j++) {
+        var _spans1$j = _slicedToArray(spans1[j], 2),
+          startIndex1 = _spans1$j[0],
+          endIndex1 = _spans1$j[1];
+        var _spans2$j = _slicedToArray(spans2[j], 1),
+          startIndex2 = _spans2$j[0];
+        if (endIndex1 === startIndex2) {
+          spans2[j][0] = startIndex1;
+        }
+      }
+    }
+    return _rowSpanInfos.map(function (_rowSpanInfo) {
+      var startIndexs = _rowSpanInfo.map(function (arr) {
+        return arr[0];
+      });
+      return Math.min.apply(Math, _toConsumableArray(startIndexs));
+    });
+  }, [props.data, props.columns]);
   var _useRef = useRef({
       cachedHeight: [],
       shouldUpdateHeight: true,
@@ -92,7 +144,20 @@ var useTableVirtual = function useTableVirtual(props) {
     var maxIndex = Math.max(props.data.length - rowsInView, 0);
     for (var i = 0; i <= maxIndex; i++) {
       sum += context.cachedHeight[i] || props.rowHeight;
-      if (scrollTop < sum || i === maxIndex) {
+      var rowSpanHeight = 0;
+      if (rowSpanInfos) {
+        var siblingsIndexs = [];
+        for (var k = 0; k < rowSpanInfos.length; k++) {
+          if (rowSpanInfos[k] <= i && k !== i) {
+            siblingsIndexs.push(k);
+          }
+        }
+        for (var j = 0; j < siblingsIndexs.length; j++) {
+          var index = siblingsIndexs[j];
+          rowSpanHeight += context.cachedHeight[index] || props.rowHeight;
+        }
+      }
+      if (scrollTop < sum + rowSpanHeight || i === maxIndex) {
         currentIndex = i;
         var beforeHeight = i === 0 ? 0 : sum - (context.cachedHeight[i] || props.rowHeight);
         top = scrollTop - beforeHeight;

package/esm/utils/is.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"is.d.ts","sourceRoot":"","sources":["is.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AACxE,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,wBAAgB,SAAS,YAExB;AASD,eAAO,MAAM,OAAO,4BAAgB,CAAC;AACrC,eAAO,MAAM,QAAQ,QAAS,OAAO,sBACc,CAAC;AACpD,eAAO,MAAM,MAAM,QAAS,OAAO,gBAAqC,CAAC;AACzE,eAAO,MAAM,SAAS,QAAS,OAAO,mBAA2C,CAAC;AAClF,eAAO,MAAM,OAAO,QAAS,OAAO,KAAG,OAA+B,CAAC;AACvE,eAAO,MAAM,QAAQ,MAAO,OAAO,gBAAuC,CAAC;AAC3E,eAAO,MAAM,QAAQ,QAAS,OAAO,KAAG,OAAgC,CAAC;AACzE,eAAO,MAAM,QAAQ,MAAO,OAAO,gBAAuC,CAAC;AAC3E,eAAO,MAAM,WAAW,QAAS,GAAG,qBAAwC,CAAC;AAC7E,eAAO,MAAM,KAAK,QAjBsB,OAAO,mBAiBb,CAAC;AACnC,eAAO,MAAM,KAAK,QAlBsB,OAAO,mBAkBb,CAAC;AACnC,eAAO,MAAM,QAAQ,QAAS,OAAO,KAAG,OAUvC,CAAC;AACF,eAAO,MAAM,eAAe,QAAS,OAAO,yBAE3C,CAAC;AACF,eAAO,MAAM,WAAW,QAAS,OAAO,KAAG,OAS1C,CAAC;AAEF,eAAO,MAAM,MAAM,MAAO,OAAO,kBAA2C,CAAC;AAE7E,eAAO,MAAM,SAAS,MAAO,OAAO,YACiC,CAAC;AAGtE,eAAO,MAAM,KAAK,MAAO,OAAO,KAAG,OAAkB,CAAC;AAEtD,eAAO,MAAM,OAAO,QAAS,OAAO,KAAG,OActC,CAAC;AAEF,eAAO,MAAM,MAAM,OAAQ,OAAO,6EASjC,CAAC;AAEF,eAAO,MAAM,OAAO,QAAO,OACqC,CAAC;AAEjE,eAAO,MAAM,SAAS,QAAO,OAG5B,CAAC;AAEF,eAAO,MAAM,iBAAiB,YAAY,MAAM,KAAE,OASjD,CAAA;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,GAAG,GAAG,OAAO,IAAI,WAAW,CAQjE"}
+{"version":3,"file":"is.d.ts","sourceRoot":"","sources":["is.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AACxE,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,wBAAgB,SAAS,YAExB;AASD,eAAO,MAAM,OAAO,4BAAgB,CAAC;AACrC,eAAO,MAAM,QAAQ,QAAS,OAAO,sBACc,CAAC;AACpD,eAAO,MAAM,MAAM,QAAS,OAAO,gBAAqC,CAAC;AACzE,eAAO,MAAM,SAAS,QAAS,OAAO,mBAA2C,CAAC;AAClF,eAAO,MAAM,OAAO,QAAS,OAAO,KAAG,OAA+B,CAAC;AACvE,eAAO,MAAM,QAAQ,MAAO,OAAO,gBAAuC,CAAC;AAC3E,eAAO,MAAM,QAAQ,QAAS,OAAO,KAAG,OAAgC,CAAC;AACzE,eAAO,MAAM,QAAQ,MAAO,OAAO,gBAAuC,CAAC;AAC3E,eAAO,MAAM,WAAW,QAAS,GAAG,qBAAwC,CAAC;AAC7E,eAAO,MAAM,KAAK,QAjBsB,OAAO,mBAiBb,CAAC;AACnC,eAAO,MAAM,KAAK,QAlBsB,OAAO,mBAkBb,CAAC;AACnC,eAAO,MAAM,QAAQ,QAAS,OAAO,KAAG,OAUvC,CAAC;AACF,eAAO,MAAM,eAAe,QAAS,OAAO,yBAE3C,CAAC;AACF,eAAO,MAAM,WAAW,QAAS,OAAO,KAAG,OAS1C,CAAC;AAEF,eAAO,MAAM,MAAM,MAAO,OAAO,kBAA2C,CAAC;AAE7E,eAAO,MAAM,SAAS,MAAO,OAAO,YACiC,CAAC;AAGtE,eAAO,MAAM,KAAK,MAAO,OAAO,KAAG,OAAkB,CAAC;AAEtD,eAAO,MAAM,OAAO,QAAS,OAAO,KAAG,OActC,CAAC;AAEF,eAAO,MAAM,MAAM,OAAQ,OAAO,6EASjC,CAAC;AAEF,eAAO,MAAM,OAAO,QAAO,OACqC,CAAC;AAEjE,eAAO,MAAM,SAAS,QAAO,OAG5B,CAAC;AAEF,eAAO,MAAM,iBAAiB,YAAa,MAAM,KAAG,OASnD,CAAC;AAEF,wBAAgB,YAAY,CAAC,OAAO,EAAE,GAAG,GAAG,OAAO,IAAI,WAAW,CAQjE"}

package/esm/utils/is.js

@@ -45,7 +45,7 @@ export var isBuffer = function isBuffer(val) {
   return false;
 };
 export var isUnMatchedData = function isUnMatchedData(val) {
-  return isObject(val) && val.IS_NOT_MATCHED_VALUE;
+  return isObject(val) && val.IS_NOT_MATCHED_VALUE === true;
 };
 export var isMergeable = function isMergeable(val) {
   if (!isObject(val)) return false;

package/package.json

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