shineout 3.9.15-beta.3 → 3.9.15-beta.5

package/cjs/index.js

@@ -522,5 +522,5 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 // 此文件由脚本自动生成，请勿直接修改。
 // This file was generated automatically by a script. Please do not modify it directly.
 var _default = exports.default = {
-  version: '3.9.15-beta.3'
+  version: '3.9.15-beta.5'
 };

package/dist/shineout.js

@@ -12326,7 +12326,7 @@ var handleStyle = function handleStyle(style) {
 };
 /* harmony default export */ var jss_style_handleStyle = (handleStyle);
 ;// CONCATENATED MODULE: ../shineout-style/src/version.ts
-/* harmony default export */ var version = ('3.9.15-beta.3');
+/* harmony default export */ var version = ('3.9.15-beta.5');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -66310,6 +66310,8 @@ var useTableVirtualExternal = function useTableVirtualExternal(props) {
     setHeaderOffset = _useState2[1];
   var externalStickyRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(null);
   var tableOffsetRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(0);
+  var stickyCompensationTimer = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(null);
+  var heightSyncTimer = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(null);
   var handleExternalScroll = usePersistFn(function () {
     var _props$tableRef, _externalStickyRef$cu;
     if (props.disabled) return;
@@ -66335,23 +66337,63 @@ var useTableVirtualExternal = function useTableVirtualExternal(props) {
     if (rawScrollTop < 0) rawScrollTop = 0;
     var sumHeight = props.getContentHeight(props.dataLength - 1);
     var viewportHeight = ((_externalStickyRef$cu = externalStickyRef.current) === null || _externalStickyRef$cu === void 0 ? void 0 : _externalStickyRef$cu.clientHeight) || container.clientHeight;
+
+    // 物理可滚动范围：基于当前外层 div 高度（滚动中不变）
+    var physicalMax = props.scrollHeight - viewportHeight;
+
+    // 滚动停止后才同步外层 div 高度，防止滚动中 div 变高导致滑块倒退
+    if (sumHeight !== props.scrollHeight) {
+      if (heightSyncTimer.current) clearTimeout(heightSyncTimer.current);
+      heightSyncTimer.current = setTimeout(function () {
+        props.setScrollHeight(sumHeight);
+      }, 200);
+    }
     var scrollTop;
     var max;
     if (props.externalStickyHeader) {
       max = sumHeight - props.tfootHeight - viewportHeight;
-      scrollTop = rawScrollTop;
+      if (physicalMax > 0 && max > 0) {
+        var rate = Math.min(rawScrollTop / physicalMax, 1);
+        scrollTop = rate * max;
+      } else {
+        scrollTop = rawScrollTop;
+      }
     } else {
       var newHeaderOffset = Math.min(rawScrollTop, props.theadHeight);
       if (newHeaderOffset !== headerOffset) {
         setHeaderOffset(newHeaderOffset);
       }
       max = sumHeight - props.theadHeight - props.tfootHeight - viewportHeight;
-      scrollTop = rawScrollTop - props.theadHeight;
-      if (scrollTop < 0) scrollTop = 0;
+      var adjustedRaw = rawScrollTop - props.theadHeight;
+      var physicalMaxBody = physicalMax - props.theadHeight;
+      if (physicalMaxBody > 0 && max > 0) {
+        var _rate = Math.min(Math.max(adjustedRaw, 0) / physicalMaxBody, 1);
+        scrollTop = _rate * max;
+      } else {
+        scrollTop = adjustedRaw;
+        if (scrollTop < 0) scrollTop = 0;
+      }
     }
     if (max > 0 && scrollTop > max) {
       scrollTop = max;
     }
+
+    // 补偿 sticky 失效：滚动停止后设置补偿值，避免滚动中抖动
+    if (externalStickyRef.current && props.externalStickyHeader) {
+      var stickyDivFullHeight = externalStickyRef.current.offsetHeight;
+      var stickyBreakPoint = sumHeight - stickyDivFullHeight;
+      if (stickyCompensationTimer.current) {
+        clearTimeout(stickyCompensationTimer.current);
+      }
+      externalStickyRef.current.style.setProperty('--sticky-compensation', '0px');
+      if (rawScrollTop > stickyBreakPoint && stickyBreakPoint > 0) {
+        var el = externalStickyRef.current;
+        stickyCompensationTimer.current = setTimeout(function () {
+          var compensation = rawScrollTop - stickyBreakPoint;
+          el.style.setProperty('--sticky-compensation', "".concat(compensation, "px"));
+        }, 150);
+      }
+    }
     props.updateIndexAndTopFromTop(scrollTop);
   });
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
@@ -66365,8 +66407,37 @@ var useTableVirtualExternal = function useTableVirtualExternal(props) {
     handleExternalScroll();
     return function () {
       scrollTarget.removeEventListener('scroll', handleExternalScroll);
+      if (heightSyncTimer.current) clearTimeout(heightSyncTimer.current);
     };
   }, [props.disabled, props.dataLength]);
+
+  // 动态控制 overflowX：当 table 仅因亚像素舍入比容器宽 1px 时隐藏滚动条，
+  // 容器真正变小（如 resize）需要横滚时恢复 auto
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
+    var stickyEl = externalStickyRef.current;
+    if (!stickyEl) return;
+    var checkOverflowX = function checkOverflowX() {
+      var overflow = stickyEl.scrollWidth - stickyEl.clientWidth;
+      var next = overflow <= 1 ? 'hidden' : 'auto';
+      if (stickyEl.style.overflowX !== next) {
+        stickyEl.style.overflowX = next;
+      }
+    };
+    checkOverflowX();
+    var ro = new ResizeObserver(checkOverflowX);
+    ro.observe(stickyEl);
+    var mo = new MutationObserver(checkOverflowX);
+    mo.observe(stickyEl, {
+      childList: true,
+      subtree: true,
+      attributes: true,
+      attributeFilter: ['style']
+    });
+    return function () {
+      ro.disconnect();
+      mo.disconnect();
+    };
+  }, [props.disabled]);
   return {
     externalStickyRef: externalStickyRef,
     headerOffset: headerOffset,
@@ -66516,7 +66587,9 @@ var useTableVirtual = function useTableVirtual(props) {
     var beforeHeight = context.cachedHeight[index];
     if (beforeHeight && beforeHeight === height) return;
     context.cachedHeight[index] = height;
-    if (context.shouldUpdateHeight) {
+
+    // 外部滚动模式下不由 setRowHeight 更新高度，由 handleExternalScroll debounce 同步
+    if (context.shouldUpdateHeight && !props.virtualScrollContainer) {
       setHeight(getContentHeight(props.data.length - 1));
     }
     var preIndex = context.preIndex;
@@ -66783,7 +66856,9 @@ var useTableVirtual = function useTableVirtual(props) {
     },
     tableRef: props.tableRef,
     getContentHeight: getContentHeight,
-    updateIndexAndTopFromTop: updateIndexAndTopFromTop
+    updateIndexAndTopFromTop: updateIndexAndTopFromTop,
+    scrollHeight: scrollHeight,
+    setScrollHeight: setHeight
   });
   return {
     scrollHeight: scrollHeight,
@@ -69167,13 +69242,13 @@ function Table(props) {
               style: {
                 position: 'relative',
                 zIndex: 1,
-                marginTop: props.sticky ? 0 : -virtualInfo.headerOffset
+                marginTop: props.sticky ? 0 : -virtualInfo.headerOffset,
+                transform: 'translateY(var(--sticky-compensation, 0px))'
               },
               children: $headTable
             }), !!((_props$data3 = props.data) !== null && _props$data3 !== void 0 && _props$data3.length) && /*#__PURE__*/(0,jsx_runtime.jsxs)("table", {
               style: objectSpread2_default()(objectSpread2_default()({}, tableStyle), {}, {
-                transform: virtualInfo.translateStyle,
-                willChange: 'transform'
+                transform: virtualInfo.translateStyle
               }),
               ref: tbodyRef,
               children: [Group, /*#__PURE__*/(0,jsx_runtime.jsx)(tbody, objectSpread2_default()(objectSpread2_default()({}, bodyCommonProps), {}, {
@@ -75920,7 +75995,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.9.15-beta.3'
+  version: '3.9.15-beta.5'
 });
 }();
 /******/ 	return __webpack_exports__;