@chaoswise/ui 3.0.23 → 3.1.0

package/lib/Antd5/menu/MenuItem.js

@@ -20,7 +20,8 @@ var MenuItem = function MenuItem(props) {
     children = props.children,
     icon = props.icon,
     title = props.title,
-    danger = props.danger;
+    danger = props.danger,
+    extra = props.extra;
   var _React$useContext = React.useContext(MenuContext),
     prefixCls = _React$useContext.prefixCls,
     firstLevel = _React$useContext.firstLevel,
@@ -28,17 +29,18 @@ var MenuItem = function MenuItem(props) {
     disableMenuItemTitleTooltip = _React$useContext.disableMenuItemTitleTooltip,
     isInlineCollapsed = _React$useContext.inlineCollapsed;
   var renderItemChildren = function renderItemChildren(inlineCollapsed) {
+    var label = children === null || children === void 0 ? void 0 : children[0];
     var wrapNode = _jsx("span", {
-      className: "".concat(prefixCls, "-title-content"),
+      className: classNames("".concat(prefixCls, "-title-content"), _defineProperty({}, "".concat(prefixCls, "-title-content-with-extra"), !!extra || extra === 0)),
       children: children
     });
     // inline-collapsed.md demo 依赖 span 来隐藏文字,有 icon 属性，则内部包裹一个 span
     // ref: https://github.com/ant-design/ant-design/pull/23456
     if (!icon || /*#__PURE__*/React.isValidElement(children) && children.type === 'span') {
-      if (children && inlineCollapsed && firstLevel && typeof children === 'string') {
+      if (children && inlineCollapsed && firstLevel && typeof label === 'string') {
         return _jsx("div", {
           className: "".concat(prefixCls, "-inline-collapsed-noicon"),
-          children: children.charAt(0)
+          children: label.charAt(0)
         });
       }
     }
@@ -52,7 +54,6 @@ var MenuItem = function MenuItem(props) {
   } else if (title === false) {
     tooltipTitle = '';
   }
-  tooltipTitle = firstLevel ? title ? title : children : ''; // 修复折叠状态每一层级的Menu.Item均有tooltip问题，符合ui规范
   var tooltipProps = {
     title: tooltipTitle
   };

package/lib/Antd5/menu/OverrideContext.js

@@ -9,8 +9,8 @@ function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i
 function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.includes(n)) continue; t[n] = r[n]; } return t; }
 import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
-import { supportNodeRef, useComposeRef } from 'rc-util';
-import { NoCompactStyle } from '../space/Compact';
+import { supportNodeRef, useComposeRef } from 'rc-util/lib/ref';
+import ContextIsolator from '../_util/ContextIsolator';
 var OverrideContext = /*#__PURE__*/React.createContext(null);
 /** @internal Only used for Dropdown component. Do not use this in your production. */
 export var OverrideProvider = /*#__PURE__*/React.forwardRef(function (props, ref) {
@@ -28,7 +28,8 @@ export var OverrideProvider = /*#__PURE__*/React.forwardRef(function (props, ref
   var mergedRef = useComposeRef(ref, canRef ? children.ref : null);
   return _jsx(OverrideContext.Provider, {
     value: context,
-    children: _jsx(NoCompactStyle, {
+    children: _jsx(ContextIsolator, {
+      space: true,
       children: canRef ? /*#__PURE__*/React.cloneElement(children, {
         ref: mergedRef
       }) : children

package/lib/Antd5/menu/SubMenu.js

@@ -65,9 +65,9 @@ var SubMenu = function SubMenu(props) {
     children: _jsx(RcSubMenu, _objectSpread(_objectSpread({}, omit(props, ['icon'])), {}, {
       title: titleNode,
       popupClassName: classNames(prefixCls, popupClassName, "".concat(prefixCls, "-").concat(customTheme || contextTheme)),
-      popupStyle: {
+      popupStyle: _objectSpread({
         zIndex: zIndex
-      }
+      }, props.popupStyle)
     }))
   });
 };

package/lib/Antd5/menu/menu.js

@@ -19,15 +19,15 @@ import { forwardRef } from 'react';
 import EllipsisOutlined from '@ant-design/icons/EllipsisOutlined';
 import classNames from 'classnames';
 import RcMenu from 'rc-menu';
-import { useEvent } from 'rc-util';
+import useEvent from 'rc-util/lib/hooks/useEvent';
 import omit from 'rc-util/lib/omit';
 import initCollapseMotion from '../_util/motion';
 import { cloneElement } from '../_util/reactNode';
 import { devUseWarning } from '../_util/warning';
 import { ConfigContext } from '../config-provider';
 import useCSSVarCls from '../config-provider/hooks/useCSSVarCls';
-import Divider from './MenuDivider';
 import MenuContext from './MenuContext';
+import Divider from './MenuDivider';
 import MenuItem from './MenuItem';
 import OverrideContext from './OverrideContext';
 import useStyle from './style';

package/lib/Antd5/menu/style/index.js

@@ -28,7 +28,7 @@ var genMenuItemStyle = function genMenuItemStyle(token) {
     margin: 0,
     whiteSpace: 'nowrap',
     cursor: 'pointer',
-    transition: ["border-color ".concat(motionDurationSlow), "background ".concat(motionDurationSlow), "padding ".concat(motionDurationSlow, " ").concat(motionEaseInOut)].join(',')
+    transition: ["border-color ".concat(motionDurationSlow), "background ".concat(motionDurationSlow), "padding calc(".concat(motionDurationSlow, " + 0.1s) ").concat(motionEaseInOut)].join(',')
   }, "".concat(componentCls, "-item-icon, ").concat(iconCls), {
     minWidth: iconSize,
     fontSize: iconSize,
@@ -61,32 +61,35 @@ var genSubMenuArrowStyle = function genSubMenuArrowStyle(token) {
     borderRadius = token.borderRadius,
     menuArrowSize = token.menuArrowSize,
     menuArrowOffset = token.menuArrowOffset;
-  return _defineProperty({}, "".concat(componentCls, "-submenu"), _defineProperty(_defineProperty({}, "&-expand-icon, &-arrow", {
-    position: 'absolute',
-    top: '50%',
-    insetInlineEnd: token.margin,
-    width: menuArrowSize,
-    color: 'currentcolor',
-    transform: 'translateY(-50%)',
-    transition: "transform ".concat(motionDurationSlow, " ").concat(motionEaseInOut, ", opacity ").concat(motionDurationSlow)
-  }), '&-arrow', {
-    // →
-    '&::before, &::after': {
+  return _defineProperty({}, "".concat(componentCls, "-submenu"), {
+    '&-expand-icon, &-arrow': {
       position: 'absolute',
-      width: token.calc(menuArrowSize).mul(0.6).equal(),
-      height: token.calc(menuArrowSize).mul(0.15).equal(),
-      backgroundColor: 'currentcolor',
-      borderRadius: borderRadius,
-      transition: ["background ".concat(motionDurationSlow, " ").concat(motionEaseInOut), "transform ".concat(motionDurationSlow, " ").concat(motionEaseInOut), "top ".concat(motionDurationSlow, " ").concat(motionEaseInOut), "color ".concat(motionDurationSlow, " ").concat(motionEaseInOut)].join(','),
-      content: '""'
-    },
-    '&::before': {
-      transform: "rotate(45deg) translateY(".concat(unit(token.calc(menuArrowOffset).mul(-1).equal()), ")")
+      top: '50%',
+      insetInlineEnd: token.margin,
+      width: menuArrowSize,
+      color: 'currentcolor',
+      transform: 'translateY(-50%)',
+      transition: "transform ".concat(motionDurationSlow, " ").concat(motionEaseInOut, ", opacity ").concat(motionDurationSlow)
     },
-    '&::after': {
-      transform: "rotate(-45deg) translateY(".concat(unit(menuArrowOffset), ")")
+    '&-arrow': {
+      // →
+      '&::before, &::after': {
+        position: 'absolute',
+        width: token.calc(menuArrowSize).mul(0.6).equal(),
+        height: token.calc(menuArrowSize).mul(0.15).equal(),
+        backgroundColor: 'currentcolor',
+        borderRadius: borderRadius,
+        transition: ["background ".concat(motionDurationSlow, " ").concat(motionEaseInOut), "transform ".concat(motionDurationSlow, " ").concat(motionEaseInOut), "top ".concat(motionDurationSlow, " ").concat(motionEaseInOut), "color ".concat(motionDurationSlow, " ").concat(motionEaseInOut)].join(','),
+        content: '""'
+      },
+      '&::before': {
+        transform: "rotate(45deg) translateY(".concat(unit(token.calc(menuArrowOffset).mul(-1).equal()), ")")
+      },
+      '&::after': {
+        transform: "rotate(-45deg) translateY(".concat(unit(menuArrowOffset), ")")
+      }
     }
-  }));
+  });
 };
 // =============================== Base ===============================
 var getBaseStyle = function getBaseStyle(token) {
@@ -110,12 +113,15 @@ var getBaseStyle = function getBaseStyle(token) {
     groupTitleFontSize = token.groupTitleFontSize;
   return [// Misc
   _defineProperty({
-    '': _defineProperty({}, "".concat(componentCls), _objectSpread(_objectSpread({}, clearFix()), {}, _defineProperty({}, "&-hidden", {
-      display: 'none'
-    })))
+    '': _defineProperty({}, componentCls, _objectSpread(_objectSpread({}, clearFix()), {}, {
+      // Hidden
+      '&-hidden': {
+        display: 'none'
+      }
+    }))
   }, "".concat(componentCls, "-submenu-hidden"), {
     display: 'none'
-  }), _defineProperty({}, componentCls, _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, resetComponent(token)), clearFix()), {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({
+  }), _defineProperty({}, componentCls, _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, resetComponent(token)), clearFix()), {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({
     marginBottom: 0,
     paddingInlineStart: 0,
     // Override default ul/ol
@@ -125,16 +131,19 @@ var getBaseStyle = function getBaseStyle(token) {
     listStyle: 'none',
     outline: 'none',
     // Magic cubic here but smooth transition
-    transition: "width ".concat(motionDurationSlow, " cubic-bezier(0.2, 0, 0, 1) 0s")
-  }, "ul, ol", {
-    margin: 0,
-    padding: 0,
-    listStyle: 'none'
-  }), "&-overflow", _defineProperty({
-    display: 'flex'
-  }, "".concat(componentCls, "-item"), {
-    flex: 'none'
-  })), "".concat(componentCls, "-item, ").concat(componentCls, "-submenu, ").concat(componentCls, "-submenu-title"), {
+    transition: "width ".concat(motionDurationSlow, " cubic-bezier(0.2, 0, 0, 1) 0s"),
+    'ul, ol': {
+      margin: 0,
+      padding: 0,
+      listStyle: 'none'
+    },
+    // Overflow ellipsis
+    '&-overflow': _defineProperty({
+      display: 'flex'
+    }, "".concat(componentCls, "-item"), {
+      flex: 'none'
+    })
+  }, "".concat(componentCls, "-item, ").concat(componentCls, "-submenu, ").concat(componentCls, "-submenu-title"), {
     borderRadius: token.itemBorderRadius
   }), "".concat(componentCls, "-item-group-title"), {
     padding: "".concat(unit(paddingXS), " ").concat(unit(padding)),
@@ -148,11 +157,20 @@ var getBaseStyle = function getBaseStyle(token) {
   }), "".concat(componentCls, "-submenu ").concat(componentCls, "-sub"), {
     cursor: 'initial',
     transition: ["background ".concat(motionDurationSlow, " ").concat(motionEaseInOut), "padding ".concat(motionDurationSlow, " ").concat(motionEaseInOut)].join(',')
-  }), "".concat(componentCls, "-title-content"), _defineProperty({
-    transition: "color ".concat(motionDurationSlow)
+  }), "".concat(componentCls, "-title-content"), _defineProperty(_defineProperty({
+    transition: "color ".concat(motionDurationSlow),
+    '&-with-extra': {
+      display: 'inline-flex',
+      alignItems: 'center',
+      width: '100%'
+    }
   }, "> ".concat(antCls, "-typography-ellipsis-single-line"), {
     display: 'inline',
     verticalAlign: 'unset'
+  }), "".concat(componentCls, "-item-extra"), {
+    marginInlineStart: 'auto',
+    paddingInlineStart: token.padding,
+    fontSize: token.fontSizeSM
   })), "".concat(componentCls, "-item a"), {
     '&::before': {
       position: 'absolute',

package/lib/Antd5/menu/style/theme.js

@@ -46,8 +46,10 @@ var getThemeStyle = function getThemeStyle(token, themeSuffix) {
   return _defineProperty({}, "".concat(componentCls, "-").concat(themeSuffix, ", ").concat(componentCls, "-").concat(themeSuffix, " > ").concat(componentCls), (_$concat$concat$conca2 = {
     color: itemColor,
     background: itemBg
-  }, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_$concat$concat$conca2, "&".concat(componentCls, "-root:focus-visible"), _objectSpread({}, accessibilityFocus(token))), "".concat(componentCls, "-item-group-title"), {
-    color: groupTitleColor
+  }, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_$concat$concat$conca2, "&".concat(componentCls, "-root:focus-visible"), _objectSpread({}, accessibilityFocus(token))), "".concat(componentCls, "-item"), {
+    '&-group-title, &-extra': {
+      color: groupTitleColor
+    }
   }), "".concat(componentCls, "-submenu-selected"), _defineProperty({}, "> ".concat(componentCls, "-submenu-title"), {
     color: itemSelectedColor
   })), "".concat(componentCls, "-item, ").concat(componentCls, "-submenu-title"), _defineProperty({
@@ -84,7 +86,7 @@ var getThemeStyle = function getThemeStyle(token, themeSuffix) {
     color: itemSelectedColor
   }, "&".concat(componentCls, "-item-danger"), {
     color: dangerItemSelectedColor
-  }), "a, a:hover", {
+  }), 'a, a:hover', {
     color: 'inherit'
   })), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_$concat$concat$conca2, "& ".concat(componentCls, "-item-selected"), _defineProperty({
     backgroundColor: itemSelectedBg
@@ -98,7 +100,7 @@ var getThemeStyle = function getThemeStyle(token, themeSuffix) {
     backgroundColor: popupBg
   }), "&".concat(componentCls, "-horizontal"), _objectSpread(_objectSpread({}, themeSuffix === 'dark' ? {
     borderBottom: 0
-  } : {}), {}, _defineProperty({}, "> ".concat(componentCls, "-item, > ").concat(componentCls, "-submenu"), _defineProperty(_defineProperty({
+  } : {}), {}, _defineProperty({}, "> ".concat(componentCls, "-item, > ").concat(componentCls, "-submenu"), {
     top: activeBarBorderWidth,
     marginTop: token.calc(activeBarBorderWidth).mul(-1).equal(),
     marginBottom: 0,
@@ -110,24 +112,26 @@ var getThemeStyle = function getThemeStyle(token, themeSuffix) {
       borderBottom: "".concat(unit(activeBarHeight), " solid transparent"),
       transition: "border-color ".concat(motionDurationSlow, " ").concat(motionEaseInOut),
       content: '""'
-    }
-  }, "&:hover, &-active, &-open", {
-    background: horizontalItemHoverBg,
-    '&::after': {
-      borderBottomWidth: activeBarHeight,
-      borderBottomColor: horizontalItemSelectedColor
-    }
-  }), "&-selected", {
-    color: horizontalItemSelectedColor,
-    backgroundColor: horizontalItemSelectedBg,
-    '&:hover': {
-      backgroundColor: horizontalItemSelectedBg
     },
-    '&::after': {
-      borderBottomWidth: activeBarHeight,
-      borderBottomColor: horizontalItemSelectedColor
+    '&:hover, &-active, &-open': {
+      background: horizontalItemHoverBg,
+      '&::after': {
+        borderBottomWidth: activeBarHeight,
+        borderBottomColor: horizontalItemSelectedColor
+      }
+    },
+    '&-selected': {
+      color: horizontalItemSelectedColor,
+      backgroundColor: horizontalItemSelectedBg,
+      '&:hover': {
+        backgroundColor: horizontalItemSelectedBg
+      },
+      '&::after': {
+        borderBottomWidth: activeBarHeight,
+        borderBottomColor: horizontalItemSelectedColor
+      }
     }
-  })))), "&".concat(componentCls, "-root"), _defineProperty({}, "&".concat(componentCls, "-inline, &").concat(componentCls, "-vertical"), {
+  }))), "&".concat(componentCls, "-root"), _defineProperty({}, "&".concat(componentCls, "-inline, &").concat(componentCls, "-vertical"), {
     borderInlineEnd: "".concat(unit(activeBarBorderWidth), " ").concat(lineType, " ").concat(colorSplit)
   })), "&".concat(componentCls, "-inline"), _defineProperty(_defineProperty(_defineProperty({}, "".concat(componentCls, "-sub").concat(componentCls, "-inline"), {
     background: subMenuItemBg

package/lib/Antd5/menu/style/vertical.js

@@ -14,7 +14,8 @@ var getVerticalInlineStyle = function getVerticalInlineStyle(token) {
     menuArrowSize = token.menuArrowSize,
     marginXS = token.marginXS,
     itemMarginBlock = token.itemMarginBlock,
-    itemWidth = token.itemWidth;
+    itemWidth = token.itemWidth,
+    itemPaddingInline = token.itemPaddingInline;
   var paddingWithArrow = token.calc(menuArrowSize).add(padding).add(marginXS).equal();
   return _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "".concat(componentCls, "-item"), {
     position: 'relative',
@@ -22,7 +23,7 @@ var getVerticalInlineStyle = function getVerticalInlineStyle(token) {
   }), "".concat(componentCls, "-item, ").concat(componentCls, "-submenu-title"), {
     height: itemHeight,
     lineHeight: unit(itemHeight),
-    paddingInline: padding,
+    paddingInline: itemPaddingInline,
     overflow: 'hidden',
     textOverflow: 'ellipsis',
     marginInline: itemMarginInline,
@@ -42,11 +43,11 @@ var getVerticalStyle = function getVerticalStyle(token) {
     colorTextLightSolid = token.colorTextLightSolid,
     dropdownWidth = token.dropdownWidth,
     controlHeightLG = token.controlHeightLG,
-    motionDurationMid = token.motionDurationMid,
     motionEaseOut = token.motionEaseOut,
     paddingXL = token.paddingXL,
     itemMarginInline = token.itemMarginInline,
     fontSizeLG = token.fontSizeLG,
+    motionDurationFast = token.motionDurationFast,
     motionDurationSlow = token.motionDurationSlow,
     paddingXS = token.paddingXS,
     boxShadowSecondary = token.boxShadowSecondary,
@@ -58,9 +59,11 @@ var getVerticalStyle = function getVerticalStyle(token) {
     listStylePosition: 'inside',
     listStyleType: 'disc'
   };
-  return [_defineProperty(_defineProperty({}, componentCls, _defineProperty({}, "&-inline, &-vertical", _objectSpread(_defineProperty({}, "&".concat(componentCls, "-root"), {
-    boxShadow: 'none'
-  }), getVerticalInlineStyle(token)))), "".concat(componentCls, "-submenu-popup"), _defineProperty({}, "".concat(componentCls, "-vertical"), _objectSpread(_objectSpread({}, getVerticalInlineStyle(token)), {}, {
+  return [_defineProperty(_defineProperty({}, componentCls, {
+    '&-inline, &-vertical': _objectSpread(_defineProperty({}, "&".concat(componentCls, "-root"), {
+      boxShadow: 'none'
+    }), getVerticalInlineStyle(token))
+  }), "".concat(componentCls, "-submenu-popup"), _defineProperty({}, "".concat(componentCls, "-vertical"), _objectSpread(_objectSpread({}, getVerticalInlineStyle(token)), {}, {
     boxShadow: boxShadowSecondary
   }))), // Vertical only
   _defineProperty({}, "".concat(componentCls, "-submenu-popup ").concat(componentCls, "-vertical").concat(componentCls, "-sub"), {
@@ -81,7 +84,7 @@ var getVerticalStyle = function getVerticalStyle(token) {
   }, "&".concat(componentCls, "-root"), _defineProperty({}, "".concat(componentCls, "-item, ").concat(componentCls, "-submenu-title"), _defineProperty(_defineProperty({
     display: 'flex',
     alignItems: 'center',
-    transition: ["border-color ".concat(motionDurationSlow), "background ".concat(motionDurationSlow), "padding ".concat(motionDurationMid, " ").concat(motionEaseOut), "padding-inline calc(50% - ".concat(unit(token.calc(fontSizeLG).div(2).equal()), " - ").concat(unit(itemMarginInline), ")")].join(',')
+    transition: ["border-color ".concat(motionDurationSlow), "background ".concat(motionDurationSlow), "padding ".concat(motionDurationFast, " ").concat(motionEaseOut)].join(',')
   }, "> ".concat(componentCls, "-title-content"), {
     flex: 'auto',
     minWidth: 0,

package/lib/Antd5/message/PurePanel.js

@@ -1,7 +1,10 @@
-var _excluded = ["prefixCls", "className", "type", "icon", "content"];
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+var _excluded = ["prefixCls", "className", "type", "icon", "content"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
@@ -10,22 +13,18 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var s = Object.getOwnPropertySymbols(e); for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
 function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.includes(n)) continue; t[n] = r[n]; } return t; }
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import * as React from "react";
-import CheckCircleFilled from "@ant-design/icons/CheckCircleFilled";
-import CloseCircleFilled from "@ant-design/icons/CloseCircleFilled";
-import ExclamationCircleFilled from "@ant-design/icons/ExclamationCircleFilled";
-import InfoCircleFilled from "@ant-design/icons/InfoCircleFilled";
-import LoadingOutlined from "@ant-design/icons/LoadingOutlined";
-import classNames from "classnames";
-import { Notice } from "rc-notification";
-import { ConfigContext } from "../config-provider";
-import useCSSVarCls from "../config-provider/hooks/useCSSVarCls";
-import useStyle from "./style";
-import CloseSvg from "./assets/Close";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import * as React from 'react';
+import CheckCircleFilled from '@ant-design/icons/CheckCircleFilled';
+import CloseCircleFilled from '@ant-design/icons/CloseCircleFilled';
+import ExclamationCircleFilled from '@ant-design/icons/ExclamationCircleFilled';
+import InfoCircleFilled from '@ant-design/icons/InfoCircleFilled';
+import LoadingOutlined from '@ant-design/icons/LoadingOutlined';
+import classNames from 'classnames';
+import { Notice } from 'rc-notification';
+import { ConfigContext } from '../config-provider';
+import useCSSVarCls from '../config-provider/hooks/useCSSVarCls';
+import useStyle from './style';
 export var TypeIcon = {
   info: _jsx(InfoCircleFilled, {}),
   success: _jsx(CheckCircleFilled, {}),
@@ -37,28 +36,11 @@ export var PureContent = function PureContent(_ref) {
   var prefixCls = _ref.prefixCls,
     type = _ref.type,
     icon = _ref.icon,
-    children = _ref.children,
-    onClose = _ref.onClose,
-    closable = _ref.closable,
-    dec = _ref.dec;
-  return _jsxs(_Fragment, {
-    children: [_jsxs("div", {
-      className: classNames("".concat(prefixCls, "-custom-content"), "".concat(prefixCls, "-").concat(type), _defineProperty({}, "".concat(prefixCls, "-custom-content-has-dec"), dec)),
-      children: [icon || TypeIcon[type], _jsx("span", {
-        className: "".concat(prefixCls, "-custom-header-content"),
-        children: children
-      }), closable && _jsx("span", {
-        onClick: function onClick() {
-          onClose === null || onClose === void 0 || onClose();
-        },
-        className: "".concat(prefixCls, "-custom-header-close-wrapper"),
-        children: _jsx(CloseSvg, {
-          className: "".concat(prefixCls, "-custom-header-close")
-        })
-      })]
-    }), dec && _jsx("div", {
-      className: classNames(_defineProperty(_defineProperty({}, "".concat(prefixCls, "-custom-dec-wrapper"), true), "".concat(prefixCls, "-custom-dec-not-closable"), !closable)),
-      children: dec
+    children = _ref.children;
+  return _jsxs("div", {
+    className: classNames("".concat(prefixCls, "-custom-content"), "".concat(prefixCls, "-").concat(type)),
+    children: [icon || TypeIcon[type], _jsx("span", {
+      children: children
     })]
   });
 };
@@ -72,7 +54,7 @@ var PurePanel = function PurePanel(props) {
     restProps = _objectWithoutProperties(props, _excluded);
   var _React$useContext = React.useContext(ConfigContext),
     getPrefixCls = _React$useContext.getPrefixCls;
-  var prefixCls = staticPrefixCls || getPrefixCls("message");
+  var prefixCls = staticPrefixCls || getPrefixCls('message');
   var rootCls = useCSSVarCls(prefixCls);
   var _useStyle = useStyle(prefixCls, rootCls),
     _useStyle2 = _slicedToArray(_useStyle, 3),

package/lib/Antd5/message/style/index.js

@@ -51,63 +51,24 @@ var genMessageStyle = function genMessageStyle(token) {
       opacity: 0
     }
   });
-  var noticeStyle = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({
+  var noticeStyle = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({
     padding: paddingXS,
     textAlign: 'center'
-  }, "".concat(componentCls, "-custom-content > ").concat(iconCls), {
-    verticalAlign: 'text-bottom',
+  }, "".concat(componentCls, "-custom-content"), {
+    display: 'flex',
+    alignItems: 'center'
+  }), "".concat(componentCls, "-custom-content > ").concat(iconCls), {
     marginInlineEnd: marginXS,
     // affected by ltr or rtl
     fontSize: fontSizeLG
-  }), "".concat(noticeCls, "-content"), _defineProperty(_defineProperty(_defineProperty({
+  }), "".concat(noticeCls, "-content"), {
     display: 'inline-block',
     padding: contentPadding,
     background: contentBg,
     borderRadius: borderRadiusLG,
     boxShadow: boxShadow,
-    pointerEvents: 'all',
-    maxWidth: "400px"
-  }, "&:has(".concat(componentCls, "-custom-dec-wrapper)"), {
-    paddingBottom: "12px",
-    width: "400px"
-  }), "".concat(componentCls, "-custom-content"), _defineProperty(_defineProperty(_defineProperty(_defineProperty({
-    display: "flex",
-    lineHeight: "22px"
-  }, "> ".concat(iconCls), {
-    fontSize: "16px",
-    width: "16px",
-    height: "16px",
-    transform: "translateY(3px)"
-  }), "".concat(componentCls, "-custom-header-content"), {
-    display: "inline-block",
-    fontSize: "14px",
-    lineHeight: "22px",
-    flex: "1",
-    flexBasis: "auto",
-    textAlign: "left",
-    marginRight: "16px",
-    wordBreak: "break-all"
-  }), "".concat(componentCls, "-custom-header-close-wrapper"), {
-    display: "inline-block",
-    height: "22px",
-    lineHeight: "22px",
-    cursor: "pointer",
-    "&:hover": {
-      color: token.colorPrimaryHover
-    }
-  }), "&".concat(componentCls, "-custom-content-has-dec"), _defineProperty({}, "".concat(componentCls, "-custom-header-content"), {
-    fontWeight: "500"
-  }))), "".concat(componentCls, "-custom-dec-wrapper"), _defineProperty({
-    textAlign: "left",
-    paddingLeft: "24px",
-    paddingRight: "32px",
-    marginTop: "6px",
-    fontSize: "14px",
-    lineHeight: "22px",
-    wordBreak: "break-all"
-  }, "&".concat(componentCls, "-custom-dec-not-closable"), {
-    paddingRight: "16px"
-  }))), "".concat(componentCls, "-success > ").concat(iconCls), {
+    pointerEvents: 'all'
+  }), "".concat(componentCls, "-success > ").concat(iconCls), {
     color: colorSuccess
   }), "".concat(componentCls, "-error > ").concat(iconCls), {
     color: colorError

package/lib/Antd5/message/useMessage.js

@@ -1,4 +1,4 @@
-var _excluded = ["content", "icon", "type", "key", "className", "style", "onClose", "closable", "dec"];
+var _excluded = ["content", "icon", "type", "key", "className", "style", "onClose"];
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var s = Object.getOwnPropertySymbols(e); for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
 function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.includes(n)) continue; t[n] = r[n]; } return t; }
@@ -151,18 +151,12 @@ export function useInternalMessage(messageConfig) {
         className = config.className,
         style = config.style,
         _onClose = config.onClose,
-        _config$closable = config.closable,
-        closable = _config$closable === void 0 ? true : _config$closable,
-        dec = config.dec,
         restConfig = _objectWithoutProperties(config, _excluded);
       var mergedKey = key;
       if (mergedKey === undefined || mergedKey === null) {
         keyIndex += 1;
         mergedKey = "antd-message-".concat(keyIndex);
       }
-      var onCloseCustom = function onCloseCustom() {
-        close(mergedKey);
-      };
       return wrapPromiseFn(function (resolve) {
         originOpen(_objectSpread(_objectSpread({}, restConfig), {}, {
           key: mergedKey,
@@ -170,9 +164,6 @@ export function useInternalMessage(messageConfig) {
             prefixCls: prefixCls,
             type: type,
             icon: icon,
-            onClose: onCloseCustom,
-            closable: closable,
-            dec: dec,
             children: content
           }),
           placement: 'top',
@@ -204,8 +195,7 @@ export function useInternalMessage(messageConfig) {
     };
     var keys = ['info', 'success', 'warning', 'error', 'loading'];
     keys.forEach(function (type) {
-      var typeOpen = function typeOpen(jointContent, duration, onClose, dec) {
-        var closable = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : true;
+      var typeOpen = function typeOpen(jointContent, duration, onClose) {
         var config;
         if (jointContent && _typeof(jointContent) === 'object' && 'content' in jointContent) {
           config = jointContent;
@@ -225,9 +215,7 @@ export function useInternalMessage(messageConfig) {
         }
         var mergedConfig = _objectSpread(_objectSpread({
           onClose: mergedOnClose,
-          duration: mergedDuration,
-          dec: dec,
-          closable: closable
+          duration: mergedDuration
         }, config), {}, {
           type: type
         });