chore: auto merge branches (ant-design#44516)

chore: Feature merge master
ammar-knowledge · Aug 29, 2023 · 639c0c2 · 639c0c2
2 parents 6ebbdc9 + 25e7641
commit 639c0c2
Show file tree

Hide file tree

Showing 29 changed files with 836 additions and 582 deletions.
diff --git a/components/button/button.tsx b/components/button/button.tsx
@@ -25,7 +25,7 @@ import { isTwoCNChar, isUnBorderedButtonType, spaceChildren } from './buttonHelp
 import IconWrapper from './IconWrapper';
 import LoadingIcon from './LoadingIcon';
 import useStyle from './style';
-import CompactStyle from './style/compactCmp';
+import CompactCmp from './style/compactCmp';
 
 export type LegacyButtonType = ButtonType | 'danger';
 
@@ -289,7 +289,7 @@ const InternalButton: React.ForwardRefRenderFunction<
       {kids}
 
       {/* Styles: compact */}
-      {compactItemClassnames && <CompactStyle prefixCls={prefixCls} />}
+      {compactItemClassnames && <CompactCmp key="compact" prefixCls={prefixCls} />}
     </button>
   );