DMs to show all avatars #21402
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| import React, {memo, useEffect, useState} from 'react'; | ||
| import PropTypes from 'prop-types'; | ||
| import {View} from 'react-native'; | ||
| import _ from 'underscore'; | ||
|
|
@@ -32,6 +32,9 @@ const propTypes = { | |
| /** Prop to identify if we should load avatars vertically instead of diagonally */ | ||
| shouldStackHorizontally: PropTypes.bool, | ||
|
|
||
| /** Prop to identify if we should display avatars in rows */ | ||
| shouldDisplayAvatarsInRows: PropTypes.bool, | ||
|
|
||
| /** Whether the avatars are hovered */ | ||
| isHovered: PropTypes.bool, | ||
|
|
||
|
|
@@ -49,6 +52,9 @@ const propTypes = { | |
|
|
||
| /** Whether avatars are displayed with the highlighted background color instead of the app background color. This is primarily the case for IOU previews. */ | ||
| shouldUseCardBackground: PropTypes.bool, | ||
|
|
||
| /** Prop to limit the amount of avatars displayed horizontally */ | ||
| maxAvatarsInRow: PropTypes.number, | ||
| }; | ||
|
|
||
| const defaultProps = { | ||
|
|
@@ -57,20 +63,48 @@ const defaultProps = { | |
| secondAvatarStyle: [StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG)], | ||
| fallbackIcon: undefined, | ||
| shouldStackHorizontally: false, | ||
| shouldDisplayAvatarsInRows: false, | ||
| isHovered: false, | ||
| isPressed: false, | ||
| isFocusMode: false, | ||
| isInReportAction: false, | ||
| shouldShowTooltip: true, | ||
| shouldUseCardBackground: false, | ||
| maxAvatarsInRow: CONST.AVATAR_ROW_SIZE.DEFAULT, | ||
| }; | ||
|
|
||
| function MultipleAvatars(props) { | ||
| const [avatarRows, setAvatarRows] = useState([props.icons]); | ||
| let avatarContainerStyles = props.size === CONST.AVATAR_SIZE.SMALL ? [styles.emptyAvatarSmall, styles.emptyAvatarMarginSmall] : [styles.emptyAvatar, styles.emptyAvatarMargin]; | ||
| const singleAvatarStyles = props.size === CONST.AVATAR_SIZE.SMALL ? styles.singleAvatarSmall : styles.singleAvatar; | ||
| const secondAvatarStyles = [props.size === CONST.AVATAR_SIZE.SMALL ? styles.secondAvatarSmall : styles.secondAvatar, ...props.secondAvatarStyle]; | ||
| const tooltipTexts = props.shouldShowTooltip ? _.pluck(props.icons, 'name') : ['']; | ||
|
|
||
| const calculateAvatarRows = () => { | ||
| // If we're not displaying avatars in rows or the number of icons is less than or equal to the max avatars in a row, return a single row | ||
| if (!props.shouldDisplayAvatarsInRows || props.icons.length <= props.maxAvatarsInRow) { | ||
| setAvatarRows([props.icons]); | ||
| return; | ||
| } | ||
|
|
||
| // Calculate the size of each row | ||
| const rowSize = Math.min(Math.ceil(props.icons.length / 2), props.maxAvatarsInRow); | ||
|
|
||
| // Slice the icons array into two rows | ||
| const firstRow = props.icons.slice(rowSize); | ||
| const secondRow = props.icons.slice(0, rowSize); | ||
|
|
||
| // Update the state with the two rows as an array | ||
| setAvatarRows([firstRow, secondRow]); | ||
| }; | ||
|
|
||
| useEffect(() => { | ||
| calculateAvatarRows(); | ||
|
|
||
| // The only dependencies of the effect are based on props, so we can safely disable the exhaustive-deps rule | ||
| // eslint-disable-next-line react-hooks/exhaustive-deps | ||
| }, [props.icons, props.maxAvatarsInRow, props.shouldDisplayAvatarsInRows]); | ||
|
Comment on lines
+101
to
+106
There was a problem hiding this comment. Greetings, This code has introduced a regression in #24062. The |
||
|
|
||
| if (!props.icons.length) { | ||
| return null; | ||
| } | ||
|
|
@@ -118,114 +152,126 @@ function MultipleAvatars(props) { | |
| } | ||
|
|
||
| return ( | ||
| <> | ||
| {props.shouldStackHorizontally ? ( | ||
| _.map(avatarRows, (avatars, rowIndex) => ( | ||
| <View | ||
| style={avatarContainerStyles} | ||
| key={`avatarRow-${rowIndex}`} | ||
| > | ||
| {_.map([...avatars].splice(0, props.maxAvatarsInRow), (icon, index) => ( | ||
| <UserDetailsTooltip | ||
| key={`stackedAvatars-${index}`} | ||
| accountID={icon.id} | ||
| > | ||
| <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) : {}, | ||
| ]} | ||
| > | ||
| <Avatar | ||
| source={icon.source || props.fallbackIcon} | ||
| fill={themeColors.iconSuccessFill} | ||
| size={props.size} | ||
| name={icon.name} | ||
| type={icon.type} | ||
| /> | ||
| </View> | ||
| </UserDetailsTooltip> | ||
| ))} | ||
| {avatars.length > props.maxAvatarsInRow && ( | ||
| <Tooltip | ||
| // We only want to cap tooltips to only the first 10 users or so since some reports have hundreds of users, causing performance to degrade. | ||
| text={tooltipTexts.slice(3, 10).join(', ')} | ||
|
There was a problem hiding this comment. It was missed to change tooltip text while implementing this feature so it caused regression - #22951 |
||
| > | ||
| <View | ||
| style={[ | ||
| styles.alignItemsCenter, | ||
| styles.justifyContentCenter, | ||
| StyleUtils.getHorizontalStackedAvatarBorderStyle({ | ||
| isHovered: props.isHovered, | ||
| isPressed: props.isPressed, | ||
| isInReportAction: props.isInReportAction, | ||
| shouldUseCardBackground: props.shouldUseCardBackground, | ||
| }), | ||
|
|
||
| // Set overlay background color with RGBA value so that the text will not inherit opacity | ||
| StyleUtils.getBackgroundColorWithOpacityStyle(themeColors.overlay, variables.overlayOpacity), | ||
| StyleUtils.getHorizontalStackedOverlayAvatarStyle(oneAvatarSize, oneAvatarBorderWidth), | ||
| props.icons[3].type === CONST.ICON_TYPE_WORKSPACE ? StyleUtils.getAvatarBorderRadius(props.size, props.icons[3].type) : {}, | ||
| ]} | ||
| > | ||
| <View | ||
| style={[ | ||
| styles.justifyContentCenter, | ||
| styles.alignItemsCenter, | ||
| StyleUtils.getHeight(oneAvatarSize.height), | ||
| StyleUtils.getWidthStyle(oneAvatarSize.width), | ||
| ]} | ||
| > | ||
| <Text style={[styles.avatarInnerTextSmall, StyleUtils.getAvatarExtraFontSizeStyle(props.size)]}>{`+${avatars.length - props.maxAvatarsInRow}`}</Text> | ||
|
|
||
| </View> | ||
| </View> | ||
| </Tooltip> | ||
| )} | ||
| </View> | ||
| )) | ||
| ) : ( | ||
| <View style={avatarContainerStyles}> | ||
| <View style={singleAvatarStyles}> | ||
| <UserDetailsTooltip accountID={props.icons[0].id}> | ||
| {/* View is necessary for tooltip to show for multiple avatars in LHN */} | ||
| <View> | ||
| <Avatar | ||
| source={props.icons[0].source || props.fallbackIcon} | ||
| fill={themeColors.iconSuccessFill} | ||
| size={props.isFocusMode ? CONST.AVATAR_SIZE.MID_SUBSCRIPT : CONST.AVATAR_SIZE.SMALLER} | ||
| imageStyles={[singleAvatarStyles]} | ||
| name={props.icons[0].name} | ||
| type={props.icons[0].type} | ||
| /> | ||
| </View> | ||
| </UserDetailsTooltip> | ||
| <View style={secondAvatarStyles}> | ||
| {props.icons.length === 2 ? ( | ||
| <UserDetailsTooltip accountID={props.icons[1].id}> | ||
| <View> | ||
| <Avatar | ||
| source={props.icons[1].source || props.fallbackIcon} | ||
| fill={themeColors.iconSuccessFill} | ||
| size={props.isFocusMode ? CONST.AVATAR_SIZE.MID_SUBSCRIPT : CONST.AVATAR_SIZE.SMALLER} | ||
| imageStyles={[singleAvatarStyles]} | ||
| name={props.icons[1].name} | ||
| type={props.icons[1].type} | ||
| /> | ||
| </View> | ||
| </UserDetailsTooltip> | ||
| ) : ( | ||
| <Tooltip text={tooltipTexts.slice(1).join(', ')}> | ||
| <View style={[singleAvatarStyles, styles.alignItemsCenter, styles.justifyContentCenter]}> | ||
| <Text | ||
| selectable={false} | ||
| style={props.size === CONST.AVATAR_SIZE.SMALL ? styles.avatarInnerTextSmall : styles.avatarInnerText} | ||
| > | ||
| {`+${props.icons.length - 1}`} | ||
| </Text> | ||
| </View> | ||
| </Tooltip> | ||
| )} | ||
| </View> | ||
| </View> | ||
| </View> | ||
| )} | ||
| </> | ||
| ); | ||
| } | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👋 Coming from #31151
The slice seems backward between
firstRowandsecondRow, so causing the issue.