shineout 3.8.4-beta.1 → 3.8.4-beta.3

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.4-beta.1'
+  version: '3.8.4-beta.3'
 };

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.4-beta.1');
+/* harmony default export */ var version = ('3.8.4-beta.3');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -26736,8 +26736,12 @@ var tableStyle = objectSpread2_default()(objectSpread2_default()({
       overflow: 'hidden scroll'
     }, customScrollBar({
       background: 'transparent'
-    }))
+    })),
+    '&$overlayScrollbar$headWrapper, &$overlayScrollbar$footWrapper': {
+      overflow: 'hidden'
+    }
   },
+  overlayScrollbar: {},
   scrollX: {
     '&$headWrapper, &$footWrapper': {
       overflowX: 'hidden'
@@ -30523,6 +30527,32 @@ function isInDocument(element) {
   }
   return is_isBrowser() && document.documentElement.contains(element);
 }
+function document_isScrollAble(container) {
+  if (!container || !is_isBrowser()) return false;
+  if (container.scrollHeight > container.clientHeight) {
+    return true;
+  }
+  var placeholderEl = document.createElement('div');
+  placeholderEl.style.height = '9999px';
+  placeholderEl.style.top = '0';
+  placeholderEl.style.flexShrink = '0';
+  placeholderEl.style.left = '0';
+  placeholderEl.style.width = '1px';
+  placeholderEl.style.pointerEvents = 'none';
+  container.appendChild(placeholderEl);
+  var absoluteEl = document.createElement('div');
+  absoluteEl.style.position = 'absolute';
+  absoluteEl.style.top = '0';
+  absoluteEl.style.bottom = '0';
+  absoluteEl.style.left = '0';
+  absoluteEl.style.width = '1px';
+  absoluteEl.style.pointerEvents = 'none';
+  container.appendChild(absoluteEl);
+  var hasScroll = absoluteEl.clientHeight < placeholderEl.clientHeight;
+  placeholderEl.remove();
+  absoluteEl.remove();
+  return hasScroll;
+}
 ;// CONCATENATED MODULE: ../hooks/src/utils/position.ts
 
 // 根据位置计算合适的 position
@@ -63117,12 +63147,11 @@ 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) return;
-    var rootTableHeight = props.tableRef.current.clientHeight;
+    if (!props.tableRef.current || !props.setFakeVirtual) return;
     var container = containerRef.current;
     var isContainerVisible = (container === null || container === void 0 ? void 0 : container.offsetParent) !== null;
     if (!isContainerVisible) return;
-
+    var rootTableHeight = props.tableRef.current.clientHeight;
     // 判断内容滚动高度是否真的超过了容器高度
     var isRealScroll = (container === null || container === void 0 ? void 0 : container.scrollHeight) !== undefined && container.scrollHeight > rootTableHeight;
     // 判断Table的根节点dom高度是否发生变化，如果变化了，则是因为不定高，被内部元素撑高了导致的
@@ -63132,7 +63161,7 @@ var scroll_table_Scroll = function Scroll(props) {
     } else {
       context.lastTableHeight = rootTableHeight;
     }
-  }, [paddingTop]);
+  }, [paddingTop, props.setFakeVirtual]);
   if (props.isEmpty) {
     return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", objectSpread2_default()(objectSpread2_default()({}, scrollRoleProps), {}, {
       children: [/*#__PURE__*/(0,jsx_runtime.jsx)("div", {
@@ -66040,12 +66069,16 @@ var emptyRef = {
   var tableRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(null);
   var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(false),
     _useState2 = slicedToArray_default()(_useState, 2),
-    scrolling = _useState2[0],
-    setScrolling = _useState2[1];
+    scrollAble = _useState2[0],
+    setScrollAble = _useState2[1];
   var _useState3 = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(false),
     _useState4 = slicedToArray_default()(_useState3, 2),
-    fakeVirtual = _useState4[0],
-    setFakeVirtual = _useState4[1];
+    scrolling = _useState4[0],
+    setScrolling = _useState4[1];
+  var _useState5 = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(false),
+    _useState6 = slicedToArray_default()(_useState5, 2),
+    fakeVirtual = _useState6[0],
+    setFakeVirtual = _useState6[1];
   var browserScrollbarWidth = useScrollbarWidth();
   if (props.fixed) {
     table_devUseWarning.deprecated('fixed', 'virtual', 'Table');
@@ -66074,6 +66107,14 @@ var emptyRef = {
     }),
     context = _useRef.current;
   var virtual = !fakeVirtual && props.rowsInView !== 0 && (!!props.virtual || props.fixed === 'both' || props.fixed === 'y' || props.fixed === 'auto');
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useLayoutEffect)(function () {
+    if (!virtual) return;
+    if (!tableRef.current) return;
+    var maxHeight = tableRef.current.style.maxHeight;
+    if (!maxHeight) return;
+    var isScrollAble = document_isScrollAble(tableRef.current);
+    setScrollAble(isScrollAble);
+  }, [virtual]);
 
   // 虚拟列表高度另外计算
   var _useResize = useResize({
@@ -66415,7 +66456,7 @@ var emptyRef = {
       }
     };
     var isRenderVirtualTable = virtual || props.sticky || !((_props$data2 = props.data) !== null && _props$data2 !== void 0 && _props$data2.length);
-    var headWrapperClass = classnames_default()(tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.headWrapper, !!$empty && tableClasses.emptyHeader, props.sticky && isScrollY && tableClasses.scrollY, props.sticky && !isScrollY && tableClasses.scrollX);
+    var headWrapperClass = classnames_default()(tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.headWrapper, !!$empty && tableClasses.emptyHeader, props.sticky && isScrollY && tableClasses.scrollY, props.sticky && isScrollY && browserScrollbarWidth === 0 && tableClasses.overlayScrollbar, props.sticky && !isScrollY && tableClasses.scrollX);
     var footWrapperClass = classnames_default()(tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.footWrapper);
     var renderHeadMirrorScroller = function renderHeadMirrorScroller() {
       var _scrollRef$current2, _scrollRef$current3, _scrollRef$current4;
@@ -66527,7 +66568,7 @@ var emptyRef = {
           isScrollX: isScrollX,
           isEmpty: !!$empty,
           tableRef: tableRef,
-          setFakeVirtual: setFakeVirtual,
+          setFakeVirtual: scrollAble ? undefined : setFakeVirtual,
           children: [!props.hideHeader && !props.sticky && $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
@@ -73183,7 +73224,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.8.4-beta.1'
+  version: '3.8.4-beta.3'
 });
 }();
 /******/ 	return __webpack_exports__;