shineout 3.10.0-beta.10 → 3.10.0-beta.12

package/cjs/index.js

@@ -545,5 +545,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.10.0-beta.10'
+  version: '3.10.0-beta.12'
 };

package/dist/shineout.js

@@ -12345,7 +12345,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.10.0-beta.10');
+/* harmony default export */ var version = ('3.10.0-beta.12');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -16103,7 +16103,7 @@ var useBadgeStyle = styled(badge_badge, 'badge');
 ;// CONCATENATED MODULE: ../shineout-style/src/border-beam/border-beam.ts
 
 
-var MASK_SUPPORT = '@supports ((mask-composite: exclude) or (-webkit-mask-composite: xor))';
+var MASK_SUPPORT = '@supports (mask-composite: exclude)';
 var PATH_SUPPORT = '@supports (offset-path: rect(0 auto auto 0 round 1px))';
 var gradient = 'linear-gradient(to left, ' + CommonToken['Brand-6'] + ' 0%, ' + CommonToken['Brand-5'] + ' 70%, transparent)';
 var borderBeamStyle = {
@@ -16119,10 +16119,8 @@ var borderBeamStyle = {
     pointerEvents: 'none',
     padding: 'var(--soui-border-beam-line-width, 1px)'
   }, MASK_SUPPORT, defineProperty_default()({
-    '--soui-border-beam-mask': 'linear-gradient(#fff 0 0) content-box, linear-gradient(#fff 0 0)',
-    WebkitMask: 'var(--soui-border-beam-mask)',
-    mask: 'var(--soui-border-beam-mask)',
-    WebkitMaskComposite: 'xor',
+    maskImage: 'linear-gradient(#fff 0 0), linear-gradient(#fff 0 0)',
+    maskClip: 'content-box, border-box',
     maskComposite: 'exclude'
   }, PATH_SUPPORT, {
     display: 'block',
@@ -65492,6 +65490,8 @@ var scroll_table_Scroll = function Scroll(props) {
     width = _useResize.width,
     h = _useResize.height;
   var height = h || defaultHeight;
+  // 高度尚未测量时不设置 paddingTop，避免首帧出现巨大占位导致布局抖动
+  var heightReady = h > 0;
   var config = useConfig();
   var isRtl = config.direction === 'rtl';
   var scrollerStyle = {
@@ -65509,7 +65509,7 @@ var scroll_table_Scroll = function Scroll(props) {
     flexDirection: 'column',
     top: 0
   };
-  var paddingTop = Math.max(0, Math.floor(scrollHeight - height));
+  var paddingTop = heightReady ? Math.max(0, Math.floor(scrollHeight - height)) : 0;
   if (props.isEmpty) {
     paddingTop = 0;
     Object.assign(scrollerStyle, {
@@ -65604,14 +65604,31 @@ 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 || !props.setFakeVirtual) return;
-    if (props.tableRef.current.style.height || props.tableRef.current.style.flex) return;
+
+    // 明确的像素高度或 flex 约束时，Table 有确定的高度，可以正常虚拟滚动
+    if (props.tableRef.current.style.flex) return;
+    var inlineHeight = props.tableRef.current.style.height;
+    if (inlineHeight && !inlineHeight.endsWith('%')) 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;
+
+    // 核心检测：如果 scrollRef 的 scrollHeight 等于 scrollRef 的 clientHeight，
+    // 说明 scrollRef 没有被约束——它被内容撑开了（高度 = 内容高度），没有产生滚动。
+    // 在这种情况下虚拟滚动无意义，退回全量渲染。
+    var scrollEl = scrollRef.current;
+    if (scrollEl && paddingTop > 0) {
+      var noScrollConstraint = scrollEl.scrollHeight <= scrollEl.clientHeight + 1;
+      if (noScrollConstraint) {
+        props.setFakeVirtual(true);
+        context.lastTableHeight = 0;
+        return;
+      }
+    }
+
     // 判断Table的根节点dom高度是否发生变化，如果变化了，则是因为不定高，被内部元素撑高了导致的
+    var isRealScroll = (container === null || container === void 0 ? void 0 : container.scrollHeight) !== undefined && container.scrollHeight > rootTableHeight;
     if (paddingTop > 0 && context.lastTableHeight > 0 && context.lastTableHeight !== rootTableHeight && !isRealScroll) {
       props.setFakeVirtual(true);
       context.lastTableHeight = 0;
@@ -78208,7 +78225,7 @@ var watermark_interface = __webpack_require__(6640);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.10.0-beta.10'
+  version: '3.10.0-beta.12'
 });
 }();
 /******/ 	return __webpack_exports__;