@sheinx/base 3.7.0-beta.4 → 3.7.0-beta.41

package/esm/virtual-scroll/scroll-table.js

@@ -4,7 +4,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import React, { useMemo, useRef } from 'react';
+import React, { useLayoutEffect, useRef } from 'react';
 import { useForkRef, usePersistFn, useResize, util } from '@sheinx/hooks';
 import { useConfig } from "../config";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -22,19 +22,16 @@ var Scroll = function Scroll(props) {
   var scrollRef = useRef(null);
   var wrapperRef = useForkRef(scrollRef, props.wrapperRef);
   var _useRef = useRef({
-      timer: null,
-      isMouseDown: false
+      isMouseDown: false,
+      lastTableHeight: 0
     }),
     context = _useRef.current;
-  // TODO: keepScrollTop考虑做成Table的新feat?
   var _props$scrollHeight = props.scrollHeight,
     scrollHeight = _props$scrollHeight === void 0 ? 0 : _props$scrollHeight,
     _props$scrollWidth = props.scrollWidth,
     scrollWidth = _props$scrollWidth === void 0 ? 0 : _props$scrollWidth,
     _props$defaultHeight = props.defaultHeight,
-    defaultHeight = _props$defaultHeight === void 0 ? 0 : _props$defaultHeight,
-    _props$keepScrollTop = props.keepScrollTop,
-    keepScrollTop = _props$keepScrollTop === void 0 ? false : _props$keepScrollTop;
+    defaultHeight = _props$defaultHeight === void 0 ? 0 : _props$defaultHeight;
   var _useResize = useResize({
       targetRef: containerRef,
       timer: 100
@@ -48,7 +45,7 @@ var Scroll = function Scroll(props) {
     flex: 1,
     minWidth: 0,
     minHeight: 0,
-    overflow: props.isEmptyContent ? 'hidden' : 'auto',
+    overflow: 'auto',
     width: '100%'
   };
   var containerStyle = {
@@ -57,15 +54,17 @@ var Scroll = function Scroll(props) {
     display: 'flex',
     position: 'sticky',
     flexDirection: 'column',
-    top: 0,
-    overflow: props.isEmptyContent ? 'auto' : undefined
+    overflow: props.isScrollX ? 'initial' : 'hidden',
+    top: 0
   };
-
-  // 当滚动容器的高度为 0 时，paddingTop 为 0，避免滚动条抖动现象
-  var paddingTop = useMemo(function () {
-    if (keepScrollTop) return Math.max(0, Math.floor(scrollHeight - height));
-    return height === 0 ? 0 : Math.max(0, Math.floor(scrollHeight - height));
-  }, [scrollHeight, height]);
+  var paddingTop = Math.max(0, Math.floor(scrollHeight - height));
+  if (props.isEmpty) {
+    paddingTop = 0;
+    Object.assign(scrollerStyle, {
+      display: 'flex',
+      flexDirection: 'column'
+    });
+  }
   var placeStyle = {
     paddingTop: paddingTop,
     width: scrollWidth,
@@ -117,7 +116,7 @@ var Scroll = function Scroll(props) {
       scrollRef.current.scrollTop += scrollTop;
     }
   });
-  return /*#__PURE__*/_jsxs("div", _objectSpread(_objectSpread({}, util.getDataAttribute({
+  var scrollRoleProps = _objectSpread(_objectSpread({}, util.getDataAttribute({
     role: 'scroll'
   })), {}, {
     style: scrollerStyle,
@@ -128,18 +127,49 @@ var Scroll = function Scroll(props) {
     },
     onMouseUp: function onMouseUp() {
       context.isMouseDown = false;
-    },
-    children: [/*#__PURE__*/_jsx("div", _objectSpread(_objectSpread({}, util.getDataAttribute({
-      role: 'scroll-container'
-    })), {}, {
-      style: containerStyle,
-      ref: containerRef,
-      onScroll: handleInnerScroll,
-      children: props.children
-    })), /*#__PURE__*/_jsx("div", {
-      style: placeStyle,
-      children: "\xA0"
-    })]
-  }));
+    }
+  });
+
+  // 非定高的Table但依旧采用了virtual渲染方式，需要渲染出全部的data
+  useLayoutEffect(function () {
+    if (!props.tableRef.current) return;
+    var rootTableHeight = props.tableRef.current.clientHeight;
+    var container = containerRef.current;
+    // 判断内容滚动高度是否真的超过了容器高度
+    var isRealScroll = (container === null || container === void 0 ? void 0 : container.scrollHeight) !== undefined && container.scrollHeight > rootTableHeight;
+    // 判断Table的根节点dom高度是否发生变化，如果变化了，则是因为不定高，被内部元素撑高了导致的
+    if (paddingTop > 0 && context.lastTableHeight > 0 && context.lastTableHeight !== rootTableHeight && !isRealScroll) {
+      props.setFakeVirtual(true);
+      context.lastTableHeight = 0;
+    } else {
+      context.lastTableHeight = rootTableHeight;
+    }
+  }, [paddingTop]);
+  if (props.isEmpty) {
+    return /*#__PURE__*/_jsxs("div", _objectSpread(_objectSpread({}, scrollRoleProps), {}, {
+      children: [/*#__PURE__*/_jsx("div", {
+        style: {
+          width: scrollWidth
+        }
+      }), props.children]
+    }));
+  }
+  return /*#__PURE__*/_jsx("div", {
+    className: props.className,
+    style: props.style,
+    children: /*#__PURE__*/_jsxs("div", _objectSpread(_objectSpread({}, scrollRoleProps), {}, {
+      children: [/*#__PURE__*/_jsx("div", _objectSpread(_objectSpread({}, util.getDataAttribute({
+        role: 'scroll-container'
+      })), {}, {
+        style: containerStyle,
+        ref: containerRef,
+        onScroll: handleInnerScroll,
+        children: props.children
+      })), /*#__PURE__*/_jsx("div", {
+        style: placeStyle,
+        children: "\xA0"
+      })]
+    }))
+  });
 };
 export default Scroll;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sheinx/base",
-  "version": "3.7.0-beta.4",
+  "version": "3.7.0-beta.41",
   "description": "",
   "keywords": [],
   "license": "MIT",
@@ -10,7 +10,7 @@
   "module": "./esm/index.js",
   "typings": "./cjs/index.d.ts",
   "dependencies": {
-    "@sheinx/hooks": "3.7.0-beta.4",
+    "@sheinx/hooks": "3.7.0-beta.41",
     "immer": "^10.0.0",
     "classnames": "^2.0.0",
     "@shined/reactive": "^0.1.3-alpha.0"