Kill keyOf :) (#7615)

src/addons/link/LinkedStateMixin.js

@@ -24,8 +24,7 @@ var LinkedStateMixin = {
    * ReactLink will have the current value of this.state[key] and will call
    * setState() when a change is requested.
    *
-   * @param {string} key state key to update. Note: you may want to use keyOf()
-   * if you're using Google Closure Compiler advanced mode.
+   * @param {string} key state key to update.
    * @return {ReactLink} ReactLink instance linking to the state.
    */
   linkState: function(key) {

src/addons/update.js

@@ -13,7 +13,6 @@
 
 'use strict';
 
-var keyOf = require('keyOf');
 var invariant = require('invariant');
 var hasOwnProperty = {}.hasOwnProperty;
 
@@ -27,12 +26,12 @@ function shallowCopy(x) {
   }
 }
 
-var COMMAND_PUSH = keyOf({$push: null});
-var COMMAND_UNSHIFT = keyOf({$unshift: null});
-var COMMAND_SPLICE = keyOf({$splice: null});
-var COMMAND_SET = keyOf({$set: null});
-var COMMAND_MERGE = keyOf({$merge: null});
-var COMMAND_APPLY = keyOf({$apply: null});
+var COMMAND_PUSH = '$push';
+var COMMAND_UNSHIFT = '$unshift';
+var COMMAND_SPLICE = '$splice';
+var COMMAND_SET = '$set';
+var COMMAND_MERGE = '$merge';
+var COMMAND_APPLY = '$apply';
 
 var ALL_COMMANDS_LIST = [
   COMMAND_PUSH,

src/isomorphic/classic/class/ReactClass.js

@@ -18,12 +18,11 @@ var ReactNoopUpdateQueue = require('ReactNoopUpdateQueue');
 
 var emptyObject = require('emptyObject');
 var invariant = require('invariant');
-var keyOf = require('keyOf');
 var warning = require('warning');
 
 import type { ReactPropTypeLocations } from 'ReactPropTypeLocations';
 
-var MIXINS_KEY = keyOf({mixins: null});
+var MIXINS_KEY = 'mixins';
 
 /**
  * Policies that describe methods in `ReactClassInterface`.

src/renderers/dom/client/__tests__/ReactBrowserEventEmitter-test.js

@@ -11,8 +11,6 @@
 
 'use strict';
 
-var keyOf = require('keyOf');
-
 var EventListener;
 var EventPluginHub;
 var EventPluginRegistry;
@@ -36,10 +34,10 @@ var recordIDAndReturnFalse = function(id, event) {
   return false;
 };
 var LISTENER = jest.fn();
-var ON_CLICK_KEY = keyOf({onClick: null});
-var ON_TOUCH_TAP_KEY = keyOf({onTouchTap: null});
-var ON_CHANGE_KEY = keyOf({onChange: null});
-var ON_MOUSE_ENTER_KEY = keyOf({onMouseEnter: null});
+var ON_CLICK_KEY = 'onClick';
+var ON_TOUCH_TAP_KEY = 'onTouchTap';
+var ON_CHANGE_KEY = 'onChange';
+var ON_MOUSE_ENTER_KEY = 'onMouseEnter';
 
 var GRANDPARENT;
 var PARENT;

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

@@ -17,8 +17,6 @@ var FallbackCompositionState = require('FallbackCompositionState');
 var SyntheticCompositionEvent = require('SyntheticCompositionEvent');
 var SyntheticInputEvent = require('SyntheticInputEvent');
 
-var keyOf = require('keyOf');
-
 import type { TopLevelTypes } from 'EventConstants';
 
 var END_KEYCODES = [9, 13, 27, 32]; // Tab, Return, Esc, Space
@@ -75,8 +73,8 @@ var SPACEBAR_CHAR = String.fromCharCode(SPACEBAR_CODE);
 var eventTypes = {
   beforeInput: {
     phasedRegistrationNames: {
-      bubbled: keyOf({onBeforeInput: null}),
-      captured: keyOf({onBeforeInputCapture: null}),
+      bubbled: 'onBeforeInput',
+      captured: 'onBeforeInputCapture',
     },
     dependencies: [
       'topCompositionEnd',
@@ -87,8 +85,8 @@ var eventTypes = {
   },
   compositionEnd: {
     phasedRegistrationNames: {
-      bubbled: keyOf({onCompositionEnd: null}),
-      captured: keyOf({onCompositionEndCapture: null}),
+      bubbled: 'onCompositionEnd',
+      captured: 'onCompositionEndCapture',
     },
     dependencies: [
       'topBlur',
@@ -101,8 +99,8 @@ var eventTypes = {
   },
   compositionStart: {
     phasedRegistrationNames: {
-      bubbled: keyOf({onCompositionStart: null}),
-      captured: keyOf({onCompositionStartCapture: null}),
+      bubbled: 'onCompositionStart',
+      captured: 'onCompositionStartCapture',
     },
     dependencies: [
       'topBlur',
@@ -115,8 +113,8 @@ var eventTypes = {
   },
   compositionUpdate: {
     phasedRegistrationNames: {
-      bubbled: keyOf({onCompositionUpdate: null}),
-      captured: keyOf({onCompositionUpdateCapture: null}),
+      bubbled: 'onCompositionUpdate',
+      captured: 'onCompositionUpdateCapture',
     },
     dependencies: [
       'topBlur',

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

@@ -22,14 +22,12 @@ var inputValueTracking = require('inputValueTracking');
 var getEventTarget = require('getEventTarget');
 var isEventSupported = require('isEventSupported');
 var isTextInputElement = require('isTextInputElement');
-var keyOf = require('keyOf');
-
 
 var eventTypes = {
   change: {
     phasedRegistrationNames: {
-      bubbled: keyOf({onChange: null}),
-      captured: keyOf({onChangeCapture: null}),
+      bubbled: 'onChange',
+      captured: 'onChangeCapture',
     },
     dependencies: [
       'topBlur',

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

@@ -11,8 +11,6 @@
 
 'use strict';
 
-var keyOf = require('keyOf');
-
 /**
  * Module that is injectable into `EventPluginHub`, that specifies a
  * deterministic ordering of `EventPlugin`s. A convenient way to reason about
@@ -23,13 +21,13 @@ var keyOf = require('keyOf');
  * preventing default on events is convenient in `SimpleEventPlugin` handlers.
  */
 var DefaultEventPluginOrder = [
-  keyOf({ResponderEventPlugin: null}),
-  keyOf({SimpleEventPlugin: null}),
-  keyOf({TapEventPlugin: null}),
-  keyOf({EnterLeaveEventPlugin: null}),
-  keyOf({ChangeEventPlugin: null}),
-  keyOf({SelectEventPlugin: null}),
-  keyOf({BeforeInputEventPlugin: null}),
+  'ResponderEventPlugin',
+  'SimpleEventPlugin',
+  'TapEventPlugin',
+  'EnterLeaveEventPlugin',
+  'ChangeEventPlugin',
+  'SelectEventPlugin',
+  'BeforeInputEventPlugin',
 ];
 
 module.exports = DefaultEventPluginOrder;

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

@@ -15,18 +15,16 @@ var EventPropagators = require('EventPropagators');
 var ReactDOMComponentTree = require('ReactDOMComponentTree');
 var SyntheticMouseEvent = require('SyntheticMouseEvent');
 
-var keyOf = require('keyOf');
-
 var eventTypes = {
   mouseEnter: {
-    registrationName: keyOf({onMouseEnter: null}),
+    registrationName: 'onMouseEnter',
     dependencies: [
       'topMouseOut',
       'topMouseOver',
     ],
   },
   mouseLeave: {
-    registrationName: keyOf({onMouseLeave: null}),
+    registrationName: 'onMouseLeave',
     dependencies: [
       'topMouseOut',
       'topMouseOver',

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

@@ -19,7 +19,6 @@ var SyntheticEvent = require('SyntheticEvent');
 
 var getActiveElement = require('getActiveElement');
 var isTextInputElement = require('isTextInputElement');
-var keyOf = require('keyOf');
 var shallowEqual = require('shallowEqual');
 
 var skipSelectionChangeEvent = (
@@ -31,8 +30,8 @@ var skipSelectionChangeEvent = (
 var eventTypes = {
   select: {
     phasedRegistrationNames: {
-      bubbled: keyOf({onSelect: null}),
-      captured: keyOf({onSelectCapture: null}),
+      bubbled: 'onSelect',
+      captured: 'onSelectCapture',
     },
     dependencies: [
       'topBlur',
@@ -55,7 +54,6 @@ var mouseDown = false;
 // Track whether a listener exists for this plugin. If none exist, we do
 // not extract events. See #3639.
 var hasListener = false;
-var ON_SELECT_KEY = keyOf({onSelect: null});
 
 /**
  * Get an object which is a unique representation of the current selection.
@@ -212,7 +210,7 @@ var SelectEventPlugin = {
   },
 
   didPutListener: function(inst, registrationName, listener) {
-    if (registrationName === ON_SELECT_KEY) {
+    if (registrationName === 'onSelect') {
       hasListener = true;
     }
   },