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.

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

Missing onLoad and onError events on image tag #5626 #9042

Merged
merged 1 commit into from Feb 23, 2017
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions scripts/fiber/tests-passing.txt
Expand Up @@ -1044,6 +1044,7 @@ src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js
* should track textarea values
* should warn for children on void elements
* should support custom elements which extend native elements
* should work load and error events on <image> element in SVG
* should warn against children for void elements
* should warn against dangerouslySetInnerHTML for void elements
* should validate against multiple children props
Expand Down
2 changes: 2 additions & 0 deletions src/renderers/dom/fiber/ReactDOMFiberComponent.js
Expand Up @@ -232,6 +232,7 @@ function trapBubbledEventsLocal(node : Element, tag : string) {
);
break;
case 'img':
case 'image':
ReactBrowserEventEmitter.trapBubbledEvent(
'topError',
'error',
Expand Down Expand Up @@ -521,6 +522,7 @@ var ReactDOMFiberComponent = {
case 'form':
case 'iframe':
case 'img':
case 'image':
case 'link':
case 'object':
case 'source':
Expand Down
32 changes: 32 additions & 0 deletions src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js
Expand Up @@ -1102,6 +1102,38 @@ describe('ReactDOMComponent', () => {
expect(ReactDOMServer.renderToString(<div is="custom-div" />)).toContain('is="custom-div"');
}
});

it('should work load and error events on <image> element in SVG', () => {
spyOn(console, 'log');
var container = document.createElement('div');
ReactDOM.render(
<svg>
<image
xlinkHref="http://example.org/image"
onError={(e) => console.log('onError called')}
onLoad={(e) => console.log('onLoad called')}
/>
</svg>,
container
);

var loadEvent = document.createEvent('Event');
var errorEvent = document.createEvent('Event');

loadEvent.initEvent('load', false, false);
errorEvent.initEvent('error', false, false);

container.getElementsByTagName('image')[0].dispatchEvent(errorEvent);
container.getElementsByTagName('image')[0].dispatchEvent(loadEvent);

expectDev(console.log.calls.count()).toBe(2);
expectDev(console.log.calls.argsFor(0)[0]).toContain(
'onError called'
);
expectDev(console.log.calls.argsFor(1)[0]).toContain(
'onLoad called'
);
});
});

describe('updateComponent', () => {
Expand Down
3 changes: 3 additions & 0 deletions src/renderers/dom/stack/client/ReactDOMComponent.js
Expand Up @@ -293,6 +293,7 @@ function trapBubbledEventsLocal() {
];
break;
case 'img':
case 'image':
inst._wrapperState.listeners = [
ReactBrowserEventEmitter.trapBubbledEvent(
'topError',
Expand Down Expand Up @@ -470,6 +471,7 @@ ReactDOMComponent.Mixin = {
case 'form':
case 'iframe':
case 'img':
case 'image':
case 'link':
case 'object':
case 'source':
Expand Down Expand Up @@ -1129,6 +1131,7 @@ ReactDOMComponent.Mixin = {
case 'form':
case 'iframe':
case 'img':
case 'image':
case 'link':
case 'object':
case 'source':
Expand Down