Skip to content

Commit

Permalink
chore: auto merge branches (ant-design#44516)
Browse files Browse the repository at this point in the history
chore: Feature merge master
  • Loading branch information
github-actions[bot] authored Aug 29, 2023
2 parents 6ebbdc9 + 25e7641 commit 639c0c2
Show file tree
Hide file tree
Showing 29 changed files with 836 additions and 582 deletions.
4 changes: 2 additions & 2 deletions components/button/button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down Expand Up @@ -289,7 +289,7 @@ const InternalButton: React.ForwardRefRenderFunction<
{kids}

{/* Styles: compact */}
{compactItemClassnames && <CompactStyle prefixCls={prefixCls} />}
{compactItemClassnames && <CompactCmp key="compact" prefixCls={prefixCls} />}
</button>
);

Expand Down
Loading

0 comments on commit 639c0c2

Please sign in to comment.