@chaoswise/ui 3.0.23 → 3.1.1

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/modal/Modal.js

@@ -1,5 +1,5 @@
 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", "rootClassName", "open", "wrapClassName", "centered", "getContainer", "focusTriggerAfterClose", "style", "visible", "width", "footer", "classNames", "styles"];
+var _excluded = ["prefixCls", "className", "rootClassName", "open", "wrapClassName", "centered", "getContainer", "focusTriggerAfterClose", "style", "visible", "width", "footer", "classNames", "styles", "children", "loading"];
 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; }
@@ -18,6 +18,7 @@ import * as React from 'react';
 import CloseOutlined from '@ant-design/icons/CloseOutlined';
 import classNames from 'classnames';
 import Dialog from 'rc-dialog';
+import ContextIsolator from '../_util/ContextIsolator';
 import useClosable, { pickClosable } from '../_util/hooks/useClosable';
 import { useZIndex } from '../_util/hooks/useZIndex';
 import { getTransitionName } from '../_util/motion';
@@ -26,8 +27,7 @@ import { devUseWarning } from '../_util/warning';
 import zIndexContext from '../_util/zindexContext';
 import { ConfigContext } from '../config-provider';
 import useCSSVarCls from '../config-provider/hooks/useCSSVarCls';
-import { NoFormStyle } from '../form/context';
-import { NoCompactStyle } from '../space/Compact';
+import Skeleton from '../skeleton';
 import { usePanelRef } from '../watermark/context';
 import { Footer, renderCloseIcon } from './shared';
 import useStyle from './style';
