@chaoswise/ui 3.0.22 → 3.1.0

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

@@ -14,10 +14,13 @@ var genSharedButtonStyle = function genSharedButtonStyle(token) {
   var componentCls = token.componentCls,
     iconCls = token.iconCls,
     fontWeight = token.fontWeight;
-  return _defineProperty({}, componentCls, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({
+  return _defineProperty({}, componentCls, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({
     outline: 'none',
     position: 'relative',
-    display: 'inline-block',
+    display: 'inline-flex',
+    gap: token.marginXS,
+    alignItems: 'center',
+    justifyContent: 'center',
     fontWeight: fontWeight,
     whiteSpace: 'nowrap',
     textAlign: 'center',
@@ -31,29 +34,18 @@ var genSharedButtonStyle = function genSharedButtonStyle(token) {
     color: token.colorText,
     '&:disabled > *': {
       pointerEvents: 'none'
-    },
-    '> span': {
-      display: 'inline-block'
     }
-  }, "".concat(componentCls, "-icon"), _defineProperty({
-    lineHeight: 0
-  }, "&-end", {
-    marginInlineStart: token.marginXS
-  })), "> ".concat(iconCls, " + span, > span + ").concat(iconCls), {
-    marginInlineStart: token.marginXS
-  }), "&:not(".concat(componentCls, "-icon-only) > ").concat(componentCls, "-icon"), _defineProperty(_defineProperty({}, "&".concat(componentCls, "-loading-icon, &:not(:last-child)"), {
-    marginInlineEnd: token.marginXS
-  }), "&".concat(componentCls, "-loading-icon-end"), {
-    marginInlineStart: token.marginXS
-  })), '> a', {
+  }, "> span, ".concat(componentCls, "-icon"), {
+    display: 'inline-flex'
+  }), '> a', {
     color: 'currentColor'
   }), '&:not(:disabled)', _objectSpread({}, genFocusStyle(token))), "&".concat(componentCls, "-two-chinese-chars::first-letter"), {
     letterSpacing: '0.34em'
   }), "&".concat(componentCls, "-two-chinese-chars > *:not(").concat(iconCls, ")"), {
     marginInlineEnd: '-0.34em',
     letterSpacing: '0.34em'
-  }), "&-icon-only".concat(componentCls, "-compact-item"), {
-    flex: 'none'
+  }), '&-icon-end', {
+    flexDirection: 'row-reverse'
   }));
 };
 var genHoverActiveButtonStyle = function genHoverActiveButtonStyle(btnCls, hoverStyle, activeStyle) {
@@ -78,7 +70,6 @@ var genRoundButtonStyle = function genRoundButtonStyle(token) {
     paddingInlineEnd: token.calc(token.controlHeight).div(2).equal()
   };
 };
