Skip to content

Fix an SVG focusing crash in IE11 #12996

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
gaearon merged 4 commits into from
Jun 11, 2018
+3 −1
Merged

Fix an SVG focusing crash in IE11 #12996

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9871f37
revert #11800
ThaddeusJiang Jun 8, 2018
f5abb78
use try/catch for SVG in IE11
ThaddeusJiang Jun 10, 2018
18f6b9d
use focusNode(element) when element.focus isn't a function.
ThaddeusJiang Jun 10, 2018
c6f8204
revert #11800
ThaddeusJiang Jun 11, 2018
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: 7 additions & 1 deletion packages/react-dom/src/client/ReactInputSelection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
*/

import containsNode from 'fbjs/lib/containsNode';
import focusNode from 'fbjs/lib/focusNode';
import getActiveElement from 'fbjs/lib/getActiveElement';

import * as ReactDOMSelection from './ReactDOMSelection';
Expand Down Expand Up @@ -82,7 +83,12 @@ export function restoreSelection(priorSelectionInformation) {
}
}

priorFocusedElem.focus();
if (typeof priorFocusedElem.focus === 'function') {
priorFocusedElem.focus();
} else {
// The SVGElement don't have a focus method in IE11
focusNode(priorFocusedElem);
Copy link
Collaborator

@gaearon gaearon Jun 11, 2018

Choose a reason for hiding this comment

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

Hmm, we don't need this part now, right?

}

for (let i = 0; i < ancestors.length; i++) {
const info = ancestors[i];
Expand Down