Sync commit from React

Summary: This diff syncs a commit from React to bring in https://github.com/facebook/react/pull/15802#pullrequestreview-245969201

Reviewed By: cpojer

Differential Revision: D15660020

fbshipit-source-id: 15d2413a69968b2898bb37d256f35bc09ebc8d58

Libraries/Renderer/implementations/ReactFabric-dev.fb.js

@@ -2461,11 +2461,9 @@ var customBubblingEventTypes =
 var customDirectEventTypes =
   ReactNativePrivateInterface.ReactNativeViewConfigRegistry
     .customDirectEventTypes;
-var eventTypes$1 =
-  ReactNativePrivateInterface.ReactNativeViewConfigRegistry.eventTypes;
 
 var ReactNativeBridgeEventPlugin = {
-  eventTypes: eventTypes$1,
+  eventTypes: {},
 
   /**
    * @see {EventPluginHub.extractEvents}

Libraries/Renderer/implementations/ReactFabric-dev.js

@@ -2462,11 +2462,9 @@ var customBubblingEventTypes =
 var customDirectEventTypes =
   ReactNativePrivateInterface.ReactNativeViewConfigRegistry
     .customDirectEventTypes;
-var eventTypes$1 =
-  ReactNativePrivateInterface.ReactNativeViewConfigRegistry.eventTypes;
 
 var ReactNativeBridgeEventPlugin = {
-  eventTypes: eventTypes$1,
+  eventTypes: {},
 
   /**
    * @see {EventPluginHub.extractEvents}

Libraries/Renderer/implementations/ReactFabric-prod.fb.js

@@ -946,10 +946,15 @@ var eventTypes = {
       .customBubblingEventTypes,
   customDirectEventTypes =
     ReactNativePrivateInterface.ReactNativeViewConfigRegistry
-      .customDirectEventTypes,
-  ReactNativeBridgeEventPlugin = {
-    eventTypes:
-      ReactNativePrivateInterface.ReactNativeViewConfigRegistry.eventTypes,
+      .customDirectEventTypes;
+injection.injectEventPluginOrder([
+  "ResponderEventPlugin",
+  "ReactNativeBridgeEventPlugin"
+]);
+injection.injectEventPluginsByName({
+  ResponderEventPlugin: ResponderEventPlugin,
+  ReactNativeBridgeEventPlugin: {
+    eventTypes: {},
     extractEvents: function(
       topLevelType,
       targetInst,
@@ -976,14 +981,7 @@ var eventTypes = {
       else return null;
       return topLevelType;
     }
-  };
-injection.injectEventPluginOrder([
-  "ResponderEventPlugin",
-  "ReactNativeBridgeEventPlugin"
-]);
-injection.injectEventPluginsByName({
-  ResponderEventPlugin: ResponderEventPlugin,
-  ReactNativeBridgeEventPlugin: ReactNativeBridgeEventPlugin
+  }
 });
 function getInstanceFromInstance(instanceHandle) {
   return instanceHandle;

Libraries/Renderer/implementations/ReactFabric-prod.js

@@ -947,10 +947,15 @@ var eventTypes = {
       .customBubblingEventTypes,
   customDirectEventTypes =
     ReactNativePrivateInterface.ReactNativeViewConfigRegistry
-      .customDirectEventTypes,
-  ReactNativeBridgeEventPlugin = {
-    eventTypes:
-      ReactNativePrivateInterface.ReactNativeViewConfigRegistry.eventTypes,
+      .customDirectEventTypes;
+injection.injectEventPluginOrder([
+  "ResponderEventPlugin",
+  "ReactNativeBridgeEventPlugin"
+]);
+injection.injectEventPluginsByName({
+  ResponderEventPlugin: ResponderEventPlugin,
+  ReactNativeBridgeEventPlugin: {
+    eventTypes: {},
     extractEvents: function(
       topLevelType,
       targetInst,
@@ -977,14 +982,7 @@ var eventTypes = {
       else return null;
       return topLevelType;
     }
-  };
-injection.injectEventPluginOrder([
-  "ResponderEventPlugin",
-  "ReactNativeBridgeEventPlugin"
-]);
-injection.injectEventPluginsByName({
-  ResponderEventPlugin: ResponderEventPlugin,
-  ReactNativeBridgeEventPlugin: ReactNativeBridgeEventPlugin
+  }
 });
 function getInstanceFromInstance(instanceHandle) {
   return instanceHandle;

Libraries/Renderer/implementations/ReactFabric-profiling.fb.js

@@ -947,10 +947,15 @@ var eventTypes = {
       .customBubblingEventTypes,
   customDirectEventTypes =
     ReactNativePrivateInterface.ReactNativeViewConfigRegistry
-      .customDirectEventTypes,
-  ReactNativeBridgeEventPlugin = {
-    eventTypes:
-      ReactNativePrivateInterface.ReactNativeViewConfigRegistry.eventTypes,
+      .customDirectEventTypes;
+injection.injectEventPluginOrder([
+  "ResponderEventPlugin",
+  "ReactNativeBridgeEventPlugin"
+]);
+injection.injectEventPluginsByName({
+  ResponderEventPlugin: ResponderEventPlugin,
+  ReactNativeBridgeEventPlugin: {
+    eventTypes: {},
     extractEvents: function(
       topLevelType,
       targetInst,
@@ -977,14 +982,7 @@ var eventTypes = {
       else return null;
       return topLevelType;
     }
-  };
-injection.injectEventPluginOrder([
-  "ResponderEventPlugin",
-  "ReactNativeBridgeEventPlugin"
-]);
-injection.injectEventPluginsByName({
-  ResponderEventPlugin: ResponderEventPlugin,
-  ReactNativeBridgeEventPlugin: ReactNativeBridgeEventPlugin
+  }
 });
 function getInstanceFromInstance(instanceHandle) {
   return instanceHandle;

Libraries/Renderer/implementations/ReactFabric-profiling.js

@@ -948,10 +948,15 @@ var eventTypes = {
       .customBubblingEventTypes,
   customDirectEventTypes =
     ReactNativePrivateInterface.ReactNativeViewConfigRegistry
-      .customDirectEventTypes,
-  ReactNativeBridgeEventPlugin = {
-    eventTypes:
-      ReactNativePrivateInterface.ReactNativeViewConfigRegistry.eventTypes,
+      .customDirectEventTypes;
+injection.injectEventPluginOrder([
+  "ResponderEventPlugin",
+  "ReactNativeBridgeEventPlugin"
+]);
+injection.injectEventPluginsByName({
+  ResponderEventPlugin: ResponderEventPlugin,
+  ReactNativeBridgeEventPlugin: {
+    eventTypes: {},
     extractEvents: function(
       topLevelType,
       targetInst,
@@ -978,14 +983,7 @@ var eventTypes = {
       else return null;
       return topLevelType;
     }
-  };
-injection.injectEventPluginOrder([
-  "ResponderEventPlugin",
-  "ReactNativeBridgeEventPlugin"
-]);
-injection.injectEventPluginsByName({
-  ResponderEventPlugin: ResponderEventPlugin,
-  ReactNativeBridgeEventPlugin: ReactNativeBridgeEventPlugin
+  }
 });
 function getInstanceFromInstance(instanceHandle) {
   return instanceHandle;

Libraries/Renderer/implementations/ReactNativeRenderer-dev.fb.js

@@ -2461,11 +2461,9 @@ var customBubblingEventTypes =
 var customDirectEventTypes =
   ReactNativePrivateInterface.ReactNativeViewConfigRegistry
     .customDirectEventTypes;
-var eventTypes$1 =
-  ReactNativePrivateInterface.ReactNativeViewConfigRegistry.eventTypes;
 
 var ReactNativeBridgeEventPlugin = {
-  eventTypes: eventTypes$1,
+  eventTypes: {},
 
   /**
    * @see {EventPluginHub.extractEvents}

Libraries/Renderer/implementations/ReactNativeRenderer-dev.js

@@ -2462,11 +2462,9 @@ var customBubblingEventTypes =
 var customDirectEventTypes =
   ReactNativePrivateInterface.ReactNativeViewConfigRegistry
     .customDirectEventTypes;
-var eventTypes$1 =
-  ReactNativePrivateInterface.ReactNativeViewConfigRegistry.eventTypes;
 
 var ReactNativeBridgeEventPlugin = {
-  eventTypes: eventTypes$1,
+  eventTypes: {},
 
   /**
    * @see {EventPluginHub.extractEvents}

Libraries/Renderer/implementations/ReactNativeRenderer-prod.fb.js

@@ -946,10 +946,15 @@ var eventTypes = {
       .customBubblingEventTypes,
   customDirectEventTypes =
     ReactNativePrivateInterface.ReactNativeViewConfigRegistry
-      .customDirectEventTypes,
-  ReactNativeBridgeEventPlugin = {
-    eventTypes:
-      ReactNativePrivateInterface.ReactNativeViewConfigRegistry.eventTypes,
+      .customDirectEventTypes;
+injection.injectEventPluginOrder([
+  "ResponderEventPlugin",
+  "ReactNativeBridgeEventPlugin"
+]);
+injection.injectEventPluginsByName({
+  ResponderEventPlugin: ResponderEventPlugin,
+  ReactNativeBridgeEventPlugin: {
+    eventTypes: {},
     extractEvents: function(
       topLevelType,
       targetInst,
@@ -976,14 +981,7 @@ var eventTypes = {
       else return null;
       return topLevelType;
     }
-  };
-injection.injectEventPluginOrder([
-  "ResponderEventPlugin",
-  "ReactNativeBridgeEventPlugin"
-]);
-injection.injectEventPluginsByName({
-  ResponderEventPlugin: ResponderEventPlugin,
-  ReactNativeBridgeEventPlugin: ReactNativeBridgeEventPlugin
+  }
 });
 var instanceCache = {},
   instanceProps = {};

Libraries/Renderer/implementations/ReactNativeRenderer-prod.js

@@ -947,10 +947,15 @@ var eventTypes = {
       .customBubblingEventTypes,
   customDirectEventTypes =
     ReactNativePrivateInterface.ReactNativeViewConfigRegistry
-      .customDirectEventTypes,
-  ReactNativeBridgeEventPlugin = {
-    eventTypes:
-      ReactNativePrivateInterface.ReactNativeViewConfigRegistry.eventTypes,
+      .customDirectEventTypes;
+injection.injectEventPluginOrder([
+  "ResponderEventPlugin",
+  "ReactNativeBridgeEventPlugin"
+]);
+injection.injectEventPluginsByName({
+  ResponderEventPlugin: ResponderEventPlugin,
+  ReactNativeBridgeEventPlugin: {
+    eventTypes: {},
     extractEvents: function(
       topLevelType,
       targetInst,
@@ -977,14 +982,7 @@ var eventTypes = {
       else return null;
       return topLevelType;
     }
-  };
-injection.injectEventPluginOrder([
-  "ResponderEventPlugin",
-  "ReactNativeBridgeEventPlugin"
-]);
-injection.injectEventPluginsByName({
-  ResponderEventPlugin: ResponderEventPlugin,
-  ReactNativeBridgeEventPlugin: ReactNativeBridgeEventPlugin
+  }
 });
 var instanceCache = {},
   instanceProps = {};

Libraries/Renderer/implementations/ReactNativeRenderer-profiling.fb.js

@@ -947,10 +947,15 @@ var eventTypes = {
       .customBubblingEventTypes,
   customDirectEventTypes =
     ReactNativePrivateInterface.ReactNativeViewConfigRegistry
-      .customDirectEventTypes,
-  ReactNativeBridgeEventPlugin = {
-    eventTypes:
-      ReactNativePrivateInterface.ReactNativeViewConfigRegistry.eventTypes,
+      .customDirectEventTypes;
+injection.injectEventPluginOrder([
+  "ResponderEventPlugin",
+  "ReactNativeBridgeEventPlugin"
+]);
+injection.injectEventPluginsByName({
+  ResponderEventPlugin: ResponderEventPlugin,
+  ReactNativeBridgeEventPlugin: {
+    eventTypes: {},
     extractEvents: function(
       topLevelType,
       targetInst,
@@ -977,14 +982,7 @@ var eventTypes = {
       else return null;
       return topLevelType;
     }
-  };
-injection.injectEventPluginOrder([
-  "ResponderEventPlugin",
-  "ReactNativeBridgeEventPlugin"
-]);
-injection.injectEventPluginsByName({
-  ResponderEventPlugin: ResponderEventPlugin,
-  ReactNativeBridgeEventPlugin: ReactNativeBridgeEventPlugin
+  }
 });
 var instanceCache = {},
   instanceProps = {};

Libraries/Renderer/implementations/ReactNativeRenderer-profiling.js

@@ -948,10 +948,15 @@ var eventTypes = {
       .customBubblingEventTypes,
   customDirectEventTypes =
     ReactNativePrivateInterface.ReactNativeViewConfigRegistry
-      .customDirectEventTypes,
-  ReactNativeBridgeEventPlugin = {
-    eventTypes:
-      ReactNativePrivateInterface.ReactNativeViewConfigRegistry.eventTypes,
+      .customDirectEventTypes;
+injection.injectEventPluginOrder([
+  "ResponderEventPlugin",
+  "ReactNativeBridgeEventPlugin"
+]);
+injection.injectEventPluginsByName({
+  ResponderEventPlugin: ResponderEventPlugin,
+  ReactNativeBridgeEventPlugin: {
+    eventTypes: {},
     extractEvents: function(
       topLevelType,
       targetInst,
@@ -978,14 +983,7 @@ var eventTypes = {
       else return null;
       return topLevelType;
     }
-  };
-injection.injectEventPluginOrder([
-  "ResponderEventPlugin",
-  "ReactNativeBridgeEventPlugin"
-]);
-injection.injectEventPluginsByName({
-  ResponderEventPlugin: ResponderEventPlugin,
-  ReactNativeBridgeEventPlugin: ReactNativeBridgeEventPlugin
+  }
 });
 var instanceCache = {},
   instanceProps = {};

Libraries/Renderer/shims/ReactNativeViewConfigRegistry.js

@@ -20,11 +20,9 @@ const invariant = require('invariant');
 // Event configs
 const customBubblingEventTypes = {};
 const customDirectEventTypes = {};
-const eventTypes = {};
 
 exports.customBubblingEventTypes = customBubblingEventTypes;
 exports.customDirectEventTypes = customDirectEventTypes;
-exports.eventTypes = eventTypes;
 
 const viewConfigCallbacks = new Map();
 const viewConfigs = new Map();
@@ -49,7 +47,7 @@ function processEventTypes(
   if (bubblingEventTypes != null) {
     for (const topLevelType in bubblingEventTypes) {
       if (customBubblingEventTypes[topLevelType] == null) {
-        eventTypes[topLevelType] = customBubblingEventTypes[topLevelType] =
+        customBubblingEventTypes[topLevelType] =
           bubblingEventTypes[topLevelType];
       }
     }
@@ -58,8 +56,7 @@ function processEventTypes(
   if (directEventTypes != null) {
     for (const topLevelType in directEventTypes) {
       if (customDirectEventTypes[topLevelType] == null) {
-        eventTypes[topLevelType] = customDirectEventTypes[topLevelType] =
-          directEventTypes[topLevelType];
+        customDirectEventTypes[topLevelType] = directEventTypes[topLevelType];
       }
     }
   }