shineout 3.7.0-beta.2 → 3.7.0-beta.3

package/cjs/index.js

@@ -514,5 +514,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.7.0-beta.2'
+  version: '3.7.0-beta.3'
 };

package/cjs/tests/utils.d.ts

@@ -2,12 +2,12 @@ import React from 'react';
 export declare function classTest(element: Element, className: string, bool?: boolean): void;
 export declare function snapshotTest(component: JSX.Element, testName?: string): void;
 export declare function snapshotTestByClick(component: JSX.Element, testName: string | undefined, wrapper: string): void;
-export declare function attributesTest(element: Element, attr: string, content: string): void;
+export declare function attributesTest(element: Element, attr: string, content: string | null): void;
 export declare function hasAttributesTest(element: Element, attr: string, bool?: boolean): void;
 export declare function componentsClassTest(components: NodeListOf<Element>, bool: boolean, componentClassName: string, excludes?: string[]): void;
 export declare function textContentTest(element: Element, text: string | null | undefined): void;
 export declare function classContentTest(element: Element, name: string, bool?: boolean): void;
-export declare function styleTest(element: Element, style: string): void;
+export declare function styleTest(element: Element, style: string | null): void;
 export declare function styleContainTest(element: Element, styleObject: object): void;
 export declare function styleContentTest(element: Element, name: string, bool?: boolean): void;
 export interface StyleProps {

package/dist/shineout.js

@@ -12142,7 +12142,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.7.0-beta.2');
+/* harmony default export */ var version = ('3.7.0-beta.3');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -25578,6 +25578,7 @@ var tableStyle = objectSpread2_default()(objectSpread2_default()({
         borderBottom: "1px solid ".concat(src.tableCellBorderColor),
         boxSizing: 'border-box',
         lineHeight: src.lineHeightDynamic,
+        zIndex: fixedIndex - 1,
         '&$cellFixedLeft, &$cellFixedRight': {
           zIndex: fixedIndex
         },
@@ -25704,7 +25705,7 @@ var tableStyle = objectSpread2_default()(objectSpread2_default()({
   },
   headWrapper: {
     flex: '0 0 auto',
-    overflow: 'hidden',
+    // overflow: 'hidden',
     boxSizing: 'border-box',
     background: src.tableTheadBackgroundColor,
     '$sticky > &': {
@@ -25737,7 +25738,7 @@ var tableStyle = objectSpread2_default()(objectSpread2_default()({
   },
   footWrapper: {
     flex: '0 0 auto',
-    overflow: 'hidden',
+    // overflow: 'hidden',
     boxSizing: 'border-box',
     background: src.tableTfootBackgroundColor
   },
@@ -38724,7 +38725,6 @@ var useResize = function useResize(props) {
 
 
 
-
 var Scroll = function Scroll(props) {
   var containerRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(null);
   var scrollRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(null);
@@ -38756,13 +38756,13 @@ var Scroll = function Scroll(props) {
     width: '100%',
     overflow: 'auto'
   };
-  var containerStyle = defineProperty_default()(defineProperty_default()({
+  var containerStyle = {
     height: '100%',
     width: '100%',
     display: 'inline-flex',
-    overflow: 'hidden',
-    position: 'sticky'
-  }, isRtl ? 'right' : 'left', 0), "top", 0);
+    position: 'sticky',
+    top: 0
+  };
 
   // 当滚动容器的高度为 0 时，paddingTop 为 0，避免滚动条抖动现象
   var paddingTop = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
@@ -60602,7 +60602,7 @@ var useTableLayout = function useTableLayout(props) {
     width: tableWidth,
     shouldLastColAuto: props.columnResizable && !adjust,
     scrollWidth: scrollWidth,
-    maxScrollLeft: scrollWidth - context.clientWidth,
+    // maxScrollLeft: scrollWidth - context.clientWidth,
     resizeFlag: resizeFlag
   };
 };
@@ -60871,26 +60871,21 @@ function getMaxRowSpanLength(input) {
 var useTableVirtual = function useTableVirtual(props) {
   var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(0),
     _useState2 = slicedToArray_default()(_useState, 2),
-    innerLeft = _useState2[0],
-    setLeft = _useState2[1];
-  var _useState3 = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(0),
+    innerTop = _useState2[0],
+    setTop = _useState2[1];
+  var _useState3 = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(props.data.length * props.rowHeight),
     _useState4 = slicedToArray_default()(_useState3, 2),
-    innerTop = _useState4[0],
-    setTop = _useState4[1];
-  var _useState5 = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(props.data.length * props.rowHeight),
+    scrollHeight = _useState4[0],
+    setHeight = _useState4[1];
+  var _useState5 = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(0),
     _useState6 = slicedToArray_default()(_useState5, 2),
-    scrollHeight = _useState6[0],
-    setHeight = _useState6[1];
+    startIndex = _useState6[0],
+    setStartIndex = _useState6[1];
   var _useState7 = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(0),
     _useState8 = slicedToArray_default()(_useState7, 2),
-    startIndex = _useState8[0],
-    setStartIndex = _useState8[1];
-  var _useState9 = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(0),
-    _useState10 = slicedToArray_default()(_useState9, 2),
-    offsetY = _useState10[0],
-    setOffsetY = _useState10[1];
+    offsetY = _useState8[0],
+    setOffsetY = _useState8[1];
   var rowsInView = props.rowsInView === 0 ? props.data.length : props.rowsInView;
-  var sleft = props.scrollLeft !== undefined ? props.scrollLeft : innerLeft;
   var rowSpanInfo = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
     var rowSpanColumns = props.columns.filter(function (col) {
       return typeof col.rowSpan === 'function';
@@ -60963,18 +60958,11 @@ var useTableVirtual = function useTableVirtual(props) {
     }),
     context = _useRef.current;
   var getTranslate = usePersistFn(function (left, top) {
-    var l = left === undefined ? sleft : left;
     var t = top === undefined ? innerTop + offsetY : top;
     if (t < 0) {
       t = 0;
     }
-    if (!props.isRtl && l < 0) {
-      l = 0;
-    }
-    if (props.isRtl && l > 0) {
-      l = 0;
-    }
-    return "translate3d(".concat(0 - l, "px, ").concat(0 - t, "px, 0)");
+    return "translate3d(0, ".concat(0 - t, "px, 0)");
   });
   var getContentHeight = function getContentHeight(index) {
     if (props.disabled) return 0;
@@ -61076,12 +61064,10 @@ var useTableVirtual = function useTableVirtual(props) {
     setHeight(sumHeight);
   });
   var handleScroll = function handleScroll(info) {
-    var scrollLeft = info.scrollLeft,
-      height = info.height,
+    var height = info.height,
       y = info.y,
       fromDrag = info.fromDrag;
     var scrollTop = info.scrollTop;
-    setLeft(scrollLeft);
     if (props.disabled) {
       setTop(scrollTop);
       return;
@@ -61138,7 +61124,6 @@ var useTableVirtual = function useTableVirtual(props) {
     var max = scrollEl.scrollWidth - scrollEl.clientWidth;
     var left = Math.min(targetLeft, max);
     if (left === scrollEl.scrollLeft) return;
-    setLeft(left);
     scrollEl.scrollLeft = left;
   });
   var scrollColumnIntoView = usePersistFn(function (colKey) {
@@ -61157,6 +61142,11 @@ var useTableVirtual = function useTableVirtual(props) {
     }
     scrollColumnByLeft(left);
   });
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
+    if (props.scrollLeft) {
+      scrollColumnByLeft(props.scrollLeft);
+    }
+  }, [props.scrollLeft]);
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     var scrollRefHeight = props.scrollRef.current ? props.scrollRef.current.clientHeight : 0;
     var tableRefHeight = props.innerRef.current ? props.innerRef.current.clientHeight : 0;
@@ -61216,7 +61206,6 @@ var useTableVirtual = function useTableVirtual(props) {
   return {
     scrollHeight: scrollHeight,
     startIndex: startIndex,
-    innerLeft: sleft,
     innerTop: innerTop + offsetY,
     data: renderData,
     handleScroll: handleScroll,
@@ -61976,16 +61965,9 @@ var thead_toNum = toNum;
   };
   var getFixedStyle = function getFixedStyle(fixed, index, colSpan, level) {
     if (fixed === 'left') {
-      if (props.virtual) {
-        // 这是virtual table场景下的th样式
-        return {
-          transform: "translate3d(var(--virtual-fixed-left, 0), 0, 0)"
-        };
-      }
       var left = colgroup.slice(0, index).reduce(function (a, b) {
         return thead_toNum(a) + thead_toNum(b);
       }, 0);
-      // 这是base table场景下的th样式
       return {
         left: left,
         top: context.trHeights[level - 1] || 0,
@@ -61993,24 +61975,15 @@ var thead_toNum = toNum;
       };
     }
     if (fixed === 'right') {
-      if (props.virtual) {
-        // 这是virtual table场景下的th样式
-        return {
-          transform: "translate3d(var(--virtual-fixed-right, 0), 0, 0)"
-        };
-      }
       var right = colgroup.slice(index + colSpan).reduce(function (a, b) {
         return thead_toNum(a) + thead_toNum(b);
       }, 0);
-      // 这是base table场景下的th样式
       return {
         right: right,
         top: context.trHeights[level - 1] || 0,
         position: 'sticky'
       };
     }
-
-    // 这是base table场景下的非fixed th样式
     return {
       top: context.trHeights[level - 1] || 0,
       position: 'sticky'
@@ -62369,11 +62342,6 @@ var Tr = function Tr(props) {
   var getFixedStyle = function getFixedStyle(fixed, index, colSpan) {
     if (!props.isScrollX) return;
     if (fixed === 'left') {
-      if (props.virtual) {
-        return {
-          transform: "translate3d(var(--virtual-fixed-left, 0), 0, 0)"
-        };
-      }
       var left = props.colgroup.slice(0, index).reduce(function (a, b) {
         return tr_toNum(a) + tr_toNum(b);
       }, 0);
@@ -62383,11 +62351,6 @@ var Tr = function Tr(props) {
       };
     }
     if (fixed === 'right') {
-      if (props.virtual) {
-        return {
-          transform: "translate3d(var(--virtual-fixed-right, 0), 0, 0)"
-        };
-      }
       var right = props.colgroup.slice(index + colSpan).reduce(function (a, b) {
         return tr_toNum(a) + tr_toNum(b);
       }, 0);
@@ -62775,7 +62738,6 @@ var Tr = function Tr(props) {
       isEmptyTree: props.isEmptyTree,
       treeColumnsName: props.treeColumnsName,
       setRowHeight: props.setRowHeight,
-      virtual: props.virtual,
       striped: props.striped,
       radio: props.radio,
       isCellHover: isCellHover,
@@ -62816,11 +62778,6 @@ var tfoot_isArray = isArray,
   var getFixedStyle = function getFixedStyle(fixed, index, colSpan) {
     var colgroup = props.colgroup;
     if (fixed === 'left') {
-      if (props.virtual) {
-        return {
-          transform: "translate3d(var(--virtual-fixed-left, 0), 0, 0)"
-        };
-      }
       var left = colgroup.slice(0, index).reduce(function (a, b) {
         return tfoot_toNum(a) + tfoot_toNum(b);
       }, 0);
@@ -62830,11 +62787,6 @@ var tfoot_isArray = isArray,
       };
     }
     if (fixed === 'right') {
-      if (props.virtual) {
-        return {
-          transform: "translate3d(var(--virtual-fixed-right, 0), 0, 0)"
-        };
-      }
       var right = colgroup.slice(index + colSpan).reduce(function (a, b) {
         return tfoot_toNum(a) + tfoot_toNum(b);
       }, 0);
@@ -63057,7 +63009,6 @@ var emptyRef = {
     floatRight = _useTableLayout.floatRight,
     width = _useTableLayout.width,
     shouldLastColAuto = _useTableLayout.shouldLastColAuto,
-    maxScrollLeft = _useTableLayout.maxScrollLeft,
     scrollBarWidth = _useTableLayout.scrollBarWidth,
     scrollWidth = _useTableLayout.scrollWidth,
     resizeFlag = _useTableLayout.resizeFlag;
@@ -63153,19 +63104,6 @@ var emptyRef = {
     scrollLeft: props.scrollLeft,
     isRtl: isRtl
   });
-
-  // handle head and  foot scroll
-  var handleHeaderWheel = usePersistFn(function (e) {
-    var scrollEl = scrollRef.current;
-    if (!scrollEl) return;
-    var max = scrollEl.scrollWidth - scrollEl.clientWidth;
-    var scrollLeft = scrollEl.scrollLeft + e.deltaX;
-    if (scrollLeft === scrollEl.scrollLeft) {
-      return;
-    }
-    e.preventDefault();
-    scrollEl.scrollLeft = Math.min(Math.max(scrollLeft, 0), max);
-  });
   var handleBodyScroll = usePersistFn(function (e) {
     var target = e.currentTarget;
     if (!target) return;
@@ -63273,7 +63211,6 @@ var emptyRef = {
       jssStyle: props.jssStyle,
       colgroup: colgroup
     };
-    var fixRightNum = (isRtl ? -1 * maxScrollLeft : maxScrollLeft) - virtualInfo.innerLeft;
     var StickyWrapper = props.sticky ? src_sticky_sticky : (external_root_React_commonjs2_react_commonjs_react_amd_react_default()).Fragment;
     var sticky = typeof_default()(props.sticky) === 'object' ? props.sticky : {
       top: 0
@@ -63286,7 +63223,8 @@ var emptyRef = {
       parent: tableRef === null || tableRef === void 0 ? void 0 : tableRef.current
     };
     var isRenderVirtualTable = virtual || props.sticky || !((_props$data3 = props.data) !== null && _props$data3 !== void 0 && _props$data3.length);
-    var headWrapperClass = classnames_default()(tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.headWrapper, isScrollY && scrollBarWidth && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.scrollY));
+    var headWrapperClass = classnames_default()(tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.headWrapper // isScrollY && scrollBarWidth && tableClasses?.scrollY,
+    );
     var footWrapperClass = classnames_default()(tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.footWrapper, isScrollY && scrollBarWidth && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.scrollY));
     var renderHeadMirrorScroller = function renderHeadMirrorScroller() {
       var _scrollRef$current, _scrollRef$current2, _scrollRef$current3;
@@ -63326,26 +63264,8 @@ var emptyRef = {
     };
     if (isRenderVirtualTable) {
       var _props$data4;
-      var virtualCssVar = {
-        '--virtual-fixed-left': "".concat(virtualInfo.innerLeft, "px"),
-        '--virtual-fixed-right': fixRightNum > 0 ? "-".concat(fixRightNum, "px") : "".concat(fixRightNum, "px")
-      };
       return /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
-        children: [renderHeadMirrorScroller(), !props.hideHeader && /*#__PURE__*/(0,jsx_runtime.jsx)(StickyWrapper, objectSpread2_default()(objectSpread2_default()({}, props.sticky ? stickyProps : {}), {}, {
-          children: /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
-            className: headWrapperClass,
-            children: /*#__PURE__*/(0,jsx_runtime.jsxs)("table", {
-              style: objectSpread2_default()({
-                width: width,
-                transform: "translate3d(-".concat(virtualInfo.innerLeft, "px, 0, 0)")
-              }, virtualCssVar),
-              ref: theadRef,
-              children: [Group, /*#__PURE__*/(0,jsx_runtime.jsx)(thead, objectSpread2_default()(objectSpread2_default()({}, headCommonProps), {}, {
-                virtual: true
-              }))]
-            })
-          })
-        })), /*#__PURE__*/(0,jsx_runtime.jsx)(virtual_scroll_scroll, {
+        children: [renderHeadMirrorScroller(), /*#__PURE__*/(0,jsx_runtime.jsxs)(virtual_scroll_scroll, {
           style: scrollWrapperStyle,
           scrollerStyle: (_props$data4 = props.data) !== null && _props$data4 !== void 0 && _props$data4.length ? virtualScrollerStyle : emptyStyle,
           wrapperRef: scrollRef,
@@ -63354,32 +63274,39 @@ var emptyRef = {
           onScroll: handleVirtualScroll,
           defaultHeight: context.emptyHeight,
           isScrollY: isScrollY,
-          children: /*#__PURE__*/(0,jsx_runtime.jsxs)("table", {
-            style: objectSpread2_default()({
+          children: [!props.hideHeader && /*#__PURE__*/(0,jsx_runtime.jsx)(StickyWrapper, objectSpread2_default()(objectSpread2_default()({}, props.sticky ? stickyProps : {}), {}, {
+            children: /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+              className: headWrapperClass,
+              children: /*#__PURE__*/(0,jsx_runtime.jsxs)("table", {
+                style: {
+                  width: width
+                },
+                ref: theadRef,
+                children: [Group, /*#__PURE__*/(0,jsx_runtime.jsx)(thead, objectSpread2_default()({}, headCommonProps))]
+              })
+            })
+          })), /*#__PURE__*/(0,jsx_runtime.jsxs)("table", {
+            style: {
               width: width,
               transform: virtualInfo.getTranslate()
-            }, virtualCssVar),
+            },
             ref: tbodyRef,
             children: [Group, /*#__PURE__*/(0,jsx_runtime.jsx)(tbody, objectSpread2_default()(objectSpread2_default()({}, bodyCommonProps), {}, {
               currentIndex: virtualInfo.startIndex,
               data: virtualInfo.data,
-              setRowHeight: virtualInfo.setRowHeight,
-              virtual: true
+              setRowHeight: virtualInfo.setRowHeight
             }))]
-          })
-        }), renderEmpty(), showFoot ? /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
-          className: footWrapperClass,
-          children: /*#__PURE__*/(0,jsx_runtime.jsxs)("table", {
-            style: objectSpread2_default()({
-              width: width,
-              transform: "translate3d(-".concat(virtualInfo.innerLeft, "px, 0, 0)")
-            }, virtualCssVar),
-            ref: tfootRef,
-            children: [Group, /*#__PURE__*/(0,jsx_runtime.jsx)(tfoot, objectSpread2_default()(objectSpread2_default()({}, footCommonProps), {}, {
-              virtual: true
-            }))]
-          })
-        }) : null]
+          }), showFoot ? /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+            className: footWrapperClass,
+            children: /*#__PURE__*/(0,jsx_runtime.jsxs)("table", {
+              style: {
+                width: width
+              },
+              ref: tfootRef,
+              children: [Group, /*#__PURE__*/(0,jsx_runtime.jsx)(tfoot, objectSpread2_default()({}, footCommonProps))]
+            })
+          }) : null]
+        }), renderEmpty()]
       });
     }
     return /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
@@ -63416,27 +63343,6 @@ var emptyRef = {
       align: "right"
     }, pagination), paginationInfo));
   };
-  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
-    // 绑定 wheel 事件
-    if (theadRef.current && theadRef.current.parentElement) {
-      theadRef.current.parentElement.addEventListener('wheel', handleHeaderWheel, {
-        passive: false
-      });
-    }
-    if (tfootRef.current && tfootRef.current.parentElement) {
-      tfootRef.current.parentElement.addEventListener('wheel', handleHeaderWheel, {
-        passive: false
-      });
-    }
-    return function () {
-      if (theadRef.current && theadRef.current.parentElement) {
-        theadRef.current.parentElement.removeEventListener('wheel', handleHeaderWheel);
-      }
-      if (tfootRef.current && tfootRef.current.parentElement) {
-        tfootRef.current.parentElement.removeEventListener('wheel', handleHeaderWheel);
-      }
-    };
-  }, [theadRef.current, isScrollY]);
   var getRenderIndexByData = function getRenderIndexByData(data) {
     var originKey = typeof data === 'string' ? data : getKey(props.keygen, data);
     var index = treeData.findIndex(function (item) {
@@ -69812,7 +69718,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.7.0-beta.2'
+  version: '3.7.0-beta.3'
 });
 }();
 /******/ 	return __webpack_exports__;