@@ -89,6 +89,8 @@ var Modal = function Modal(props) {
     footer = props.footer,
     modalClassNames = props.classNames,
     modalStyles = props.styles,
+    children = props.children,
+    loading = props.loading,
     restProps = _objectWithoutProperties(props, _excluded);
   var prefixCls = getPrefixCls('modal', customizePrefixCls);
   var rootPrefixCls = getPrefixCls();
@@ -100,10 +102,10 @@ var Modal = function Modal(props) {
     hashId = _useStyle2[1],
     cssVarCls = _useStyle2[2];
   var wrapClassNameExtended = classNames(wrapClassName, _defineProperty(_defineProperty({}, "".concat(prefixCls, "-centered"), !!centered), "".concat(prefixCls, "-wrap-rtl"), direction === 'rtl'));
-  var dialogFooter = footer !== null && _jsx(Footer, _objectSpread(_objectSpread({}, props), {}, {
+  var dialogFooter = footer !== null && !loading ? _jsx(Footer, _objectSpread(_objectSpread({}, props), {}, {
     onOk: handleOk,
     onCancel: handleCancel
-  }));
+  })) : null;
   var _useClosable = useClosable(pickClosable(props), pickClosable(modalContext), {
       closable: true,
       closeIcon: _jsx(CloseOutlined, {
@@ -113,9 +115,10 @@ var Modal = function Modal(props) {
         return renderCloseIcon(prefixCls, icon);
       }
     }),
-    _useClosable2 = _slicedToArray(_useClosable, 2),
+    _useClosable2 = _slicedToArray(_useClosable, 3),
     mergedClosable = _useClosable2[0],
-    mergedCloseIcon = _useClosable2[1];
+    mergedCloseIcon = _useClosable2[1],
+    closeBtnIsDisabled = _useClosable2[2];
   // ============================ Refs ============================
   // Select `ant-modal-content` by `panelRef`
   var panelRef = usePanelRef(".".concat(prefixCls, "-content"));
@@ -125,37 +128,46 @@ var Modal = function Modal(props) {
     zIndex = _useZIndex2[0],
     contextZIndex = _useZIndex2[1];
   // =========================== Render ===========================
-  return wrapCSSVar(_jsx(NoCompactStyle, {
-    children: _jsx(NoFormStyle, {
-      status: true,
-      override: true,
-      children: _jsx(zIndexContext.Provider, {
-        value: contextZIndex,
-        children: _jsx(Dialog, _objectSpread(_objectSpread({
-          width: width
-        }, restProps), {}, {
-          zIndex: zIndex,
-          getContainer: getContainer === undefined ? getContextPopupContainer : getContainer,
-          prefixCls: prefixCls,
-          rootClassName: classNames(hashId, rootClassName, cssVarCls, rootCls),
-          footer: dialogFooter,
-          visible: open !== null && open !== void 0 ? open : visible,
-          mousePosition: (_restProps$mousePosit = restProps.mousePosition) !== null && _restProps$mousePosit !== void 0 ? _restProps$mousePosit : mousePosition,
-          onClose: handleCancel,
-          closable: mergedClosable,
-          closeIcon: mergedCloseIcon,
-          focusTriggerAfterClose: focusTriggerAfterClose,
-          transitionName: getTransitionName(rootPrefixCls, 'zoom', props.transitionName),
-          maskTransitionName: getTransitionName(rootPrefixCls, 'fade', props.maskTransitionName),
-          className: classNames(hashId, className, modalContext === null || modalContext === void 0 ? void 0 : modalContext.className),
-          style: _objectSpread(_objectSpread({}, modalContext === null || modalContext === void 0 ? void 0 : modalContext.style), style),
-          classNames: _objectSpread(_objectSpread(_objectSpread({}, modalContext === null || modalContext === void 0 ? void 0 : modalContext.classNames), modalClassNames), {}, {
-            wrapper: classNames(wrapClassNameExtended, modalClassNames === null || modalClassNames === void 0 ? void 0 : modalClassNames.wrapper)
-          }),
-          styles: _objectSpread(_objectSpread({}, modalContext === null || modalContext === void 0 ? void 0 : modalContext.styles), modalStyles),
-          panelRef: panelRef
-        }))
-      })
+  return wrapCSSVar(_jsx(ContextIsolator, {
+    form: true,
+    space: true,
+    children: _jsx(zIndexContext.Provider, {
+      value: contextZIndex,
+      children: _jsx(Dialog, _objectSpread(_objectSpread({
+        width: width
+      }, restProps), {}, {
+        zIndex: zIndex,
+        getContainer: getContainer === undefined ? getContextPopupContainer : getContainer,
+        prefixCls: prefixCls,
+        rootClassName: classNames(hashId, rootClassName, cssVarCls, rootCls),
+        footer: dialogFooter,
+        visible: open !== null && open !== void 0 ? open : visible,
+        mousePosition: (_restProps$mousePosit = restProps.mousePosition) !== null && _restProps$mousePosit !== void 0 ? _restProps$mousePosit : mousePosition,
+        onClose: handleCancel,
+        closable: mergedClosable ? {
+          disabled: closeBtnIsDisabled,
+          closeIcon: mergedCloseIcon
+        } : mergedClosable,
+        closeIcon: mergedCloseIcon,
+        focusTriggerAfterClose: focusTriggerAfterClose,
+        transitionName: getTransitionName(rootPrefixCls, 'zoom', props.transitionName),
+        maskTransitionName: getTransitionName(rootPrefixCls, 'fade', props.maskTransitionName),
+        className: classNames(hashId, className, modalContext === null || modalContext === void 0 ? void 0 : modalContext.className),
+        style: _objectSpread(_objectSpread({}, modalContext === null || modalContext === void 0 ? void 0 : modalContext.style), style),
+        classNames: _objectSpread(_objectSpread(_objectSpread({}, modalContext === null || modalContext === void 0 ? void 0 : modalContext.classNames), modalClassNames), {}, {
+          wrapper: classNames(wrapClassNameExtended, modalClassNames === null || modalClassNames === void 0 ? void 0 : modalClassNames.wrapper)
+        }),
+        styles: _objectSpread(_objectSpread({}, modalContext === null || modalContext === void 0 ? void 0 : modalContext.styles), modalStyles),
+        panelRef: panelRef,
+        children: loading ? _jsx(Skeleton, {
+          active: true,
+          title: false,
+          paragraph: {
+            rows: 4
+          },
+          className: "".concat(prefixCls, "-body-skeleton")
+        }) : children
+      }))
     })
   }));
 };

package/lib/Antd5/modal/PurePanel.js

@@ -14,7 +14,6 @@ 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; }
 import { jsx as _jsx } from "react/jsx-runtime";
-/* eslint-disable react/jsx-no-useless-fragment */
 import * as React from 'react';
 import classNames from 'classnames';
 import { Panel } from 'rc-dialog';

package/lib/Antd5/modal/confirm.js

@@ -55,7 +55,6 @@ export default function confirm(config) {
     warnContext('Modal');
   }
   var container = document.createDocumentFragment();
-  // eslint-disable-next-line @typescript-eslint/no-use-before-define
   var currentConfig = _objectSpread(_objectSpread({}, config), {}, {
     close: close,
     open: true
@@ -66,14 +65,14 @@ export default function confirm(config) {
       args[_key] = arguments[_key];
     }
     var triggerCancel = args.some(function (param) {
-      return param && param.triggerCancel;
+      return param === null || param === void 0 ? void 0 : param.triggerCancel;
     });
-    if (config.onCancel && triggerCancel) {
-      config.onCancel.apply(config, [function () {}].concat(_toConsumableArray(args.slice(1))));
+    if (triggerCancel) {
+      var _config$onCancel;
+      (_config$onCancel = config.onCancel) === null || _config$onCancel === void 0 || _config$onCancel.call.apply(_config$onCancel, [config, function () {}].concat(_toConsumableArray(args.slice(1))));
     }
     for (var i = 0; i < destroyFns.length; i++) {
       var fn = destroyFns[i];
-      // eslint-disable-next-line @typescript-eslint/no-use-before-define
       if (fn === close) {
         destroyFns.splice(i, 1);
         break;

package/lib/Antd5/modal/style/confirm.js

@@ -9,7 +9,6 @@ import { unit } from '@ant-design/cssinjs';
 import { prepareComponentToken, prepareToken } from '.';
 import { clearFix } from '../../style';
 import { genSubStyleComponent } from '../../theme/internal';
-import customStyle from '../../../Modal/confirmGlobalStyle';
 // ============================= Confirm ==============================
 var genModalConfirmStyle = function genModalConfirmStyle(token) {
   var componentCls = token.componentCls,
@@ -76,7 +75,7 @@ var genModalConfirmStyle = function genModalConfirmStyle(token) {
 // ============================== Export ==============================
 export default genSubStyleComponent(['Modal', 'confirm'], function (token) {
   var modalToken = prepareToken(token);
-  return [genModalConfirmStyle(modalToken), customStyle(modalToken)];
+  return [genModalConfirmStyle(modalToken)];
 }, prepareComponentToken, {
   // confirm is weak than modal since no conflict here
   order: -1000

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

@@ -112,11 +112,14 @@ var genModalStyle = function genModalStyle(token) {
       display: 'flex',
       fontSize: token.fontSizeLG,
       fontStyle: 'normal',
-      lineHeight: "".concat(unit(token.modalCloseBtnSize)),
+      lineHeight: unit(token.modalCloseBtnSize),
       justifyContent: 'center',
       textTransform: 'none',
       textRendering: 'auto'
     },
+    '&:disabled': {
+      pointerEvents: 'none'
+    },
     '&:hover': {
       color: token.modalCloseIconHoverColor,
       backgroundColor: token.colorBgTextHover,
@@ -132,12 +135,19 @@ var genModalStyle = function genModalStyle(token) {
     marginBottom: token.headerMarginBottom,
     padding: token.headerPadding,
     borderBottom: token.headerBorderBottom
-  }), "".concat(componentCls, "-body"), {
+  }), "".concat(componentCls, "-body"), _defineProperty({
     fontSize: token.fontSize,
     lineHeight: token.lineHeight,
     wordWrap: 'break-word',
     padding: token.bodyPadding
-  }), "".concat(componentCls, "-footer"), _defineProperty({
+  }, "".concat(componentCls, "-body-skeleton"), {
+    width: '100%',
+    height: '100%',
+    display: 'flex',
+    justifyContent: 'center',
+    alignItems: 'center',
+    margin: "".concat(unit(token.margin), " auto")
+  })), "".concat(componentCls, "-footer"), _defineProperty({
     textAlign: 'end',
     background: token.footerBg,
     marginTop: token.footerMarginTop,

package/lib/Antd5/modal/useModal/HookModal.js

@@ -52,10 +52,11 @@ var HookModal = function HookModal(_ref, ref) {
       args[_key] = arguments[_key];
     }
     var triggerCancel = args.some(function (param) {
-      return param && param.triggerCancel;
+      return param === null || param === void 0 ? void 0 : param.triggerCancel;
     });
-    if (innerConfig.onCancel && triggerCancel) {
-      innerConfig.onCancel.apply(innerConfig, [function () {}].concat(_toConsumableArray(args.slice(1))));
+    if (triggerCancel) {
+      var _innerConfig$onCancel;
+      (_innerConfig$onCancel = innerConfig.onCancel) === null || _innerConfig$onCancel === void 0 || _innerConfig$onCancel.call.apply(_innerConfig$onCancel, [innerConfig, function () {}].concat(_toConsumableArray(args.slice(1))));
     }
   };
   React.useImperativeHandle(ref, function () {

package/lib/Antd5/modal/useModal/index.js

@@ -25,7 +25,6 @@ var ElementsHolder = /*#__PURE__*/React.memo(/*#__PURE__*/React.forwardRef(funct
       patchElement: patchElement
     };
   }, []);
-  // eslint-disable-next-line react/jsx-no-useless-fragment
   return _jsx(_Fragment, {
     children: elements
   });