Merge pull request #6274 from facebook/revert-6226-PR-5202

Revert "Bug fix for issue 5202"

src/renderers/dom/client/ReactBrowserEventEmitter.js

@@ -287,8 +287,7 @@ var ReactBrowserEventEmitter = assign({}, ReactEventEmitterMixin, {
             );
           }
         } else if (dependency === topLevelTypes.topFocus ||
-            dependency === topLevelTypes.topBlur || dependency === topLevelTypes.topFocusIn ||
-            dependency === topLevelTypes.topFocusOut) {
+            dependency === topLevelTypes.topBlur) {
 
           if (isEventSupported('focus', true)) {
             ReactBrowserEventEmitter.ReactEventListener.trapCapturedEvent(
@@ -296,16 +295,6 @@ var ReactBrowserEventEmitter = assign({}, ReactEventEmitterMixin, {
               'focus',
               mountAt
             );
-            ReactBrowserEventEmitter.ReactEventListener.trapCapturedEvent(
-              topLevelTypes.topFocusIn,
-              'focusin',
-              mountAt
-            );
-            ReactBrowserEventEmitter.ReactEventListener.trapCapturedEvent(
-              topLevelTypes.topFocusOut,
-              'focusout',
-              mountAt
-            );
             ReactBrowserEventEmitter.ReactEventListener.trapCapturedEvent(
               topLevelTypes.topBlur,
               'blur',
@@ -329,8 +318,6 @@ var ReactBrowserEventEmitter = assign({}, ReactEventEmitterMixin, {
           // to make sure blur and focus event listeners are only attached once
           isListening[topLevelTypes.topBlur] = true;
           isListening[topLevelTypes.topFocus] = true;
-          isListening[topLevelTypes.topFocusIn] = true;
-          isListening[topLevelTypes.topFocusOut] = true;
         } else if (topEventMapping.hasOwnProperty(dependency)) {
           ReactBrowserEventEmitter.ReactEventListener.trapBubbledEvent(
             dependency,

src/renderers/dom/client/eventPlugins/ChangeEventPlugin.js

@@ -37,8 +37,6 @@ var eventTypes = {
       topLevelTypes.topChange,
       topLevelTypes.topClick,
       topLevelTypes.topFocus,
-      topLevelTypes.topFocusIn,
-      topLevelTypes.topFocusOut,
       topLevelTypes.topInput,
       topLevelTypes.topKeyDown,
       topLevelTypes.topKeyUp,

src/renderers/dom/client/eventPlugins/SimpleEventPlugin.js

@@ -191,18 +191,6 @@ var eventTypes = {
       captured: keyOf({onFocusCapture: true}),
     },
   },
-  focusOut: {
-    phasedRegistrationNames: {
-      bubbled: keyOf({onFocusOut: true}),
-      captured: keyOf({onFocusOutCapture: true}),
-    },
-  },
-  focusIn: {
-    phasedRegistrationNames: {
-      bubbled: keyOf({onFocusIn: true}),
-      captured: keyOf({onFocusInCapture: true}),
-    },
-  },
   input: {
     phasedRegistrationNames: {
       bubbled: keyOf({onInput: true}),
@@ -450,8 +438,6 @@ var topLevelEventsToDispatchConfig = {
   topEnded:           eventTypes.ended,
   topError:           eventTypes.error,
   topFocus:           eventTypes.focus,
-  topFocusOut:        eventTypes.focusOut,
-  topFocusIn:         eventTypes.focusIn,
   topInput:           eventTypes.input,
   topInvalid:         eventTypes.invalid,
   topKeyDown:         eventTypes.keyDown,
@@ -559,8 +545,6 @@ var SimpleEventPlugin = {
         break;
       case topLevelTypes.topBlur:
       case topLevelTypes.topFocus:
-      case topLevelTypes.topFocusIn:
-      case topLevelTypes.topFocusOut:
         EventConstructor = SyntheticFocusEvent;
         break;
       case topLevelTypes.topClick:

src/renderers/shared/event/EventConstants.js

@@ -49,8 +49,6 @@ var topLevelTypes = keyMirror({
   topEnded: null,
   topError: null,
   topFocus: null,
-  topFocusIn: null,
-  topFocusOut: null,
   topInput: null,
   topInvalid: null,
   topKeyDown: null,