toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix LHS team icon on team switch (#4545)

Browse source 
Co-authored-by: Elias Nahum <nahumhbl@gmail.com>
This commit is contained in:
Mattermost Build 2020-07-07 19:01:53 +02:00 committed by GitHub
parent f8ff6c4520
commit 457df4bb4d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
app/components/team_icon/team_icon.js
View file

@ -21,30 +21,21 @@ export default class TeamIcon extends React.PureComponent {
theme: PropTypes.object.isRequired,
};
constructor(props) {
super(props);
static defaultProps = {
displayName: '',
};
this.state = {
teamIcon: null,
imageError: false,
};
}
state = {
imageError: false,
};
componentDidMount() {
const {lastIconUpdate, teamId} = this.props;
this.mounted = true;
if (lastIconUpdate) {
this.preloadTeamIcon(teamId, lastIconUpdate);
}
}
componentDidUpdate(prevProps) {
if (this.props.teamId !== prevProps.teamId) {
this.setImageURL(null);
} else if (this.props.lastIconUpdate && this.props.lastIconUpdate !== prevProps.lastIconUpdate) {
const {lastIconUpdate, teamId} = this.props;
this.preloadTeamIcon(teamId, lastIconUpdate);
componentDidUpdate(prevProps, prevState) {
if (prevState.imageError && prevProps.teamId !== this.props.teamId) {
this.handleImageError(false);
}
}
@ -52,20 +43,17 @@ export default class TeamIcon extends React.PureComponent {
this.mounted = false;
}
preloadTeamIcon = (teamId, lastIconUpdate) => {
const uri = Client4.getTeamIconUrl(teamId, lastIconUpdate);
this.setImageURL(uri);
};
setImageURL = (teamIcon) => {
handleImageError = (hasError) => {
if (this.mounted) {
this.setState({imageError: false, teamIcon});
this.setState({imageError: Boolean(hasError)});
}
};
render() {
const {
displayName,
lastIconUpdate,
teamId,
theme,
styleContainer,
styleText,
@ -75,20 +63,20 @@ export default class TeamIcon extends React.PureComponent {
const styles = getStyleSheet(theme);
let teamIconContent;
if (this.state.teamIcon) {
teamIconContent = (
<FastImage
style={[styles.image, styleImage]}
source={{uri: this.state.teamIcon}}
onError={() => this.setState({imageError: true})}
/>
);
} else {
if (this.state.imageError || !lastIconUpdate) {
teamIconContent = (
<Text style={[styles.text, styleText]}>
{displayName?.substr(0, 2).toUpperCase()}
</Text>
);
} else {
teamIconContent = (
<FastImage
style={[styles.image, styleImage]}
source={{uri: Client4.getTeamIconUrl(teamId, lastIconUpdate)}}
onError={this.handleImageError}
/>
);
}
return (