diff --git a/src/browser/ReactInputSelection.js b/src/browser/ReactInputSelection.js index 8b46b670b6..5a8b4f8196 100644 --- a/src/browser/ReactInputSelection.js +++ b/src/browser/ReactInputSelection.js @@ -21,6 +21,7 @@ var ReactDOMSelection = require('ReactDOMSelection'); var containsNode = require('containsNode'); +var focusNode = require('focusNode'); var getActiveElement = require('getActiveElement'); function isInDocument(node) { @@ -71,7 +72,7 @@ var ReactInputSelection = { priorSelectionRange ); } - priorFocusedElem.focus(); + focusNode(priorFocusedElem); } }, diff --git a/src/browser/dom/components/AutoFocusMixin.js b/src/browser/dom/components/AutoFocusMixin.js index 1fa1bd3742..130768be31 100644 --- a/src/browser/dom/components/AutoFocusMixin.js +++ b/src/browser/dom/components/AutoFocusMixin.js @@ -19,10 +19,12 @@ "use strict"; +var focusNode = require('focusNode'); + var AutoFocusMixin = { componentDidMount: function() { if (this.props.autoFocus) { - this.getDOMNode().focus(); + focusNode(this.getDOMNode()); } } };