Skip to content

Fix workspace icon border radius is different than the overlay #23707

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
danieldoglas merged 3 commits into from
Jul 31, 2023
Merged

Fix workspace icon border radius is different than the overlay #23707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
72189c8
fix icon border radius is different than the overlay
bernhardoj Jul 27, 2023
fc0a75c
prettier
bernhardoj Jul 27, 2023
d9c824a
Merge branch 'main' into fix/23426-icon-overlay-border-radius
bernhardoj Jul 28, 2023
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
24 changes: 10 additions & 14 deletions src/components/MultipleAvatars.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,21 +174,17 @@ function MultipleAvatars(props) {
avatar: icon.avatar,
}}
>
<View
style={[
styles.justifyContentCenter,
styles.alignItemsCenter,
StyleUtils.getHorizontalStackedAvatarBorderStyle({
isHovered: props.isHovered,
isPressed: props.isPressed,
isInReportAction: props.isInReportAction,
shouldUseCardBackground: props.shouldUseCardBackground,
}),
StyleUtils.getHorizontalStackedAvatarStyle(index, overlapSize, oneAvatarBorderWidth, oneAvatarSize.width),
icon.type === CONST.ICON_TYPE_WORKSPACE ? StyleUtils.getAvatarBorderRadius(props.size, icon.type) : {},
]}
>
<View style={[StyleUtils.getHorizontalStackedAvatarStyle(index, overlapSize), StyleUtils.getAvatarBorderRadius(props.size, icon.type)]}>
<Avatar
iconAdditionalStyles={[
StyleUtils.getHorizontalStackedAvatarBorderStyle({
isHovered: props.isHovered,
isPressed: props.isPressed,
isInReportAction: props.isInReportAction,
shouldUseCardBackground: props.shouldUseCardBackground,
}),
StyleUtils.getAvatarBorderWidth(props.size),
]}
source={icon.source || props.fallbackIcon}
fill={themeColors.iconSuccessFill}
size={props.size}
Expand Down
15 changes: 5 additions & 10 deletions src/styles/StyleUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -878,20 +878,17 @@ function getKeyboardShortcutsModalWidth(isSmallScreenWidth) {
* @returns {Object}
*/
function getHorizontalStackedAvatarBorderStyle({isHovered, isPressed, isInReportAction = false, shouldUseCardBackground = false}) {
let backgroundColor = shouldUseCardBackground ? themeColors.cardBG : themeColors.appBG;
let borderColor = shouldUseCardBackground ? themeColors.cardBG : themeColors.appBG;

if (isHovered) {
backgroundColor = isInReportAction ? themeColors.highlightBG : themeColors.border;
borderColor = isInReportAction ? themeColors.highlightBG : themeColors.border;
}

if (isPressed) {
backgroundColor = isInReportAction ? themeColors.highlightBG : themeColors.buttonPressedBG;
borderColor = isInReportAction ? themeColors.highlightBG : themeColors.buttonPressedBG;
}

return {
backgroundColor,
borderColor: backgroundColor,
};
return {borderColor};
}

/**
Expand All @@ -902,11 +899,9 @@ function getHorizontalStackedAvatarBorderStyle({isHovered, isPressed, isInReport
* @param {Number} borderRadius
* @returns {Object}
*/
function getHorizontalStackedAvatarStyle(index, overlapSize, borderWidth, borderRadius) {
function getHorizontalStackedAvatarStyle(index, overlapSize) {
return {
marginLeft: index > 0 ? -overlapSize : 0,
borderRadius,
borderWidth,
zIndex: index + 2,
};
}
Expand Down