Skip to content
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

Jump to bottom

Clear the image error when going back from other menus #26148

Merged
merged 7 commits into from
Sep 18, 2023
Merged

Clear the image error when going back from other menus #26148

Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b820138
Clear the error when going back from other menus
dukenv0307 Aug 29, 2023
4cf570f
import withNavigationFocus
dukenv0307 Aug 29, 2023
dc7e813
fix lint
dukenv0307 Aug 29, 2023
efbad5c
Merge branch 'main' into fix/25405
dukenv0307 Aug 31, 2023
4e443a9
add proptypes
dukenv0307 Aug 31, 2023
9cabc60
Merge branch 'main' into fix/25405
dukenv0307 Sep 11, 2023
98a3bf5
Merge branch 'main' into fix/25405
dukenv0307 Sep 18, 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
7 changes: 6 additions & 1 deletion src/components/AvatarWithImagePicker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ import getImageResolution from '../libs/fileDownload/getImageResolution';
import PressableWithoutFeedback from './Pressable/PressableWithoutFeedback';
import DotIndicatorMessage from './DotIndicatorMessage';
import * as Browser from '../libs/Browser';
import withNavigationFocus from './withNavigationFocus';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NAB because I see we're not consistent with this, but I think we should spread withNavigationFocusPropTypes into the component prop types.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@neil-marcellini I just updated. Please help to approve again.

import compose from '../libs/compose';

const propTypes = {
/** Avatar source to display */
Expand Down Expand Up @@ -129,6 +131,9 @@ class AvatarWithImagePicker extends React.Component {
}

componentDidUpdate(prevProps) {
if (!prevProps.isFocused && this.props.isFocused) {
this.setError(null, {});
}
if (!prevProps.isUploading && this.props.isUploading) {
this.animation.start();
} else if (prevProps.isUploading && !this.props.isUploading) {
Expand Down Expand Up @@ -350,4 +355,4 @@ class AvatarWithImagePicker extends React.Component {
AvatarWithImagePicker.propTypes = propTypes;
AvatarWithImagePicker.defaultProps = defaultProps;

export default withLocalize(AvatarWithImagePicker);
export default compose(withLocalize, withNavigationFocus)(AvatarWithImagePicker);
Loading