Merge pull request #47304 from ant-design/master-merge-feature

Master merge feature
ant-design · Feb 2, 2024 · 0c781ee · 0c781ee
2 parents 82b1f77 + 03b9175
commit 0c781ee
Show file tree

Hide file tree

Showing 134 changed files with 246,558 additions and 211,032 deletions.
diff --git a/.gitignore b/.gitignore
@@ -70,3 +70,4 @@ __image_snapshots__/
 
 .eslintcache
 .node-version
+.node
diff --git a/components/affix/utils.ts b/components/affix/utils.ts
@@ -7,7 +7,10 @@ export function getTargetRect(target: BindElement): DOMRect {
 }
 
 export function getFixedTop(placeholderRect: DOMRect, targetRect: DOMRect, offsetTop?: number) {
-  if (offsetTop !== undefined && Math.round(targetRect.top) > Math.round(placeholderRect.top) - offsetTop) {
+  if (
+    offsetTop !== undefined &&
+    Math.round(targetRect.top) > Math.round(placeholderRect.top) - offsetTop
+  ) {
     return offsetTop + targetRect.top;
   }
   return undefined;
@@ -18,7 +21,10 @@ export function getFixedBottom(
   targetRect: DOMRect,
   offsetBottom?: number,
 ) {
-  if (offsetBottom !== undefined && Math.round(targetRect.bottom) < Math.round(placeholderRect.bottom) + offsetBottom) {
+  if (
+    offsetBottom !== undefined &&
+    Math.round(targetRect.bottom) < Math.round(placeholderRect.bottom) + offsetBottom
+  ) {
     const targetBottomOffset = window.innerHeight - targetRect.bottom;
     return offsetBottom + targetBottomOffset;
   }

diff --git a/components/alert/Alert.tsx b/components/alert/Alert.tsx
@@ -84,7 +84,7 @@ interface CloseIconProps {
   handleClose: AlertProps['onClose'];
 }
 
-const CloseIcon: React.FC<CloseIconProps> = (props) => {
+const CloseIconNode: React.FC<CloseIconProps> = (props) => {
   const { isClosable, prefixCls, closeIcon, handleClose } = props;
   const mergedCloseIcon =
     closeIcon === true || closeIcon === undefined ? <CloseOutlined /> : closeIcon;
@@ -143,7 +143,7 @@ const Alert: React.FC<AlertProps> = (props) => {
   }, [props.type, banner]);
 
   // closeable when closeText or closeIcon is assigned
-  const isClosable = React.useMemo(() => {
+  const isClosable = React.useMemo<boolean>(() => {
     if (closeText) {
       return true;
     }
@@ -209,10 +209,10 @@ const Alert: React.FC<AlertProps> = (props) => {
             {description ? <div className={`${prefixCls}-description`}>{description}</div> : null}
           </div>
           {action ? <div className={`${prefixCls}-action`}>{action}</div> : null}
-          <CloseIcon
+          <CloseIconNode
             isClosable={isClosable}
             prefixCls={prefixCls}
-            closeIcon={closeText || closeIcon}
+            closeIcon={closeText || (closeIcon ?? alert?.closeIcon)}
             handleClose={handleClose}
           />
         </div>

diff --git a/components/button/style/index.ts b/components/button/style/index.ts
@@ -179,12 +179,14 @@ const genDefaultButtonStyle: GenerateStyle<ButtonToken, CSSObject> = (token) =>
   ...genHoverActiveButtonStyle(
     token.componentCls,
     {
-      color: token.colorPrimaryHover,
-      borderColor: token.colorPrimaryHover,
+      color: token.defaultHoverColor,
+      borderColor: token.defaultHoverBorderColor,
+      background: token.defaultHoverBg,
     },
     {
-      color: token.colorPrimaryActive,
-      borderColor: token.colorPrimaryActive,
+      color: token.defaultActiveColor,
+      borderColor: token.defaultActiveBorderColor,
+      background: token.defaultActiveBg,
     },
   ),
 

diff --git a/components/button/style/token.ts b/components/button/style/token.ts
@@ -50,6 +50,36 @@ export interface ComponentToken {
    * @descEN Text color of danger button
    */
   dangerColor: string;
+  /**
+   * @desc 默认按钮悬浮态背景色
+   * @descEN Background color of default button when hover
+   */
+  defaultHoverBg: string;
+  /**
+   * @desc 默认按钮悬浮态文本颜色
+   * @descEN Text color of default button when hover
+   */
+  defaultHoverColor: string;
+  /**
+   * @desc 默认按钮悬浮态边框颜色
+   * @descEN Border color of default button
+   */
+  defaultHoverBorderColor: string;
+  /**
+   * @desc 默认按钮激活态背景色
+   * @descEN Background color of default button when active
+   */
+  defaultActiveBg: string;
+  /**
+   * @desc 默认按钮激活态文字颜色
+   * @descEN Text color of default button when active
+   */
+  defaultActiveColor: string;
+  /**
+   * @desc 默认按钮激活态边框颜色
+   * @descEN Border color of default button when active
+   */
+  defaultActiveBorderColor: string;
   /**
    * @desc 禁用状态边框颜色
    * @descEN Border color of disabled button
@@ -214,6 +244,12 @@ export const prepareComponentToken: GetDefaultToken<'Button'> = (token) => {
     defaultBg: token.colorBgContainer,
     defaultBorderColor: token.colorBorder,
     defaultBorderColorDisabled: token.colorBorder,
+    defaultHoverBg: token.colorBgContainer,
+    defaultHoverColor: token.colorPrimaryHover,
+    defaultHoverBorderColor: token.colorPrimaryHover,
+    defaultActiveBg: token.colorBgContainer,
+    defaultActiveColor: token.colorPrimaryActive,
+    defaultActiveBorderColor: token.colorPrimaryActive,
     contentFontSize,
     contentFontSizeSM,
     contentFontSizeLG,