Skip to content

Modify Avatar to add imageStyles when image error #12908

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
sketchydroide merged 8 commits into from
Nov 24, 2022
Merged

Modify Avatar to add imageStyles when image error #12908

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6d7c71f
Modify Avatar to add imageStyles when image error
markarmanus Nov 21, 2022
b93905f
Change based on comments
markarmanus Nov 22, 2022
615f4ed
Address comments
markarmanus Nov 23, 2022
550c1c3
remove inline styling
markarmanus Nov 23, 2022
57292e7
Update src/components/Avatar.js
markarmanus Nov 23, 2022
4fc8201
add import
markarmanus Nov 23, 2022
bd37756
add spacing
markarmanus Nov 23, 2022
7a05180
Merge branch 'main' into main
markarmanus Nov 23, 2022
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
20 changes: 14 additions & 6 deletions src/components/Avatar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import CONST from '../CONST';
import * as StyleUtils from '../styles/StyleUtils';
import * as Expensicons from './Icon/Expensicons';
import getAvatarDefaultSource from '../libs/getAvatarDefaultSource';
import styles from '../styles/styles';
import FastImage from './FastImage';

const propTypes = {
Expand Down Expand Up @@ -59,18 +60,25 @@ class Avatar extends PureComponent {
...this.props.imageStyles,
];

const iconStyle = [
StyleUtils.getAvatarStyle(this.props.size),
styles.bgTransparent,
...this.props.imageStyles,
];
const iconSize = StyleUtils.getAvatarSize(this.props.size);

return (
<View pointerEvents="none" style={this.props.containerStyles}>
{_.isFunction(this.props.source) || this.state.imageError
? (
<Icon
src={this.state.imageError ? this.props.fallbackIcon : this.props.source}
height={iconSize}
width={iconSize}
fill={this.state.imageError ? themeColors.offline : this.props.fill}
/>
<View style={iconStyle}>
<Icon
src={this.state.imageError ? this.props.fallbackIcon : this.props.source}
height={iconSize}
width={iconSize}
fill={this.state.imageError ? themeColors.offline : this.props.fill}
/>
</View>
)
: (
<FastImage
Expand Down