Skip to content

Commit

Permalink
Merge branch 'master' into add-table-component
Browse files Browse the repository at this point in the history
  • Loading branch information
michaeltaranto authored Dec 23, 2024
2 parents ff0dc63 + cc41935 commit 057c413
Showing 1 changed file with 2 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import { useBraidTheme } from '../BraidProvider/BraidThemeContext';
import { iconSlotSpace } from '../private/iconSlotSpace';
import { badgeSlotSpace } from '../private/badgeSlotSpace';
import { virtualTouchable } from '../private/touchable/virtualTouchable.css';
import { DefaultBadgePropsProvider } from '../Badge/defaultBadgeProps';

const {
MENU_ITEM_UP,
Expand Down Expand Up @@ -248,13 +247,8 @@ function MenuItemChildren({
</Text>
</Box>
{badge ? (
<Box
component="span"
paddingLeft={badgeSpace}
flexShrink={0}
minWidth={0}
>
<DefaultBadgePropsProvider bleedY>{badge}</DefaultBadgePropsProvider>
<Box component="span" paddingLeft={badgeSpace}>
<Text size={size}>{badge}</Text>
</Box>
) : null}
</Box>
Expand Down

0 comments on commit 057c413

Please sign in to comment.