shineout 3.9.2-beta.6 → 3.9.2-beta.8

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.9.2-beta.6'
+  version: '3.9.2-beta.8'
 };

package/dist/shineout.js

@@ -12400,7 +12400,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.9.2-beta.6');
+/* harmony default export */ var version = ('3.9.2-beta.8');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -55111,7 +55111,7 @@ var ImageGroup = function ImageGroup(props) {
 
 
 
-var image_excluded = ["fit", "alt", "src", "href", "lazy", "title", "style", "error", "target", "jssStyle", "className", "placeholder", "width", "height", "shape", "autoSSL", "noImgDrag", "onClick", "componentRef", "renderHoverMask"];
+var image_excluded = ["fit", "alt", "src", "href", "lazy", "title", "style", "error", "target", "jssStyle", "className", "placeholder", "width", "height", "shape", "autoSSL", "noImgDrag", "onClick", "componentRef", "renderHoverMask", "inViewOnly"];
 
 
 
@@ -55152,6 +55152,7 @@ var Image = function Image(props) {
     onClick = props.onClick,
     componentRef = props.componentRef,
     renderHoverMask = props.renderHoverMask,
+    inViewOnly = props.inViewOnly,
     rest = objectWithoutProperties_default()(props, image_excluded);
   var _useImage = use_image(objectSpread2_default()({
       container: getDefaultContainer(),
@@ -55161,7 +55162,8 @@ var Image = function Image(props) {
       lazy: lazy,
       autoSSL: autoSSL,
       noImgDrag: noImgDrag,
-      fit: fit
+      fit: fit,
+      inViewOnly: inViewOnly
     }, rest)),
     status = _useImage.status,
     getRootProps = _useImage.getRootProps,
@@ -60775,7 +60777,9 @@ var MenuItem = function MenuItem(props) {
     var content = function content(close) {
       return /*#__PURE__*/(0,jsx_runtime.jsx)("ul", {
         ref: childrenRef,
-        className: classnames_default()(shoudPop && (classes === null || classes === void 0 ? void 0 : classes.childrenShow), classes === null || classes === void 0 ? void 0 : classes.children, isUp && (classes === null || classes === void 0 ? void 0 : classes.childrenUp), hasExpandAbleChildren && (classes === null || classes === void 0 ? void 0 : classes.childrenHasExpand), shouldHideChildren && (classes === null || classes === void 0 ? void 0 : classes.childrenHidden))
+        className: classnames_default()(shoudPop && (classes === null || classes === void 0 ? void 0 : classes.childrenShow), classes === null || classes === void 0 ? void 0 : classes.children, isUp && (classes === null || classes === void 0 ? void 0 : classes.childrenUp), hasExpandAbleChildren && (classes === null || classes === void 0 ? void 0 : classes.childrenHasExpand),
+        // 有close函数的是popover弹出的菜单，不需要childrenHidden类名
+        shouldHideChildren && !close && (classes === null || classes === void 0 ? void 0 : classes.childrenHidden))
         // 子菜单点击弹出
         ,
         onClick: close,
@@ -61014,7 +61018,10 @@ var Menu = function Menu(props) {
         context.inTransition = false;
         render();
       }
-    },
+    }
+    // todo: 其实可以把scrollRef指向到这里，后续验证相关功能后重构
+    // ref={scrollRef}
+    ,
     children: [renderHeader(), /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
       className: classes === null || classes === void 0 ? void 0 : classes.scrollbox,
       ref: scrollRef,
@@ -64397,6 +64404,7 @@ function useScrollbarWidth() {
 
 
 
+
 var getHideExpandCol = function getHideExpandCol() {
   var cols = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   var expandCol = cols.find(function (col) {
@@ -64472,12 +64480,24 @@ var useColumns = function useColumns(props) {
     return context.cachedColumns;
   });
   var columns = getColumns(propsColumns) || [];
-  var leftFixedColumns = columns.filter(function (col) {
-    return col.fixed === 'left';
-  });
-  var middleColumns = columns.filter(function (col) {
-    return !col.fixed;
-  });
+  var _useMemo = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
+      if (!props.virtualColumn) return {
+        leftFixedColumns: [],
+        middleColumns: []
+      };
+      var leftFixedColumns = columns.filter(function (col) {
+        return col.fixed === 'left';
+      });
+      var middleColumns = columns.filter(function (col) {
+        return !col.fixed;
+      });
+      return {
+        leftFixedColumns: leftFixedColumns,
+        middleColumns: middleColumns
+      };
+    }, [columns, props.virtualColumn]),
+    leftFixedColumns = _useMemo.leftFixedColumns,
+    middleColumns = _useMemo.middleColumns;
   var handleScroll = function handleScroll(scrollInfo) {
     var scrollLeft = scrollInfo.scrollLeft;
     var sum = 0;
@@ -64501,7 +64521,7 @@ var useColumns = function useColumns(props) {
 
         // 左侧也增加缓冲列，但不能小于0
         var bufferedStartIndex = Math.max(0, i - BUFFER_COUNT);
-        currentIndex = bufferedStartIndex + leftFixedColumns.length;
+        currentIndex = bufferedStartIndex;
         break;
       }
     }
@@ -64513,8 +64533,9 @@ var useColumns = function useColumns(props) {
       scrollLeft: 0
     });
   }, []);
-  return {
-    columns: props.virtualColumn ? columns.map(function (col, index) {
+  var processedColumns = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
+    if (!props.virtualColumn) return columns;
+    return columns.map(function (col, index) {
       if (col.fixed) {
         return col;
       }
@@ -64529,16 +64550,27 @@ var useColumns = function useColumns(props) {
             return startIndex;
           };
         }
+        var hiddenTitle = context.groupLevel > 0 ? function () {
+          return /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+            style: {
+              visibility: 'hidden'
+            },
+            children: typeof col.title === 'function' ? col.title([]) : col.title
+          });
+        } : null;
         return objectSpread2_default()(objectSpread2_default()({}, col), {}, {
           colSpan: colSpan,
           render: function render() {
             return null;
           },
-          title: null
+          title: hiddenTitle
         });
       }
       return col;
-    }) : columns,
+    });
+  }, [columns, startIndex, renderedCount, props.virtualColumn, leftFixedColumns.length, middleColumns.length, context.groupLevel]);
+  return {
+    columns: processedColumns,
     columnInfo: {
       handleScroll: handleScroll
     },
@@ -74535,7 +74567,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.9.2-beta.6'
+  version: '3.9.2-beta.8'
 });
 }();
 /******/ 	return __webpack_exports__;