Skip to content

[Android] Add missing onError event to Image #9416

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

Closed
SergeyKorochansky wants to merge 5 commits into from
Closed

[Android] Add missing onError event to Image #9416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b86e7ab
Merge pull request #1 from facebook/master
SergeyKorochansky Jul 20, 2016
733a9a6
Merge pull request #2 from facebook/master
SergeyKorochansky Aug 15, 2016
94dfc0e
[Android] Add missing onError event to Image
SergeyKorochansky Aug 15, 2016
df8f79a
[Android] Add onError prop to Image
SergeyKorochansky Aug 15, 2016
9119588
Merge branch 'master' into fix/missing-image-onerror-event
SergeyKorochansky Aug 15, 2016
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
8 changes: 6 additions & 2 deletions Libraries/Image/Image.android.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,10 @@ var Image = React.createClass({
* Invoked when load either succeeds or fails
*/
onLoadEnd: PropTypes.func,
/**
* Invoked when load fails
*/
onError: PropTypes.func,
/**
* Used to locate this view in end-to-end tests.
*/
Expand Down Expand Up @@ -248,10 +252,10 @@ var Image = React.createClass({
sources = source;
}

const {onLoadStart, onLoad, onLoadEnd} = this.props;
const {onLoadStart, onLoad, onLoadEnd, onError} = this.props;
const nativeProps = merge(this.props, {
style,
shouldNotifyLoadEvents: !!(onLoadStart || onLoad || onLoadEnd),
shouldNotifyLoadEvents: !!(onLoadStart || onLoad || onLoadEnd || onError),
src: sources,
loadingIndicatorSrc: loadingIndicatorSource ? loadingIndicatorSource.uri : null,
});
Expand Down
4 changes: 3 additions & 1 deletion ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,9 @@ public void setLoadHandlersRegistered(ReactImageView view, boolean shouldNotifyL
ImageLoadEvent.eventNameForType(ImageLoadEvent.ON_LOAD),
MapBuilder.of("registrationName", "onLoad"),
ImageLoadEvent.eventNameForType(ImageLoadEvent.ON_LOAD_END),
MapBuilder.of("registrationName", "onLoadEnd"));
MapBuilder.of("registrationName", "onLoadEnd"),
ImageLoadEvent.eventNameForType(ImageLoadEvent.ON_ERROR),
MapBuilder.of("registrationName", "onError"));
}

@Override
Expand Down