Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions src/CONST/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4731,6 +4731,13 @@ const CONST = {
XXXX_LARGE: 'xxxx-large',
},

AVATAR_SHAPE: {
// Fully round, used for user avatars
CIRCLE: 'circle',
// Corner radius scaled to the avatar size, used for workspace avatars
ROUNDED_SQUARE: 'rounded-square',
},

COMPANY_CARD: {
// Mostly used for feed details
FEED_BANK_NAME: {
Expand Down
43 changes: 43 additions & 0 deletions src/components/Avatar/AvatarFromIcon.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
import {getAccountIDFromAvatarID} from '@libs/UserAvatarUtils';

import CONST from '@src/CONST';
import type {Icon} from '@src/types/onyx/OnyxCommon';

import React from 'react';

import type {AvatarCommonProps} from './types';

import UserAvatar from './UserAvatar';
import WorkspaceAvatar from './WorkspaceAvatar';

type AvatarFromIconProps = Omit<AvatarCommonProps, 'source'> & {
/** Icon entry (typically from item.icons) describing the avatar to render. Forks on `icon.type`. */
icon: Icon;
};

/** Renders a user or workspace avatar from an Onyx `Icon` entry.
* Prefer `UserAvatar` and `WorkspaceAvatar` directly when the avatar kind is known at the call site.
*/
function AvatarFromIcon({icon, ...rest}: AvatarFromIconProps) {
if (icon.type === CONST.ICON_TYPE_WORKSPACE) {
return (
<WorkspaceAvatar
name={icon.name ?? ''}
avatarID={icon.id ?? CONST.DEFAULT_NUMBER_ID}
source={icon.source}
{...rest}
/>
);
}

return (
<UserAvatar
accountID={getAccountIDFromAvatarID(icon.id)}
fallbackIcon={icon.fallbackIcon}
source={icon.source}
{...rest}
/>
);
}

export default AvatarFromIcon;
9 changes: 4 additions & 5 deletions src/components/Avatar/UserAvatar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ function UserAvatar({
iconAdditionalStyles,
containerStyles,
size = CONST.AVATAR_SIZE.DEFAULT,
fill,
fallbackIcon,
fallbackIconTestID = '',
accountID,
Expand All @@ -61,7 +60,7 @@ function UserAvatar({
urlColors={letterAvatar.colors}
accountID={accountID}
size={size}
type={CONST.ICON_TYPE_AVATAR}
shape={CONST.AVATAR_SHAPE.CIRCLE}
containerStyles={imageStyles}
containerAdditionalStyles={iconAdditionalStyles}
/>
Expand All @@ -84,7 +83,7 @@ function UserAvatar({
<AvatarImage
avatarSource={avatarSource}
size={size}
type={CONST.ICON_TYPE_AVATAR}
shape={CONST.AVATAR_SHAPE.CIRCLE}
imageStyles={imageStyles}
imageContainerAdditionalStyles={iconAdditionalStyles}
onImageError={onImageError}
Expand All @@ -106,12 +105,12 @@ function UserAvatar({
<AvatarIcon
avatarSource={avatarSource}
size={size}
type={CONST.ICON_TYPE_AVATAR}
shape={CONST.AVATAR_SHAPE.CIRCLE}
iconContainerStyles={imageStyles}
iconAdditionalStyles={iconAdditionalStyles}
fallbackAvatarTestID={fallbackAvatarTestID}
iconColors={iconColors}
fill={iconColors?.fill ?? (hasImageError ? theme.offline : fill)}
fill={iconColors?.fill ?? (hasImageError ? theme.offline : undefined)}
/>
</AvatarContainer>
);
Expand Down
8 changes: 4 additions & 4 deletions src/components/Avatar/WorkspaceAvatar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ type WorkspaceAvatarProps = AvatarCommonProps & {
};

/** Renders a workspace avatar, falling back to a default icon derived from the workspace name. */
function WorkspaceAvatar({source, imageStyles, iconAdditionalStyles, containerStyles, size = CONST.AVATAR_SIZE.DEFAULT, fill, name, avatarID, testID}: WorkspaceAvatarProps) {
function WorkspaceAvatar({source, imageStyles, iconAdditionalStyles, containerStyles, size = CONST.AVATAR_SIZE.DEFAULT, name, avatarID, testID}: WorkspaceAvatarProps) {
const theme = useTheme();
const StyleUtils = useStyleUtils();
const defaultAvatars = useDefaultAvatars();
Expand All @@ -46,7 +46,7 @@ function WorkspaceAvatar({source, imageStyles, iconAdditionalStyles, containerSt
<AvatarImage
avatarSource={avatarSource}
size={size}
type={CONST.ICON_TYPE_WORKSPACE}
shape={CONST.AVATAR_SHAPE.ROUNDED_SQUARE}
imageStyles={imageStyles}
imageContainerAdditionalStyles={iconAdditionalStyles}
onImageError={onImageError}
Expand All @@ -65,12 +65,12 @@ function WorkspaceAvatar({source, imageStyles, iconAdditionalStyles, containerSt
<AvatarIcon
avatarSource={avatarSource}
size={size}
type={CONST.ICON_TYPE_WORKSPACE}
shape={CONST.AVATAR_SHAPE.ROUNDED_SQUARE}
iconContainerStyles={imageStyles}
iconAdditionalStyles={iconAdditionalStyles}
fallbackAvatarTestID={fallbackAvatarTestID}
iconColors={iconColors}
fill={iconColors?.fill ?? (hasImageError ? theme.offline : fill)}
fill={iconColors?.fill ?? (hasImageError ? theme.offline : undefined)}
/>
</AvatarContainer>
);
Expand Down
80 changes: 0 additions & 80 deletions src/components/Avatar/index.tsx

This file was deleted.

31 changes: 14 additions & 17 deletions src/components/Avatar/layouts/DiagonalAvatars.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import AvatarFromIcon from '@components/Avatar/AvatarFromIcon';
import AvatarNamesTooltip from '@components/Avatar/tooltips/AvatarNamesTooltip';
import AvatarTooltip from '@components/Avatar/tooltips/AvatarTooltip';
import Text from '@components/Text';
Expand All @@ -7,6 +8,7 @@ import useTheme from '@hooks/useTheme';
import useThemeStyles from '@hooks/useThemeStyles';

import CONST from '@src/CONST';
import type {Icon} from '@src/types/onyx/OnyxCommon';

import type {StyleProp, ViewStyle} from 'react-native';

Expand All @@ -15,10 +17,12 @@ import {View} from 'react-native';

import type {MultipleAvatarsProps} from './types';

import Avatar from '..';
import DiagonalAvatarsFrame from './DiagonalAvatarsFrame';
import getDiagonalAvatarSizing from './getDiagonalAvatarSizing';

// Rendered when the icons array is unexpectedly short. Falls back to the default user avatar.
const EMPTY_USER_ICON: Icon = {source: '', type: CONST.ICON_TYPE_AVATAR};

type DiagonalAvatarsProps = MultipleAvatarsProps & {
/** Style for the secondary avatar container */
secondaryAvatarContainerStyle?: StyleProp<ViewStyle>;
Expand Down Expand Up @@ -46,20 +50,18 @@ function DiagonalAvatars({size, icons, isInReportAction, secondaryAvatarContaine
size={size}
iconCount={icons.length}
containerStyle={StyleUtils.getContainerStyles(size, isInReportAction)}
primaryContainerStyle={primaryIcon?.type === CONST.ICON_TYPE_WORKSPACE && StyleUtils.getAvatarBorderRadius(size, primaryIcon.type)}
secondaryContainerStyle={[secondaryAvatarContainerStyles, secondaryIcon?.type === CONST.ICON_TYPE_WORKSPACE && StyleUtils.getAvatarBorderRadius(size, secondaryIcon.type)]}
primaryContainerStyle={primaryIcon?.type === CONST.ICON_TYPE_WORKSPACE && StyleUtils.getAvatarBorderRadius(size, CONST.AVATAR_SHAPE.ROUNDED_SQUARE)}
secondaryContainerStyle={[
secondaryAvatarContainerStyles,
secondaryIcon?.type === CONST.ICON_TYPE_WORKSPACE && StyleUtils.getAvatarBorderRadius(size, CONST.AVATAR_SHAPE.ROUNDED_SQUARE),
]}
primary={
<AvatarTooltip
avatar={primaryIcon}
fallbackDisplayName={fallbackDisplayName}
>
<Avatar
type={primaryIcon?.type ?? CONST.ICON_TYPE_AVATAR}
source={primaryIcon?.source}
name={primaryIcon?.name ?? ''}
avatarID={primaryIcon?.id ?? CONST.DEFAULT_NUMBER_ID}
fallbackIcon={primaryIcon?.fallbackIcon}
fill={primaryIcon?.fill}
<AvatarFromIcon
icon={primaryIcon ?? EMPTY_USER_ICON}
size={avatarSize}
imageStyles={styles[singleAvatarStyleKey]}
testID="ReportActionAvatars-MultipleAvatars-MainAvatar"
Expand All @@ -72,13 +74,8 @@ function DiagonalAvatars({size, icons, isInReportAction, secondaryAvatarContaine
avatar={secondaryIcon}
fallbackDisplayName={fallbackDisplayName}
>
<Avatar
type={secondaryIcon?.type ?? CONST.ICON_TYPE_AVATAR}
source={secondaryIcon?.source}
name={secondaryIcon?.name ?? ''}
avatarID={secondaryIcon?.id ?? CONST.DEFAULT_NUMBER_ID}
fallbackIcon={secondaryIcon?.fallbackIcon}
fill={secondaryIcon?.fill}
<AvatarFromIcon
icon={secondaryIcon ?? EMPTY_USER_ICON}
size={avatarSize}
imageStyles={styles[singleAvatarStyleKey]}
testID="ReportActionAvatars-MultipleAvatars-SecondaryAvatar"
Expand Down
16 changes: 5 additions & 11 deletions src/components/Avatar/layouts/HorizontalAvatars.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import AvatarFromIcon from '@components/Avatar/AvatarFromIcon';
import AvatarNamesTooltip from '@components/Avatar/tooltips/AvatarNamesTooltip';
import AvatarTooltip from '@components/Avatar/tooltips/AvatarTooltip';
import Text from '@components/Text';
Expand All @@ -17,8 +18,6 @@ import {View} from 'react-native';

import type {MultipleAvatarsProps} from './types';

import Avatar from '..';

type HorizontalStackingOptions = Partial<{
isHovered: boolean;
isActive: boolean;
Expand Down Expand Up @@ -77,9 +76,9 @@ function HorizontalAvatars({
key={`stackedAvatars-${icon.id}`}
avatar={icon}
fallbackDisplayName={fallbackDisplayName}
style={[StyleUtils.getHorizontalStackedAvatarStyle(index, overlapSize), StyleUtils.getAvatarBorderRadius(size, icon.type)]}
style={[StyleUtils.getHorizontalStackedAvatarStyle(index, overlapSize), StyleUtils.getAvatarBorderRadius(size, StyleUtils.getShapeFromIconType(icon.type))]}
>
<Avatar
<AvatarFromIcon
iconAdditionalStyles={[
StyleUtils.getHorizontalStackedAvatarBorderStyle({
theme,
Expand All @@ -91,12 +90,7 @@ function HorizontalAvatars({
}),
StyleUtils.getAvatarBorderWidth(size),
]}
type={icon.type}
source={icon.source}
name={icon.name ?? ''}
avatarID={icon.id ?? CONST.DEFAULT_NUMBER_ID}
fallbackIcon={icon.fallbackIcon}
fill={icon.fill}
icon={icon}
size={size}
testID="ReportActionAvatars-MultipleAvatars-StackedHorizontally-Avatar"
/>
Expand All @@ -118,7 +112,7 @@ function HorizontalAvatars({
}),
StyleUtils.getBackgroundColorWithOpacityStyle(theme.overlay, variables.overlayOpacity),
StyleUtils.getHorizontalStackedOverlayAvatarStyle(size),
icons.at(3)?.type === CONST.ICON_TYPE_WORKSPACE && StyleUtils.getAvatarBorderRadius(size, icons.at(3)?.type),
icons.at(3)?.type === CONST.ICON_TYPE_WORKSPACE && StyleUtils.getAvatarBorderRadius(size, CONST.AVATAR_SHAPE.ROUNDED_SQUARE),
]}
>
<View style={[styles.justifyContentCenter, styles.alignItemsCenter, StyleUtils.getHeight(oneAvatarSize.height), StyleUtils.getWidthStyle(oneAvatarSize.width)]}>
Expand Down
15 changes: 5 additions & 10 deletions src/components/Avatar/layouts/PressableDiagonalAvatars.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import AvatarFromIcon from '@components/Avatar/AvatarFromIcon';
import AvatarTooltip from '@components/Avatar/tooltips/AvatarTooltip';
import PressableWithoutFocus from '@components/Pressable/PressableWithoutFocus';

Expand All @@ -13,7 +14,6 @@ import type {ValueOf} from 'type-fest';

import React from 'react';

import Avatar from '..';
import DiagonalAvatarsFrame from './DiagonalAvatarsFrame';
import getDiagonalAvatarSizing from './getDiagonalAvatarSizing';

Expand Down Expand Up @@ -56,13 +56,8 @@ function PressableDiagonalAvatars({size, primaryAvatar, secondaryAvatar, iconCou
accessibilityRole={CONST.ROLE.BUTTON}
sentryLabel={sentryLabel}
>
<Avatar
type={avatar.type}
source={avatar.source}
name={avatar.name ?? ''}
avatarID={avatar.id ?? CONST.DEFAULT_NUMBER_ID}
fallbackIcon={avatar.fallbackIcon}
fill={avatar.fill}
<AvatarFromIcon
icon={avatar}
size={avatarSize}
imageStyles={styles[singleAvatarStyleKey]}
testID={testID}
Expand All @@ -76,10 +71,10 @@ function PressableDiagonalAvatars({size, primaryAvatar, secondaryAvatar, iconCou
size={size}
iconCount={iconCount}
containerStyle={StyleUtils.getContainerStyles(size)}
primaryContainerStyle={primaryAvatar.type === CONST.ICON_TYPE_WORKSPACE && StyleUtils.getAvatarBorderRadius(size, primaryAvatar.type)}
primaryContainerStyle={primaryAvatar.type === CONST.ICON_TYPE_WORKSPACE && StyleUtils.getAvatarBorderRadius(size, CONST.AVATAR_SHAPE.ROUNDED_SQUARE)}
secondaryContainerStyle={[
StyleUtils.getBackgroundAndBorderStyle(theme.componentBG),
secondaryAvatar.type === CONST.ICON_TYPE_WORKSPACE && StyleUtils.getAvatarBorderRadius(size, secondaryAvatar.type),
secondaryAvatar.type === CONST.ICON_TYPE_WORKSPACE && StyleUtils.getAvatarBorderRadius(size, CONST.AVATAR_SHAPE.ROUNDED_SQUARE),
]}
primary={renderPressableAvatar(primaryAvatar, 'ReportActionAvatars-MultipleAvatars-MainAvatar')}
secondary={renderPressableAvatar(secondaryAvatar, 'ReportActionAvatars-MultipleAvatars-SecondaryAvatar')}
Expand Down
Loading
Loading