-// =============================== Type ===============================
 var genDisabledStyle = function genDisabledStyle(token) {
   return {
     cursor: 'not-allowed',
@@ -109,119 +100,165 @@ var genGhostButtonStyle = function genGhostButtonStyle(btnCls, background, textC
 var genSolidDisabledButtonStyle = function genSolidDisabledButtonStyle(token) {
   return _defineProperty({}, "&:disabled, &".concat(token.componentCls, "-disabled"), _objectSpread({}, genDisabledStyle(token)));
 };
-var genSolidButtonStyle = function genSolidButtonStyle(token) {
-  return _objectSpread({}, genSolidDisabledButtonStyle(token));
-};
 var genPureDisabledButtonStyle = function genPureDisabledButtonStyle(token) {
   return _defineProperty({}, "&:disabled, &".concat(token.componentCls, "-disabled"), {
     cursor: 'not-allowed',
     color: token.colorTextDisabled
   });
 };
-// Type: Default
+// ============================== Variant =============================
+var genVariantButtonStyle = function genVariantButtonStyle(token, hoverStyle, activeStyle, variant) {
+  var isPureDisabled = variant && ['link', 'text'].includes(variant);
+  var genDisabledButtonStyle = isPureDisabled ? genPureDisabledButtonStyle : genSolidDisabledButtonStyle;
+  return _objectSpread(_objectSpread({}, genDisabledButtonStyle(token)), genHoverActiveButtonStyle(token.componentCls, hoverStyle, activeStyle));
+};
+var genSolidButtonStyle = function genSolidButtonStyle(token, textColor, background, hoverStyle, activeStyle) {
+  return _defineProperty({}, "&".concat(token.componentCls, "-variant-solid"), _objectSpread({
+    color: textColor,
+    background: background
+  }, genVariantButtonStyle(token, hoverStyle, activeStyle)));
+};
+var genOutlinedDashedButtonStyle = function genOutlinedDashedButtonStyle(token, borderColor, background, hoverStyle, activeStyle) {
+  return _defineProperty({}, "&".concat(token.componentCls, "-variant-outlined, &").concat(token.componentCls, "-variant-dashed"), _objectSpread({
+    borderColor: borderColor,
+    background: background
+  }, genVariantButtonStyle(token, hoverStyle, activeStyle)));
+};
+var genDashedButtonStyle = function genDashedButtonStyle(token) {
+  return _defineProperty({}, "&".concat(token.componentCls, "-variant-dashed"), {
+    borderStyle: 'dashed'
+  });
+};
+var genFilledButtonStyle = function genFilledButtonStyle(token, background, hoverStyle, activeStyle) {
+  return _defineProperty({}, "&".concat(token.componentCls, "-variant-filled"), _objectSpread({
+    boxShadow: 'none',
+    background: background
+  }, genVariantButtonStyle(token, hoverStyle, activeStyle)));
+};
+var genTextLinkButtonStyle = function genTextLinkButtonStyle(token, textColor, variant, hoverStyle, activeStyle) {
+  return _defineProperty({}, "&".concat(token.componentCls, "-variant-").concat(variant), _objectSpread({
+    color: textColor,
+    boxShadow: 'none'
+  }, genVariantButtonStyle(token, hoverStyle, activeStyle, variant)));
+};
+// =============================== Color ==============================
 var genDefaultButtonStyle = function genDefaultButtonStyle(token) {
-  return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, genSolidButtonStyle(token)), {}, {
-    background: token.defaultBg,
-    borderColor: token.defaultBorderColor,
+  return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
     color: token.defaultColor,
     boxShadow: token.defaultShadow
-  }, genHoverActiveButtonStyle(token.componentCls, {
-    color: token.defaultHoverColor,
-    borderColor: token.defaultHoverBorderColor,
-    background: token.defaultHoverBg
+  }, genSolidButtonStyle(token, token.solidTextColor, token.colorBgSolid, {
+    background: token.colorBgSolidHover
   }, {
-    color: token.defaultActiveColor,
-    borderColor: token.defaultActiveBorderColor,
-    background: token.defaultActiveBg
-  })), genGhostButtonStyle(token.componentCls, token.ghostBg, token.defaultGhostColor, token.defaultGhostBorderColor, token.colorTextDisabled, token.colorBorder)), {}, _defineProperty({}, "&".concat(token.componentCls, "-dangerous"), _objectSpread(_objectSpread(_objectSpread({
-    color: token.colorError,
-    borderColor: token.colorError
-  }, genHoverActiveButtonStyle(token.componentCls, {
-    color: token.colorErrorHover,
-    borderColor: token.colorErrorBorderHover
+    background: token.colorBgSolidActive
+  })), genDashedButtonStyle(token)), genFilledButtonStyle(token, token.colorFillTertiary, {
+    background: token.colorFillSecondary
   }, {
-    color: token.colorErrorActive,
-    borderColor: token.colorErrorActive
-  })), genGhostButtonStyle(token.componentCls, token.ghostBg, token.colorError, token.colorError, token.colorTextDisabled, token.colorBorder)), genSolidDisabledButtonStyle(token))));
+    background: token.colorFill
+  })), genTextLinkButtonStyle(token, token.textTextColor, 'link', {
+    color: token.colorLinkHover,
+    background: token.linkHoverBg
+  }, {
+    color: token.colorLinkActive
+  })), genGhostButtonStyle(token.componentCls, token.ghostBg, token.defaultGhostColor, token.defaultGhostBorderColor, token.colorTextDisabled, token.colorBorder));
 };
