shineout 3.9.6-beta.1 → 3.9.6-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.9.6-beta.1'
+  version: '3.9.6-beta.3'
 };

package/dist/shineout.js

@@ -12401,7 +12401,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.6-beta.1');
+/* harmony default export */ var version = ('3.9.6-beta.3');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -60925,6 +60925,21 @@ var MenuItem = function MenuItem(props) {
     }),
     shouldHideChildren = _useCollapseAnimation.shouldHide,
     shouldKeepOpen = _useCollapseAnimation.shouldKeepOpen;
+
+  // 合并自定义属性：优先级 getItemProps > dataItem 中的 data-* 属性
+  var customAttributes = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
+    var _props$getItemProps;
+    // 1. 从 dataItem 中提取 data-* 和 aria-* 属性（方案2）
+    var dataAttrs = extractProps(props.dataItem, 'data-attr');
+
+    // 2. 通过 getItemProps 函数生成自定义属性（方案1，优先级更高）
+    var fnAttrs = ((_props$getItemProps = props.getItemProps) === null || _props$getItemProps === void 0 ? void 0 : _props$getItemProps.call(props, props.dataItem, {
+      level: props.level,
+      hasChildren: expandAble,
+      index: props.index
+    })) || {};
+    return objectSpread2_default()(objectSpread2_default()({}, dataAttrs), fnAttrs);
+  }, [props.dataItem, props.getItemProps, props.level, props.index, expandAble]);
   var renderChildren = function renderChildren() {
     var _items;
     var items = children;
@@ -61043,7 +61058,7 @@ var MenuItem = function MenuItem(props) {
       }));
     }
     if (props.frontCaret) {
-      return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+      return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", objectSpread2_default()(objectSpread2_default()({}, expandAble ? customAttributes : undefined), {}, {
         className: classnames_default()(classes === null || classes === void 0 ? void 0 : classes.itemContent, classes === null || classes === void 0 ? void 0 : classes.itemContentFront),
         onClick: handleItemClick,
         children: [/*#__PURE__*/(0,jsx_runtime.jsx)("div", {
@@ -61058,9 +61073,9 @@ var MenuItem = function MenuItem(props) {
             children: frontCaretType === 'hollow' ? icons_config.menu.CollapseArrow : icons_config.menu.FrontSolidArrowDown
           })
         }), title]
-      });
+      }));
     } else {
-      return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+      return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", objectSpread2_default()(objectSpread2_default()({}, expandAble ? customAttributes : undefined), {}, {
         className: classnames_default()(classes === null || classes === void 0 ? void 0 : classes.itemContent, classes === null || classes === void 0 ? void 0 : classes.itemContentBack),
         onClick: handleItemClick,
         children: [title, expandAble && /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
@@ -61075,17 +61090,17 @@ var MenuItem = function MenuItem(props) {
             children: icons_config.menu.CollapseArrow
           })
         })]
-      });
+      }));
     }
   };
-  return /*#__PURE__*/(0,jsx_runtime.jsxs)("li", {
+  return /*#__PURE__*/(0,jsx_runtime.jsxs)("li", objectSpread2_default()(objectSpread2_default()({}, expandAble ? undefined : customAttributes), {}, {
     className: classnames_default()(classes === null || classes === void 0 ? void 0 : classes.item, isDisabled && (classes === null || classes === void 0 ? void 0 : classes.itemDisabled), isInPath && (classes === null || classes === void 0 ? void 0 : classes.itemInPath), (isOpen || popOpen || shouldKeepOpen) && (classes === null || classes === void 0 ? void 0 : classes.itemOpen), shouldKeepOpen && (classes === null || classes === void 0 ? void 0 : classes.itemClosing), isChecked && (classes === null || classes === void 0 ? void 0 : classes.itemActive), expandAble && (classes === null || classes === void 0 ? void 0 : classes.itemHasChildren)),
     onMouseEnter: handleMouseEnter,
     onMouseLeave: handleMouseLeave,
     dir: config.direction,
     ref: liRef,
     children: [renderItem(), renderChildren()]
-  });
+  }));
 };
 /* harmony default export */ var menu_item = (MenuItem);
 ;// CONCATENATED MODULE: ../base/src/menu/menu.tsx
@@ -61222,7 +61237,8 @@ var Menu = function Menu(props) {
             theme: theme,
             renderIcon: props.renderIcon,
             collapse: collapse,
-            isEdgeItem: false
+            isEdgeItem: false,
+            getItemProps: props.getItemProps
           }, key);
         })
       })
@@ -67856,8 +67872,11 @@ function Table(props) {
     if (props.onScroll && typeof props.onScroll === 'function') {
       var maxWidth = target.scrollWidth - target.clientWidth;
       var maxHeight = target.scrollHeight - target.clientHeight;
-      var x = Math.min(target.scrollLeft / maxWidth, 1);
-      var y = Math.min(target.scrollTop / maxHeight, 1);
+      // 浏览器缩放时，scrollHeight/clientHeight 的取整方式不同，导致 scrollTop 最大值可能无法达到 maxHeight
+      // 例如：缩放到 80% 时，scrollTop 可能是 1981.25，而 maxHeight 是 1982
+      // 因此需要容错 1px 误差，当 scrollTop >= maxHeight - 1 时认为已滚动到底
+      var x = maxWidth > 0 ? maxWidth - target.scrollLeft < 1 ? 1 : Math.min(target.scrollLeft / maxWidth, 1) : 0;
+      var y = maxHeight > 0 ? maxHeight - target.scrollTop < 1 ? 1 : Math.min(target.scrollTop / maxHeight, 1) : 0;
       props.onScroll(x, y, target.scrollLeft, target.scrollTop);
     }
     syncHeaderScroll(target.scrollLeft);
@@ -74802,7 +74821,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.9.6-beta.1'
+  version: '3.9.6-beta.3'
 });
 }();
 /******/ 	return __webpack_exports__;