Skip to content

Fix missing padding on workspace avatar in menu item #98041

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
roryabraham merged 1 commit into from
Aug 7, 2026
Merged

Fix missing padding on workspace avatar in menu item #98041

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/components/MenuItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -683,8 +683,9 @@ function MenuItem({
});
const shouldDimIconRight = iconRight === icons.ArrowRight || !iconRight;

const hasIcon = (!!icon || iconType === CONST.ICON_TYPE_WORKSPACE) && !Array.isArray(icon);
// eslint-disable-next-line no-nested-ternary -- Selects ml2/ml3/empty based on icon presence and avatar size
const iconLeftPadding = shouldPutLeftPaddingWhenNoIcon || (icon && !Array.isArray(icon)) ? (avatarSize === CONST.AVATAR_SIZE.SMALL ? styles.ml2 : styles.ml3) : {};
const iconLeftPadding = shouldPutLeftPaddingWhenNoIcon || hasIcon ? (avatarSize === CONST.AVATAR_SIZE.SMALL ? styles.ml2 : styles.ml3) : {};

const combinedTitleTextStyle = StyleUtils.combineStyles<TextStyle>(
[
Expand All @@ -707,7 +708,7 @@ function MenuItem({
styles.flex1,
title ? {} : StyleUtils.getFontSizeStyle(variables.fontSizeNormal),
title ? styles.textLineHeightNormal : StyleUtils.getLineHeightStyle(variables.fontSizeNormalHeight),
!descriptionAddon && icon && !Array.isArray(icon) ? styles.ml3 : {},
!descriptionAddon && hasIcon ? styles.ml3 : {},
descriptionAddon ? styles.ml2 : {},
(descriptionTextStyle as TextStyle) || styles.breakWord,
isDeleted ? styles.offlineFeedbackDeleted : {},
Expand All @@ -716,7 +717,7 @@ function MenuItem({
const descriptionContainerStyle = StyleUtils.combineStyles<ViewStyle>([
styles.flexRow,
styles.alignItemsCenter,
descriptionAddon && icon && !Array.isArray(icon) ? styles.ml3 : {},
descriptionAddon && hasIcon ? styles.ml3 : {},
title ? descriptionVerticalMargin : {},
]);

Expand Down Expand Up @@ -959,7 +960,7 @@ function MenuItem({
]}
/>
)}
{(!!icon || iconType === CONST.ICON_TYPE_WORKSPACE) && !Array.isArray(icon) && (
{hasIcon && (
<View
style={[
styles.popoverMenuIcon,
Expand Down
Loading