@hi-ui/menu 4.3.1 → 5.0.0-alpha.0

package/CHANGELOG.md

@@ -1,5 +1,88 @@
 # @hi-ui/menu
 
+## 5.0.0-alpha.0
+
+### Major Changes
+
+- 1b05b44a4: feat: 组件的 package.json 中的 exports 统一加上 types 配置 (5.0)
+
+### Minor Changes
+
+- a1ad318d9: feat(menu): 增加 GroupMenu 和 SideMenu 组件 (5.0)
+- d9b2b928c: feat(menu): GroupMenu 组件增加 titleRender 参数 (5.0)
+- 2fec303ab: feat(menu): add showTitleOnMini api (5.0)
+- 0d2737b09: chore(menu): 增加变更记录文件 (5.0)
+
+### Patch Changes
+
+- 5de7a848b: chore: 将代码中 v4 改为 v5 (5.0)
+- 307f68517: <br />
+  - perf(layout): 优化导航菜单交互体验 (5.0)
+  - perf(menu): 优化搜索菜单组件的样式和交互逻辑 & 修改分组菜单样式问题 (5.0)
+- 8116f0304: fix: 修改 UI 问题 (5.0)
+- 46dbd140f: style(layout): 修改 Sider 收起时宽度为 60px & 增加 width 参数 (5.0)
+- 300d1573a: perf(layout&menu): 优化 FloatMenuContainer 组件的折叠逻辑 & 修改 SideMenu 组件 hover 样式 (5.0)
+- 7f8760993: style(menu): 优化 GroupMenu 组件的样式和交互逻辑 (5.0)
+- 61d132802: build: 将 package.json 中 exports 配置中的 types 配置放在最上面 (5.0)
+- Updated dependencies [abebb5eed]
+- Updated dependencies [7bda04e64]
+- Updated dependencies [77ed66eac]
+- Updated dependencies [ddd2acc79]
+- Updated dependencies [5de7a848b]
+- Updated dependencies [1b05b44a4]
+- Updated dependencies [0cd15438e]
+- Updated dependencies [eb69f0baa]
+- Updated dependencies [a01771e8d]
+- Updated dependencies [09451c7d9]
+- Updated dependencies [67960d871]
+- Updated dependencies [43da85a56]
+- Updated dependencies [de7f92b26]
+- Updated dependencies [8116f0304]
+- Updated dependencies [85bb84874]
+- Updated dependencies [5de7a848b]
+- Updated dependencies [77ed66eac]
+- Updated dependencies [632dbda3a]
+- Updated dependencies [36bb992d3]
+- Updated dependencies [1b51c1bbe]
+- Updated dependencies [61d132802]
+- Updated dependencies [6ebf40f96]
+- Updated dependencies [9f2ee08cf]
+- Updated dependencies [6eac4b78b]
+- Updated dependencies [bcd3d08dd]
+- Updated dependencies [4fb586f6f]
+- Updated dependencies [c125e4c48]
+- Updated dependencies [b7ad460d8]
+- Updated dependencies [df25ec39b]
+  - @hi-ui/picker@5.0.0-alpha.0
+  - @hi-ui/input@5.0.0-alpha.0
+  - @hi-ui/tooltip@5.0.0-alpha.0
+  - @hi-ui/core@5.0.0-alpha.0
+  - @hi-ui/use-id@5.0.0-alpha.0
+  - @hi-ui/use-latest@5.0.0-alpha.0
+  - @hi-ui/use-merge-refs@5.0.0-alpha.0
+  - @hi-ui/use-outside-click@5.0.0-alpha.0
+  - @hi-ui/use-resize-observer@5.0.0-alpha.0
+  - @hi-ui/use-toggle@5.0.0-alpha.0
+  - @hi-ui/use-uncontrolled-state@5.0.0-alpha.0
+  - @hi-ui/icons@5.0.0-alpha.0
+  - @hi-ui/ellipsis-tooltip@5.0.0-alpha.0
+  - @hi-ui/highlighter@5.0.0-alpha.0
+  - @hi-ui/icon-button@5.0.0-alpha.0
+  - @hi-ui/popper@5.0.0-alpha.0
+  - @hi-ui/scrollbar@5.0.0-alpha.0
+  - @hi-ui/array-utils@5.0.0-alpha.0
+  - @hi-ui/classname@5.0.0-alpha.0
+  - @hi-ui/env@5.0.0-alpha.0
+  - @hi-ui/times@5.0.0-alpha.0
+  - @hi-ui/tree-utils@5.0.0-alpha.0
+  - @hi-ui/type-assertion@5.0.0-alpha.0
+
+## 4.3.2
+
+### Patch Changes
+
+- [#3270](https://github.com/XiaoMi/hiui/pull/3270) [`9a241f9`](https://github.com/XiaoMi/hiui/commit/9a241f9ace65037a2dc6308566f1b36c2e1856a6) Thanks [@zyprepare](https://github.com/zyprepare)! - fix(menu): 添加国际化支持，更新“更多”菜单项的标题为本地化文本
+
 ## 4.3.1
 
 ### Patch Changes

package/lib/cjs/EnterIcon.js

@@ -0,0 +1,44 @@
+/** @LICENSE
+ * @hi-ui/menu
+ * https://github.com/XiaoMi/hiui/tree/master/packages/ui/menu#readme
+ *
+ * Copyright (c) HiUI <mi-hiui@xiaomi.com>.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+'use strict';
+
+var _typeof = require("@babel/runtime/helpers/typeof");
+Object.defineProperty(exports, '__esModule', {
+  value: true
+});
+var React = require('react');
+function _interopDefaultCompat(e) {
+  return e && _typeof(e) === 'object' && 'default' in e ? e : {
+    'default': e
+  };
+}
+var React__default = /*#__PURE__*/_interopDefaultCompat(React);
+var EnterIcon = function EnterIcon() {
+  return /*#__PURE__*/React__default["default"].createElement("svg", {
+    width: "12",
+    height: "12",
+    viewBox: "0 0 12 12",
+    fill: "none",
+    xmlns: "http://www.w3.org/2000/svg"
+  }, /*#__PURE__*/React__default["default"].createElement("path", {
+    d: "M4 9L2 7L4 5",
+    stroke: "#91959e",
+    strokeWidth: "1.2",
+    strokeLinecap: "round",
+    strokeLinejoin: "round"
+  }), /*#__PURE__*/React__default["default"].createElement("path", {
+    d: "M10 3L10 6.25C10 6.66422 9.66423 7 9.25 7L2 7",
+    stroke: "#91959e",
+    strokeWidth: "1.2",
+    strokeLinecap: "round",
+    strokeLinejoin: "round"
+  }));
+};
+exports.EnterIcon = EnterIcon;

package/lib/cjs/GroupMenu.js

@@ -0,0 +1,96 @@
+/** @LICENSE
+ * @hi-ui/menu
+ * https://github.com/XiaoMi/hiui/tree/master/packages/ui/menu#readme
+ *
+ * Copyright (c) HiUI <mi-hiui@xiaomi.com>.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+'use strict';
+
+var _typeof = require("@babel/runtime/helpers/typeof");
+Object.defineProperty(exports, '__esModule', {
+  value: true
+});
+var tslib = require('tslib');
+var React = require('react');
+var classname = require('@hi-ui/classname');
+var env = require('@hi-ui/env');
+var typeAssertion = require('@hi-ui/type-assertion');
+var useLatest = require('@hi-ui/use-latest');
+var useUncontrolledState = require('@hi-ui/use-uncontrolled-state');
+var Scrollbar = require('@hi-ui/scrollbar');
+function _interopDefaultCompat(e) {
+  return e && _typeof(e) === 'object' && 'default' in e ? e : {
+    'default': e
+  };
+}
+var React__default = /*#__PURE__*/_interopDefaultCompat(React);
+var Scrollbar__default = /*#__PURE__*/_interopDefaultCompat(Scrollbar);
+var _role = 'group-menu';
+var GROUP_MENU_PREFIX = classname.getPrefixCls(_role);
+/**
+ * 分组菜单
+ */
+var GroupMenu = /*#__PURE__*/React.forwardRef(function (_a, ref) {
+  var _a$prefixCls = _a.prefixCls,
+    prefixCls = _a$prefixCls === void 0 ? GROUP_MENU_PREFIX : _a$prefixCls,
+    _a$role = _a.role,
+    role = _a$role === void 0 ? _role : _a$role,
+    className = _a.className,
+    _a$data = _a.data,
+    data = _a$data === void 0 ? [] : _a$data,
+    onClick = _a.onClick,
+    _a$defaultActiveId = _a.defaultActiveId,
+    defaultActiveId = _a$defaultActiveId === void 0 ? '' : _a$defaultActiveId,
+    activeIdProp = _a.activeId,
+    titleRender = _a.titleRender,
+    rest = tslib.__rest(_a, ["prefixCls", "role", "className", "data", "onClick", "defaultActiveId", "activeId", "titleRender"]);
+  var _useUncontrolledState = useUncontrolledState.useUncontrolledState(defaultActiveId, activeIdProp),
+    activeId = _useUncontrolledState[0],
+    tryChangeActiveId = _useUncontrolledState[1];
+  var handleClick = useLatest.useLatestCallback(function (evt, id, item) {
+    tryChangeActiveId(id);
+    onClick === null || onClick === void 0 ? void 0 : onClick(evt, id, item);
+  });
+  var renderItem = React.useCallback(function (data) {
+    return data.map(function (item) {
+      var _cx;
+      var id = item.id,
+        icon = item.icon,
+        title = item.title,
+        _item$children = item.children,
+        children = _item$children === void 0 ? [] : _item$children,
+        disabled = item.disabled;
+      var isParent = typeAssertion.isArrayNonEmpty(children);
+      return /*#__PURE__*/React__default["default"].createElement("div", {
+        key: id,
+        className: classname.cx(isParent ? prefixCls + "-parent-item" : prefixCls + "-item", (_cx = {}, _cx[prefixCls + "-item--active"] = activeId === id, _cx[prefixCls + "-item--disabled"] = disabled, _cx[prefixCls + "-item--empty"] = !title && !icon, _cx)),
+        onClick: function onClick(evt) {
+          if (disabled || isParent) return;
+          evt.stopPropagation();
+          handleClick(evt, id, item);
+        }
+      }, /*#__PURE__*/React__default["default"].createElement("div", {
+        className: classname.cx(prefixCls + "-item__content")
+      }, /*#__PURE__*/React__default["default"].createElement("div", {
+        className: classname.cx(prefixCls + "-item__icon")
+      }, icon), /*#__PURE__*/React__default["default"].createElement("div", {
+        className: classname.cx(prefixCls + "-item__title")
+      }, typeof titleRender === 'function' ? titleRender(item) : title)), isParent && renderItem(children));
+    });
+  }, [activeId, handleClick, prefixCls, titleRender]);
+  return /*#__PURE__*/React__default["default"].createElement("div", Object.assign({
+    className: classname.cx("" + prefixCls, className),
+    ref: ref,
+    role: role
+  }, rest), /*#__PURE__*/React__default["default"].createElement(Scrollbar__default["default"], {
+    onlyScrollVisible: true,
+    axes: "y"
+  }, renderItem(data)));
+});
+if (env.__DEV__) {
+  GroupMenu.displayName = 'GroupMenu';
+}
+exports.GroupMenu = GroupMenu;

package/lib/cjs/Menu.js

@@ -19,6 +19,7 @@ var classname = require('@hi-ui/classname');
 var icons = require('@hi-ui/icons');
 var env = require('@hi-ui/env');
 var useUncontrolledState = require('@hi-ui/use-uncontrolled-state');
+var core = require('@hi-ui/core');
 var Tooltip = require('@hi-ui/tooltip');
 var useToggle = require('@hi-ui/use-toggle');
 var treeUtils = require('@hi-ui/tree-utils');
@@ -82,7 +83,10 @@ var Menu = /*#__PURE__*/React.forwardRef(function (_a, ref) {
     onClick = _a.onClick,
     _a$size = _a.size,
     size = _a$size === void 0 ? 'lg' : _a$size,
-    rest = tslib.__rest(_a, ["prefixCls", "role", "className", "data", "fieldNames", "placement", "showCollapse", "expandedType", "showAllSubMenus", "defaultExpandAll", "defaultExpandedIds", "expandedIds", "onExpand", "defaultActiveId", "activeId", "onClickSubMenu", "collapsed", "defaultCollapsed", "overlayClassName", "onCollapse", "footerRender", "render", "extraHeader", "onClick", "size"]);
+    _a$showTitleOnMini = _a.showTitleOnMini,
+    showTitleOnMini = _a$showTitleOnMini === void 0 ? false : _a$showTitleOnMini,
+    rest = tslib.__rest(_a, ["prefixCls", "role", "className", "data", "fieldNames", "placement", "showCollapse", "expandedType", "showAllSubMenus", "defaultExpandAll", "defaultExpandedIds", "expandedIds", "onExpand", "defaultActiveId", "activeId", "onClickSubMenu", "collapsed", "defaultCollapsed", "overlayClassName", "onCollapse", "footerRender", "render", "extraHeader", "onClick", "size", "showTitleOnMini"]);
+  var i18n = core.useLocaleContext();
   var _useUncontrolledState = useUncontrolledState.useUncontrolledState(defaultActiveId, activeIdProp, onClick),
     activeId = _useUncontrolledState[0],
     updateActiveId = _useUncontrolledState[1];
@@ -104,6 +108,7 @@ var Menu = /*#__PURE__*/React.forwardRef(function (_a, ref) {
     }, expandedIdsProp, onExpand),
     expandedIds = _useUncontrolledState2[0],
     updateExpandedIds = _useUncontrolledState2[1];
+  var expandedIdsRef = React.useRef(expandedIds);
   var clickMenu = React.useCallback(function (id, raw) {
     updateActiveId(id, raw);
   }, [updateActiveId]);
@@ -112,14 +117,17 @@ var Menu = /*#__PURE__*/React.forwardRef(function (_a, ref) {
       return expandedId !== id;
     }) : expandedIds.concat(id);
     updateExpandedIds(nextExpandedIds);
+    expandedIdsRef.current = nextExpandedIds;
     if (onClickSubMenu) {
       onClickSubMenu(id, nextExpandedIds);
     }
   }, [onClickSubMenu, expandedIds, updateExpandedIds]);
   var closePopper = React.useCallback(function (id) {
-    updateExpandedIds(expandedIds.filter(function (expandedId) {
+    var nextExpandedIds = expandedIds.filter(function (expandedId) {
       return expandedId !== id;
-    }));
+    });
+    updateExpandedIds(nextExpandedIds);
+    expandedIdsRef.current = nextExpandedIds;
   }, [expandedIds, updateExpandedIds]);
   var closeAllPopper = React.useCallback(function () {
     updateExpandedIds([]);
@@ -152,6 +160,13 @@ var Menu = /*#__PURE__*/React.forwardRef(function (_a, ref) {
       setContainerWidth(width);
     }
   });
+  React.useEffect(function () {
+    if (mini) {
+      updateExpandedIds([]);
+    } else {
+      updateExpandedIds(expandedIdsRef.current);
+    }
+  }, [mini, updateExpandedIds]);
   var _useState4 = React.useState(0),
     tagMaxCount = _useState4[0],
     setTagMaxCount = _useState4[1];
@@ -166,7 +181,7 @@ var Menu = /*#__PURE__*/React.forwardRef(function (_a, ref) {
   }, [transformedData, tagMaxCount]);
   var getTagWidth = React.useCallback(function (index) {
     if (!containerElement) return MIN_WIDTH;
-    var elements = containerElement.getElementsByClassName('hi-v4-menu-item');
+    var elements = containerElement.getElementsByClassName('hi-v5-menu-item');
     var element = elements && elements[index];
     if (!element) return MIN_WIDTH;
     return element.getBoundingClientRect().width;
@@ -202,9 +217,7 @@ var Menu = /*#__PURE__*/React.forwardRef(function (_a, ref) {
     var collapseNode = canToggle ? ( /*#__PURE__*/React__default["default"].createElement("div", {
       className: classname.cx(prefixCls + "__toggle"),
       onClick: function onClick() {
-        miniToggleAction.not();
-        // 关闭所有展开的子菜单，防止切换到 mini 模式后，子菜单还是展开的
-        updateExpandedIds([]);
+        return miniToggleAction.not();
       }
     }, mini ? /*#__PURE__*/React__default["default"].createElement(icons.MenuUnfoldOutlined, null) : /*#__PURE__*/React__default["default"].createElement(icons.MenuFoldOutlined, null))) : null;
     return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, typeAssertion.isFunction(footerRender) ? footerRender({
@@ -214,12 +227,12 @@ var Menu = /*#__PURE__*/React.forwardRef(function (_a, ref) {
   };
   var renderItem = React.useCallback(function (menuItem, level) {
     // 显示缩略内容
-    if (showMini && level === 1) {
+    if (showMini && level === 1 && !showTitleOnMini) {
       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");
+  }, [render, showMini, showTitleOnMini]);
+  var cls = classname.cx(prefixCls, className, prefixCls + "--" + placement, prefixCls + "--size-" + size, mini && prefixCls + "--mini", showTitleOnMini && prefixCls + "--show-title-on-mini", (expandedType === 'pop' || showAllSubMenus || mini) && prefixCls + "--popup");
   return /*#__PURE__*/React__default["default"].createElement("div", Object.assign({
     ref: useMergeRefs.useMergeRefs(ref, setContainerElement),
     role: role,
@@ -230,6 +243,7 @@ var Menu = /*#__PURE__*/React.forwardRef(function (_a, ref) {
       expandedType: expandedType,
       showAllSubMenus: showAllSubMenus,
       mini: mini,
+      showTitleOnMini: showTitleOnMini,
       clickMenu: clickMenu,
       clickSubMenu: clickSubMenu,
       closePopper: closePopper,
@@ -263,7 +277,7 @@ var Menu = /*#__PURE__*/React.forwardRef(function (_a, ref) {
   }), showVertical || restTagList.length === 0 ? null : ( /*#__PURE__*/React__default["default"].createElement(MenuItem.MenuItem, {
     key: MENU_MORE_ID,
     id: MENU_MORE_ID,
-    title: "\u66F4\u591A",
+    title: i18n.tabs.more,
     children: restTagList
   }))), /*#__PURE__*/React__default["default"].createElement("div", {
     className: prefixCls + "__footer"

package/lib/cjs/MenuItem.js

@@ -69,7 +69,8 @@ var MenuItem = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     clickSubMenu = _useContext.clickSubMenu,
     closeAllPopper = _useContext.closeAllPopper,
     activeParents = _useContext.activeParents,
-    overlayClassName = _useContext.overlayClassName;
+    overlayClassName = _useContext.overlayClassName,
+    showTitleOnMini = _useContext.showTitleOnMini;
   var _parentIds = (parentIds || []).concat(id);
   var hasChildren = typeAssertion.isArrayNonEmpty(children);
   var mergedRef = useMergeRefs.useMergeRefs(itemRef, ref);
@@ -135,7 +136,7 @@ var MenuItem = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     visible: !!(expandedIds === null || expandedIds === void 0 ? void 0 : expandedIds.includes(id)),
     attachEl: itemRef.current,
     placement: 'right-start',
-    gutterGap: 16,
+    gutterGap: showTitleOnMini ? 8 : 16,
     className: overlayClassName,
     onClose: function onClose() {
       closePopper === null || closePopper === void 0 ? void 0 : closePopper(id);
@@ -155,7 +156,7 @@ var MenuItem = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     visible: !!(expandedIds === null || expandedIds === void 0 ? void 0 : expandedIds.includes(id)),
     attachEl: itemRef.current,
     placement: 'right-start',
-    gutterGap: 16,
+    gutterGap: showTitleOnMini ? 12 : 16,
     disabledPortal: true,
     className: overlayClassName,
     onClose: function onClose() {