@chaoswise/ui 3.1.6 → 3.1.8

package/lib/Antd5/avatar/{avatar.js → Avatar.js}

@@ -1,18 +1,18 @@
-var _excluded = ["prefixCls", "shape", "size", "src", "srcSet", "icon", "className", "rootClassName", "alt", "draggable", "children", "crossOrigin"];
+var _excluded = ["prefixCls", "shape", "size", "src", "srcSet", "icon", "className", "rootClassName", "style", "alt", "draggable", "children", "crossOrigin", "gap", "onError"];
 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 _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 n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(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 (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return 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; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 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 n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(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 (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
 import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
 import classNames from 'classnames';
@@ -26,7 +26,24 @@ import useSize from '../config-provider/hooks/useSize';
 import useBreakpoint from '../grid/hooks/useBreakpoint';
 import AvatarContext from './AvatarContext';
 import useStyle from './style';
-var InternalAvatar = function InternalAvatar(props, ref) {
+var Avatar = /*#__PURE__*/React.forwardRef(function (props, ref) {
+  var customizePrefixCls = props.prefixCls,
+    shape = props.shape,
+    customSize = props.size,
+    src = props.src,
+    srcSet = props.srcSet,
+    icon = props.icon,
+    className = props.className,
+    rootClassName = props.rootClassName,
+    style = props.style,
+    alt = props.alt,
+    draggable = props.draggable,
+    children = props.children,
+    crossOrigin = props.crossOrigin,
+    _props$gap = props.gap,
+    gap = _props$gap === void 0 ? 4 : _props$gap,
+    onError = props.onError,
+    others = _objectWithoutProperties(props, _excluded);
   var _React$useState = React.useState(1),
     _React$useState2 = _slicedToArray(_React$useState, 2),
     scale = _React$useState2[0],
@@ -54,8 +71,6 @@ var InternalAvatar = function InternalAvatar(props, ref) {
     var nodeWidth = avatarNodeRef.current.offsetWidth;
     // denominator is 0 is no meaning
     if (childrenWidth !== 0 && nodeWidth !== 0) {
-      var _props$gap = props.gap,
-        gap = _props$gap === void 0 ? 4 : _props$gap;
       if (gap * 2 < nodeWidth) {
         setScale(nodeWidth - gap * 2 < childrenWidth ? (nodeWidth - gap * 2) / childrenWidth : 1);
       }
@@ -67,28 +82,14 @@ var InternalAvatar = function InternalAvatar(props, ref) {
   React.useEffect(function () {
     setIsImgExist(true);
     setScale(1);
-  }, [props.src]);
-  React.useEffect(setScaleParam, [props.gap]);
+  }, [src]);
+  React.useEffect(setScaleParam, [gap]);
   var handleImgLoadError = function handleImgLoadError() {
-    var onError = props.onError;
     var errorFlag = onError === null || onError === void 0 ? void 0 : onError();
     if (errorFlag !== false) {
       setIsImgExist(false);
     }
   };
-  var customizePrefixCls = props.prefixCls,
-    shape = props.shape,
-    customSize = props.size,
-    src = props.src,
-    srcSet = props.srcSet,
-    icon = props.icon,
-    className = props.className,
-    rootClassName = props.rootClassName,
-    alt = props.alt,
-    draggable = props.draggable,
-    children = props.children,
-    crossOrigin = props.crossOrigin,
-    others = _objectWithoutProperties(props, _excluded);
   var size = useSize(function (ctxSize) {
     var _ref, _ref2;
     return (_ref = (_ref2 = customSize !== null && customSize !== void 0 ? customSize : avatarCtx === null || avatarCtx === void 0 ? void 0 : avatarCtx.size) !== null && _ref2 !== void 0 ? _ref2 : ctxSize) !== null && _ref !== void 0 ? _ref : 'default';
@@ -171,18 +172,13 @@ var InternalAvatar = function InternalAvatar(props, ref) {
       children: children
     });
   }
-  // The event is triggered twice from bubbling up the DOM tree.
-  // see https://codesandbox.io/s/kind-snow-9lidz
-  delete others.onError;
-  delete others.gap;
   return wrapCSSVar(_jsx("span", _objectSpread(_objectSpread({}, others), {}, {
-    style: _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, sizeStyle), responsiveSizeStyle), avatar === null || avatar === void 0 ? void 0 : avatar.style), others.style),
+    style: _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, sizeStyle), responsiveSizeStyle), avatar === null || avatar === void 0 ? void 0 : avatar.style), style),
     className: classString,
     ref: avatarNodeMergedRef,
     children: childrenToRender
   })));
