@sheinx/hooks 3.4.0-beta.4 → 3.4.0-beta.6

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

@@ -10,6 +10,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { usePersistFn } from "../../common/use-persist-fn";
 import { useState, useRef, useEffect, useMemo } from 'react';
+var MAX_ROW_SPAN = 200;
 var useTableVirtual = function useTableVirtual(props) {
   var _useState = useState(0),
     _useState2 = _slicedToArray(_useState, 2),
@@ -92,7 +93,9 @@ var useTableVirtual = function useTableVirtual(props) {
       topTimer: null,
       controlScrollRate: null,
       heightCallback: null,
-      preIndex: null
+      preIndex: null,
+      rowSpanRows: 0,
+      autoAddRows: 0
     }),
     context = _useRef.current;
   var getTranslate = usePersistFn(function (left, top) {
@@ -143,17 +146,20 @@ var useTableVirtual = function useTableVirtual(props) {
     var top = 0;
     var maxIndex = Math.max(props.data.length - rowsInView, 0);
     for (var i = 0; i <= maxIndex; i++) {
+      context.rowSpanRows = 0;
       sum += context.cachedHeight[i] || props.rowHeight;
       var rowSpanHeight = 0;
       if (rowSpanInfos) {
+        var maxRowSpanLenth = Math.min(rowSpanInfos.length, props.rowsInView > MAX_ROW_SPAN ? props.rowsInView : props.rowsInView || MAX_ROW_SPAN);
         var siblingsIndexs = [];
-        for (var k = 0; k < rowSpanInfos.length; k++) {
+        for (var k = 0; k < maxRowSpanLenth; k++) {
           if (rowSpanInfos[k] <= i && k > i) {
             siblingsIndexs.push(k);
           }
         }
         for (var j = 0; j < siblingsIndexs.length; j++) {
           var index = siblingsIndexs[j];
+          context.rowSpanRows += 1;
           rowSpanHeight += context.cachedHeight[index] || props.rowHeight;
         }
       }
@@ -244,6 +250,24 @@ var useTableVirtual = function useTableVirtual(props) {
       props.scrollRef.current.scrollTop = beforeHeight;
     }
   });
+  useEffect(function () {
+    var scrollRefHeight = props.scrollRef.current ? props.scrollRef.current.clientHeight : 0;
+    var tableRefHeight = props.innerRef.current ? props.innerRef.current.clientHeight : 0;
+    var remainHeight = scrollRefHeight - tableRefHeight;
+    if (remainHeight > 0) {
+      var addonHeight = 0;
+      var addonCount = 0;
+      for (var i = startIndex + rowsInView; i < props.data.length; i++) {
+        var height = context.cachedHeight[i] || props.rowHeight;
+        addonHeight += height;
+        addonCount += 1;
+        if (addonHeight >= remainHeight + context.cachedHeight[0]) break;
+      }
+      if (addonCount > 0) {
+        context.autoAddRows = addonCount;
+      }
+    }
+  }, []);
   useEffect(function () {
     // 记录preIndex
     context.preIndex = startIndex;
@@ -278,7 +302,8 @@ var useTableVirtual = function useTableVirtual(props) {
       cb();
     }
   }, [scrollHeight]);
-  var renderData = props.disabled ? props.data : _toConsumableArray(props.data).slice(startIndex, startIndex + rowsInView);
+  var finalRowsInView = rowsInView + context.rowSpanRows + context.autoAddRows;
+  var renderData = props.disabled ? props.data : _toConsumableArray(props.data).slice(startIndex, startIndex + finalRowsInView);
   return {
     scrollHeight: scrollHeight,
     startIndex: startIndex,

package/esm/utils/position.d.ts

@@ -1,2 +1,2 @@
-export declare const getPosition: (target: HTMLElement | null, priorityDirection: "vertical" | "horizontal" | "auto" | undefined, mode: 'popover' | 'menu' | 'list') => "bottom" | "left" | "right" | "top" | "top-left" | "top-right" | "bottom-left" | "bottom-right" | "left-top" | "left-bottom" | "right-top" | "right-bottom";
+export declare const getPosition: (target: HTMLElement | null, priorityDirection: "vertical" | "horizontal" | "auto" | undefined, mode: 'popover' | 'menu' | 'list', popup?: HTMLElement) => "bottom" | "left" | "right" | "top" | "top-left" | "top-right" | "bottom-left" | "bottom-right" | "left-top" | "left-bottom" | "right-top" | "right-bottom";
 //# sourceMappingURL=position.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"position.d.ts","sourceRoot":"","sources":["position.ts"],"names":[],"mappings":"AAgFA,eAAO,MAAM,WAAW,WACd,WAAW,GAAG,IAAI,2EAEpB,SAAS,GAAG,MAAM,GAAG,MAAM,gKAKlC,CAAC"}
+{"version":3,"file":"position.d.ts","sourceRoot":"","sources":["position.ts"],"names":[],"mappings":"AAiGA,eAAO,MAAM,WAAW,WACd,WAAW,GAAG,IAAI,2EAEpB,SAAS,GAAG,MAAM,GAAG,MAAM,UACzB,WAAW,gKAKpB,CAAC"}

package/esm/utils/position.js

@@ -35,6 +35,7 @@ var getMenuPosition = function getMenuPosition(target) {
 };
 var getPopoverPosition = function getPopoverPosition(target) {
   var priorityDirection = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'vertical';
+  var popup = arguments.length > 2 ? arguments[2] : undefined;
   var position = 'bottom-left';
   if (!target) return position;
   var rect = target.getBoundingClientRect();
@@ -56,11 +57,24 @@ var getPopoverPosition = function getPopoverPosition(target) {
       position += '-top';
     }
   } else {
+    var popupRect = popup === null || popup === void 0 ? void 0 : popup.getBoundingClientRect();
     if (verticalPoint > windowHeight / 2) position = 'top';else position = 'bottom';
-    if (horizontalPoint > windowWidth * 0.6) {
-      position += '-right';
-    } else if (horizontalPoint < windowWidth * 0.4) {
-      position += '-left';
+
+    // 如果渲染了弹出内容，则根据弹出内容宽度计算是否自动调整位置
+    if (popupRect) {
+      if ((popupRect === null || popupRect === void 0 ? void 0 : popupRect.width) / 2 > rect.left) {
+        position += '-left';
+      }
+      if ((popupRect === null || popupRect === void 0 ? void 0 : popupRect.width) / 2 > windowWidth - rect.right) {
+        position += '-right';
+      }
+    } else {
+      // 兜底计算
+      if (horizontalPoint > windowWidth * 0.6) {
+        position += '-right';
+      } else if (horizontalPoint < windowWidth * 0.4) {
+        position += '-left';
+      }
     }
   }
   return position;
@@ -68,7 +82,8 @@ var getPopoverPosition = function getPopoverPosition(target) {
 export var getPosition = function getPosition(target) {
   var priorityDirection = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'vertical';
   var mode = arguments.length > 2 ? arguments[2] : undefined;
-  if (mode === 'popover') return getPopoverPosition(target, priorityDirection);
+  var popup = arguments.length > 3 ? arguments[3] : undefined;
+  if (mode === 'popover') return getPopoverPosition(target, priorityDirection, popup);
   if (mode === 'menu') return getMenuPosition(target, priorityDirection);
   return 'bottom-left';
 };

package/package.json

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