-// Type: Primary
 var genPrimaryButtonStyle = function genPrimaryButtonStyle(token) {
-  return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, genSolidButtonStyle(token)), {}, {
-    color: token.primaryColor,
-    background: token.colorPrimary,
+  return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
+    color: token.colorPrimary,
     boxShadow: token.primaryShadow
-  }, genHoverActiveButtonStyle(token.componentCls, {
-    color: token.colorTextLightSolid,
-    background: token.colorPrimaryHover
+  }, genOutlinedDashedButtonStyle(token, token.colorPrimary, token.colorBgContainer, {
+    color: token.colorPrimaryTextHover,
+    borderColor: token.colorPrimaryHover,
+    background: token.colorBgContainer
+  }, {
+    color: token.colorPrimaryTextActive,
+    borderColor: token.colorPrimaryActive,
+    background: token.colorBgContainer
+  })), genDashedButtonStyle(token)), genFilledButtonStyle(token, token.colorPrimaryBg, {
+    background: token.colorPrimaryBgHover
   }, {
-    color: token.colorTextLightSolid,
-    background: token.colorPrimaryActive
+    background: token.colorPrimaryBorder
+  })), genTextLinkButtonStyle(token, token.colorLink, 'text', {
+    color: token.colorPrimaryTextHover,
+    background: token.colorPrimaryBg
+  }, {
+    color: token.colorPrimaryTextActive,
+    background: token.colorPrimaryBorder
   })), genGhostButtonStyle(token.componentCls, token.ghostBg, token.colorPrimary, token.colorPrimary, token.colorTextDisabled, token.colorBorder, {
     color: token.colorPrimaryHover,
     borderColor: token.colorPrimaryHover
   }, {
     color: token.colorPrimaryActive,
     borderColor: token.colorPrimaryActive
-  })), {}, _defineProperty({}, "&".concat(token.componentCls, "-dangerous"), _objectSpread(_objectSpread(_objectSpread({
-    background: token.colorError,
-    boxShadow: token.dangerShadow,
-    color: token.dangerColor
-  }, genHoverActiveButtonStyle(token.componentCls, {
+  }));
+};
+var genDangerousStyle = function genDangerousStyle(token) {
+  return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
+    color: token.colorError,
+    boxShadow: token.dangerShadow
+  }, genSolidButtonStyle(token, token.dangerColor, token.colorError, {
     background: token.colorErrorHover
   }, {
     background: token.colorErrorActive
-  })), genGhostButtonStyle(token.componentCls, token.ghostBg, token.colorError, token.colorError, token.colorTextDisabled, token.colorBorder, {
+  })), genOutlinedDashedButtonStyle(token, token.colorError, token.colorBgContainer, {
     color: token.colorErrorHover,
-    borderColor: token.colorErrorHover
+    borderColor: token.colorErrorBorderHover
   }, {
     color: token.colorErrorActive,
     borderColor: token.colorErrorActive
-  })), genSolidDisabledButtonStyle(token))));
-};
-// Type: Dashed
-var genDashedButtonStyle = function genDashedButtonStyle(token) {
-  return _objectSpread(_objectSpread({}, genDefaultButtonStyle(token)), {}, {
-    borderStyle: 'dashed'
-  });
-};
-// Type: Link
-var genLinkButtonStyle = function genLinkButtonStyle(token) {
-  return _objectSpread(_objectSpread(_objectSpread({
-    color: token.colorLink
-  }, genHoverActiveButtonStyle(token.componentCls, {
-    color: token.colorLinkHover,
-    background: token.linkHoverBg
+  })), genDashedButtonStyle(token)), genFilledButtonStyle(token, token.colorErrorBg, {
+    background: token.colorErrorBgFilledHover
   }, {
-    color: token.colorLinkActive
-  })), genPureDisabledButtonStyle(token)), {}, _defineProperty({}, "&".concat(token.componentCls, "-dangerous"), _objectSpread(_objectSpread({
-    color: token.colorError
-  }, genHoverActiveButtonStyle(token.componentCls, {
+    background: token.colorErrorBgActive
+  })), genTextLinkButtonStyle(token, token.colorError, 'text', {
+    color: token.colorErrorHover,
+    background: token.colorErrorBg
+  }, {
+    color: token.colorErrorHover,
+    background: token.colorErrorBgActive
+  })), genTextLinkButtonStyle(token, token.colorError, 'link', {
     color: token.colorErrorHover
   }, {
     color: token.colorErrorActive
-  })), genPureDisabledButtonStyle(token))));
+  })), genGhostButtonStyle(token.componentCls, token.ghostBg, token.colorError, token.colorError, token.colorTextDisabled, token.colorBorder, {
+    color: token.colorErrorHover,
+    borderColor: token.colorErrorHover
+  }, {
+    color: token.colorErrorActive,
+    borderColor: token.colorErrorActive
+  }));
 };