-};
-var Avatar = /*#__PURE__*/React.forwardRef(InternalAvatar);
+});
 if (process.env.NODE_ENV !== 'production') {
   Avatar.displayName = 'Avatar';
 }

package/lib/Antd5/avatar/{group.js → AvatarGroup.js}

@@ -19,7 +19,7 @@ import { devUseWarning } from '../_util/warning';
 import { ConfigContext } from '../config-provider';
 import useCSSVarCls from '../config-provider/hooks/useCSSVarCls';
 import Popover from '../popover';
-import Avatar from './avatar';
+import Avatar from './Avatar';
 import AvatarContext from './AvatarContext';
 import useStyle from './style';
 var AvatarContextProvider = function AvatarContextProvider(props) {
@@ -37,7 +37,7 @@ var AvatarContextProvider = function AvatarContextProvider(props) {
     children: props.children
   });
 };
-var Group = function Group(props) {
+var AvatarGroup = function AvatarGroup(props) {
   var _React$useContext2 = React.useContext(ConfigContext),
     getPrefixCls = _React$useContext2.getPrefixCls,
     direction = _React$useContext2.direction;
@@ -55,10 +55,12 @@ var Group = function Group(props) {
     max = props.max;
   if (process.env.NODE_ENV !== 'production') {
     var warning = devUseWarning('Avatar.Group');
-    warning.deprecated(!maxCount, 'maxCount', 'max={{ count: number }}');
-    warning.deprecated(!maxStyle, 'maxStyle', 'max={{ style: CSSProperties }}');
-    warning.deprecated(!maxPopoverPlacement, 'maxPopoverPlacement', 'max={{ popover: PopoverProps }}');
-    warning.deprecated(!maxPopoverTrigger, 'maxPopoverTrigger', 'max={{ popover: PopoverProps }}');
+    [['maxCount', 'max={{ count: number }}'], ['maxStyle', 'max={{ style: CSSProperties }}'], ['maxPopoverPlacement', 'max={{ popover: PopoverProps }}'], ['maxPopoverTrigger', 'max={{ popover: PopoverProps }}']].forEach(function (_ref) {
+      var _ref2 = _slicedToArray(_ref, 2),
+        deprecatedName = _ref2[0],
+        newName = _ref2[1];
+      warning.deprecated(!(deprecatedName in props), deprecatedName, newName);
+    });
   }
   var prefixCls = getPrefixCls('avatar', customizePrefixCls);
   var groupPrefixCls = "".concat(prefixCls, "-group");
@@ -71,6 +73,7 @@ var Group = function Group(props) {
   var cls = classNames(groupPrefixCls, _defineProperty({}, "".concat(groupPrefixCls, "-rtl"), direction === 'rtl'), cssVarCls, rootCls, className, rootClassName, hashId);
   var childrenWithProps = toArray(children).map(function (child, index) {
     return cloneElement(child, {
+      // eslint-disable-next-line react/no-array-index-key
       key: "avatar-key-".concat(index)
     });
   });
@@ -86,12 +89,14 @@ var Group = function Group(props) {
     var mergeProps = _objectSpread(_objectSpread({
       content: childrenHidden
     }, max === null || max === void 0 ? void 0 : max.popover), {}, {
-      overlayClassName: classNames("".concat(groupPrefixCls, "-popover"), max === null || max === void 0 || (_max$popover3 = max.popover) === null || _max$popover3 === void 0 ? void 0 : _max$popover3.overlayClassName),
+      classNames: {
+        root: classNames("".concat(groupPrefixCls, "-popover"), max === null || max === void 0 || (_max$popover3 = max.popover) === null || _max$popover3 === void 0 || (_max$popover3 = _max$popover3.classNames) === null || _max$popover3 === void 0 ? void 0 : _max$popover3.root)
+      },
       placement: mergePopoverPlacement,
       trigger: mergePopoverTrigger
     });
     childrenShow.push(_jsx(Popover, _objectSpread(_objectSpread({
-      destroyTooltipOnHide: true
+      destroyOnHidden: true
     }, mergeProps), {}, {
       children: _jsx(Avatar, {
         style: mergeStyle,
@@ -118,4 +123,4 @@ var Group = function Group(props) {
     })
   }));
 };
-export default Group;
+export default AvatarGroup;

package/lib/Antd5/avatar/index.js

@@ -1,6 +1,5 @@
-import InternalAvatar from './avatar';
-import Group from './group';
-export { Group };
+import InternalAvatar from './Avatar';
+import AvatarGroup from './AvatarGroup';
 var Avatar = InternalAvatar;
-Avatar.Group = Group;
+Avatar.Group = AvatarGroup;
 export default Avatar;

package/lib/Antd5/breadcrumb/Breadcrumb.js

@@ -134,6 +134,7 @@ var Breadcrumb = function Breadcrumb(props) {
       var isLastItem = index === childrenLength - 1;
       return cloneElement(element, {
         separator: isLastItem ? '' : separator,
+        // eslint-disable-next-line react/no-array-index-key
         key: index
       });
     });

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

@@ -34,7 +34,7 @@ var genBreadcrumbStyle = function genBreadcrumbStyle(token) {
       color: token.linkHoverColor,
       backgroundColor: token.colorBgTextHover
     }
-  }, genFocusStyle(token))), "li:last-child", {
+  }, genFocusStyle(token))), 'li:last-child', {
     color: token.lastItemColor
   }), "".concat(componentCls, "-separator"), {
     marginInline: token.separatorMargin,

package/lib/Antd5/button/{LoadingIcon.js → DefaultLoadingIcon.js}

@@ -40,12 +40,13 @@ var getRealWidth = function getRealWidth(node) {
     transform: 'scale(1)'
   };
 };
