shineout 3.8.2-beta.5 → 3.8.2-beta.7

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.8.2-beta.5'
+  version: '3.8.2-beta.7'
 };

package/dist/shineout.js

@@ -12386,7 +12386,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.8.2-beta.5');
+/* harmony default export */ var version = ('3.8.2-beta.7');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -62913,8 +62913,7 @@ var scroll_table_Scroll = function Scroll(props) {
   var wrapperRef = useForkRef(scrollRef, props.wrapperRef);
   var _useRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)({
       isMouseDown: false,
-      lastTableHeight: 0,
-      unmounted: false
+      lastTableHeight: 0
     }),
     context = _useRef.current;
   var _props$scrollHeight = props.scrollHeight,
@@ -63023,9 +63022,12 @@ var scroll_table_Scroll = function Scroll(props) {
 
   // 非定高的Table但依旧采用了virtual渲染方式，需要渲染出全部的data
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useLayoutEffect)(function () {
-    if (!props.tableRef.current || context.unmounted) return;
+    if (!props.tableRef.current) return;
     var rootTableHeight = props.tableRef.current.clientHeight;
     var container = containerRef.current;
+    var isContainerVisible = (container === null || container === void 0 ? void 0 : container.offsetParent) !== null;
+    if (!isContainerVisible) return;
+
     // 判断内容滚动高度是否真的超过了容器高度
     var isRealScroll = (container === null || container === void 0 ? void 0 : container.scrollHeight) !== undefined && container.scrollHeight > rootTableHeight;
     // 判断Table的根节点dom高度是否发生变化，如果变化了，则是因为不定高，被内部元素撑高了导致的
@@ -63035,9 +63037,6 @@ var scroll_table_Scroll = function Scroll(props) {
     } else {
       context.lastTableHeight = rootTableHeight;
     }
-    return function () {
-      context.unmounted = true;
-    };
   }, [paddingTop]);
   if (props.isEmpty) {
     return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", objectSpread2_default()(objectSpread2_default()({}, scrollRoleProps), {}, {
@@ -66359,11 +66358,12 @@ var emptyRef = {
       }));
     };
     var renderBottomMirrorScroller = function renderBottomMirrorScroller() {
-      var _scrollRef$current5, _scrollRef$current6, _scrollRef$current7;
+      var _scrollRef$current5, _scrollRef$current6, _scrollRef$current7, _scrollRef$current8, _scrollRef$current9;
       if (!props.showBottomScrollbar) return null;
       var scrollRefWidth = (scrollRef === null || scrollRef === void 0 || (_scrollRef$current5 = scrollRef.current) === null || _scrollRef$current5 === void 0 ? void 0 : _scrollRef$current5.clientWidth) || 0;
       var scrollRefScrollWidth = (scrollRef === null || scrollRef === void 0 || (_scrollRef$current6 = scrollRef.current) === null || _scrollRef$current6 === void 0 ? void 0 : _scrollRef$current6.scrollWidth) || 0;
-      var mirrorScrollRefWidth = scrollRefWidth + scrollBarWidth;
+      var hasVerticalScroll = ((scrollRef === null || scrollRef === void 0 || (_scrollRef$current7 = scrollRef.current) === null || _scrollRef$current7 === void 0 ? void 0 : _scrollRef$current7.scrollHeight) || 0) > ((scrollRef === null || scrollRef === void 0 || (_scrollRef$current8 = scrollRef.current) === null || _scrollRef$current8 === void 0 ? void 0 : _scrollRef$current8.clientHeight) || 0);
+      var mirrorScrollRefWidth = scrollRefWidth + (hasVerticalScroll ? 0 : scrollBarWidth);
       var showScroll = scrollRefScrollWidth > scrollRefWidth;
       // 开启了双滚，但是没有滚动条，不显示
       if (!scrollRefWidth || !mirrorScrollRefWidth || !showScroll) return null;
@@ -66371,7 +66371,8 @@ var emptyRef = {
       var scrollerStickyProps = {
         bottom: options.bottom || 0,
         zIndex: options.zIndex || defaultZIndex + 1,
-        parent: tableRef === null || tableRef === void 0 ? void 0 : tableRef.current
+        parent: tableRef === null || tableRef === void 0 ? void 0 : tableRef.current,
+        scrollContainer: options.scrollContainer
       };
       return /*#__PURE__*/(0,jsx_runtime.jsx)(src_sticky_sticky, objectSpread2_default()(objectSpread2_default()({}, scrollerStickyProps), {}, {
         children: /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
@@ -66390,7 +66391,7 @@ var emptyRef = {
           ref: bottomMirrorScrollRef,
           children: /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
             style: {
-              width: scrollRef === null || scrollRef === void 0 || (_scrollRef$current7 = scrollRef.current) === null || _scrollRef$current7 === void 0 ? void 0 : _scrollRef$current7.scrollWidth,
+              width: scrollRef === null || scrollRef === void 0 || (_scrollRef$current9 = scrollRef.current) === null || _scrollRef$current9 === void 0 ? void 0 : _scrollRef$current9.scrollWidth,
               height: 1
             }
           })
@@ -66505,10 +66506,10 @@ var emptyRef = {
     theadRef.current.parentElement.scrollLeft = left;
   });
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
-    var _scrollRef$current8;
+    var _scrollRef$current10;
     if (!props.sticky || !scrollRef.current || !isScrollX) return;
     // sticky场景下，从空数据到有数据切换时，同步一次滚动条的位置
-    syncHeaderScroll(((_scrollRef$current8 = scrollRef.current) === null || _scrollRef$current8 === void 0 ? void 0 : _scrollRef$current8.scrollLeft) || 0);
+    syncHeaderScroll(((_scrollRef$current10 = scrollRef.current) === null || _scrollRef$current10 === void 0 ? void 0 : _scrollRef$current10.scrollLeft) || 0);
   }, [isScrollX, props.sticky, $empty]);
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     // 绑定 wheel 事件
@@ -73086,7 +73087,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.8.2-beta.5'
+  version: '3.8.2-beta.7'
 });
 }();
 /******/ 	return __webpack_exports__;