-// Type: Text
-var genTextButtonStyle = function genTextButtonStyle(token) {
-  return _objectSpread(_objectSpread(_objectSpread({}, genHoverActiveButtonStyle(token.componentCls, {
-    color: token.colorText,
+var genColorButtonStyle = function genColorButtonStyle(token) {
+  var componentCls = token.componentCls;
+  return _defineProperty(_defineProperty(_defineProperty({}, "".concat(componentCls, "-color-default"), genDefaultButtonStyle(token)), "".concat(componentCls, "-color-primary"), genPrimaryButtonStyle(token)), "".concat(componentCls, "-color-dangerous"), genDangerousStyle(token));
+};
+// =========== Compatible with versions earlier than 5.21.0 ===========
+var genCompatibleButtonStyle = function genCompatibleButtonStyle(token) {
+  return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, genOutlinedDashedButtonStyle(token, token.defaultBorderColor, token.defaultBg, {
+    color: token.defaultHoverColor,
+    borderColor: token.defaultHoverBorderColor,
+    background: token.defaultHoverBg
+  }, {
+    color: token.defaultActiveColor,
+    borderColor: token.defaultActiveBorderColor,
+    background: token.defaultActiveBg
+  })), genTextLinkButtonStyle(token, token.textTextColor, 'text', {
+    color: token.textTextHoverColor,
     background: token.textHoverBg
   }, {
-    color: token.colorText,
+    color: token.textTextActiveColor,
     background: token.colorBgTextActive
-  })), genPureDisabledButtonStyle(token)), {}, _defineProperty({}, "&".concat(token.componentCls, "-dangerous"), _objectSpread(_objectSpread({
-    color: token.colorError
-  }, genPureDisabledButtonStyle(token)), genHoverActiveButtonStyle(token.componentCls, {
-    color: token.colorErrorHover,
-    background: token.colorErrorBg
+  })), genSolidButtonStyle(token, token.primaryColor, token.colorPrimary, {
+    background: token.colorPrimaryHover,
+    color: token.primaryColor
   }, {
-    color: token.colorErrorHover,
-    background: token.colorErrorBgActive
-  }))));
-};
-var genTypeButtonStyle = function genTypeButtonStyle(token) {
-  var componentCls = token.componentCls;
-  return _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "".concat(componentCls, "-default"), genDefaultButtonStyle(token)), "".concat(componentCls, "-primary"), genPrimaryButtonStyle(token)), "".concat(componentCls, "-dashed"), genDashedButtonStyle(token)), "".concat(componentCls, "-link"), genLinkButtonStyle(token)), "".concat(componentCls, "-text"), genTextButtonStyle(token)), "".concat(componentCls, "-ghost"), genGhostButtonStyle(token.componentCls, token.ghostBg, token.colorBgContainer, token.colorBgContainer, token.colorTextDisabled, token.colorBorder));
+    background: token.colorPrimaryActive,
+    color: token.primaryColor
+  })), genTextLinkButtonStyle(token, token.colorLink, 'link', {
+    color: token.colorLinkHover,
+    background: token.linkHoverBg
+  }, {
+    color: token.colorLinkActive
+  }));
 };
 // =============================== Size ===============================
 var genButtonStyle = function genButtonStyle(token) {
@@ -233,30 +270,31 @@ var genButtonStyle = function genButtonStyle(token) {
     borderRadius = token.borderRadius,
     buttonPaddingHorizontal = token.buttonPaddingHorizontal,
     iconCls = token.iconCls,
-    buttonPaddingVertical = token.buttonPaddingVertical;
-  var iconOnlyCls = "".concat(componentCls, "-icon-only");
-  return [_defineProperty({}, "".concat(prefixCls), _defineProperty(_defineProperty(_defineProperty({
+    buttonPaddingVertical = token.buttonPaddingVertical,
+    motionDurationSlow = token.motionDurationSlow,
+    motionEaseInOut = token.motionEaseInOut,
+    buttonIconOnlyFontSize = token.buttonIconOnlyFontSize,
+    opacityLoading = token.opacityLoading;
+  return [_defineProperty({}, prefixCls, _defineProperty(_defineProperty(_defineProperty({
     fontSize: fontSize,
     lineHeight: lineHeight,
     height: controlHeight,
     padding: "".concat(unit(buttonPaddingVertical), " ").concat(unit(buttonPaddingHorizontal)),
     borderRadius: borderRadius
-  }, "&".concat(iconOnlyCls), _defineProperty(_defineProperty({
-    display: 'inline-flex',
-    alignItems: 'center',
-    justifyContent: 'center',
+  }, "&".concat(componentCls, "-icon-only"), _defineProperty(_defineProperty(_defineProperty({
     width: controlHeight,
-    paddingInlineStart: 0,
-    paddingInlineEnd: 0
-  }, "&".concat(componentCls, "-round"), {
+    paddingInline: 0
+  }, "&".concat(componentCls, "-compact-item"), {
+    flex: 'none'
+  }), "&".concat(componentCls, "-round"), {
     width: 'auto'
   }), iconCls, {
-    fontSize: token.buttonIconOnlyFontSize
+    fontSize: buttonIconOnlyFontSize
   })), "&".concat(componentCls, "-loading"), {
-    opacity: token.opacityLoading,
+    opacity: opacityLoading,
     cursor: 'default'
   }), "".concat(componentCls, "-loading-icon"), {
-    transition: "width ".concat(token.motionDurationSlow, " ").concat(token.motionEaseInOut, ", opacity ").concat(token.motionDurationSlow, " ").concat(token.motionEaseInOut)
+    transition: "width ".concat(motionDurationSlow, " ").concat(motionEaseInOut, ", opacity ").concat(motionDurationSlow, " ").concat(motionEaseInOut)
   })), // Shape - patch prefixCls again to override solid border radius style
   _defineProperty({}, "".concat(componentCls).concat(componentCls, "-circle").concat(prefixCls), genCircleButtonStyle(token)), _defineProperty({}, "".concat(componentCls).concat(componentCls, "-round").concat(prefixCls), genRoundButtonStyle(token))];
 };
@@ -308,8 +346,10 @@ export default genStyleHooks('Button', function (token) {
   genSizeBaseButtonStyle(buttonToken), genSizeSmallButtonStyle(buttonToken), genSizeLargeButtonStyle(buttonToken),
   // Block
   genBlockButtonStyle(buttonToken),
-  // Group (type, ghost, danger, loading)
-  genTypeButtonStyle(buttonToken),
+  // Color
+  genColorButtonStyle(buttonToken),
+  // https://github.com/ant-design/ant-design/issues/50969
+  genCompatibleButtonStyle(buttonToken),
   // Button Group
   genGroupStyle(buttonToken)];
 }, prepareComponentToken, {

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

@@ -1,3 +1,5 @@
+import { AggregationColor } from '../../color-picker/color';
+import { isBright } from '../../color-picker/components/ColorPresets';
 import { getLineHeight, mergeToken } from '../../theme/internal';
 export var prepareToken = function prepareToken(token) {
   var paddingInline = token.paddingInline,
@@ -18,6 +20,7 @@ export var prepareComponentToken = function prepareComponentToken(token) {
   var contentLineHeight = (_token$contentLineHei = token.contentLineHeight) !== null && _token$contentLineHei !== void 0 ? _token$contentLineHei : getLineHeight(contentFontSize);
   var contentLineHeightSM = (_token$contentLineHei2 = token.contentLineHeightSM) !== null && _token$contentLineHei2 !== void 0 ? _token$contentLineHei2 : getLineHeight(contentFontSizeSM);
   var contentLineHeightLG = (_token$contentLineHei3 = token.contentLineHeightLG) !== null && _token$contentLineHei3 !== void 0 ? _token$contentLineHei3 : getLineHeight(contentFontSizeLG);
+  var solidTextColor = isBright(new AggregationColor(token.colorBgSolid), '#fff') ? '#000' : '#fff';
   return {
     fontWeight: 400,
     defaultShadow: "0 ".concat(token.controlOutlineWidth, "px 0 ").concat(token.controlTmpOutline),
@@ -37,7 +40,10 @@ export var prepareComponentToken = function prepareComponentToken(token) {
     onlyIconSizeLG: token.fontSizeLG + 2,
     groupBorderColor: token.colorPrimaryHover,
     linkHoverBg: 'transparent',
-    textHoverBg: token.colorBgTextHover,
+    textTextColor: token.colorText,
+    textTextHoverColor: token.colorText,
+    textTextActiveColor: token.colorText,
+    textHoverBg: token.colorFillTertiary,
     defaultColor: token.colorText,
     defaultBg: token.colorBgContainer,
     defaultBorderColor: token.colorBorder,
@@ -48,6 +54,7 @@ export var prepareComponentToken = function prepareComponentToken(token) {
     defaultActiveBg: token.colorBgContainer,
     defaultActiveColor: token.colorPrimaryActive,
     defaultActiveBorderColor: token.colorPrimaryActive,
+    solidTextColor: solidTextColor,
     contentFontSize: contentFontSize,
     contentFontSizeSM: contentFontSizeSM,
     contentFontSizeLG: contentFontSizeLG,

package/lib/Antd5/calendar/generateCalendar.js

@@ -21,16 +21,19 @@ import { useLocale } from '../locale';
 import CalendarHeader from './Header';
 import enUS from './locale/en_US';
 import useStyle from './style';
-function generateCalendar(generateConfig) {
-  function isSameYear(date1, date2) {
-    return date1 && date2 && generateConfig.getYear(date1) === generateConfig.getYear(date2);
-  }
-  function isSameMonth(date1, date2) {
-    return isSameYear(date1, date2) && generateConfig.getMonth(date1) === generateConfig.getMonth(date2);
-  }
-  function isSameDate(date1, date2) {
-    return isSameMonth(date1, date2) && generateConfig.getDate(date1) === generateConfig.getDate(date2);
-  }
+var isSameYear = function isSameYear(date1, date2, config) {
+  var getYear = config.getYear;
+  return date1 && date2 && getYear(date1) === getYear(date2);
+};
+var isSameMonth = function isSameMonth(date1, date2, config) {
+  var getMonth = config.getMonth;
+  return isSameYear(date1, date2, config) && getMonth(date1) === getMonth(date2);
+};
+var isSameDate = function isSameDate(date1, date2, config) {
+  var getDate = config.getDate;
+  return isSameMonth(date1, date2, config) && getDate(date1) === getDate(date2);
+};
+var generateCalendar = function generateCalendar(generateConfig) {
   var Calendar = function Calendar(props) {
     var customizePrefixCls = props.prefixCls,
       className = props.className,
@@ -105,9 +108,9 @@ function generateCalendar(generateConfig) {
     };
     var triggerChange = function triggerChange(date) {
       setMergedValue(date);
-      if (!isSameDate(date, mergedValue)) {
+      if (!isSameDate(date, mergedValue, generateConfig)) {
         // Trigger when month panel switch month
-        if (panelMode === 'date' && !isSameMonth(date, mergedValue) || panelMode === 'month' && !isSameYear(date, mergedValue)) {
+        if (panelMode === 'date' && !isSameMonth(date, mergedValue, generateConfig) || panelMode === 'month' && !isSameYear(date, mergedValue, generateConfig)) {
           triggerPanelChange(date, mergedMode);
         }
         onChange === null || onChange === void 0 || onChange(date);
@@ -123,13 +126,6 @@ function generateCalendar(generateConfig) {
         source: source
       });
     };
-    // ====================== Locale ======================
-    var getDefaultLocale = function getDefaultLocale() {
-      var locale = props.locale;
-      var result = _objectSpread(_objectSpread({}, enUS), locale);
-      result.lang = _objectSpread(_objectSpread({}, result.lang), (locale || {}).lang);
-      return result;
-    };
     // ====================== Render ======================
     var dateRender = React.useCallback(function (date, info) {
       if (fullCellRender) {
@@ -139,13 +135,13 @@ function generateCalendar(generateConfig) {
         return dateFullCellRender(date);
       }
       return _jsxs("div", {
-        className: classNames("".concat(prefixCls, "-cell-inner"), "".concat(calendarPrefixCls, "-date"), _defineProperty({}, "".concat(calendarPrefixCls, "-date-today"), isSameDate(today, date))),
+        className: classNames("".concat(prefixCls, "-cell-inner"), "".concat(calendarPrefixCls, "-date"), _defineProperty({}, "".concat(calendarPrefixCls, "-date-today"), isSameDate(today, date, generateConfig))),
         children: [_jsx("div", {
           className: "".concat(calendarPrefixCls, "-date-value"),
           children: String(generateConfig.getDate(date)).padStart(2, '0')
         }), _jsx("div", {
           className: "".concat(calendarPrefixCls, "-date-content"),
-          children: cellRender ? cellRender(date, info) : dateCellRender && dateCellRender(date)
+          children: cellRender ? cellRender(date, info) : dateCellRender === null || dateCellRender === void 0 ? void 0 : dateCellRender(date)
         })]
       });
     }, [dateFullCellRender, dateCellRender, cellRender, fullCellRender]);
@@ -158,26 +154,27 @@ function generateCalendar(generateConfig) {
       }
       var months = info.locale.shortMonths || generateConfig.locale.getShortMonths(info.locale.locale);
       return _jsxs("div", {
-        className: classNames("".concat(prefixCls, "-cell-inner"), "".concat(calendarPrefixCls, "-date"), _defineProperty({}, "".concat(calendarPrefixCls, "-date-today"), isSameMonth(today, date))),
+        className: classNames("".concat(prefixCls, "-cell-inner"), "".concat(calendarPrefixCls, "-date"), _defineProperty({}, "".concat(calendarPrefixCls, "-date-today"), isSameMonth(today, date, generateConfig))),
         children: [_jsx("div", {
           className: "".concat(calendarPrefixCls, "-date-value"),
           children: months[generateConfig.getMonth(date)]
         }), _jsx("div", {
           className: "".concat(calendarPrefixCls, "-date-content"),
-          children: cellRender ? cellRender(date, info) : monthCellRender && monthCellRender(date)
+          children: cellRender ? cellRender(date, info) : monthCellRender === null || monthCellRender === void 0 ? void 0 : monthCellRender(date)
         })]
       });
     }, [monthFullCellRender, monthCellRender, cellRender, fullCellRender]);
-    var _useLocale = useLocale('Calendar', getDefaultLocale),
+    var _useLocale = useLocale('Calendar', enUS),
       _useLocale2 = _slicedToArray(_useLocale, 1),
       contextLocale = _useLocale2[0];
+    var locale = _objectSpread(_objectSpread({}, contextLocale), props.locale);
     var mergedCellRender = function mergedCellRender(current, info) {
       if (info.type === 'date') {
         return dateRender(current, info);
       }
       if (info.type === 'month') {
         return monthRender(current, _objectSpread(_objectSpread({}, info), {}, {
-          locale: contextLocale === null || contextLocale === void 0 ? void 0 : contextLocale.lang
+          locale: locale === null || locale === void 0 ? void 0 : locale.lang
         }));
       }
     };
@@ -197,14 +194,14 @@ function generateCalendar(generateConfig) {
         generateConfig: generateConfig,
         mode: mergedMode,
         fullscreen: fullscreen,
-        locale: contextLocale === null || contextLocale === void 0 ? void 0 : contextLocale.lang,
+        locale: locale === null || locale === void 0 ? void 0 : locale.lang,
         validRange: validRange,
         onChange: onInternalSelect,
         onModeChange: triggerModeChange
       }), _jsx(RCPickerPanel, {
         value: mergedValue,
         prefixCls: prefixCls,
-        locale: contextLocale === null || contextLocale === void 0 ? void 0 : contextLocale.lang,
+        locale: locale === null || locale === void 0 ? void 0 : locale.lang,
         generateConfig: generateConfig,
         cellRender: mergedCellRender,
         onSelect: function onSelect(nextDate) {
@@ -221,5 +218,5 @@ function generateCalendar(generateConfig) {
     Calendar.displayName = 'Calendar';
   }
   return Calendar;
-}
+};
 export default generateCalendar;

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

@@ -53,7 +53,7 @@ export var genCalendarStyles = function genCalendarStyles(token) {
     th: {
       height: 'auto',
       padding: 0,
-      lineHeight: "".concat(unit(token.weekHeight))
+      lineHeight: unit(token.weekHeight)
     }
   }), "".concat(componentCls, "-cell::before"), {
     pointerEvents: 'none'
@@ -71,7 +71,7 @@ export var genCalendarStyles = function genCalendarStyles(token) {
       height: 'auto',
       paddingInlineEnd: token.paddingSM,
       paddingBottom: token.paddingXXS,
-      lineHeight: "".concat(unit(token.weekHeight))
+      lineHeight: unit(token.weekHeight)
     }
   })), "".concat(componentCls, "-cell"), _defineProperty(_defineProperty(_defineProperty({
     '&::before': {
@@ -97,7 +97,7 @@ export var genCalendarStyles = function genCalendarStyles(token) {
     borderRadius: 0,
     transition: "background ".concat(token.motionDurationSlow),
     '&-value': {
-      lineHeight: "".concat(unit(token.dateValueHeight)),
+      lineHeight: unit(token.dateValueHeight),
       transition: "color ".concat(token.motionDurationSlow)
     },
     '&-content': {
@@ -114,7 +114,7 @@ export var genCalendarStyles = function genCalendarStyles(token) {
     }, "".concat(calendarCls, "-date-value"), {
       color: token.colorText
     })
-  })), "@media only screen and (max-width: ".concat(unit(token.screenXS), ") "), _defineProperty({}, "".concat(calendarCls), _defineProperty({}, "".concat(calendarCls, "-header"), _defineProperty(_defineProperty(_defineProperty({
+  })), "@media only screen and (max-width: ".concat(unit(token.screenXS), ") "), _defineProperty({}, calendarCls, _defineProperty({}, "".concat(calendarCls, "-header"), _defineProperty(_defineProperty(_defineProperty({
     display: 'block'
   }, "".concat(calendarCls, "-year-select"), {
     width: '50%'

package/lib/Antd5/card/Card.js

@@ -107,7 +107,7 @@ var Card = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var isContainGrid = React.useMemo(function () {
     var containGrid = false;
     React.Children.forEach(children, function (element) {
-      if (element && element.type && element.type === Grid) {
+      if ((element === null || element === void 0 ? void 0 : element.type) === Grid) {
         containGrid = true;
       }
     });
@@ -182,13 +182,13 @@ var Card = /*#__PURE__*/React.forwardRef(function (props, ref) {
     children: loading ? loadingBlock : children
   });
   var actionClasses = classNames("".concat(prefixCls, "-actions"), moduleClass('actions'));
-  var actionDom = actions && actions.length ? _jsx(ActionNode, {
+  var actionDom = actions !== null && actions !== void 0 && actions.length ? _jsx(ActionNode, {
     actionClasses: actionClasses,
     actionStyle: moduleStyle('actions'),
     actions: actions
   }) : null;
   var divProps = omit(others, ['onTabChange']);
-  var classString = classNames(prefixCls, card === null || card === void 0 ? void 0 : card.className, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "".concat(prefixCls, "-loading"), loading), "".concat(prefixCls, "-bordered"), bordered), "".concat(prefixCls, "-hoverable"), hoverable), "".concat(prefixCls, "-contain-grid"), isContainGrid), "".concat(prefixCls, "-contain-tabs"), tabList && tabList.length), "".concat(prefixCls, "-").concat(mergedSize), mergedSize), "".concat(prefixCls, "-type-").concat(type), !!type), "".concat(prefixCls, "-rtl"), direction === 'rtl'), className, rootClassName, hashId, cssVarCls);
+  var classString = classNames(prefixCls, card === null || card === void 0 ? void 0 : card.className, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "".concat(prefixCls, "-loading"), loading), "".concat(prefixCls, "-bordered"), bordered), "".concat(prefixCls, "-hoverable"), hoverable), "".concat(prefixCls, "-contain-grid"), isContainGrid), "".concat(prefixCls, "-contain-tabs"), tabList === null || tabList === void 0 ? void 0 : tabList.length), "".concat(prefixCls, "-").concat(mergedSize), mergedSize), "".concat(prefixCls, "-type-").concat(type), !!type), "".concat(prefixCls, "-rtl"), direction === 'rtl'), className, rootClassName, hashId, cssVarCls);
   var mergedStyle = _objectSpread(_objectSpread({}, card === null || card === void 0 ? void 0 : card.style), style);
   return wrapCSSVar(_jsxs("div", _objectSpread(_objectSpread({
     ref: ref

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

@@ -177,8 +177,7 @@ var genCardLoadingStyle = function genCardLoadingStyle(token) {
 };
 // ============================== Basic ==============================
 var genCardStyle = function genCardStyle(token) {
-  var antCls = token.antCls,
-    componentCls = token.componentCls,
+  var componentCls = token.componentCls,
     cardShadow = token.cardShadow,
     cardHeadPadding = token.cardHeadPadding,
     colorBorderSecondary = token.colorBorderSecondary,
@@ -190,8 +189,7 @@ var genCardStyle = function genCardStyle(token) {
     background: token.colorBgContainer,
     borderRadius: token.borderRadiusLG
   }, "&:not(".concat(componentCls, "-bordered)"), {
-    // boxShadow: boxShadowTertiary,
-    boxShadow: "none"
+    boxShadow: boxShadowTertiary
   }), "".concat(componentCls, "-head"), genCardHeadStyle(token)), "".concat(componentCls, "-extra"), {
     // https://stackoverflow.com/a/22429853/3040605
     marginInlineStart: 'auto',
@@ -201,14 +199,13 @@ var genCardStyle = function genCardStyle(token) {
   }), "".concat(componentCls, "-body"), _objectSpread({
     padding: cardPaddingBase,
     borderRadius: "0 0 ".concat(unit(token.borderRadiusLG), " ").concat(unit(token.borderRadiusLG))
-  }, clearFix())), "".concat(componentCls, "-grid"), genCardGridStyle(token)), "".concat(componentCls, "-cover"), _defineProperty({
+  }, clearFix())), "".concat(componentCls, "-grid"), genCardGridStyle(token)), "".concat(componentCls, "-cover"), {
     '> *': {
       display: 'block',
-      width: '100%'
+      width: '100%',
+      borderRadius: "".concat(unit(token.borderRadiusLG), " ").concat(unit(token.borderRadiusLG), " 0 0")
     }
-  }, "img, img + ".concat(antCls, "-image-mask"), {
-    borderRadius: "".concat(unit(token.borderRadiusLG), " ").concat(unit(token.borderRadiusLG), " 0 0")
-  })), "".concat(componentCls, "-actions"), genCardActionsStyle(token)), "".concat(componentCls, "-meta"), genCardMetaStyle(token)))), "".concat(componentCls, "-bordered"), _defineProperty({
+  }), "".concat(componentCls, "-actions"), genCardActionsStyle(token)), "".concat(componentCls, "-meta"), genCardMetaStyle(token)))), "".concat(componentCls, "-bordered"), _defineProperty({
     border: "".concat(unit(token.lineWidth), " ").concat(token.lineType, " ").concat(colorBorderSecondary)
   }, "".concat(componentCls, "-cover"), {
     marginTop: -1,