-var LoadingIcon = function LoadingIcon(props) {
+var DefaultLoadingIcon = function DefaultLoadingIcon(props) {
   var prefixCls = props.prefixCls,
     loading = props.loading,
     existIcon = props.existIcon,
     className = props.className,
-    style = props.style;
+    style = props.style,
+    mount = props.mount;
   var visible = !!loading;
   if (existIcon) {
     return _jsx(InnerLoadingIcon, {
@@ -56,9 +57,11 @@ var LoadingIcon = function LoadingIcon(props) {
   }
   return _jsx(CSSMotion, {
     visible: visible,
-    // We do not really use this motionName
+    // Used for minus flex gap style only
     motionName: "".concat(prefixCls, "-loading-icon-motion"),
-    motionLeave: visible,
+    motionAppear: !mount,
+    motionEnter: !mount,
+    motionLeave: !mount,
     removeOnLeave: true,
     onAppearStart: getCollapsedWidth,
     onAppearActive: getRealWidth,
@@ -69,14 +72,14 @@ var LoadingIcon = function LoadingIcon(props) {
     children: function children(_ref, ref) {
       var motionCls = _ref.className,
         motionStyle = _ref.style;
+      var mergedStyle = _objectSpread(_objectSpread({}, style), motionStyle);
       return _jsx(InnerLoadingIcon, {
         prefixCls: prefixCls,
-        className: className,
-        style: _objectSpread(_objectSpread({}, style), motionStyle),
-        ref: ref,
-        iconClassName: motionCls
+        className: classNames(className, motionCls),
+        style: mergedStyle,
+        ref: ref
       });
     }
   });
 };
-export default LoadingIcon;
+export default DefaultLoadingIcon;

package/lib/Antd5/button/button-group.js

@@ -32,19 +32,19 @@ var ButtonGroup = function ButtonGroup(props) {
   var _useToken = useToken(),
     _useToken2 = _slicedToArray(_useToken, 3),
     hashId = _useToken2[2];
-  var sizeCls = '';
-  switch (size) {
-    case 'large':
-      sizeCls = 'lg';
-      break;
-    case 'small':
-      sizeCls = 'sm';
-      break;
-    default:
-    // Do nothing
-  }
+  var sizeCls = React.useMemo(function () {
+    switch (size) {
+      case 'large':
+        return 'lg';
+      case 'small':
+        return 'sm';
+      default:
+        return '';
+    }
+  }, [size]);
   if (process.env.NODE_ENV !== 'production') {
     var warning = devUseWarning('Button.Group');
+    warning.deprecated(false, 'Button.Group', 'Space.Compact');
     warning(!size || ['large', 'small', 'middle'].includes(size), 'usage', 'Invalid prop `size`.');
   }
   var classes = classNames(prefixCls, _defineProperty(_defineProperty({}, "".concat(prefixCls, "-").concat(sizeCls), sizeCls), "".concat(prefixCls, "-rtl"), direction === 'rtl'), className, hashId);

package/lib/Antd5/button/button.js

@@ -14,20 +14,20 @@ 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 (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
 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); }
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import React, { Children, useContext, useEffect, useMemo, useRef, useState } from 'react';
+import React, { Children, useContext, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
 import classNames from 'classnames';
 import omit from 'rc-util/lib/omit';
 import { useComposeRef } from 'rc-util/lib/ref';
 import { devUseWarning } from '../_util/warning';
 import Wave from '../_util/wave';
-import { ConfigContext } from '../config-provider';
+import { ConfigContext, useComponentConfig } from '../config-provider/context';
 import DisabledContext from '../config-provider/DisabledContext';
 import useSize from '../config-provider/hooks/useSize';
 import { useCompactItemContext } from '../space/Compact';
 import Group, { GroupSizeContext } from './button-group';
 import { isTwoCNChar, isUnBorderedButtonVariant, spaceChildren } from './buttonHelpers';
+import DefaultLoadingIcon from './DefaultLoadingIcon';
 import IconWrapper from './IconWrapper';
-import LoadingIcon from './LoadingIcon';
 import useStyle from './style';
 import Compact from './style/compact';
 function getLoadingConfig(loading) {
@@ -48,11 +48,12 @@ var ButtonTypeMap = {
   "default": ['default', 'outlined'],
   primary: ['primary', 'solid'],
   dashed: ['default', 'dashed'],
-  link: ['primary', 'link'],
+  // `link` is not a real color but we should compatible with it
+  link: ['link', 'link'],
   text: ['default', 'text']
 };
 var InternalCompoundedButton = /*#__PURE__*/React.forwardRef(function (props, ref) {
-  var _ref, _sizeClassNameMap$siz, _classNames, _button$classNames, _button$styles;
+  var _ref, _sizeClassNameMap$siz, _classNames;
   var _props$loading = props.loading,
     loading = _props$loading === void 0 ? false : _props$loading,
     customizePrefixCls = props.prefixCls,
@@ -87,26 +88,42 @@ var InternalCompoundedButton = /*#__PURE__*/React.forwardRef(function (props, re
   // https://github.com/ant-design/ant-design/issues/47605
   // Compatible with original `type` behavior
   var mergedType = type || 'default';
+  var _React$useContext = React.useContext(ConfigContext),
+    button = _React$useContext.button;
   var _useMemo = useMemo(function () {
+      // >>>>> Local
+      // Color & Variant
       if (color && variant) {
         return [color, variant];
       }
-      var colorVariantPair = ButtonTypeMap[mergedType] || [];
-      if (danger) {
-        return ['danger', colorVariantPair[1]];
+      // Sugar syntax
+      if (type || danger) {
+        var colorVariantPair = ButtonTypeMap[mergedType] || [];
+        if (danger) {
+          return ['danger', colorVariantPair[1]];
+        }
+        return colorVariantPair;
       }
-      return colorVariantPair;
-    }, [type, color, variant, danger]),
+      // >>> Context fallback
+      if (button !== null && button !== void 0 && button.color && button !== null && button !== void 0 && button.variant) {
+        return [button.color, button.variant];
+      }
+      return ['default', 'outlined'];
+    }, [type, color, variant, danger, button === null || button === void 0 ? void 0 : button.variant, button === null || button === void 0 ? void 0 : button.color]),
     _useMemo2 = _slicedToArray(_useMemo, 2),
     mergedColor = _useMemo2[0],
     mergedVariant = _useMemo2[1];
   var isDanger = mergedColor === 'danger';
   var mergedColorText = isDanger ? 'dangerous' : mergedColor;
-  var _useContext = useContext(ConfigContext),
-    getPrefixCls = _useContext.getPrefixCls,
-    direction = _useContext.direction,
-    button = _useContext.button;
-  var mergedInsertSpace = (_ref = autoInsertSpace !== null && autoInsertSpace !== void 0 ? autoInsertSpace : button === null || button === void 0 ? void 0 : button.autoInsertSpace) !== null && _ref !== void 0 ? _ref : true;
+  var _useComponentConfig = useComponentConfig('button'),
+    getPrefixCls = _useComponentConfig.getPrefixCls,
+    direction = _useComponentConfig.direction,
+    contextAutoInsertSpace = _useComponentConfig.autoInsertSpace,
+    contextClassName = _useComponentConfig.className,
+    contextStyle = _useComponentConfig.style,
+    contextClassNames = _useComponentConfig.classNames,
+    contextStyles = _useComponentConfig.styles;
+  var mergedInsertSpace = (_ref = autoInsertSpace !== null && autoInsertSpace !== void 0 ? autoInsertSpace : contextAutoInsertSpace) !== null && _ref !== void 0 ? _ref : true;
   var prefixCls = getPrefixCls('btn', customizePrefixCls);
   var _useStyle = useStyle(prefixCls),
     _useStyle2 = _slicedToArray(_useStyle, 3),
@@ -127,12 +144,23 @@ var InternalCompoundedButton = /*#__PURE__*/React.forwardRef(function (props, re
     _useState4 = _slicedToArray(_useState3, 2),
     hasTwoCNChar = _useState4[0],
     setHasTwoCNChar = _useState4[1];
-  var buttonRef = useRef();
+  var buttonRef = useRef(null);
   var mergedRef = useComposeRef(ref, buttonRef);
   var needInserted = Children.count(children) === 1 && !icon && !isUnBorderedButtonVariant(mergedVariant);
+  // ========================= Mount ==========================
+  // Record for mount status.
+  // This will help to no to show the animation of loading on the first mount.
+  var isMountRef = useRef(true);
+  React.useEffect(function () {
+    isMountRef.current = false;
+    return function () {
+      isMountRef.current = true;
+    };
+  }, []);
   // ========================= Effect =========================
-  // Loading
-  useEffect(function () {
+  // Loading. Should use `useLayoutEffect` to avoid low perf multiple click issue.
+  // https://github.com/ant-design/ant-design/issues/51325
+  useLayoutEffect(function () {
     var delayTimer = null;
     if (loadingOrDelay.delay > 0) {
       delayTimer = setTimeout(function () {
@@ -149,7 +177,7 @@ var InternalCompoundedButton = /*#__PURE__*/React.forwardRef(function (props, re
       }
     }
     return cleanupTimer;
-  }, [loadingOrDelay]);
+  }, [loadingOrDelay.delay, loadingOrDelay.loading]);
   // Two chinese characters check
   useEffect(function () {
     // FIXME: for HOC usage like <FormatMessage />
@@ -179,7 +207,7 @@ var InternalCompoundedButton = /*#__PURE__*/React.forwardRef(function (props, re
       e.preventDefault();
       return;
     }
-    (_props$onClick = props.onClick) === null || _props$onClick === void 0 || _props$onClick.call(props, e);
+    (_props$onClick = props.onClick) === null || _props$onClick === void 0 || _props$onClick.call(props, 'href' in props ? e : e);
   }, [props.onClick, innerLoading, mergedDisabled]);
   // ========================== Warn ==========================
   if (process.env.NODE_ENV !== 'production') {
@@ -204,19 +232,25 @@ var InternalCompoundedButton = /*#__PURE__*/React.forwardRef(function (props, re
   var iconType = innerLoading ? 'loading' : icon;
   var linkButtonRestProps = omit(rest, ['navigate']);
   // ========================= Render =========================
-  var classes = classNames(prefixCls, hashId, cssVarCls, (_classNames = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_classNames, "".concat(prefixCls, "-").concat(shape), shape !== 'default' && shape), "".concat(prefixCls, "-").concat(mergedType), mergedType), "".concat(prefixCls, "-dangerous"), danger), "".concat(prefixCls, "-color-").concat(mergedColorText), mergedColorText), "".concat(prefixCls, "-variant-").concat(mergedVariant), mergedVariant), "".concat(prefixCls, "-").concat(sizeCls), sizeCls), "".concat(prefixCls, "-icon-only"), !children && children !== 0 && !!iconType), "".concat(prefixCls, "-background-ghost"), ghost && !isUnBorderedButtonVariant(mergedVariant)), "".concat(prefixCls, "-loading"), innerLoading), "".concat(prefixCls, "-two-chinese-chars"), hasTwoCNChar && mergedInsertSpace && !innerLoading), _defineProperty(_defineProperty(_defineProperty(_classNames, "".concat(prefixCls, "-block"), block), "".concat(prefixCls, "-rtl"), direction === 'rtl'), "".concat(prefixCls, "-icon-end"), iconPosition === 'end')), compactItemClassnames, className, rootClassName, button === null || button === void 0 ? void 0 : button.className);
-  var fullStyle = _objectSpread(_objectSpread({}, button === null || button === void 0 ? void 0 : button.style), customStyle);
-  var iconClasses = classNames(customClassNames === null || customClassNames === void 0 ? void 0 : customClassNames.icon, button === null || button === void 0 || (_button$classNames = button.classNames) === null || _button$classNames === void 0 ? void 0 : _button$classNames.icon);
-  var iconStyle = _objectSpread(_objectSpread({}, (styles === null || styles === void 0 ? void 0 : styles.icon) || {}), (button === null || button === void 0 || (_button$styles = button.styles) === null || _button$styles === void 0 ? void 0 : _button$styles.icon) || {});
+  var classes = classNames(prefixCls, hashId, cssVarCls, (_classNames = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_classNames, "".concat(prefixCls, "-").concat(shape), shape !== 'default' && shape), "".concat(prefixCls, "-").concat(mergedType), mergedType), "".concat(prefixCls, "-dangerous"), danger), "".concat(prefixCls, "-color-").concat(mergedColorText), mergedColorText), "".concat(prefixCls, "-variant-").concat(mergedVariant), mergedVariant), "".concat(prefixCls, "-").concat(sizeCls), sizeCls), "".concat(prefixCls, "-icon-only"), !children && children !== 0 && !!iconType), "".concat(prefixCls, "-background-ghost"), ghost && !isUnBorderedButtonVariant(mergedVariant)), "".concat(prefixCls, "-loading"), innerLoading), "".concat(prefixCls, "-two-chinese-chars"), hasTwoCNChar && mergedInsertSpace && !innerLoading), _defineProperty(_defineProperty(_defineProperty(_classNames, "".concat(prefixCls, "-block"), block), "".concat(prefixCls, "-rtl"), direction === 'rtl'), "".concat(prefixCls, "-icon-end"), iconPosition === 'end')), compactItemClassnames, className, rootClassName, contextClassName);
+  var fullStyle = _objectSpread(_objectSpread({}, contextStyle), customStyle);
+  var iconClasses = classNames(customClassNames === null || customClassNames === void 0 ? void 0 : customClassNames.icon, contextClassNames.icon);
+  var iconStyle = _objectSpread(_objectSpread({}, (styles === null || styles === void 0 ? void 0 : styles.icon) || {}), contextStyles.icon || {});
   var iconNode = icon && !innerLoading ? _jsx(IconWrapper, {
     prefixCls: prefixCls,
     className: iconClasses,
     style: iconStyle,
     children: icon
-  }) : _jsx(LoadingIcon, {
+  }) : loading && _typeof(loading) === 'object' && loading.icon ? _jsx(IconWrapper, {
+    prefixCls: prefixCls,
+    className: iconClasses,
+    style: iconStyle,
+    children: loading.icon
+  }) : _jsx(DefaultLoadingIcon, {
     existIcon: !!icon,
     prefixCls: prefixCls,
-    loading: innerLoading
+    loading: innerLoading,
+    mount: isMountRef.current
   });
   var kids = children || children === 0 ? spaceChildren(children, needInserted && mergedInsertSpace) : null;
   if (linkButtonRestProps.href !== undefined) {

package/lib/Antd5/button/buttonHelpers.js

@@ -1,7 +1,14 @@
+function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread 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; } }
+function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
+function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 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); }
 import { jsx as _jsx } from "react/jsx-runtime";
 import React from 'react';
 import { cloneElement, isFragment } from '../_util/reactNode';
