@hi-ui/menu 4.1.2 → 4.1.3

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @hi-ui/menu
 
+## 4.1.3
+
+### Patch Changes
+
+- [#2659](https://github.com/XiaoMi/hiui/pull/2659) [`b78487cd7`](https://github.com/XiaoMi/hiui/commit/b78487cd725532000f81876e1826f1918c37b23a) Thanks [@zyprepare](https://github.com/zyprepare)! - fix: 修复 mini 模式下子菜单内容展示不全问题
+
 ## 4.1.2
 
 ### Patch Changes

package/lib/cjs/Menu.js

@@ -251,6 +251,14 @@ var Menu = /*#__PURE__*/React.forwardRef(function (_a, ref) {
     }) : collapseNode);
   };
 
+  var renderItem = React.useCallback(function (menuItem, level) {
+    // 显示缩略内容
+    if (showMini && level === 1) {
+      return renderMenuItemMini(menuItem);
+    }
+
+    return typeAssertion.isFunction(render) ? render(menuItem, level) : menuItem.title;
+  }, [render, showMini]);
   var cls = classname.cx(prefixCls, className, prefixCls + "--" + placement, prefixCls + "--size-" + size, mini && prefixCls + "--mini", (expandedType === 'pop' || showAllSubMenus || mini) && prefixCls + "--popup");
   return /*#__PURE__*/React__default["default"].createElement("div", Object.assign({
     ref: useMergeRefs.useMergeRefs(ref, setContainerElement),
@@ -280,13 +288,13 @@ var Menu = /*#__PURE__*/React.forwardRef(function (_a, ref) {
       placement: "right"
     }, /*#__PURE__*/React__default["default"].createElement(MenuItem.MenuItem, Object.assign({}, item, {
       level: 1,
-      render: renderMenuItemMini,
+      render: renderItem,
       raw: item,
       size: size
     }))) : /*#__PURE__*/React__default["default"].createElement(MenuItem.MenuItem, Object.assign({
       hidden: !showVertical && index >= tagMaxCount
     }, item, {
-      render: render,
+      render: renderItem,
       key: item.id,
       level: 1,
       raw: item,

package/lib/cjs/MenuItem.js

@@ -124,7 +124,7 @@ var MenuItem = /*#__PURE__*/React.forwardRef(function (_a, ref) {
     id: id,
     icon: icon,
     title: title
-  }) : title), hasChildren && !mini && placement === 'vertical' && expandedType === 'collapse' && !showAllSubMenus && (!disabled && (expandedIds === null || expandedIds === void 0 ? void 0 : expandedIds.includes(id)) ? /*#__PURE__*/React__default["default"].createElement(Arrow, {
+  }, level) : title), hasChildren && !mini && placement === 'vertical' && expandedType === 'collapse' && !showAllSubMenus && (!disabled && (expandedIds === null || expandedIds === void 0 ? void 0 : expandedIds.includes(id)) ? /*#__PURE__*/React__default["default"].createElement(Arrow, {
     prefixCls: prefixCls + "-item",
     direction: "up"
   }) : /*#__PURE__*/React__default["default"].createElement(Arrow, {

package/lib/esm/Menu.js

@@ -217,6 +217,14 @@ var Menu = /*#__PURE__*/forwardRef(function (_a, ref) {
     }) : collapseNode);
   };
 
+  var renderItem = useCallback(function (menuItem, level) {
+    // 显示缩略内容
+    if (showMini && level === 1) {
+      return renderMenuItemMini(menuItem);
+    }
+
+    return isFunction(render) ? render(menuItem, level) : menuItem.title;
+  }, [render, showMini]);
   var cls = cx(prefixCls, className, prefixCls + "--" + placement, prefixCls + "--size-" + size, mini && prefixCls + "--mini", (expandedType === 'pop' || showAllSubMenus || mini) && prefixCls + "--popup");
   return /*#__PURE__*/React.createElement("div", Object.assign({
     ref: useMergeRefs(ref, setContainerElement),
@@ -246,13 +254,13 @@ var Menu = /*#__PURE__*/forwardRef(function (_a, ref) {
       placement: "right"
     }, /*#__PURE__*/React.createElement(MenuItem, Object.assign({}, item, {
       level: 1,
-      render: renderMenuItemMini,
+      render: renderItem,
       raw: item,
       size: size
     }))) : /*#__PURE__*/React.createElement(MenuItem, Object.assign({
       hidden: !showVertical && index >= tagMaxCount
     }, item, {
-      render: render,
+      render: renderItem,
       key: item.id,
       level: 1,
       raw: item,

package/lib/esm/MenuItem.js

@@ -95,7 +95,7 @@ var MenuItem = /*#__PURE__*/forwardRef(function (_a, ref) {
     id: id,
     icon: icon,
     title: title
-  }) : title), hasChildren && !mini && placement === 'vertical' && expandedType === 'collapse' && !showAllSubMenus && (!disabled && (expandedIds === null || expandedIds === void 0 ? void 0 : expandedIds.includes(id)) ? /*#__PURE__*/React.createElement(Arrow, {
+  }, level) : title), hasChildren && !mini && placement === 'vertical' && expandedType === 'collapse' && !showAllSubMenus && (!disabled && (expandedIds === null || expandedIds === void 0 ? void 0 : expandedIds.includes(id)) ? /*#__PURE__*/React.createElement(Arrow, {
     prefixCls: prefixCls + "-item",
     direction: "up"
   }) : /*#__PURE__*/React.createElement(Arrow, {

package/lib/types/Menu.d.ts

@@ -85,7 +85,7 @@ export interface MenuProps extends Omit<HiBaseHTMLProps<'div'>, 'onClick'> {
     /**
      * 自定义渲染菜单项
      */
-    render?: (menuItem: MenuDataItem) => React.ReactNode;
+    render?: (menuItem: MenuDataItem, level?: number) => React.ReactNode;
     /**
      * 额外的头部内容
      */

package/lib/types/MenuItem.d.ts

@@ -10,7 +10,7 @@ export interface MenuItemProps extends Omit<HiBaseHTMLProps<'li'>, 'id'> {
     children?: MenuDataItem[];
     level?: number;
     parentIds?: React.ReactText[];
-    render?: (node: MenuDataItem) => React.ReactNode;
+    render?: (node: MenuDataItem, level?: number) => React.ReactNode;
     raw?: MenuDataItem;
     size?: HiBaseSizeEnum;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hi-ui/menu",
-  "version": "4.1.2",
+  "version": "4.1.3",
   "description": "A sub-package for @hi-ui/hiui.",
   "keywords": [],
   "author": "HiUI <mi-hiui@xiaomi.com>",