+import { PresetColors } from '../theme/interface';
 var rxTwoCNChar = /^[\u4E00-\u9FA5]{2}$/;
 export var isTwoCNChar = rxTwoCNChar.test.bind(rxTwoCNChar);
 export function convertLegacyProps(type) {
@@ -67,4 +74,4 @@ var _ButtonTypes = ['default', 'primary', 'dashed', 'link', 'text'];
 var _ButtonShapes = ['default', 'circle', 'round'];
 var _ButtonHTMLTypes = ['submit', 'button', 'reset'];
 export var _ButtonVariantTypes = ['outlined', 'dashed', 'solid', 'filled', 'text', 'link'];
-export var _ButtonColorTypes = ['default', 'primary', 'danger'];
+export var _ButtonColorTypes = ['default', 'primary', 'danger'].concat(_toConsumableArray(PresetColors));

package/lib/Antd5/button/style/compact.js

@@ -15,16 +15,15 @@ var genButtonCompactStyle = function genButtonCompactStyle(token) {
     calc = token.calc;
   var insetOffset = calc(lineWidth).mul(-1).equal();
   var getCompactBorderStyle = function getCompactBorderStyle(vertical) {
-    return _defineProperty({}, "".concat(componentCls, "-compact").concat(vertical ? '-vertical' : '', "-item").concat(componentCls, "-primary:not([disabled])"), {
-      '& + &::before': {
-        position: 'absolute',
-        top: vertical ? insetOffset : 0,
-        insetInlineStart: vertical ? 0 : insetOffset,
-        backgroundColor: colorPrimaryHover,
-        content: '""',
-        width: vertical ? '100%' : lineWidth,
-        height: vertical ? lineWidth : '100%'
-      }
+    var selector = "".concat(componentCls, "-compact").concat(vertical ? '-vertical' : '', "-item").concat(componentCls, "-primary:not([disabled])");
+    return _defineProperty({}, "".concat(selector, " + ").concat(selector, "::before"), {
+      position: 'absolute',
+      top: vertical ? insetOffset : 0,
+      insetInlineStart: vertical ? 0 : insetOffset,
+      backgroundColor: colorPrimaryHover,
+      content: '""',
+      width: vertical ? '100%' : lineWidth,
+      height: vertical ? lineWidth : '100%'
     });
   };
   // Special styles for Primary Button