{"parents":["31cdb4c8a7d84eebd5f6e32167ce7f882562f281","2dc24fc2343b6120d8b80df9e9e070917cc197d9"],"patch":"diff --git a\/src\/core\/ReactComponent.js b\/src\/core\/ReactComponent.js\nindex 4f4cffd078..e59c37fd69 100644\n--- a\/src\/core\/ReactComponent.js\n+++ b\/src\/core\/ReactComponent.js\n@@ -50,6 +50,60 @@ var ComponentLifeCycle = keyMirror({\n UNMOUNTED: null\n });\n \n+\/**\n+ * Warn if there's no key explicitly set on dynamic arrays of children.\n+ * This allows us to keep track of children between updates.\n+ *\/\n+\n+var CHILD_HAS_NO_IDENTITY =\n+ 'You are passing a dynamic array of children. You should set the ' +\n+ 'property \"key\" to a string that uniquely identifies each child.';\n+\n+var HAS_WARNED = false;\n+\n+\/**\n+ * Helpers for flattening child arguments onto a new array or use an existing\n+ * one.\n+ *\/\n+\n+function isEmptyChild(child) {\n+ return child == null || typeof child === 'boolean';\n+}\n+\n+function assignKey(setKey, child, index) {\n+ if (ReactComponent.isValidComponent(child)) {\n+ var key = child.props.key;\n+ if (__DEV__) {\n+ if (!HAS_WARNED && !key) {\n+ HAS_WARNED = true;\n+ console && console.warn && console.warn(CHILD_HAS_NO_IDENTITY);\n+ }\n+ }\n+ child._key = (setKey ? setKey + ':' : '') + (key || ('' + index));\n+ }\n+}\n+\n+function tryToReuseArray(children) {\n+ for (var i = 0; i < children.length; i++) {\n+ var child = children[i];\n+ if (isEmptyChild(child)) return false;\n+ assignKey('', child, i);\n+ }\n+ return true;\n+}\n+\n+function appendNestedChildren(parentKey, sourceArray, targetArray) {\n+ for (var i = 0; i < sourceArray.length; i++) {\n+ var child = sourceArray[i];\n+ if (isEmptyChild(child)) continue;\n+ assignKey(parentKey, child, i);\n+ \/\/ TODO: Invalid components like strings could possibly need\n+ \/\/ keys assigned to them here. Usually they're not stateful but\n+ \/\/ CSS transitions and special events could make them stateful.\n+ targetArray.push(child);\n+ }\n+}\n+\n \/**\n * Components are the basic units of composition in React.\n *\n@@ -206,13 +260,58 @@ var ReactComponent = {\n *\/\n construct: function(initialProps, children) {\n this.props = initialProps || {};\n- if (typeof children !== 'undefined') {\n- this.props.children = children;\n- }\n \/\/ Record the component responsible for creating this component.\n this.props[OWNER] = ReactCurrentOwner.current;\n \/\/ All components start unmounted.\n this._lifeCycleState = ComponentLifeCycle.UNMOUNTED;\n+\n+ \/\/ Children can be either an array or more than one argument\n+ if (arguments.length < 2) {\n+ return;\n+ }\n+\n+ if (arguments.length === 2) {\n+\n+ \/\/ A single string or number child is treated as content, not an array.\n+ var type = typeof children;\n+ if (children == null || type === 'string' || type === 'number') {\n+ this.props.children = children;\n+ return;\n+ }\n+\n+ \/\/ A single array can be reused if it's already flat\n+ if (Array.isArray(children) && tryToReuseArray(children)) {\n+ this.props.children = children;\n+ return;\n+ }\n+\n+ }\n+\n+ \/\/ Subsequent arguments are rolled into one child array. Array arguments\n+ \/\/ are flattened onto it. This is inlined to avoid extra heap allocation.\n+ var targetArray = null;\n+ for (var i = 1; i < arguments.length; i++) {\n+ var child = arguments[i];\n+ if (Array.isArray(child)) {\n+ if (child.length === 0) continue;\n+\n+ if (targetArray === null) targetArray = [];\n+ appendNestedChildren(i - 1, child, targetArray);\n+\n+ } else if (!isEmptyChild(child)) {\n+\n+ if (ReactComponent.isValidComponent(child)) {\n+ \/\/ This is a static node and therefore safe to key by index.\n+ \/\/ No warning necessary.\n+ child._key = child.props.key || ('' + (i - 1));\n+ }\n+\n+ if (targetArray === null) targetArray = [];\n+ targetArray.push(child);\n+\n+ }\n+ }\n+ this.props.children = targetArray;\n },\n \n \/**\n@@ -381,24 +480,4 @@ var ReactComponent = {\n \n };\n \n-function logDeprecated(msg) {\n- if (__DEV__) {\n- throw new Error(msg);\n- } else {\n- console && console.warn && console.warn(msg);\n- }\n-}\n-\n-\/**\n- * @deprecated\n- *\/\n-ReactComponent.Mixin.update = function(props) {\n- logDeprecated('this.update() is deprecated. Use this.setProps()');\n- this.setProps(props);\n-};\n-ReactComponent.Mixin.updateAll = function(props) {\n- logDeprecated('this.updateAll() is deprecated. Use this.replaceProps()');\n- this.replaceProps(props);\n-};\n-\n module.exports = ReactComponent;\ndiff --git a\/src\/core\/ReactCompositeComponent.js b\/src\/core\/ReactCompositeComponent.js\nindex a16e4590c8..468c200511 100644\n--- a\/src\/core\/ReactCompositeComponent.js\n+++ b\/src\/core\/ReactCompositeComponent.js\n@@ -91,6 +91,19 @@ var ReactCompositeComponentInterface = {\n \n \/\/ ==== Definition methods ====\n \n+ \/**\n+ * Invoked when the component is mounted and whenever new props are received.\n+ * Values in the returned mapping will be set on `this.props` if that prop is\n+ * not specified (i.e. using an `in` check).\n+ *\n+ * This method is invoked before `getInitialState` and therefore cannot rely\n+ * on `this.state` or use `this.setState`.\n+ *\n+ * @return {object}\n+ * @optional\n+ *\/\n+ getDefaultProps: SpecPolicy.DEFINE_ONCE,\n+\n \/**\n * Invoked once before the component is mounted. The return value will be used\n * as the initial value of `this.state`.\n@@ -396,7 +409,8 @@ var ReactCompositeComponentMixin = {\n * @internal\n *\/\n construct: function(initialProps, children) {\n- ReactComponent.Mixin.construct.call(this, initialProps, children);\n+ \/\/ Children can be either an array or more than one argument\n+ ReactComponent.Mixin.construct.apply(this, arguments);\n this.state = null;\n this._pendingState = null;\n this._compositeLifeCycleState = null;\n@@ -418,9 +432,7 @@ var ReactCompositeComponentMixin = {\n this._lifeCycleState = ReactComponent.LifeCycle.UNMOUNTED;\n this._compositeLifeCycleState = CompositeLifeCycle.MOUNTING;\n \n- if (this.constructor.propDeclarations) {\n- this._assertValidProps(this.props);\n- }\n+ this._processProps(this.props);\n \n if (this.__reactAutoBindMap) {\n this._bindAutoBindMethods();\n@@ -488,9 +500,7 @@ var ReactCompositeComponentMixin = {\n * @internal\n *\/\n receiveProps: function(nextProps, transaction) {\n- if (this.constructor.propDeclarations) {\n- this._assertValidProps(nextProps);\n- }\n+ this._processProps(nextProps);\n ReactComponent.Mixin.receiveProps.call(this, nextProps, transaction);\n \n this._compositeLifeCycleState = CompositeLifeCycle.RECEIVING_PROPS;\n@@ -572,6 +582,35 @@ var ReactCompositeComponentMixin = {\n }\n },\n \n+ \/**\n+ * Processes props by setting default values for unspecified props and\n+ * asserting that the props are valid.\n+ *\n+ * @param {object} props\n+ * @private\n+ *\/\n+ _processProps: function(props) {\n+ var propName;\n+ if (this.getDefaultProps) {\n+ var defaultProps = this.getDefaultProps();\n+ for (propName in defaultProps) {\n+ if (!(propName in props)) {\n+ props[propName] = defaultProps[propName];\n+ }\n+ }\n+ }\n+ var propDeclarations = this.constructor.propDeclarations;\n+ if (propDeclarations) {\n+ var componentName = this.constructor.displayName;\n+ for (propName in propDeclarations) {\n+ var checkProp = propDeclarations[propName];\n+ if (checkProp) {\n+ checkProp(props, propName, componentName);\n+ }\n+ }\n+ }\n+ },\n+\n \/**\n * Receives next props and next state, and negotiates whether or not the\n * component should update as a result.\n@@ -669,6 +708,17 @@ var ReactCompositeComponentMixin = {\n * @protected\n *\/\n forceUpdate: function() {\n+ var compositeLifeCycleState = this._compositeLifeCycleState;\n+ invariant(\n+ this._lifeCycleState === ReactComponent.LifeCycle.MOUNTED,\n+ 'forceUpdate(...): Can only force an update on mounted components.'\n+ );\n+ invariant(\n+ compositeLifeCycleState !== CompositeLifeCycle.RECEIVING_STATE &&\n+ compositeLifeCycleState !== CompositeLifeCycle.UNMOUNTING,\n+ 'forceUpdate(...): Cannot force an update while unmounting component ' +\n+ 'or during an existing state transition (such as within `render`).'\n+ );\n var transaction = ReactComponent.ReactReconcileTransaction.getPooled();\n transaction.perform(\n this._performComponentUpdate,\n@@ -684,9 +734,16 @@ var ReactCompositeComponentMixin = {\n * @private\n *\/\n _renderValidatedComponent: function() {\n+ var renderedComponent;\n ReactCurrentOwner.current = this;\n- var renderedComponent = this.render();\n- ReactCurrentOwner.current = null;\n+ try {\n+ renderedComponent = this.render();\n+ } catch (error) {\n+ \/\/ IE8 requires `catch` in order to use `finally`.\n+ throw error;\n+ } finally {\n+ ReactCurrentOwner.current = null;\n+ }\n invariant(\n ReactComponent.isValidComponent(renderedComponent),\n '%s.render(): A valid ReactComponent must be returned.',\n@@ -695,21 +752,6 @@ var ReactCompositeComponentMixin = {\n return renderedComponent;\n },\n \n- \/**\n- * @param {object} props\n- * @private\n- *\/\n- _assertValidProps: function(props) {\n- var propDeclarations = this.constructor.propDeclarations;\n- var componentName = this.constructor.displayName;\n- for (var propName in propDeclarations) {\n- var checkProp = propDeclarations[propName];\n- if (checkProp) {\n- checkProp(props, propName, componentName);\n- }\n- }\n- },\n-\n \/**\n * @private\n *\/\n@@ -784,9 +826,7 @@ var ReactCompositeComponent = {\n * @public\n *\/\n createClass: function(spec) {\n- var Constructor = function(initialProps, children) {\n- this.construct(initialProps, children);\n- };\n+ var Constructor = function() {};\n Constructor.prototype = new ReactCompositeComponentBase();\n Constructor.prototype.constructor = Constructor;\n mixSpecIntoComponent(Constructor, spec);\n@@ -796,7 +836,9 @@ var ReactCompositeComponent = {\n );\n \n var ConvenienceConstructor = function(props, children) {\n- return new Constructor(props, children);\n+ var instance = new Constructor();\n+ instance.construct.apply(instance, arguments);\n+ return instance;\n };\n ConvenienceConstructor.componentConstructor = Constructor;\n ConvenienceConstructor.originalSpec = spec;\ndiff --git a\/src\/core\/ReactDOM.js b\/src\/core\/ReactDOM.js\nindex d04fe2e0a6..2fe78e99a7 100644\n--- a\/src\/core\/ReactDOM.js\n+++ b\/src\/core\/ReactDOM.js\n@@ -40,15 +40,15 @@ var objMapKeyVal = require('objMapKeyVal');\n * @private\n *\/\n function createDOMComponentClass(tag, omitClose) {\n- var Constructor = function(initialProps, children) {\n- this.construct(initialProps, children);\n- };\n+ var Constructor = function() {};\n \n Constructor.prototype = new ReactNativeComponent(tag, omitClose);\n Constructor.prototype.constructor = Constructor;\n \n return function(props, children) {\n- return new Constructor(props, children);\n+ var instance = new Constructor();\n+ instance.construct.apply(instance, arguments);\n+ return instance;\n };\n }\n \ndiff --git a\/src\/core\/ReactDOMForm.js b\/src\/core\/ReactDOMForm.js\nindex 9d15130035..4aae407255 100644\n--- a\/src\/core\/ReactDOMForm.js\n+++ b\/src\/core\/ReactDOMForm.js\n@@ -20,7 +20,7 @@\n \n var ReactCompositeComponent = require('ReactCompositeComponent');\n var ReactDOM = require('ReactDOM');\n-var ReactEvent = require('ReactEvent');\n+var ReactEventEmitter = require('ReactEventEmitter');\n var EventConstants = require('EventConstants');\n \n \/\/ Store a reference to the

`ReactNativeComponent`.\n@@ -41,7 +41,7 @@ var ReactDOMForm = ReactCompositeComponent.createClass({\n },\n \n componentDidMount: function(node) {\n- ReactEvent.trapBubbledEvent(\n+ ReactEventEmitter.trapBubbledEvent(\n EventConstants.topLevelTypes.topSubmit,\n 'submit',\n node\ndiff --git a\/src\/core\/ReactEvent.js b\/src\/core\/ReactEvent.js\ndeleted file mode 100644\nindex 702c8816c3..0000000000\n--- a\/src\/core\/ReactEvent.js\n+++ \/dev\/null\n@@ -1,322 +0,0 @@\n-\/**\n- * Copyright 2013 Facebook, Inc.\n- *\n- * Licensed under the Apache License, Version 2.0 (the \"License\");\n- * you may not use this file except in compliance with the License.\n- * You may obtain a copy of the License at\n- *\n- * http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n- *\n- * Unless required by applicable law or agreed to in writing, software\n- * distributed under the License is distributed on an \"AS IS\" BASIS,\n- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n- * See the License for the specific language governing permissions and\n- * limitations under the License.\n- *\n- * @providesModule ReactEvent\n- *\/\n-\n-\"use strict\";\n-\n-var BrowserEnv = require('BrowserEnv');\n-var EventConstants = require('EventConstants');\n-var EventPluginHub = require('EventPluginHub');\n-var ExecutionEnvironment = require('ExecutionEnvironment');\n-var NormalizedEventListener = require('NormalizedEventListener');\n-\n-var invariant = require('invariant');\n-var isEventSupported = require('isEventSupported');\n-\n-var registrationNames = EventPluginHub.registrationNames;\n-var topLevelTypes = EventConstants.topLevelTypes;\n-var listen = NormalizedEventListener.listen;\n-var capture = NormalizedEventListener.capture;\n-\n-\/**\n- * `ReactEvent` is used to attach top-level event listeners. For example:\n- *\n- * ReactEvent.putListener('myID', 'onClick', myFunction);\n- *\n- * This would allocate a \"registration\" of `('onClick', myFunction)` on 'myID'.\n- *\/\n-\n-\/**\n- * Overview of React and the event system:\n- *\n- * .\n- * +-------------+ .\n- * | DOM | .\n- * +-------------+ . +-----------+\n- * + . +--------+|SimpleEvent|\n- * | . | |Plugin |\n- * +-----|-------+ . v +-----------+\n- * | | | . +--------------+ +------------+\n- * | +------------.---->|EventPluginHub| | Event |\n- * | | . | | +-----------+ | Propagators|\n- * | ReactEvent | . | | |TapEvent | |------------|\n- * | | . | |<---+|Plugin | |other plugin|\n- * | +------------.---------+ | +-----------+ | utilities |\n- * | | | . | | | +------------+\n- * | | | . +---|----------+\n- * | | | . | ^ +-----------+\n- * | | | . | | |Enter\/Leave|\n- * +-----| ------+ . | +-------+|Plugin |\n- * | . v +-----------+\n- * + . +--------+\n- * +-------------+ . |callback|\n- * | application | . |registry|\n- * |-------------| . +--------+\n- * | | .\n- * | | .\n- * | | .\n- * | | .\n- * +-------------+ .\n- * .\n- * React Core . General Purpose Event Plugin System\n- *\/\n-\n-\/**\n- * We listen for bubbled touch events on the document object.\n- *\n- * Firefox v8.01 (and possibly others) exhibited strange behavior when mounting\n- * `onmousemove` events at some node that was not the document element. The\n- * symptoms were that if your mouse is not moving over something contained\n- * within that mount point (for example on the background) the top-level\n- * listeners for `onmousemove` won't be called. However, if you register the\n- * `mousemove` on the document object, then it will of course catch all\n- * `mousemove`s. This along with iOS quirks, justifies restricting top-level\n- * listeners to the document object only, at least for these movement types of\n- * events and possibly all events.\n- *\n- * @see http:\/\/www.quirksmode.org\/blog\/archives\/2010\/09\/click_event_del.html\n- *\n- * Also, `keyup`\/`keypress`\/`keydown` do not bubble to the window on IE, but\n- * they bubble to document.\n- *\n- * @see http:\/\/www.quirksmode.org\/dom\/events\/keys.html.\n- *\/\n-\n-var _isListening = false;\n-\n-var EVENT_LISTEN_MISUSE;\n-var WORKER_DISABLE;\n-\n-if (__DEV__) {\n- EVENT_LISTEN_MISUSE =\n- 'You must register listeners at the top of the document, only once - ' +\n- 'and only in the main UI thread of a browser - if you are attempting ' +\n- 'listen in a worker, the framework is probably doing something wrong ' +\n- 'and you should report this immediately.';\n- WORKER_DISABLE =\n- 'Cannot disable event listening in Worker thread. This is likely a ' +\n- 'bug in the framework. Please report immediately.';\n-}\n-\n-\n-\/**\n- * Traps top-level events that bubble. Delegates to the main dispatcher\n- * `handleTopLevel` after performing some basic normalization via\n- * `TopLevelCallbackCreator.createTopLevelCallback`.\n- *\/\n-function trapBubbledEvent(topLevelType, handlerBaseName, onWhat) {\n- listen(\n- onWhat,\n- handlerBaseName,\n- ReactEvent.TopLevelCallbackCreator.createTopLevelCallback(topLevelType)\n- );\n-}\n-\n-\/**\n- * Traps a top-level event by using event capturing.\n- *\/\n-function trapCapturedEvent(topLevelType, handlerBaseName, onWhat) {\n- capture(\n- onWhat,\n- handlerBaseName,\n- ReactEvent.TopLevelCallbackCreator.createTopLevelCallback(topLevelType)\n- );\n-}\n-\n-\/**\n- * Listens to document scroll and window resize events that may change the\n- * document scroll values. We store those results so as to discourage\n- * application code from asking the DOM itself which could trigger additional\n- * reflows.\n- *\/\n-function registerDocumentScrollListener() {\n- listen(window, 'scroll', function(nativeEvent) {\n- if (nativeEvent.target === window) {\n- BrowserEnv.refreshAuthoritativeScrollValues();\n- }\n- });\n-}\n-\n-function registerDocumentResizeListener() {\n- listen(window, 'resize', function(nativeEvent) {\n- if (nativeEvent.target === window) {\n- BrowserEnv.refreshAuthoritativeScrollValues();\n- }\n- });\n-}\n-\n-\/**\n- * Summary of `ReactEvent` event handling:\n- *\n- * - We trap low level 'top-level' events.\n- *\n- * - We dedupe cross-browser event names into these 'top-level types' so that\n- * `DOMMouseScroll` or `mouseWheel` both become `topMouseWheel`.\n- *\n- * - At this point we have native browser events with the top-level type that\n- * was used to catch it at the top-level.\n- *\n- * - We continuously stream these native events (and their respective top-level\n- * types) to the event plugin system `EventPluginHub` and ask the plugin\n- * system if it was able to extract `AbstractEvent` objects. `AbstractEvent`\n- * objects are the events that applications actually deal with - they are not\n- * native browser events but cross-browser wrappers.\n- *\n- * - When returning the `AbstractEvent` objects, `EventPluginHub` will make\n- * sure each abstract event is annotated with \"dispatches\", which are the\n- * sequence of listeners (and IDs) that care about the event.\n- *\n- * - These `AbstractEvent` objects are fed back into the event plugin system,\n- * which in turn executes these dispatches.\n- *\n- * @private\n- *\/\n-function listenAtTopLevel(touchNotMouse) {\n- invariant(\n- !_isListening,\n- 'listenAtTopLevel(...): Cannot setup top-level listener more than once.'\n- );\n- var mountAt = document;\n-\n- registerDocumentScrollListener();\n- registerDocumentResizeListener();\n- trapBubbledEvent(topLevelTypes.topMouseOver, 'mouseover', mountAt);\n- trapBubbledEvent(topLevelTypes.topMouseDown, 'mousedown', mountAt);\n- trapBubbledEvent(topLevelTypes.topMouseUp, 'mouseup', mountAt);\n- trapBubbledEvent(topLevelTypes.topMouseMove, 'mousemove', mountAt);\n- trapBubbledEvent(topLevelTypes.topMouseOut, 'mouseout', mountAt);\n- trapBubbledEvent(topLevelTypes.topClick, 'click', mountAt);\n- trapBubbledEvent(topLevelTypes.topDoubleClick, 'dblclick', mountAt);\n- trapBubbledEvent(topLevelTypes.topMouseWheel, 'mousewheel', mountAt);\n- if (touchNotMouse) {\n- trapBubbledEvent(topLevelTypes.topTouchStart, 'touchstart', mountAt);\n- trapBubbledEvent(topLevelTypes.topTouchEnd, 'touchend', mountAt);\n- trapBubbledEvent(topLevelTypes.topTouchMove, 'touchmove', mountAt);\n- trapBubbledEvent(topLevelTypes.topTouchCancel, 'touchcancel', mountAt);\n- }\n- trapBubbledEvent(topLevelTypes.topKeyUp, 'keyup', mountAt);\n- trapBubbledEvent(topLevelTypes.topKeyPress, 'keypress', mountAt);\n- trapBubbledEvent(topLevelTypes.topKeyDown, 'keydown', mountAt);\n- trapBubbledEvent(topLevelTypes.topInput, 'input', mountAt);\n- trapBubbledEvent(topLevelTypes.topChange, 'change', mountAt);\n- trapBubbledEvent(\n- topLevelTypes.topDOMCharacterDataModified,\n- 'DOMCharacterDataModified',\n- mountAt\n- );\n-\n- \/\/ Firefox needs to capture a different mouse scroll event.\n- \/\/ @see http:\/\/www.quirksmode.org\/dom\/events\/tests\/scroll.html\n- trapBubbledEvent(topLevelTypes.topMouseWheel, 'DOMMouseScroll', mountAt);\n- \/\/ IE < 9 doesn't support capturing so just trap the bubbled event there.\n- if (isEventSupported('scroll', true)) {\n- trapCapturedEvent(topLevelTypes.topScroll, 'scroll', mountAt);\n- } else {\n- trapBubbledEvent(topLevelTypes.topScroll, 'scroll', window);\n- }\n-\n- if (isEventSupported('focus', true)) {\n- trapCapturedEvent(topLevelTypes.topFocus, 'focus', mountAt);\n- trapCapturedEvent(topLevelTypes.topBlur, 'blur', mountAt);\n- } else if (isEventSupported('focusin')) {\n- \/\/ IE has `focusin` and `focusout` events which bubble.\n- \/\/ @see http:\/\/www.quirksmode.org\/blog\/archives\/2008\/04\/delegating_the.html\n- trapBubbledEvent(topLevelTypes.topFocus, 'focusin', mountAt);\n- trapBubbledEvent(topLevelTypes.topBlur, 'focusout', mountAt);\n- }\n-}\n-\n-\/**\n- * This is the heart of `ReactEvent`. It simply streams the top-level native\n- * events to `EventPluginHub`.\n- *\n- * @param {object} topLevelType Record from `EventConstants`.\n- * @param {Event} nativeEvent A Standard Event with fixed `target` property.\n- * @param {DOMElement} renderedTarget Element of interest to the framework.\n- * @param {string} renderedTargetID string ID of `renderedTarget`.\n- * @internal\n- *\/\n-function handleTopLevel(\n- topLevelType,\n- nativeEvent,\n- renderedTargetID,\n- renderedTarget) {\n- var abstractEvents = EventPluginHub.extractAbstractEvents(\n- topLevelType,\n- nativeEvent,\n- renderedTargetID,\n- renderedTarget\n- );\n-\n- \/\/ The event queue being processed in the same cycle allows preventDefault.\n- EventPluginHub.enqueueAbstractEvents(abstractEvents);\n- EventPluginHub.processAbstractEventQueue();\n-}\n-\n-function setEnabled(enabled) {\n- invariant(\n- ExecutionEnvironment.canUseDOM,\n- 'setEnabled(...): Cannot toggle event listening in a Worker thread. This ' +\n- 'is likely a bug in the framework. Please report immediately.'\n- );\n- ReactEvent.TopLevelCallbackCreator.setEnabled(enabled);\n-}\n-\n-function isEnabled() {\n- return ReactEvent.TopLevelCallbackCreator.isEnabled();\n-}\n-\n-\/**\n- * Ensures that top-level event delegation listeners are listening at `mountAt`.\n- * There are issues with listening to both touch events and mouse events on the\n- * top-level, so we make the caller choose which one to listen to. (If there's a\n- * touch top-level listeners, anchors don't receive clicks for some reason, and\n- * only in some cases).\n- *\n- * @param {boolean} touchNotMouse Listen to touch events instead of mouse.\n- * @param {object} TopLevelCallbackCreator Module that can create top-level\n- * callback handlers.\n- * @internal\n- *\/\n-function ensureListening(touchNotMouse, TopLevelCallbackCreator) {\n- invariant(\n- ExecutionEnvironment.canUseDOM,\n- 'ensureListening(...): Cannot toggle event listening in a Worker thread. ' +\n- 'This is likely a bug in the framework. Please report immediately.'\n- );\n- if (!_isListening) {\n- ReactEvent.TopLevelCallbackCreator = TopLevelCallbackCreator;\n- listenAtTopLevel(touchNotMouse);\n- _isListening = true;\n- }\n-}\n-\n-var ReactEvent = {\n- TopLevelCallbackCreator: null, \/\/ Injectable callback creator.\n- handleTopLevel: handleTopLevel,\n- setEnabled: setEnabled,\n- isEnabled: isEnabled,\n- ensureListening: ensureListening,\n- registrationNames: registrationNames,\n- putListener: EventPluginHub.putListener,\n- getListener: EventPluginHub.getListener,\n- deleteAllListeners: EventPluginHub.deleteAllListeners,\n- trapBubbledEvent: trapBubbledEvent,\n- trapCapturedEvent: trapCapturedEvent\n-};\n-\n-module.exports = ReactEvent;\ndiff --git a\/src\/core\/ReactEventEmitter.js b\/src\/core\/ReactEventEmitter.js\nnew file mode 100644\nindex 0000000000..ccd74c08a8\n--- \/dev\/null\n+++ b\/src\/core\/ReactEventEmitter.js\n@@ -0,0 +1,334 @@\n+\/**\n+ * Copyright 2013 Facebook, Inc.\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ *\n+ * @providesModule ReactEventEmitter\n+ * @typechecks\n+ *\/\n+\n+\"use strict\";\n+\n+var BrowserEnv = require('BrowserEnv');\n+var EventConstants = require('EventConstants');\n+var EventListener = require('EventListener');\n+var EventPluginHub = require('EventPluginHub');\n+var ExecutionEnvironment = require('ExecutionEnvironment');\n+\n+var invariant = require('invariant');\n+var isEventSupported = require('isEventSupported');\n+\n+\/**\n+ * Summary of `ReactEventEmitter` event handling:\n+ *\n+ * - We trap low level 'top-level' events.\n+ *\n+ * - We dedupe cross-browser event names into these 'top-level types' (e.g. so\n+ * that `wheel`, `mousewheel`, and `DOMMouseScroll` fire one event).\n+ *\n+ * - At this point we have native browser events with the top-level type that\n+ * was used to catch it at the top-level.\n+ *\n+ * - We continuously stream these native events (and their respective top-level\n+ * types) to the event plugin system `EventPluginHub` and ask the plugin\n+ * system if it was able to extract `AbstractEvent` objects. `AbstractEvent`\n+ * objects are the events that applications actually deal with - they are not\n+ * native browser events but cross-browser wrappers.\n+ *\n+ * - When returning the `AbstractEvent` objects, `EventPluginHub` will make\n+ * sure each abstract event is annotated with \"dispatches\", which are the\n+ * sequence of listeners (and IDs) that care about the event.\n+ *\n+ * - These `AbstractEvent` objects are fed back into the event plugin system,\n+ * which in turn executes these dispatches.\n+ *\n+ * Overview of React and the event system:\n+ *\n+ * .\n+ * +------------+ .\n+ * | DOM | .\n+ * +------------+ . +-----------+\n+ * + . +--------+|SimpleEvent|\n+ * | . | |Plugin |\n+ * +-----|------+ . v +-----------+\n+ * | | | . +--------------+ +------------+\n+ * | +-----------.--->|EventPluginHub| | Event |\n+ * | | . | | +-----------+ | Propagators|\n+ * | ReactEvent | . | | |TapEvent | |------------|\n+ * | Emitter | . | |<---+|Plugin | |other plugin|\n+ * | | . | | +-----------+ | utilities |\n+ * | +-----------.---------+ | +------------+\n+ * | | | . +----|---------+\n+ * +-----|------+ . | ^ +-----------+\n+ * | . | | |Enter\/Leave|\n+ * + . | +-------+|Plugin |\n+ * +-------------+ . v +-----------+\n+ * | application | . +----------+\n+ * |-------------| . | callback |\n+ * | | . | registry |\n+ * | | . +----------+\n+ * +-------------+ .\n+ * .\n+ * React Core . General Purpose Event Plugin System\n+ *\/\n+\n+\/**\n+ * Whether or not `ensureListening` has been invoked.\n+ * @type {boolean}\n+ * @private\n+ *\/\n+var _isListening = false;\n+\n+\/**\n+ * Traps top-level events by using event bubbling.\n+ *\n+ * @param {string} topLevelType Record from `EventConstants`.\n+ * @param {string} handlerBaseName Event name (e.g. \"click\").\n+ * @param {DOMEventTarget} element Element on which to attach listener.\n+ * @internal\n+ *\/\n+function trapBubbledEvent(topLevelType, handlerBaseName, element) {\n+ EventListener.listen(\n+ element,\n+ handlerBaseName,\n+ ReactEventEmitter.TopLevelCallbackCreator.createTopLevelCallback(\n+ topLevelType\n+ )\n+ );\n+}\n+\n+\/**\n+ * Traps a top-level event by using event capturing.\n+ *\n+ * @param {string} topLevelType Record from `EventConstants`.\n+ * @param {string} handlerBaseName Event name (e.g. \"click\").\n+ * @param {DOMEventTarget} element Element on which to attach listener.\n+ * @internal\n+ *\/\n+function trapCapturedEvent(topLevelType, handlerBaseName, element) {\n+ EventListener.capture(\n+ element,\n+ handlerBaseName,\n+ ReactEventEmitter.TopLevelCallbackCreator.createTopLevelCallback(\n+ topLevelType\n+ )\n+ );\n+}\n+\n+\/**\n+ * Listens to window scroll and resize events. We cache scroll values so that\n+ * application code can access them without triggering reflows.\n+ *\n+ * NOTE: Scroll events do not bubble.\n+ *\n+ * @private\n+ * @see http:\/\/www.quirksmode.org\/dom\/events\/scroll.html\n+ *\/\n+function registerScrollValueMonitoring() {\n+ var refresh = BrowserEnv.refreshAuthoritativeScrollValues;\n+ EventListener.listen(window, 'scroll', refresh);\n+ EventListener.listen(window, 'resize', refresh);\n+}\n+\n+\/**\n+ * We listen for bubbled touch events on the document object.\n+ *\n+ * Firefox v8.01 (and possibly others) exhibited strange behavior when mounting\n+ * `onmousemove` events at some node that was not the document element. The\n+ * symptoms were that if your mouse is not moving over something contained\n+ * within that mount point (for example on the background) the top-level\n+ * listeners for `onmousemove` won't be called. However, if you register the\n+ * `mousemove` on the document object, then it will of course catch all\n+ * `mousemove`s. This along with iOS quirks, justifies restricting top-level\n+ * listeners to the document object only, at least for these movement types of\n+ * events and possibly all events.\n+ *\n+ * @see http:\/\/www.quirksmode.org\/blog\/archives\/2010\/09\/click_event_del.html\n+ *\n+ * Also, `keyup`\/`keypress`\/`keydown` do not bubble to the window on IE, but\n+ * they bubble to document.\n+ *\n+ * @param {boolean} touchNotMouse Listen to touch events instead of mouse.\n+ * @private\n+ * @see http:\/\/www.quirksmode.org\/dom\/events\/keys.html.\n+ *\/\n+function listenAtTopLevel(touchNotMouse) {\n+ invariant(\n+ !_isListening,\n+ 'listenAtTopLevel(...): Cannot setup top-level listener more than once.'\n+ );\n+ var topLevelTypes = EventConstants.topLevelTypes;\n+ var mountAt = document;\n+\n+ registerScrollValueMonitoring();\n+ trapBubbledEvent(topLevelTypes.topMouseOver, 'mouseover', mountAt);\n+ trapBubbledEvent(topLevelTypes.topMouseDown, 'mousedown', mountAt);\n+ trapBubbledEvent(topLevelTypes.topMouseUp, 'mouseup', mountAt);\n+ trapBubbledEvent(topLevelTypes.topMouseMove, 'mousemove', mountAt);\n+ trapBubbledEvent(topLevelTypes.topMouseOut, 'mouseout', mountAt);\n+ trapBubbledEvent(topLevelTypes.topClick, 'click', mountAt);\n+ trapBubbledEvent(topLevelTypes.topDoubleClick, 'dblclick', mountAt);\n+ if (touchNotMouse) {\n+ trapBubbledEvent(topLevelTypes.topTouchStart, 'touchstart', mountAt);\n+ trapBubbledEvent(topLevelTypes.topTouchEnd, 'touchend', mountAt);\n+ trapBubbledEvent(topLevelTypes.topTouchMove, 'touchmove', mountAt);\n+ trapBubbledEvent(topLevelTypes.topTouchCancel, 'touchcancel', mountAt);\n+ }\n+ trapBubbledEvent(topLevelTypes.topKeyUp, 'keyup', mountAt);\n+ trapBubbledEvent(topLevelTypes.topKeyPress, 'keypress', mountAt);\n+ trapBubbledEvent(topLevelTypes.topKeyDown, 'keydown', mountAt);\n+ trapBubbledEvent(topLevelTypes.topInput, 'input', mountAt);\n+ trapBubbledEvent(topLevelTypes.topChange, 'change', mountAt);\n+ trapBubbledEvent(\n+ topLevelTypes.topDOMCharacterDataModified,\n+ 'DOMCharacterDataModified',\n+ mountAt\n+ );\n+\n+ if (isEventSupported('wheel')) {\n+ trapBubbledEvent(topLevelTypes.topWheel, 'wheel', mountAt);\n+ } else if (isEventSupported('mousewheel')) {\n+ trapBubbledEvent(topLevelTypes.topWheel, 'mousewheel', mountAt);\n+ } else {\n+ \/\/ Firefox needs to capture a different mouse scroll event.\n+ \/\/ @see http:\/\/www.quirksmode.org\/dom\/events\/tests\/scroll.html\n+ trapBubbledEvent(topLevelTypes.topWheel, 'DOMMouseScroll', mountAt);\n+ }\n+\n+ \/\/ IE<9 does not support capturing so just trap the bubbled event there.\n+ if (isEventSupported('scroll', true)) {\n+ trapCapturedEvent(topLevelTypes.topScroll, 'scroll', mountAt);\n+ } else {\n+ trapBubbledEvent(topLevelTypes.topScroll, 'scroll', window);\n+ }\n+\n+ if (isEventSupported('focus', true)) {\n+ trapCapturedEvent(topLevelTypes.topFocus, 'focus', mountAt);\n+ trapCapturedEvent(topLevelTypes.topBlur, 'blur', mountAt);\n+ } else if (isEventSupported('focusin')) {\n+ \/\/ IE has `focusin` and `focusout` events which bubble.\n+ \/\/ @see http:\/\/www.quirksmode.org\/blog\/archives\/2008\/04\/delegating_the.html\n+ trapBubbledEvent(topLevelTypes.topFocus, 'focusin', mountAt);\n+ trapBubbledEvent(topLevelTypes.topBlur, 'focusout', mountAt);\n+ }\n+}\n+\n+\/**\n+ * `ReactEventEmitter` is used to attach top-level event listeners. For example:\n+ *\n+ * ReactEventEmitter.putListener('myID', 'onClick', myFunction);\n+ *\n+ * This would allocate a \"registration\" of `('onClick', myFunction)` on 'myID'.\n+ *\n+ * @internal\n+ *\/\n+var ReactEventEmitter = {\n+\n+ \/**\n+ * React references `ReactEventTopLevelCallback` using this property in order\n+ * to allow dependency injection via `ensureListening`.\n+ *\/\n+ TopLevelCallbackCreator: null,\n+\n+ \/**\n+ * Ensures that top-level event delegation listeners are installed.\n+ *\n+ * There are issues with listening to both touch events and mouse events on\n+ * the top-level, so we make the caller choose which one to listen to. (If\n+ * there's a touch top-level listeners, anchors don't receive clicks for some\n+ * reason, and only in some cases).\n+ *\n+ * @param {boolean} touchNotMouse Listen to touch events instead of mouse.\n+ * @param {object} TopLevelCallbackCreator\n+ *\/\n+ ensureListening: function(touchNotMouse, TopLevelCallbackCreator) {\n+ invariant(\n+ ExecutionEnvironment.canUseDOM,\n+ 'ensureListening(...): Cannot toggle event listening in a Worker ' +\n+ 'thread. This is likely a bug in the framework. Please report ' +\n+ 'immediately.'\n+ );\n+ if (!_isListening) {\n+ ReactEventEmitter.TopLevelCallbackCreator = TopLevelCallbackCreator;\n+ listenAtTopLevel(touchNotMouse);\n+ _isListening = true;\n+ }\n+ },\n+\n+ \/**\n+ * Sets whether or not any created callbacks should be enabled.\n+ *\n+ * @param {boolean} enabled True if callbacks should be enabled.\n+ *\/\n+ setEnabled: function(enabled) {\n+ invariant(\n+ ExecutionEnvironment.canUseDOM,\n+ 'setEnabled(...): Cannot toggle event listening in a Worker thread. ' +\n+ 'This is likely a bug in the framework. Please report immediately.'\n+ );\n+ if (ReactEventEmitter.TopLevelCallbackCreator) {\n+ ReactEventEmitter.TopLevelCallbackCreator.setEnabled(enabled);\n+ }\n+ },\n+\n+ \/**\n+ * @return {boolean} True if callbacks are enabled.\n+ *\/\n+ isEnabled: function() {\n+ return !!(\n+ ReactEventEmitter.TopLevelCallbackCreator &&\n+ ReactEventEmitter.TopLevelCallbackCreator.isEnabled()\n+ );\n+ },\n+\n+ \/**\n+ * Streams a fired top-level event to `EventPluginHub` where plugins have the\n+ * opportunity to create `ReactEvent`s to be dispatched.\n+ *\n+ * @param {string} topLevelType Record from `EventConstants`.\n+ * @param {DOMEventTarget} topLevelTarget The listening component root node.\n+ * @param {string} topLevelTargetID ID of `topLevelTarget`.\n+ * @param {object} nativeEvent Native browser event.\n+ *\/\n+ handleTopLevel: function(\n+ topLevelType,\n+ topLevelTarget,\n+ topLevelTargetID,\n+ nativeEvent) {\n+ var abstractEvents = EventPluginHub.extractAbstractEvents(\n+ topLevelType,\n+ topLevelTarget,\n+ topLevelTargetID,\n+ nativeEvent\n+ );\n+\n+ \/\/ Event queue being processed in the same cycle allows `preventDefault`.\n+ EventPluginHub.enqueueAbstractEvents(abstractEvents);\n+ EventPluginHub.processAbstractEventQueue();\n+ },\n+\n+ registrationNames: EventPluginHub.registrationNames,\n+\n+ putListener: EventPluginHub.putListener,\n+\n+ getListener: EventPluginHub.getListener,\n+\n+ deleteAllListeners: EventPluginHub.deleteAllListeners,\n+\n+ trapBubbledEvent: trapBubbledEvent,\n+\n+ trapCapturedEvent: trapCapturedEvent\n+\n+};\n+\n+module.exports = ReactEventEmitter;\ndiff --git a\/src\/core\/ReactEventTopLevelCallback.js b\/src\/core\/ReactEventTopLevelCallback.js\nindex a6cf82ef94..689a96c559 100644\n--- a\/src\/core\/ReactEventTopLevelCallback.js\n+++ b\/src\/core\/ReactEventTopLevelCallback.js\n@@ -14,58 +14,70 @@\n * limitations under the License.\n *\n * @providesModule ReactEventTopLevelCallback\n+ * @typechecks\n *\/\n \n \"use strict\";\n \n var ExecutionEnvironment = require('ExecutionEnvironment');\n-var ReactEvent = require('ReactEvent');\n+var ReactEventEmitter = require('ReactEventEmitter');\n var ReactInstanceHandles = require('ReactInstanceHandles');\n \n var getDOMNodeID = require('getDOMNodeID');\n+var getEventTarget = require('getEventTarget');\n \n+\/**\n+ * @type {boolean}\n+ * @private\n+ *\/\n var _topLevelListenersEnabled = true;\n \n+\/**\n+ * Top-level callback creator used to implement event handling using delegation.\n+ * This is used via dependency injection in `ReactEventEmitter.ensureListening`.\n+ *\/\n var ReactEventTopLevelCallback = {\n \n \/**\n- * @param {boolean} enabled Whether or not all callbacks that have ever been\n- * created with this module should be enabled.\n+ * Sets whether or not any created callbacks should be enabled.\n+ *\n+ * @param {boolean} enabled True if callbacks should be enabled.\n *\/\n setEnabled: function(enabled) {\n _topLevelListenersEnabled = !!enabled;\n },\n \n+ \/**\n+ * @return {boolean} True if callbacks are enabled.\n+ *\/\n isEnabled: function() {\n return _topLevelListenersEnabled;\n },\n \n \/**\n- * For a given `topLevelType`, creates a callback that could be added as a\n- * listener to the document. That top level callback will simply fix the\n- * native events before invoking `handleTopLevel`.\n+ * Creates a callback for the supplied `topLevelType` that could be added as\n+ * a listener to the document. The callback computes a `topLevelTarget` which\n+ * should be the root node of a mounted React component where the listener\n+ * is attached.\n *\n- * - Raw native events cannot be trusted to describe their targets correctly\n- * so we expect that the argument to the nested function has already been\n- * fixed. But the `target` property may not be something of interest to\n- * React, so we find the most suitable target. But even at that point, DOM\n- * Elements (the target ) can't be trusted to describe their IDs correctly\n- * so we obtain the ID in a reliable manner and pass it to\n- * `handleTopLevel`. The target\/id that we found to be relevant to our\n- * framework are called `renderedTarget`\/`renderedTargetID` respectively.\n+ * @param {string} topLevelType Record from `EventConstants`.\n+ * @return {function} Callback for handling top-level events.\n *\/\n createTopLevelCallback: function(topLevelType) {\n- return function(fixedNativeEvent) {\n+ return function(nativeEvent) {\n if (!_topLevelListenersEnabled) {\n return;\n }\n- var renderedTarget = ReactInstanceHandles.getFirstReactDOM(\n- fixedNativeEvent.target\n+ var topLevelTarget = ReactInstanceHandles.getFirstReactDOM(\n+ getEventTarget(nativeEvent)\n ) || ExecutionEnvironment.global;\n- var renderedTargetID = getDOMNodeID(renderedTarget);\n- var event = fixedNativeEvent;\n- var target = renderedTarget;\n- ReactEvent.handleTopLevel(topLevelType, event, renderedTargetID, target);\n+ var topLevelTargetID = getDOMNodeID(topLevelTarget) || '';\n+ ReactEventEmitter.handleTopLevel(\n+ topLevelType,\n+ topLevelTarget,\n+ topLevelTargetID,\n+ nativeEvent\n+ );\n };\n }\n \ndiff --git a\/src\/core\/ReactInstanceHandles.js b\/src\/core\/ReactInstanceHandles.js\nindex 27c4e1b575..7528cb7fb0 100644\n--- a\/src\/core\/ReactInstanceHandles.js\n+++ b\/src\/core\/ReactInstanceHandles.js\n@@ -14,6 +14,7 @@\n * limitations under the License.\n *\n * @providesModule ReactInstanceHandles\n+ * @typechecks\n *\/\n \n \"use strict\";\n@@ -57,13 +58,13 @@ function isValidID(id) {\n \/**\n * True if the supplied `node` is rendered by React.\n *\n- * @param {DOMElement} node DOM Element to check.\n+ * @param {DOMEventTarget} node DOM Element to check.\n * @return {boolean} True if the DOM Element appears to be rendered by React.\n * @private\n *\/\n function isRenderedByReact(node) {\n var id = getDOMNodeID(node);\n- return id && id.charAt(0) === SEPARATOR;\n+ return id ? id.charAt(0) === SEPARATOR : false;\n }\n \n \/**\n@@ -140,8 +141,8 @@ var ReactInstanceHandles = {\n * Traverses up the ancestors of the supplied node to find a node that is a\n * DOM representation of a React component.\n *\n- * @param {DOMElement} node\n- * @return {?DOMElement}\n+ * @param {?DOMEventTarget} node\n+ * @return {?DOMEventTarget}\n * @internal\n *\/\n getFirstReactDOM: function(node) {\n@@ -159,9 +160,9 @@ var ReactInstanceHandles = {\n * Finds a node with the supplied `id` inside of the supplied `ancestorNode`.\n * Exploits the ID naming scheme to perform the search quickly.\n *\n- * @param {DOMElement} ancestorNode Search from this root.\n+ * @param {DOMEventTarget} ancestorNode Search from this root.\n * @pararm {string} id ID of the DOM representation of the component.\n- * @return {?DOMElement} DOM element with the supplied `id`, if one exists.\n+ * @return {?DOMEventTarget} DOM node with the supplied `id`, if one exists.\n * @internal\n *\/\n findComponentRoot: function(ancestorNode, id) {\n@@ -228,7 +229,7 @@ var ReactInstanceHandles = {\n * contains the React component with the supplied DOM ID.\n *\n * @param {string} id DOM ID of a React component.\n- * @return {string} DOM ID of the React component that is the root.\n+ * @return {?string} DOM ID of the React component that is the root.\n * @internal\n *\/\n getReactRootIDFromNodeID: function(id) {\ndiff --git a\/src\/core\/ReactMount.js b\/src\/core\/ReactMount.js\nindex e07e209be7..d8382a4099 100644\n--- a\/src\/core\/ReactMount.js\n+++ b\/src\/core\/ReactMount.js\n@@ -18,7 +18,7 @@\n \n \"use strict\";\n \n-var ReactEvent = require('ReactEvent');\n+var ReactEventEmitter = require('ReactEventEmitter');\n var ReactInstanceHandles = require('ReactInstanceHandles');\n var ReactEventTopLevelCallback = require('ReactEventTopLevelCallback');\n \n@@ -86,7 +86,7 @@ var ReactMount = {\n * @private\n *\/\n prepareTopLevelEvents: function(TopLevelCallbackCreator) {\n- ReactEvent.ensureListening(\n+ ReactEventEmitter.ensureListening(\n ReactMount.useTouchEvents,\n TopLevelCallbackCreator\n );\n@@ -106,11 +106,15 @@ var ReactMount = {\n renderComponent: function(nextComponent, container) {\n var prevComponent = instanceByReactRootID[getReactRootID(container)];\n if (prevComponent) {\n- var nextProps = nextComponent.props;\n- ReactMount.scrollMonitor(container, function() {\n- prevComponent.replaceProps(nextProps);\n- });\n- return prevComponent;\n+ if (prevComponent.constructor === nextComponent.constructor) {\n+ var nextProps = nextComponent.props;\n+ ReactMount.scrollMonitor(container, function() {\n+ prevComponent.replaceProps(nextProps);\n+ });\n+ return prevComponent;\n+ } else {\n+ ReactMount.unmountAndReleaseReactRootNode(container);\n+ }\n }\n \n ReactMount.prepareTopLevelEvents(ReactEventTopLevelCallback);\n@@ -192,18 +196,19 @@ var ReactMount = {\n * Unmounts and destroys the React component rendered in the `container`.\n *\n * @param {DOMElement} container DOM element containing a React component.\n+ * @return {boolean} True if a component was found in and unmounted from\n+ * `container`\n *\/\n unmountAndReleaseReactRootNode: function(container) {\n var reactRootID = getReactRootID(container);\n var component = instanceByReactRootID[reactRootID];\n- if (component) {\n- component.unmountComponentFromNode(container);\n- delete instanceByReactRootID[reactRootID];\n- delete containersByReactRootID[reactRootID];\n- return true;\n- } else {\n+ if (!component) {\n return false;\n }\n+ component.unmountComponentFromNode(container);\n+ delete instanceByReactRootID[reactRootID];\n+ delete containersByReactRootID[reactRootID];\n+ return true;\n },\n \n \/**\ndiff --git a\/src\/core\/ReactNativeComponent.js b\/src\/core\/ReactNativeComponent.js\nindex cbbc01a543..82bfcf7002 100644\n--- a\/src\/core\/ReactNativeComponent.js\n+++ b\/src\/core\/ReactNativeComponent.js\n@@ -22,7 +22,7 @@\n var CSSPropertyOperations = require('CSSPropertyOperations');\n var DOMPropertyOperations = require('DOMPropertyOperations');\n var ReactComponent = require('ReactComponent');\n-var ReactEvent = require('ReactEvent');\n+var ReactEventEmitter = require('ReactEventEmitter');\n var ReactMultiChild = require('ReactMultiChild');\n \n var escapeTextForBrowser = require('escapeTextForBrowser');\n@@ -32,8 +32,8 @@ var keyOf = require('keyOf');\n var merge = require('merge');\n var mixInto = require('mixInto');\n \n-var putListener = ReactEvent.putListener;\n-var registrationNames = ReactEvent.registrationNames;\n+var putListener = ReactEventEmitter.putListener;\n+var registrationNames = ReactEventEmitter.registrationNames;\n \n \/\/ For quickly matching children type, to test if can be treated as content.\n var CONTENT_TYPES = {'string': true, 'number': true};\n@@ -317,9 +317,9 @@ ReactNativeComponent.Mixin = {\n * @internal\n *\/\n unmountComponent: function() {\n+ ReactEventEmitter.deleteAllListeners(this._rootNodeID);\n ReactComponent.Mixin.unmountComponent.call(this);\n this.unmountMultiChild();\n- ReactEvent.deleteAllListeners(this._rootNodeID);\n }\n \n };\ndiff --git a\/src\/core\/ReactProps.js b\/src\/core\/ReactProps.js\nindex fbb52195ff..0a2c0d7c21 100644\n--- a\/src\/core\/ReactProps.js\n+++ b\/src\/core\/ReactProps.js\n@@ -73,6 +73,7 @@ var Props = {\n \n array: createPrimitiveTypeChecker('array'),\n bool: createPrimitiveTypeChecker('boolean'),\n+ func: createPrimitiveTypeChecker('function'),\n number: createPrimitiveTypeChecker('number'),\n object: createPrimitiveTypeChecker('object'),\n string: createPrimitiveTypeChecker('string'),\ndiff --git a\/src\/core\/ReactReconcileTransaction.js b\/src\/core\/ReactReconcileTransaction.js\nindex f714782240..a44214dcb8 100644\n--- a\/src\/core\/ReactReconcileTransaction.js\n+++ b\/src\/core\/ReactReconcileTransaction.js\n@@ -21,7 +21,7 @@\n \n var ExecutionEnvironment = require('ExecutionEnvironment');\n var PooledClass = require('PooledClass');\n-var ReactEvent = require('ReactEvent');\n+var ReactEventEmitter = require('ReactEventEmitter');\n var ReactInputSelection = require('ReactInputSelection');\n var ReactOnDOMReady = require('ReactOnDOMReady');\n var Transaction = require('Transaction');\n@@ -50,21 +50,21 @@ var SELECTION_RESTORATION = {\n *\/\n var EVENT_SUPPRESSION = {\n \/**\n- * @return {boolean} The enabled status of `ReactEvent` before the\n+ * @return {boolean} The enabled status of `ReactEventEmitter` before the\n * reconciliation.\n *\/\n initialize: function() {\n- var currentlyEnabled = ReactEvent.isEnabled();\n- ReactEvent.setEnabled(false);\n+ var currentlyEnabled = ReactEventEmitter.isEnabled();\n+ ReactEventEmitter.setEnabled(false);\n return currentlyEnabled;\n },\n \n \/**\n- * @param {boolean} previouslyEnabled The enabled status of `ReactEvent`\n+ * @param {boolean} previouslyEnabled Enabled status of `ReactEventEmitter`\n * before the reconciliation occured. `close` restores the previous value.\n *\/\n close: function(previouslyEnabled) {\n- ReactEvent.setEnabled(previouslyEnabled);\n+ ReactEventEmitter.setEnabled(previouslyEnabled);\n }\n };\n \ndiff --git a\/src\/core\/__tests__\/ReactCompositeComponent-test.js b\/src\/core\/__tests__\/ReactCompositeComponent-test.js\nindex 463bfd6144..178edaee1d 100644\n--- a\/src\/core\/__tests__\/ReactCompositeComponent-test.js\n+++ b\/src\/core\/__tests__\/ReactCompositeComponent-test.js\n@@ -23,6 +23,7 @@ var MorphingComponent;\n var MorphingAutoBindComponent;\n var ChildUpdates;\n var React;\n+var ReactCurrentOwner;\n var ReactProps;\n var ReactTestUtils;\n \n@@ -35,6 +36,7 @@ describe('ReactCompositeComponent', function() {\n cx = require('cx');\n reactComponentExpect = require('reactComponentExpect');\n React = require('React');\n+ ReactCurrentOwner = require('ReactCurrentOwner');\n ReactProps = require('ReactProps');\n ReactTestUtils = require('ReactTestUtils');\n \n@@ -194,6 +196,53 @@ describe('ReactCompositeComponent', function() {\n expect(retValAfterMountWithCrazyScope).toBe(RETURN_VALUE_AFTER_MOUNT);\n });\n \n+ it('should normalize props with default values', function() {\n+ var Component = React.createClass({\n+ props: {key: ReactProps.string.isRequired},\n+ getDefaultProps: function() {\n+ return {key: 'testKey'};\n+ },\n+ getInitialState: function() {\n+ return {key: this.props.key + 'State'};\n+ },\n+ render: function() {\n+ return {this.props.key}<\/span>;\n+ }\n+ });\n+\n+ var instance = ;\n+ ReactTestUtils.renderIntoDocument(instance);\n+ reactComponentExpect(instance).scalarPropsEqual({key: 'testKey'});\n+ reactComponentExpect(instance).scalarStateEqual({key: 'testKeyState'});\n+\n+ expect(function() {\n+ ReactTestUtils.renderIntoDocument();\n+ }).toThrow(\n+ 'Invariant Violation: Required prop `key` was not specified in ' +\n+ '`Component`.'\n+ );\n+ });\n+\n+ it('should check default prop values', function() {\n+ var Component = React.createClass({\n+ props: {key: ReactProps.string.isRequired},\n+ getDefaultProps: function() {\n+ return {key: null};\n+ },\n+ render: function() {\n+ return {this.props.key}<\/span>;\n+ }\n+ });\n+\n+ var instance = ;\n+ expect(function() {\n+ ReactTestUtils.renderIntoDocument(instance);\n+ }).toThrow(\n+ 'Invariant Violation: Required prop `key` was not specified in ' +\n+ '`Component`.'\n+ );\n+ });\n+\n it('should check declared prop types', function() {\n var Component = React.createClass({\n props: {\n@@ -223,4 +272,53 @@ describe('ReactCompositeComponent', function() {\n }).not.toThrow();\n });\n \n+ it('should not allow `forceUpdate` on unmounted components', function() {\n+ var container = document.createElement('div');\n+ document.documentElement.appendChild(container);\n+\n+ var Component = React.createClass({\n+ render: function() {\n+ return

;\n+ }\n+ });\n+\n+ var instance = ;\n+ expect(function() {\n+ instance.forceUpdate();\n+ }).toThrow(\n+ 'Invariant Violation: forceUpdate(...): Can only force an update on ' +\n+ 'mounted components.'\n+ );\n+\n+ React.renderComponent(instance, container);\n+ expect(function() {\n+ instance.forceUpdate();\n+ }).not.toThrow();\n+\n+ React.unmountAndReleaseReactRootNode(container);\n+ expect(function() {\n+ instance.forceUpdate();\n+ }).toThrow(\n+ 'Invariant Violation: forceUpdate(...): Can only force an update on ' +\n+ 'mounted components.'\n+ );\n+ });\n+\n+ it('should cleanup even if render() fatals', function() {\n+ var BadComponent = React.createClass({\n+ render: function() {\n+ throw new Error();\n+ }\n+ });\n+ var instance = ;\n+\n+ expect(ReactCurrentOwner.current).toBe(null);\n+\n+ expect(function() {\n+ ReactTestUtils.renderIntoDocument(instance);\n+ }).toThrow();\n+\n+ expect(ReactCurrentOwner.current).toBe(null);\n+ });\n+\n });\ndiff --git a\/src\/core\/__tests__\/ReactEvent-test.js b\/src\/core\/__tests__\/ReactEvent-test.js\nindex 495bb74698..9fb5fe9eb6 100644\n--- a\/src\/core\/__tests__\/ReactEvent-test.js\n+++ b\/src\/core\/__tests__\/ReactEvent-test.js\n@@ -22,7 +22,7 @@ require('mock-modules')\n .dontMock('BrowserScroll')\n .dontMock('CallbackRegistry')\n .dontMock('EventPluginHub')\n- .dontMock('ReactEvent')\n+ .dontMock('ReactEventEmitter')\n .dontMock('ReactInstanceHandles')\n .dontMock('EventPluginHub')\n .dontMock('TapEventPlugin')\n@@ -34,7 +34,7 @@ var keyOf = require('keyOf');\n var mocks = require('mocks');\n \n var EventPluginHub;\n-var ReactEvent;\n+var ReactEventEmitter;\n var ReactEventTopLevelCallback;\n var ReactTestUtils;\n var TapEventPlugin;\n@@ -58,12 +58,12 @@ var ON_TOUCH_TAP_KEY = keyOf({onTouchTap: null});\n \n \n \/**\n- * Since `ReactEvent` is fairly well separated from the DOM, we can test almost\n- * all of `ReactEvent` without ever rendering anything in the DOM. As long as we\n- * provide IDs that follow `React's` conventional id namespace hierarchy.\n- * The only reason why we create these DOM nodes, is so that when we feed them\n- * into `ReactEvent` (through `ReactTestUtils`), the event handlers may receive\n- * a DOM node to inspect.\n+ * Since `ReactEventEmitter` is fairly well separated from the DOM, we can test\n+ * almost all of `ReactEventEmitter` without ever rendering anything in the DOM.\n+ * As long as we provide IDs that follow `React's` conventional id namespace\n+ * hierarchy. The only reason why we create these DOM nodes, is so that when we\n+ * feed them into `ReactEventEmitter` (through `ReactTestUtils`), the event\n+ * handlers may receive a DOM node to inspect.\n *\/\n var CHILD = document.createElement('div');\n var PARENT = document.createElement('div');\n@@ -73,24 +73,24 @@ PARENT.id = '.reactRoot.[0].[0]';\n GRANDPARENT.id = '.reactRoot.[0]';\n \n function registerSimpleTestHandler() {\n- ReactEvent.putListener(CHILD.id, ON_CLICK_KEY, LISTENER);\n- var listener = ReactEvent.getListener(CHILD.id, ON_CLICK_KEY);\n+ ReactEventEmitter.putListener(CHILD.id, ON_CLICK_KEY, LISTENER);\n+ var listener = ReactEventEmitter.getListener(CHILD.id, ON_CLICK_KEY);\n expect(listener).toEqual(LISTENER);\n- return ReactEvent.getListener(CHILD.id, ON_CLICK_KEY);\n+ return ReactEventEmitter.getListener(CHILD.id, ON_CLICK_KEY);\n }\n \n \n-describe('ReactEvent', function() {\n+describe('ReactEventEmitter', function() {\n beforeEach(function() {\n require('mock-modules').dumpCache();\n EventPluginHub = require('EventPluginHub');\n TapEventPlugin = require('TapEventPlugin');\n- ReactEvent = require('ReactEvent');\n+ ReactEventEmitter = require('ReactEventEmitter');\n ReactTestUtils = require('ReactTestUtils');\n ReactEventTopLevelCallback = require('ReactEventTopLevelCallback');\n idCallOrder = [];\n tapMoveThreshold = TapEventPlugin.tapMoveThreshold;\n- ReactEvent.ensureListening(false, ReactEventTopLevelCallback);\n+ ReactEventEmitter.ensureListening(false, ReactEventTopLevelCallback);\n EventPluginHub.injection.injectEventPluginsByName({\n TapEventPlugin: TapEventPlugin\n });\n@@ -98,20 +98,20 @@ describe('ReactEvent', function() {\n \n it('should store a listener correctly', function() {\n registerSimpleTestHandler();\n- var listener = ReactEvent.getListener(CHILD.id, ON_CLICK_KEY);\n+ var listener = ReactEventEmitter.getListener(CHILD.id, ON_CLICK_KEY);\n expect(listener).toBe(LISTENER);\n });\n \n it('should retrieve a listener correctly', function() {\n registerSimpleTestHandler();\n- var listener = ReactEvent.getListener(CHILD.id, ON_CLICK_KEY);\n+ var listener = ReactEventEmitter.getListener(CHILD.id, ON_CLICK_KEY);\n expect(listener).toEqual(LISTENER);\n });\n \n it('should clear all handlers when asked to', function() {\n registerSimpleTestHandler();\n- ReactEvent.deleteAllListeners(CHILD.id);\n- var listener = ReactEvent.getListener(CHILD.id, ON_CLICK_KEY);\n+ ReactEventEmitter.deleteAllListeners(CHILD.id);\n+ var listener = ReactEventEmitter.getListener(CHILD.id, ON_CLICK_KEY);\n expect(listener).toBe(undefined);\n });\n \n@@ -121,28 +121,28 @@ describe('ReactEvent', function() {\n expect(LISTENER.mock.calls.length).toBe(1);\n });\n \n- it('should not invoke handlers when ReactEvent is disabled', function() {\n+ it('should not invoke handlers if ReactEventEmitter is disabled', function() {\n registerSimpleTestHandler();\n- ReactEvent.setEnabled(false);\n+ ReactEventEmitter.setEnabled(false);\n ReactTestUtils.Simulate.click(CHILD);\n expect(LISTENER.mock.calls.length).toBe(0);\n- ReactEvent.setEnabled(true);\n+ ReactEventEmitter.setEnabled(true);\n ReactTestUtils.Simulate.click(CHILD);\n expect(LISTENER.mock.calls.length).toBe(1);\n });\n \n it('should bubble simply', function() {\n- ReactEvent.putListener(\n+ ReactEventEmitter.putListener(\n CHILD.id,\n ON_CLICK_KEY,\n recordID.bind(null, CHILD.id)\n );\n- ReactEvent.putListener(\n+ ReactEventEmitter.putListener(\n PARENT.id,\n ON_CLICK_KEY,\n recordID.bind(null, PARENT.id)\n );\n- ReactEvent.putListener(\n+ ReactEventEmitter.putListener(\n GRANDPARENT.id,\n ON_CLICK_KEY,\n recordID.bind(null, GRANDPARENT.id)\n@@ -155,17 +155,17 @@ describe('ReactEvent', function() {\n });\n \n it('should support stopPropagation()', function() {\n- ReactEvent.putListener(\n+ ReactEventEmitter.putListener(\n CHILD.id,\n ON_CLICK_KEY,\n recordID.bind(null, CHILD.id)\n );\n- ReactEvent.putListener(\n+ ReactEventEmitter.putListener(\n PARENT.id,\n ON_CLICK_KEY,\n recordIDAndStopPropagation.bind(null, PARENT.id)\n );\n- ReactEvent.putListener(\n+ ReactEventEmitter.putListener(\n GRANDPARENT.id,\n ON_CLICK_KEY,\n recordID.bind(null, GRANDPARENT.id)\n@@ -177,17 +177,17 @@ describe('ReactEvent', function() {\n });\n \n it('should stop after first dispatch if stopPropagation', function() {\n- ReactEvent.putListener(\n+ ReactEventEmitter.putListener(\n CHILD.id,\n ON_CLICK_KEY,\n recordIDAndStopPropagation.bind(null, CHILD.id)\n );\n- ReactEvent.putListener(\n+ ReactEventEmitter.putListener(\n PARENT.id,\n ON_CLICK_KEY,\n recordID.bind(null, PARENT.id)\n );\n- ReactEvent.putListener(\n+ ReactEventEmitter.putListener(\n GRANDPARENT.id,\n ON_CLICK_KEY,\n recordID.bind(null, GRANDPARENT.id)\n@@ -198,17 +198,17 @@ describe('ReactEvent', function() {\n });\n \n it('should stopPropagation if false is returned', function() {\n- ReactEvent.putListener(\n+ ReactEventEmitter.putListener(\n CHILD.id,\n ON_CLICK_KEY,\n recordIDAndReturnFalse.bind(null, CHILD.id)\n );\n- ReactEvent.putListener(\n+ ReactEventEmitter.putListener(\n PARENT.id,\n ON_CLICK_KEY,\n recordID.bind(null, PARENT.id)\n );\n- ReactEvent.putListener(\n+ ReactEventEmitter.putListener(\n GRANDPARENT.id,\n ON_CLICK_KEY,\n recordID.bind(null, GRANDPARENT.id)\n@@ -230,10 +230,10 @@ describe('ReactEvent', function() {\n it('should invoke handlers that were removed while bubbling', function() {\n var handleParentClick = mocks.getMockFunction();\n var handleChildClick = function(abstractEvent) {\n- ReactEvent.deleteAllListeners(PARENT.id);\n+ ReactEventEmitter.deleteAllListeners(PARENT.id);\n };\n- ReactEvent.putListener(CHILD.id, ON_CLICK_KEY, handleChildClick);\n- ReactEvent.putListener(PARENT.id, ON_CLICK_KEY, handleParentClick);\n+ ReactEventEmitter.putListener(CHILD.id, ON_CLICK_KEY, handleChildClick);\n+ ReactEventEmitter.putListener(PARENT.id, ON_CLICK_KEY, handleParentClick);\n ReactTestUtils.Simulate.click(CHILD);\n expect(handleParentClick.mock.calls.length).toBe(1);\n });\n@@ -241,15 +241,15 @@ describe('ReactEvent', function() {\n it('should not invoke newly inserted handlers while bubbling', function() {\n var handleParentClick = mocks.getMockFunction();\n var handleChildClick = function(abstractEvent) {\n- ReactEvent.putListener(PARENT.id, ON_CLICK_KEY, handleParentClick);\n+ ReactEventEmitter.putListener(PARENT.id, ON_CLICK_KEY, handleParentClick);\n };\n- ReactEvent.putListener(CHILD.id, ON_CLICK_KEY, handleChildClick);\n+ ReactEventEmitter.putListener(CHILD.id, ON_CLICK_KEY, handleChildClick);\n ReactTestUtils.Simulate.click(CHILD);\n expect(handleParentClick.mock.calls.length).toBe(0);\n });\n \n it('should infer onTouchTap from a touchStart\/End', function() {\n- ReactEvent.putListener(\n+ ReactEventEmitter.putListener(\n CHILD.id,\n ON_TOUCH_TAP_KEY,\n recordID.bind(null, CHILD.id)\n@@ -267,7 +267,7 @@ describe('ReactEvent', function() {\n });\n \n it('should infer onTouchTap from when dragging below threshold', function() {\n- ReactEvent.putListener(\n+ ReactEventEmitter.putListener(\n CHILD.id,\n ON_TOUCH_TAP_KEY,\n recordID.bind(null, CHILD.id)\n@@ -285,7 +285,7 @@ describe('ReactEvent', function() {\n });\n \n it('should not onTouchTap from when dragging beyond threshold', function() {\n- ReactEvent.putListener(\n+ ReactEventEmitter.putListener(\n CHILD.id,\n ON_TOUCH_TAP_KEY,\n recordID.bind(null, CHILD.id)\n@@ -303,17 +303,17 @@ describe('ReactEvent', function() {\n \n \n it('should bubble onTouchTap', function() {\n- ReactEvent.putListener(\n+ ReactEventEmitter.putListener(\n CHILD.id,\n ON_TOUCH_TAP_KEY,\n recordID.bind(null, CHILD.id)\n );\n- ReactEvent.putListener(\n+ ReactEventEmitter.putListener(\n PARENT.id,\n ON_TOUCH_TAP_KEY,\n recordID.bind(null, PARENT.id)\n );\n- ReactEvent.putListener(\n+ ReactEventEmitter.putListener(\n GRANDPARENT.id,\n ON_TOUCH_TAP_KEY,\n recordID.bind(null, GRANDPARENT.id)\ndiff --git a\/src\/core\/__tests__\/ReactIdentity-test.js b\/src\/core\/__tests__\/ReactIdentity-test.js\nnew file mode 100644\nindex 0000000000..8e00f1ebb0\n--- \/dev\/null\n+++ b\/src\/core\/__tests__\/ReactIdentity-test.js\n@@ -0,0 +1,171 @@\n+\/**\n+ * Copyright 2013 Facebook, Inc.\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ *\n+ * @jsx React.DOM\n+ * @emails react-core\n+ *\/\n+\n+\"use strict\";\n+\n+var React;\n+var ReactTestUtils;\n+var reactComponentExpect;\n+\n+describe('ReactIdentity', function() {\n+\n+ beforeEach(function() {\n+ require('mock-modules').dumpCache();\n+ React = require('React');\n+ ReactTestUtils = require('ReactTestUtils');\n+ reactComponentExpect = require('reactComponentExpect');\n+ });\n+\n+ var idExp = \/^\\.reactRoot\\[\\d+\\](.*)$\/;\n+ function checkId(child, expectedId) {\n+ var actual = idExp.exec(child.id);\n+ var expected = idExp.exec(expectedId);\n+ expect(actual).toBeTruthy();\n+ expect(expected).toBeTruthy();\n+ expect(actual[1]).toEqual(expected[1]);\n+ }\n+\n+ it('should allow keyed objects to express identity', function() {\n+ var instance =\n+

\n+ {{\n+ first:

,\n+ second:

\n+ }}\n+ <\/div>;\n+\n+ React.renderComponent(instance, document.createElement('div'));\n+ var node = instance.getDOMNode();\n+ reactComponentExpect(instance).toBeDOMComponentWithChildCount(2);\n+ checkId(node.childNodes[0], '.reactRoot[0].:0:first');\n+ checkId(node.childNodes[1], '.reactRoot[0].:0:second');\n+ });\n+\n+ it('should allow key property to express identity', function() {\n+ var instance =\n+

\n+

\n+ <\/div>;\n+\n+ React.renderComponent(instance, document.createElement('div'));\n+ var node = instance.getDOMNode();\n+ reactComponentExpect(instance).toBeDOMComponentWithChildCount(2);\n+ checkId(node.childNodes[0], '.reactRoot[0].:apple');\n+ checkId(node.childNodes[1], '.reactRoot[0].:banana');\n+ });\n+\n+ it('should use instance identity', function() {\n+\n+ var Wrapper = React.createClass({\n+ render: function() {\n+ return {this.props.children}<\/a>;\n+ }\n+ });\n+\n+ var instance =\n+

\n+ <\/Wrapper>\n+ <\/Wrapper>\n+ <\/Wrapper>\n+ <\/div>;\n+\n+ React.renderComponent(instance, document.createElement('div'));\n+ var node = instance.getDOMNode();\n+ reactComponentExpect(instance).toBeDOMComponentWithChildCount(3);\n+ checkId(node.childNodes[0], '.reactRoot[0].:wrap1');\n+ checkId(node.childNodes[0].firstChild, '.reactRoot[0].:wrap1.:squirrel');\n+ checkId(node.childNodes[1], '.reactRoot[0].:wrap2');\n+ checkId(node.childNodes[1].firstChild, '.reactRoot[0].:wrap2.:bunny');\n+ checkId(node.childNodes[2], '.reactRoot[0].:2');\n+ checkId(node.childNodes[2].firstChild, '.reactRoot[0].:2.:chipmunk');\n+ });\n+\n+ it('should let restructured components retain their uniqueness', function() {\n+ var instance0 = ;\n+ var instance1 = ;\n+ var instance2 = ;\n+ var wrapped =

{instance0} {instance1}<\/div>;\n+ var unwrappedAndAdded =\n+

\n+ {instance2}\n+ {wrapped.props.children[0]}\n+ {wrapped.props.children[1]}\n+ <\/div>;\n+\n+ expect(function() {\n+\n+ React.renderComponent(unwrappedAndAdded, document.createElement('div'));\n+\n+ }).not.toThrow();\n+ });\n+\n+ it('should retain keys during updates in composite components', function() {\n+\n+ var TestComponent = React.createClass({\n+ render: function() {\n+ return

{this.props.children}<\/div>;\n+ }\n+ });\n+\n+ var TestContainer = React.createClass({\n+\n+ getInitialState: function() {\n+ return { swapped: false };\n+ },\n+\n+ swap: function() {\n+ this.setState({ swapped: true });\n+ },\n+\n+ render: function() {\n+ return (\n+ \n+ {this.state.swapped ? this.props.second : this.props.first}\n+ {this.state.swapped ? this.props.first : this.props.second}\n+ <\/TestComponent>\n+ );\n+ }\n+\n+ });\n+\n+ var instance0 = ;\n+ var instance1 = ;\n+\n+ var wrapped = ;\n+\n+ React.renderComponent(wrapped, document.createElement('div'));\n+\n+ var beforeKey = wrapped\n+ ._renderedComponent\n+ ._renderedComponent\n+ .props.children[0]._key;\n+\n+ wrapped.swap();\n+\n+ var afterKey = wrapped\n+ ._renderedComponent\n+ ._renderedComponent\n+ .props.children[0]._key;\n+\n+ expect(beforeKey).not.toEqual(afterKey);\n+\n+ });\n+\n+});\ndiff --git a\/src\/core\/__tests__\/ReactMount-test.js b\/src\/core\/__tests__\/ReactMount-test.js\nnew file mode 100644\nindex 0000000000..d48aa1c0ee\n--- \/dev\/null\n+++ b\/src\/core\/__tests__\/ReactMount-test.js\n@@ -0,0 +1,36 @@\n+\/**\n+ * Copyright 2013 Facebook, Inc.\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ *\n+ * @jsx React.DOM\n+ * @emails react-core\n+ *\/\n+\n+\"use strict\";\n+\n+describe('ReactMount', function() {\n+ var React = require('React');\n+ var ReactMount = require('ReactMount');\n+\n+ it('should render different components in same root', function() {\n+ var container = document.createElement('container');\n+ document.documentElement.appendChild(container);\n+\n+ ReactMount.renderComponent(

<\/div>, container);\n+ expect(container.firstChild.nodeName).toBe('DIV');\n+\n+ ReactMount.renderComponent(<\/span>, container);\n+ expect(container.firstChild.nodeName).toBe('SPAN');\n+ });\n+});\ndiff --git a\/src\/core\/__tests__\/ReactMultiChildReconcile-test.js b\/src\/core\/__tests__\/ReactMultiChildReconcile-test.js\nindex 59a9a8b5b4..bead6ae660 100644\n--- a\/src\/core\/__tests__\/ReactMultiChildReconcile-test.js\n+++ b\/src\/core\/__tests__\/ReactMultiChildReconcile-test.js\n@@ -41,12 +41,11 @@ var stripEmptyValues = function(obj) {\n };\n \n \/**\n- * Children are currently named '{}' so we can retrieve the\n- * originally provided key by stripping out the braces. This relies on a tiny\n- * implementation detail of the rendering system.\n+ * These children are wrapped in an array and therefore their keys are prefixed.\n+ * This relies on a tiny implementation detail of the rendering system.\n *\/\n var getOriginalKey = function(childName) {\n- return childName.substr(1, childName.length - 2);\n+ return childName.substr(3);\n };\n \n \/**\ndiff --git a\/src\/core\/__tests__\/ReactNativeComponent-test.js b\/src\/core\/__tests__\/ReactNativeComponent-test.js\nindex ab1bb3276b..2219567ffc 100644\n--- a\/src\/core\/__tests__\/ReactNativeComponent-test.js\n+++ b\/src\/core\/__tests__\/ReactNativeComponent-test.js\n@@ -239,4 +239,30 @@ describe('ReactNativeComponent', function() {\n });\n });\n \n+ describe('unmountComponent', function() {\n+ it(\"should clean up listeners\", function() {\n+ var React = require('React');\n+ var ReactEventEmitter = require('ReactEventEmitter');\n+\n+ var container = document.createElement('div');\n+ document.documentElement.appendChild(container);\n+\n+ var callback = function() {};\n+ var instance =

;\n+ var root = document.createElement('div');\n+ React.renderComponent(div, root);\n+ expect(\/style=\".*\"\/.test(root.innerHTML)).toBe(true);\n+ });\n+\n+ it('should not set style attribute when no styles exist', function() {\n+ var styles = {\n+ backgroundColor: null,\n+ display: null\n+ };\n+ var div =

;\n+ var root = document.createElement('div');\n+ React.renderComponent(div, root);\n+ expect(\/style=\".*\"\/.test(root.innerHTML)).toBe(false);\n });\n \n });\ndiff --git a\/src\/domUtils\/__tests__\/DOMPropertyOperations-test.js b\/src\/dom\/__tests__\/DOMPropertyOperations-test.js\nsimilarity index 100%\nrename from src\/domUtils\/__tests__\/DOMPropertyOperations-test.js\nrename to src\/dom\/__tests__\/DOMPropertyOperations-test.js\ndiff --git a\/src\/domUtils\/dangerousStyleValue.js b\/src\/dom\/dangerousStyleValue.js\nsimilarity index 82%\nrename from src\/domUtils\/dangerousStyleValue.js\nrename to src\/dom\/dangerousStyleValue.js\nindex aef5c1d555..9c12b12ab3 100644\n--- a\/src\/domUtils\/dangerousStyleValue.js\n+++ b\/src\/dom\/dangerousStyleValue.js\n@@ -23,7 +23,8 @@ var CSSProperty = require('CSSProperty');\n \n \/**\n * Convert a value into the proper css writable value. The `styleName` name\n- * name should be logical (no hyphens), as specified in `CSSProperty.isNumber`.\n+ * name should be logical (no hyphens), as specified\n+ * in `CSSProperty.isUnitlessNumber`.\n *\n * @param {string} styleName CSS property name such as `topMargin`.\n * @param {*} value CSS property value such as `10px`.\n@@ -39,13 +40,18 @@ function dangerousStyleValue(styleName, value) {\n \/\/ This is not an XSS hole but instead a potential CSS injection issue\n \/\/ which has lead to a greater discussion about how we're going to\n \/\/ trust URLs moving forward. See #2115901\n- if (value === null || value === false || value === true || value === '') {\n+\n+ var isEmpty = value == null || typeof value === 'boolean' || value === '';\n+ if (isEmpty) {\n return '';\n }\n- if (isNaN(value)) {\n- return !value ? '' : '' + value;\n+\n+ var isNonNumeric = isNaN(value);\n+ if (isNonNumeric || value === 0 || CSSProperty.isUnitlessNumber[styleName]) {\n+ return '' + value; \/\/ cast to string\n }\n- return CSSProperty.isNumber[styleName] ? '' + value : (value + 'px');\n+\n+ return value + 'px';\n }\n \n module.exports = dangerousStyleValue;\ndiff --git a\/src\/domUtils\/getDOMNodeID.js b\/src\/dom\/getDOMNodeID.js\nsimilarity index 89%\nrename from src\/domUtils\/getDOMNodeID.js\nrename to src\/dom\/getDOMNodeID.js\nindex fbd9cfdcbf..1f4abe6974 100644\n--- a\/src\/domUtils\/getDOMNodeID.js\n+++ b\/src\/dom\/getDOMNodeID.js\n@@ -14,6 +14,7 @@\n * limitations under the License.\n *\n * @providesModule getDOMNodeID\n+ * @typechecks\n *\/\n \n \"use strict\";\n@@ -23,8 +24,8 @@\n * control whose name or ID is \"id\". However, not all DOM nodes support\n * `getAttributeNode` (document - which is not a form) so that is checked first.\n *\n- * @param {Element} domNode DOM node element to return ID of.\n- * @returns {string} The ID of `domNode`.\n+ * @param {DOMElement|DOMWindow|DOMDocument} domNode DOM node.\n+ * @returns {string} ID of the supplied `domNode`.\n *\/\n function getDOMNodeID(domNode) {\n if (domNode.getAttributeNode) {\ndiff --git a\/src\/dom\/getEventTarget.js b\/src\/dom\/getEventTarget.js\nnew file mode 100644\nindex 0000000000..9529e3932f\n--- \/dev\/null\n+++ b\/src\/dom\/getEventTarget.js\n@@ -0,0 +1,39 @@\n+\/**\n+ * Copyright 2013 Facebook, Inc.\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ *\n+ * @providesModule getEventTarget\n+ * @typechecks\n+ *\/\n+\n+var ExecutionEnvironment = require('ExecutionEnvironment');\n+\n+\/**\n+ * Gets the target node from a native browser event by accounting for\n+ * inconsistencies in browser DOM APIs.\n+ *\n+ * @param {object} nativeEvent Native browser event.\n+ * @return {DOMEventTarget} Target node.\n+ *\/\n+function getEventTarget(nativeEvent) {\n+ var target =\n+ nativeEvent.target ||\n+ nativeEvent.srcElement ||\n+ ExecutionEnvironment.global;\n+ \/\/ Safari may fire events on text nodes (Node.TEXT_NODE is 3).\n+ \/\/ @see http:\/\/www.quirksmode.org\/js\/events_properties.html\n+ return target.nodeType === 3 ? target.parentNode : target;\n+}\n+\n+module.exports = getEventTarget;\ndiff --git a\/src\/domUtils\/getTextContentAccessor.js b\/src\/dom\/getTextContentAccessor.js\nsimilarity index 100%\nrename from src\/domUtils\/getTextContentAccessor.js\nrename to src\/dom\/getTextContentAccessor.js\ndiff --git a\/src\/domUtils\/insertNodeAt.js b\/src\/dom\/insertNodeAt.js\nsimilarity index 100%\nrename from src\/domUtils\/insertNodeAt.js\nrename to src\/dom\/insertNodeAt.js\ndiff --git a\/src\/domUtils\/isEventSupported.js b\/src\/dom\/isEventSupported.js\nsimilarity index 80%\nrename from src\/domUtils\/isEventSupported.js\nrename to src\/dom\/isEventSupported.js\nindex b756e3c8ba..330a7086ae 100644\n--- a\/src\/domUtils\/isEventSupported.js\n+++ b\/src\/dom\/isEventSupported.js\n@@ -20,9 +20,14 @@\n \n var ExecutionEnvironment = require('ExecutionEnvironment');\n \n-var testNode;\n+var testNode, useHasFeature;\n if (ExecutionEnvironment.canUseDOM) {\n testNode = document.createElement('div');\n+ useHasFeature =\n+ document.implementation &&\n+ document.implementation.hasFeature &&\n+ \/\/ `hasFeature` always returns true in Firefox 19+.\n+ document.implementation.hasFeature('', '') !== true;\n }\n \n \/**\n@@ -44,6 +49,7 @@ function isEventSupported(eventNameSuffix, capture) {\n return false;\n }\n var element = document.createElement('div');\n+\n var eventName = 'on' + eventNameSuffix;\n var isSupported = eventName in element;\n \n@@ -55,6 +61,12 @@ function isEventSupported(eventNameSuffix, capture) {\n }\n element.removeAttribute(eventName);\n }\n+\n+ if (!isSupported && useHasFeature && eventNameSuffix === 'wheel') {\n+ \/\/ This is the only way to test support for the `wheel` event in IE9+.\n+ isSupported = document.implementation.hasFeature('Events.wheel', '3.0');\n+ }\n+\n element = null;\n return isSupported;\n }\ndiff --git a\/src\/event\/AbstractEvent.js b\/src\/event\/AbstractEvent.js\nindex 9d31b19e39..6930fdd8bf 100644\n--- a\/src\/event\/AbstractEvent.js\n+++ b\/src\/event\/AbstractEvent.js\n@@ -44,14 +44,12 @@ var MAX_POOL_SIZE = 20;\n * unreliable native event.\n *\/\n function AbstractEvent(\n- abstractEventType,\n- abstractTargetID, \/\/ Allows the abstract target to differ from native.\n- originatingTopLevelEventType,\n+ reactEventType,\n+ reactTargetID, \/\/ Allows the abstract target to differ from native.\n nativeEvent,\n data) {\n- this.type = abstractEventType;\n- this.abstractTargetID = abstractTargetID || '';\n- this.originatingTopLevelEventType = originatingTopLevelEventType;\n+ this.reactEventType = reactEventType;\n+ this.reactTargetID = reactTargetID || '';\n this.nativeEvent = nativeEvent;\n this.data = data;\n \/\/ TODO: Deprecate storing target - doesn't always make sense for some types\n@@ -263,12 +261,10 @@ AbstractEvent.persistentCloneOf = function(abstractEvent) {\n throwIf(!(abstractEvent instanceof AbstractEvent), CLONE_TYPE_ERR);\n }\n return new AbstractEvent(\n- abstractEvent.type,\n- abstractEvent.abstractTargetID,\n- abstractEvent.originatingTopLevelEventType,\n+ abstractEvent.reactEventType,\n+ abstractEvent.reactTargetID,\n abstractEvent.nativeEvent,\n- abstractEvent.data,\n- abstractEvent.target\n+ abstractEvent.data\n );\n };\n \ndiff --git a\/src\/event\/CallbackRegistry.js b\/src\/event\/CallbackRegistry.js\nindex 4d157653bd..a0c2b5aca5 100644\n--- a\/src\/event\/CallbackRegistry.js\n+++ b\/src\/event\/CallbackRegistry.js\n@@ -14,6 +14,7 @@\n * limitations under the License.\n *\n * @providesModule CallbackRegistry\n+ * @typechecks\n *\/\n \n \"use strict\";\n@@ -22,18 +23,21 @@ var listenerBank = {};\n \n \/**\n * Stores \"listeners\" by `registrationName`\/`id`. There should be at most one\n- * \"listener\" per `registrationName\/id` in the `listenerBank`.\n- * Access listeners via `listenerBank[registrationName][id]`\n+ * \"listener\" per `registrationName`\/`id` in the `listenerBank`.\n *\n- * @constructor CallbackRegistry\n+ * Access listeners via `listenerBank[registrationName][id]`.\n+ *\n+ * @class CallbackRegistry\n+ * @internal\n *\/\n var CallbackRegistry = {\n \n \/**\n- * Stores `listener` at `listenerBank[registrationName][id]. Is idempotent.\n- * @param {string} domID The id of the DOM node.\n- * @param {string} registrationName The name of listener (`onClick` etc).\n- * @param {Function} listener The callback to to store.\n+ * Stores `listener` at `listenerBank[registrationName][id]`. Is idempotent.\n+ *\n+ * @param {string} id ID of the DOM node.\n+ * @param {string} registrationName Name of listener (e.g. `onClick`).\n+ * @param {?function} listener The callback to store.\n *\/\n putListener: function(id, registrationName, listener) {\n var bankForRegistrationName =\n@@ -42,9 +46,9 @@ var CallbackRegistry = {\n },\n \n \/**\n- * @param {string} id.\n- * @param {string} registrationName Name of registration (`onClick` etc).\n- * @return {Function?} The Listener\n+ * @param {string} id ID of the DOM node.\n+ * @param {string} registrationName Name of listener (e.g. `onClick`).\n+ * @return {?function} The stored callback.\n *\/\n getListener: function(id, registrationName) {\n var bankForRegistrationName = listenerBank[registrationName];\n@@ -52,9 +56,10 @@ var CallbackRegistry = {\n },\n \n \/**\n- * Deletes the listener from the registration bank.\n- * @param {string} id\n- * @param {string} registrationName (`onClick` etc).\n+ * Deletes a listener from the registration bank.\n+ *\n+ * @param {string} id ID of the DOM node.\n+ * @param {string} registrationName Name of listener (e.g. `onClick`).\n *\/\n deleteListener: function(id, registrationName) {\n var bankForRegistrationName = listenerBank[registrationName];\n@@ -63,10 +68,13 @@ var CallbackRegistry = {\n }\n },\n \n- \/\/ This is needed for tests only. Do not use in real life\n+ \/**\n+ * This is needed for tests only. Do not use!\n+ *\/\n __purge: function() {\n listenerBank = {};\n }\n+\n };\n \n module.exports = CallbackRegistry;\ndiff --git a\/src\/event\/EventConstants.js b\/src\/event\/EventConstants.js\nindex 0af7b9d0b2..b99696d95b 100644\n--- a\/src\/event\/EventConstants.js\n+++ b\/src\/event\/EventConstants.js\n@@ -41,7 +41,7 @@ var topLevelTypes = keyMirror({\n topMouseOut: null,\n topMouseOver: null,\n topMouseUp: null,\n- topMouseWheel: null,\n+ topWheel: null,\n topScroll: null,\n topSubmit: null,\n topTouchCancel: null,\ndiff --git a\/src\/event\/EventPluginHub.js b\/src\/event\/EventPluginHub.js\nindex 5a24d557ce..52c3db0b61 100644\n--- a\/src\/event\/EventPluginHub.js\n+++ b\/src\/event\/EventPluginHub.js\n@@ -194,15 +194,16 @@ function recordAllRegistrationNames(eventType, PluginModule) {\n * @param {AbstractEvent} abstractEvent to look at\n *\/\n function getPluginModuleForAbstractEvent(abstractEvent) {\n- if (abstractEvent.type.registrationName) {\n- return registrationNames[abstractEvent.type.registrationName];\n+ var reactEventType = abstractEvent.reactEventType;\n+ if (reactEventType.registrationName) {\n+ return registrationNames[reactEventType.registrationName];\n } else {\n- for (var phase in abstractEvent.type.phasedRegistrationNames) {\n- if (!abstractEvent.type.phasedRegistrationNames.hasOwnProperty(phase)) {\n+ for (var phase in reactEventType.phasedRegistrationNames) {\n+ if (!reactEventType.phasedRegistrationNames.hasOwnProperty(phase)) {\n continue;\n }\n var PluginModule = registrationNames[\n- abstractEvent.type.phasedRegistrationNames[phase]\n+ reactEventType.phasedRegistrationNames[phase]\n ];\n if (PluginModule) {\n return PluginModule;\n@@ -223,36 +224,36 @@ var deleteAllListeners = function(domID) {\n * Accepts the stream of top level native events, and gives every registered\n * plugin an opportunity to extract `AbstractEvent`s with annotated dispatches.\n *\n- * @param {Enum} topLevelType Record from `EventConstants`.\n- * @param {Event} nativeEvent A Standard Event with fixed `target` property.\n- * @param {Element} renderedTarget Element of interest to the framework, usually\n- * the same as `nativeEvent.target` but occasionally an element immediately\n- * above `nativeEvent.target` (the first DOM node recognized as one \"rendered\"\n- * by the framework at hand.)\n- * @param {string} renderedTargetID string ID of `renderedTarget`.\n+ * @param {string} topLevelType Record from `EventConstants`.\n+ * @param {DOMEventTarget} topLevelTarget The listening component root node.\n+ * @param {string} topLevelTargetID ID of `topLevelTarget`.\n+ * @param {object} nativeEvent Native browser event.\n+ * @return {*} An accumulation of `AbstractEvent`s.\n *\/\n-var extractAbstractEvents =\n- function(topLevelType, nativeEvent, renderedTargetID, renderedTarget) {\n- var abstractEvents;\n- var plugins = injection.plugins;\n- var len = plugins.length;\n- for (var i = 0; i < len; i++) {\n- \/\/ Not every plugin in the ordering may be loaded at runtime.\n- var possiblePlugin = plugins[i];\n- var extractedAbstractEvents =\n- possiblePlugin &&\n- possiblePlugin.extractAbstractEvents(\n- topLevelType,\n- nativeEvent,\n- renderedTargetID,\n- renderedTarget\n- );\n+var extractAbstractEvents = function(\n+ topLevelType,\n+ topLevelTarget,\n+ topLevelTargetID,\n+ nativeEvent) {\n+ var abstractEvents;\n+ var plugins = injection.plugins;\n+ for (var i = 0, l = plugins.length; i < l; i++) {\n+ \/\/ Not every plugin in the ordering may be loaded at runtime.\n+ var possiblePlugin = plugins[i];\n+ if (possiblePlugin) {\n+ var extractedAbstractEvents = possiblePlugin.extractAbstractEvents(\n+ topLevelType,\n+ topLevelTarget,\n+ topLevelTargetID,\n+ nativeEvent\n+ );\n if (extractedAbstractEvents) {\n abstractEvents = accumulate(abstractEvents, extractedAbstractEvents);\n }\n }\n- return abstractEvents;\n- };\n+ }\n+ return abstractEvents;\n+};\n \n var enqueueAbstractEvents = function(abstractEvents) {\n if (abstractEvents) {\ndiff --git a\/src\/event\/EventPropagators.js b\/src\/event\/EventPropagators.js\nindex c5cfe6bfe5..e7534f7a2d 100644\n--- a\/src\/event\/EventPropagators.js\n+++ b\/src\/event\/EventPropagators.js\n@@ -58,7 +58,7 @@ var injection = {\n *\/\n function listenerAtPhase(id, abstractEvent, propagationPhase) {\n var registrationName =\n- abstractEvent.type.phasedRegistrationNames[propagationPhase];\n+ abstractEvent.reactEventType.phasedRegistrationNames[propagationPhase];\n return getListener(id, registrationName);\n }\n \n@@ -92,9 +92,9 @@ function accumulateDirectionalDispatches(domID, upwards, abstractEvent) {\n * have a different target.\n *\/\n function accumulateTwoPhaseDispatchesSingle(abstractEvent) {\n- if (abstractEvent && abstractEvent.type.phasedRegistrationNames) {\n+ if (abstractEvent && abstractEvent.reactEventType.phasedRegistrationNames) {\n injection.InstanceHandle.traverseTwoPhase(\n- abstractEvent.abstractTargetID,\n+ abstractEvent.reactTargetID,\n accumulateDirectionalDispatches,\n abstractEvent\n );\n@@ -105,11 +105,12 @@ function accumulateTwoPhaseDispatchesSingle(abstractEvent) {\n \/**\n * Accumulates without regard to direction, does not look for phased\n * registration names. Same as `accumulateDirectDispatchesSingle` but without\n- * requiring that the `abstractTargetID` be the same as the dispatched ID.\n+ * requiring that the `reactTargetID` be the same as the dispatched ID.\n *\/\n function accumulateDispatches(id, ignoredDirection, abstractEvent) {\n- if (abstractEvent && abstractEvent.type.registrationName) {\n- var listener = getListener(id, abstractEvent.type.registrationName);\n+ if (abstractEvent && abstractEvent.reactEventType.registrationName) {\n+ var registrationName = abstractEvent.reactEventType.registrationName;\n+ var listener = getListener(id, registrationName);\n if (listener) {\n abstractEvent._dispatchListeners =\n accumulate(abstractEvent._dispatchListeners, listener);\n@@ -120,12 +121,12 @@ function accumulateDispatches(id, ignoredDirection, abstractEvent) {\n \n \/**\n * Accumulates dispatches on an `AbstractEvent`, but only for the\n- * `abstractTargetID`.\n+ * `reactTargetID`.\n * @param {AbstractEvent} abstractEvent\n *\/\n function accumulateDirectDispatchesSingle(abstractEvent) {\n- if (abstractEvent && abstractEvent.type.registrationName) {\n- accumulateDispatches(abstractEvent.abstractTargetID, null, abstractEvent);\n+ if (abstractEvent && abstractEvent.reactEventType.registrationName) {\n+ accumulateDispatches(abstractEvent.reactTargetID, null, abstractEvent);\n }\n }\n \ndiff --git a\/src\/event\/NormalizedEventListener.js b\/src\/event\/NormalizedEventListener.js\ndeleted file mode 100644\nindex 97136ff430..0000000000\n--- a\/src\/event\/NormalizedEventListener.js\n+++ \/dev\/null\n@@ -1,88 +0,0 @@\n-\/**\n- * Copyright 2013 Facebook, Inc.\n- *\n- * Licensed under the Apache License, Version 2.0 (the \"License\");\n- * you may not use this file except in compliance with the License.\n- * You may obtain a copy of the License at\n- *\n- * http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n- *\n- * Unless required by applicable law or agreed to in writing, software\n- * distributed under the License is distributed on an \"AS IS\" BASIS,\n- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n- * See the License for the specific language governing permissions and\n- * limitations under the License.\n- *\n- * @providesModule NormalizedEventListener\n- *\/\n-\n-\"use strict\";\n-\n-var EventListener = require('EventListener');\n-\n-\/**\n- * @param {?Event} eventParam Event parameter from an attached listener.\n- * @return {Event} Normalized event object.\n- * @private\n- *\/\n-function normalizeEvent(eventParam) {\n- var normalized = eventParam || window.event;\n- \/\/ In some browsers (OLD FF), setting the target throws an error. A good way\n- \/\/ to tell if setting the target will throw an error, is to check if the event\n- \/\/ has a `target` property. Safari events have a `target` but it's not always\n- \/\/ normalized. Even if a `target` property exists, it's good to only set the\n- \/\/ target property if we realize that a change will actually take place.\n- var hasTargetProperty = 'target' in normalized;\n- var eventTarget = normalized.target || normalized.srcElement || window;\n- \/\/ Safari may fire events on text nodes (Node.TEXT_NODE is 3)\n- \/\/ @see http:\/\/www.quirksmode.org\/js\/events_properties.html\n- var textNodeNormalizedTarget =\n- (eventTarget.nodeType === 3) ? eventTarget.parentNode : eventTarget;\n- if (!hasTargetProperty || normalized.target !== textNodeNormalizedTarget) {\n- \/\/ Create an object that inherits from the native event so that we can set\n- \/\/ `target` on it. (It is read-only and setting it throws in strict mode).\n- normalized = Object.create(normalized);\n- normalized.target = textNodeNormalizedTarget;\n- }\n- return normalized;\n-}\n-\n-function createNormalizedCallback(cb) {\n- return function(unfixedNativeEvent) {\n- cb(normalizeEvent(unfixedNativeEvent));\n- };\n-}\n-\n-var NormalizedEventListener = {\n-\n- \/**\n- * Listens to bubbled events on a DOM node.\n- *\n- * NOTE: The listener will be invoked with a normalized event object.\n- *\n- * @param {DOMElement} el DOM element to register listener on.\n- * @param {string} handlerBaseName Event name, e.g. \"click\".\n- * @param {function} cb Callback function.\n- * @public\n- *\/\n- listen: function(el, handlerBaseName, cb) {\n- EventListener.listen(el, handlerBaseName, createNormalizedCallback(cb));\n- },\n-\n- \/**\n- * Listens to captured events on a DOM node.\n- *\n- * NOTE: The listener will be invoked with a normalized event object.\n- *\n- * @param {DOMElement} el DOM element to register listener on.\n- * @param {string} handlerBaseName Event name, e.g. \"click\".\n- * @param {function} cb Callback function.\n- * @public\n- *\/\n- capture: function(el, handlerBaseName, cb) {\n- EventListener.capture(el, handlerBaseName, createNormalizedCallback(cb));\n- }\n-\n-};\n-\n-module.exports = NormalizedEventListener;\ndiff --git a\/src\/eventPlugins\/AnalyticsEventPluginFactory.js b\/src\/eventPlugins\/AnalyticsEventPluginFactory.js\nindex 698c7fb2b4..ce79e575f1 100644\n--- a\/src\/eventPlugins\/AnalyticsEventPluginFactory.js\n+++ b\/src\/eventPlugins\/AnalyticsEventPluginFactory.js\n@@ -99,7 +99,7 @@ var analyticsData = {};\n var topLevelTypesToAnalyticsEvent = {\n topClick: 'click',\n topDoubleClick: 'doubleClick',\n- topMouseWheel: 'mouseWheel',\n+ wheel: 'wheel',\n topTouchStart: 'touchStart',\n topTouchEnd: 'touchEnd',\n topTouchMove: 'touchMove',\n@@ -117,7 +117,7 @@ if (__DEV__) {\n var analyticsEventNameToTopLevelType = {\n 'click': topLevelTypes.topClick,\n 'doubleClick': topLevelTypes.topDoubleClick,\n- 'mouseWheel': topLevelTypes.topMouseWheel,\n+ 'wheel': topLevelTypes.wheel,\n 'touchStart': topLevelTypes.topTouchStart,\n 'touchEnd': topLevelTypes.topTouchEnd,\n 'touchMove': topLevelTypes.topTouchMove,\n@@ -136,20 +136,25 @@ if (__DEV__) {\n * This plugin does not really extract any abstract events. Rather it just looks\n * at the top level event and bumps up counters as appropriate\n *\n- * @see EventPluginHub.extractAbstractEvents\n+ * @param {string} topLevelType Record from `EventConstants`.\n+ * @param {DOMEventTarget} topLevelTarget The listening component root node.\n+ * @param {string} topLevelTargetID ID of `topLevelTarget`.\n+ * @param {object} nativeEvent Native browser event.\n+ * @return {*} An accumulation of `AbstractEvent`s.\n+ * @see {EventPluginHub.extractAbstractEvents}\n *\/\n function extractAbstractEvents(\n topLevelType,\n- nativeEvent,\n- renderedTargetID,\n- renderedTarget) {\n+ topLevelTarget,\n+ topLevelTargetID,\n+ nativeEvent) {\n var currentEvent = topLevelTypesToAnalyticsEvent[topLevelType];\n- if (!currentEvent || !renderedTarget || !renderedTarget.attributes) {\n+ if (!currentEvent || !topLevelTarget || !topLevelTarget.attributes) {\n return null;\n }\n \n- var analyticsIDAttribute = renderedTarget.attributes[ANALYTICS_ID];\n- var analyticsEventsAttribute = renderedTarget.attributes[ANALYTICS_EVENTS];\n+ var analyticsIDAttribute = topLevelTarget.attributes[ANALYTICS_ID];\n+ var analyticsEventsAttribute = topLevelTarget.attributes[ANALYTICS_EVENTS];\n if(!analyticsIDAttribute || !analyticsEventsAttribute) {\n return null;\n }\ndiff --git a\/src\/eventPlugins\/EnterLeaveEventPlugin.js b\/src\/eventPlugins\/EnterLeaveEventPlugin.js\nindex 51b02c42f3..d4a39131e7 100644\n--- a\/src\/eventPlugins\/EnterLeaveEventPlugin.js\n+++ b\/src\/eventPlugins\/EnterLeaveEventPlugin.js\n@@ -14,6 +14,7 @@\n * limitations under the License.\n *\n * @providesModule EnterLeaveEventPlugin\n+ * @typechecks\n *\/\n \n \"use strict\";\n@@ -36,28 +37,32 @@ var abstractEventTypes = {\n };\n \n \/**\n- * For almost every interaction we care about, there will be a top level\n- * `mouseOver` and `mouseOut` event that occur so we can usually only pay\n- * attention to one of the two (we'll pay attention to the `mouseOut` event) to\n- * avoid extracting a duplicate event. However, there's one interaction where\n- * there will be no `mouseOut` event to rely on - mousing from outside the\n- * browser *into* the chrome. We detect this scenario and only in that case, we\n- * use the `mouseOver` event.\n+ * For almost every interaction we care about, there will be a top-level\n+ * `mouseover` and `mouseout` event that occurs so only pay attention to one of\n+ * the two (to avoid duplicate events). We use the `mouseout` event.\n *\n- * @see EventPluginHub.extractAbstractEvents\n+ * However, there's one interaction where there will be no `mouseout` event to\n+ * rely on - mousing from outside the browser *into* the chrome. We detect this\n+ * scenario and only in that case, we use the `mouseover` event.\n+ *\n+ * @param {string} topLevelType Record from `EventConstants`.\n+ * @param {DOMEventTarget} topLevelTarget The listening component root node.\n+ * @param {string} topLevelTargetID ID of `topLevelTarget`.\n+ * @param {object} nativeEvent Native browser event.\n+ * @return {*} An accumulation of `AbstractEvent`s.\n+ * @see {EventPluginHub.extractAbstractEvents}\n *\/\n var extractAbstractEvents = function(\n topLevelType,\n- nativeEvent,\n- renderedTargetID,\n- renderedTarget) {\n-\n+ topLevelTarget,\n+ topLevelTargetID,\n+ nativeEvent) {\n if (topLevelType === topLevelTypes.topMouseOver &&\n (nativeEvent.relatedTarget || nativeEvent.fromElement)) {\n- return;\n+ return null;\n }\n if (topLevelType !== topLevelTypes.topMouseOut &&\n- topLevelType !== topLevelTypes.topMouseOver){\n+ topLevelType !== topLevelTypes.topMouseOver) {\n return null; \/\/ Must not be a mouse in or mouse out - ignoring.\n }\n \n@@ -65,32 +70,33 @@ var extractAbstractEvents = function(\n if (topLevelType === topLevelTypes.topMouseOut) {\n to = getFirstReactDOM(nativeEvent.relatedTarget || nativeEvent.toElement) ||\n ExecutionEnvironment.global;\n- from = renderedTarget;\n+ from = topLevelTarget;\n } else {\n- to = renderedTarget;\n+ to = topLevelTarget;\n from = ExecutionEnvironment.global;\n }\n \n \/\/ Nothing pertains to our managed components.\n- if (from === to ) {\n- return;\n+ if (from === to) {\n+ return null;\n }\n \n var fromID = from ? getDOMNodeID(from) : '';\n var toID = to ? getDOMNodeID(to) : '';\n+\n var leave = AbstractEvent.getPooled(\n abstractEventTypes.mouseLeave,\n fromID,\n- topLevelType,\n nativeEvent\n );\n var enter = AbstractEvent.getPooled(\n abstractEventTypes.mouseEnter,\n toID,\n- topLevelType,\n nativeEvent\n );\n+\n EventPropagators.accumulateEnterLeaveDispatches(leave, enter, fromID, toID);\n+\n return [leave, enter];\n };\n \ndiff --git a\/src\/eventPlugins\/ResponderEventPlugin.js b\/src\/eventPlugins\/ResponderEventPlugin.js\nindex d06d16cd0c..73d60b54c8 100644\n--- a\/src\/eventPlugins\/ResponderEventPlugin.js\n+++ b\/src\/eventPlugins\/ResponderEventPlugin.js\n@@ -162,14 +162,13 @@ var abstractEventTypes = {\n *\/\n \n \/**\n- * @param {TopLevelTypes} topLevelType Top level event type being examined.\n- * @param {DOMEvent} nativeEvent Native DOM event.\n+ * @param {string} topLevelType Record from `EventConstants`.\n * @param {string} renderedTargetID ID of deepest React rendered element.\n- *\n- * @return {Accumulation} Extracted events.\n+ * @param {object} nativeEvent Native browser event.\n+ * @return {*} An accumulation of extracted `AbstractEvent`s.\n *\/\n var setResponderAndExtractTransfer =\n- function(topLevelType, nativeEvent, renderedTargetID) {\n+ function(topLevelType, renderedTargetID, nativeEvent) {\n var type;\n var shouldSetEventType =\n isStartish(topLevelType) ? abstractEventTypes.startShouldSetResponder :\n@@ -235,7 +234,6 @@ var setResponderAndExtractTransfer =\n return extracted;\n };\n \n-\n \/**\n * A transfer is a negotiation between a currently set responder and the next\n * element to claim responder status. Any start event could trigger a transfer\n@@ -253,51 +251,60 @@ function canTriggerTransfer(topLevelType) {\n (isPressing && isMoveish(topLevelType));\n }\n \n-var extractAbstractEvents =\n- function(topLevelType, nativeEvent, renderedTargetID, renderedTarget) {\n- var extracted;\n- \/\/ Must have missed an end event - reset the state here.\n- if (responderID && isStartish(topLevelType)) {\n- responderID = null;\n- }\n- if (isStartish(topLevelType)) {\n- isPressing = true;\n- } else if (isEndish(topLevelType)) {\n- isPressing = false;\n- }\n- if (canTriggerTransfer(topLevelType)) {\n- var transfer = setResponderAndExtractTransfer(\n- topLevelType,\n- nativeEvent,\n- renderedTargetID,\n- renderedTarget\n- );\n- if (transfer) {\n- extracted = accumulate(extracted, transfer);\n- }\n- }\n- \/\/ Now that we know the responder is set correctly, we can dispatch\n- \/\/ responder type events (directly to the responder).\n- var type = isMoveish(topLevelType) ? abstractEventTypes.responderMove :\n- isEndish(topLevelType) ? abstractEventTypes.responderRelease :\n- isStartish(topLevelType) ? abstractEventTypes.responderStart : null;\n- if (type) {\n- var data = AbstractEvent.normalizePointerData(nativeEvent);\n- var gesture = AbstractEvent.getPooled(\n- type,\n- responderID,\n- topLevelType,\n- nativeEvent,\n- data\n- );\n- EventPropagators.accumulateDirectDispatches(gesture);\n- extracted = accumulate(extracted, gesture);\n- }\n- if (type === abstractEventTypes.responderRelease) {\n- responderID = null;\n+\/**\n+ * @param {string} topLevelType Record from `EventConstants`.\n+ * @param {DOMEventTarget} topLevelTarget The listening component root node.\n+ * @param {string} topLevelTargetID ID of `topLevelTarget`.\n+ * @param {object} nativeEvent Native browser event.\n+ * @return {*} An accumulation of `AbstractEvent`s.\n+ * @see {EventPluginHub.extractAbstractEvents}\n+ *\/\n+var extractAbstractEvents = function(\n+ topLevelType,\n+ topLevelTarget,\n+ topLevelTargetID,\n+ nativeEvent) {\n+ var extracted;\n+ \/\/ Must have missed an end event - reset the state here.\n+ if (responderID && isStartish(topLevelType)) {\n+ responderID = null;\n+ }\n+ if (isStartish(topLevelType)) {\n+ isPressing = true;\n+ } else if (isEndish(topLevelType)) {\n+ isPressing = false;\n+ }\n+ if (canTriggerTransfer(topLevelType)) {\n+ var transfer = setResponderAndExtractTransfer(\n+ topLevelType,\n+ topLevelTargetID,\n+ nativeEvent\n+ );\n+ if (transfer) {\n+ extracted = accumulate(extracted, transfer);\n }\n- return extracted;\n- };\n+ }\n+ \/\/ Now that we know the responder is set correctly, we can dispatch\n+ \/\/ responder type events (directly to the responder).\n+ var type = isMoveish(topLevelType) ? abstractEventTypes.responderMove :\n+ isEndish(topLevelType) ? abstractEventTypes.responderRelease :\n+ isStartish(topLevelType) ? abstractEventTypes.responderStart : null;\n+ if (type) {\n+ var data = AbstractEvent.normalizePointerData(nativeEvent);\n+ var gesture = AbstractEvent.getPooled(\n+ type,\n+ responderID,\n+ nativeEvent,\n+ data\n+ );\n+ EventPropagators.accumulateDirectDispatches(gesture);\n+ extracted = accumulate(extracted, gesture);\n+ }\n+ if (type === abstractEventTypes.responderRelease) {\n+ responderID = null;\n+ }\n+ return extracted;\n+};\n \n \/**\n * Event plugin for formalizing the negotiation between claiming locks on\ndiff --git a\/src\/eventPlugins\/SimpleEventPlugin.js b\/src\/eventPlugins\/SimpleEventPlugin.js\nindex 0453fde60a..4087223718 100644\n--- a\/src\/eventPlugins\/SimpleEventPlugin.js\n+++ b\/src\/eventPlugins\/SimpleEventPlugin.js\n@@ -60,10 +60,10 @@ var SimpleEventPlugin = {\n captured: keyOf({onClickCapture: true})\n }\n },\n- mouseWheel: {\n+ wheel: {\n phasedRegistrationNames: {\n- bubbled: keyOf({onMouseWheel: true}),\n- captured: keyOf({onMouseWheelCapture: true})\n+ bubbled: keyOf({onWheel: true}),\n+ captured: keyOf({onWheelCapture: true})\n }\n },\n touchStart: {\n@@ -155,6 +155,7 @@ var SimpleEventPlugin = {\n \/**\n * Same as the default implementation, except cancels the event when return\n * value is false.\n+ *\n * @param {AbstractEvent} AbstractEvent to handle\n * @param {function} Application-level callback\n * @param {string} domID DOM id to pass to the callback.\n@@ -168,48 +169,55 @@ var SimpleEventPlugin = {\n },\n \n \/**\n- * @see EventPluginHub.extractAbstractEvents\n+ * @param {string} topLevelType Record from `EventConstants`.\n+ * @param {DOMEventTarget} topLevelTarget The listening component root node.\n+ * @param {string} topLevelTargetID ID of `topLevelTarget`.\n+ * @param {object} nativeEvent Native browser event.\n+ * @return {*} An accumulation of `AbstractEvent`s.\n+ * @see {EventPluginHub.extractAbstractEvents}\n *\/\n- extractAbstractEvents:\n- function(topLevelType, nativeEvent, renderedTargetID, renderedTarget) {\n- var data;\n- var abstractEventType =\n- SimpleEventPlugin.topLevelTypesToAbstract[topLevelType];\n- if (!abstractEventType) {\n- return null;\n- }\n- switch(topLevelType) {\n- case topLevelTypes.topMouseWheel:\n- data = AbstractEvent.normalizeMouseWheelData(nativeEvent);\n- break;\n- case topLevelTypes.topScroll:\n- data = AbstractEvent.normalizeScrollDataFromTarget(renderedTarget);\n- break;\n- case topLevelTypes.topClick:\n- case topLevelTypes.topDoubleClick:\n- case topLevelTypes.topChange:\n- case topLevelTypes.topDOMCharacterDataModified:\n- case topLevelTypes.topMouseDown:\n- case topLevelTypes.topMouseUp:\n- case topLevelTypes.topMouseMove:\n- case topLevelTypes.topTouchMove:\n- case topLevelTypes.topTouchStart:\n- case topLevelTypes.topTouchEnd:\n- data = AbstractEvent.normalizePointerData(nativeEvent);\n- break;\n- default:\n- data = null;\n- }\n- var abstractEvent = AbstractEvent.getPooled(\n- abstractEventType,\n- renderedTargetID,\n- topLevelType,\n- nativeEvent,\n- data\n- );\n- EventPropagators.accumulateTwoPhaseDispatches(abstractEvent);\n- return abstractEvent;\n+ extractAbstractEvents: function(\n+ topLevelType,\n+ topLevelTarget,\n+ topLevelTargetID,\n+ nativeEvent) {\n+ var data;\n+ var abstractEventType =\n+ SimpleEventPlugin.topLevelTypesToAbstract[topLevelType];\n+ if (!abstractEventType) {\n+ return null;\n }\n+ switch(topLevelType) {\n+ case topLevelTypes.topWheel:\n+ data = AbstractEvent.normalizeMouseWheelData(nativeEvent);\n+ break;\n+ case topLevelTypes.topScroll:\n+ data = AbstractEvent.normalizeScrollDataFromTarget(topLevelTarget);\n+ break;\n+ case topLevelTypes.topClick:\n+ case topLevelTypes.topDoubleClick:\n+ case topLevelTypes.topChange:\n+ case topLevelTypes.topDOMCharacterDataModified:\n+ case topLevelTypes.topMouseDown:\n+ case topLevelTypes.topMouseUp:\n+ case topLevelTypes.topMouseMove:\n+ case topLevelTypes.topTouchMove:\n+ case topLevelTypes.topTouchStart:\n+ case topLevelTypes.topTouchEnd:\n+ data = AbstractEvent.normalizePointerData(nativeEvent);\n+ break;\n+ default:\n+ data = null;\n+ }\n+ var abstractEvent = AbstractEvent.getPooled(\n+ abstractEventType,\n+ topLevelTargetID,\n+ nativeEvent,\n+ data\n+ );\n+ EventPropagators.accumulateTwoPhaseDispatches(abstractEvent);\n+ return abstractEvent;\n+ }\n };\n \n SimpleEventPlugin.topLevelTypesToAbstract = {\n@@ -218,7 +226,7 @@ SimpleEventPlugin.topLevelTypesToAbstract = {\n topMouseMove: SimpleEventPlugin.abstractEventTypes.mouseMove,\n topClick: SimpleEventPlugin.abstractEventTypes.click,\n topDoubleClick: SimpleEventPlugin.abstractEventTypes.doubleClick,\n- topMouseWheel: SimpleEventPlugin.abstractEventTypes.mouseWheel,\n+ topWheel: SimpleEventPlugin.abstractEventTypes.wheel,\n topTouchStart: SimpleEventPlugin.abstractEventTypes.touchStart,\n topTouchEnd: SimpleEventPlugin.abstractEventTypes.touchEnd,\n topTouchMove: SimpleEventPlugin.abstractEventTypes.touchMove,\ndiff --git a\/src\/eventPlugins\/TapEventPlugin.js b\/src\/eventPlugins\/TapEventPlugin.js\nindex 141b4aea4e..3759bc1cbd 100644\n--- a\/src\/eventPlugins\/TapEventPlugin.js\n+++ b\/src\/eventPlugins\/TapEventPlugin.js\n@@ -14,6 +14,7 @@\n * limitations under the License.\n *\n * @providesModule TapEventPlugin\n+ * @typechecks\n *\/\n \n \"use strict\";\n@@ -46,26 +47,27 @@ var abstractEventTypes = {\n };\n \n \/**\n- * @see EventPluginHub.extractAbstractEvents\n+ * @param {string} topLevelType Record from `EventConstants`.\n+ * @param {DOMEventTarget} topLevelTarget The listening component root node.\n+ * @param {string} topLevelTargetID ID of `topLevelTarget`.\n+ * @param {object} nativeEvent Native browser event.\n+ * @return {*} An accumulation of `AbstractEvent`s.\n+ * @see {EventPluginHub.extractAbstractEvents}\n *\/\n var extractAbstractEvents = function(\n topLevelType,\n- nativeEvent,\n- renderedTargetID,\n- renderedTarget) {\n-\n+ topLevelTarget,\n+ topLevelTargetID,\n+ nativeEvent) {\n if (!isStartish(topLevelType) && !isEndish(topLevelType)) {\n return;\n }\n var abstractEvent;\n var dist = eventDistance(startCoords, nativeEvent);\n if (isEndish(topLevelType) && dist < tapMoveThreshold) {\n- var type = abstractEventTypes.touchTap;\n- var abstractTargetID = renderedTargetID;\n abstractEvent = AbstractEvent.getPooled(\n- type,\n- abstractTargetID,\n- topLevelType,\n+ abstractEventTypes.touchTap,\n+ topLevelTargetID,\n nativeEvent\n );\n }\ndiff --git a\/src\/eventPlugins\/__tests__\/AnalyticsEventPlugin-test.js b\/src\/eventPlugins\/__tests__\/AnalyticsEventPlugin-test.js\nindex cd135cbf27..9dc33d9d5b 100644\n--- a\/src\/eventPlugins\/__tests__\/AnalyticsEventPlugin-test.js\n+++ b\/src\/eventPlugins\/__tests__\/AnalyticsEventPlugin-test.js\n@@ -23,7 +23,7 @@ require('mock-modules')\n .dontMock('AnalyticsEventPluginFactory')\n .dontMock('EventPluginHub')\n .dontMock('React')\n- .dontMock('ReactEvent')\n+ .dontMock('ReactEventEmitter')\n .dontMock('ReactEventTopLevelCallback')\n .dontMock('ReactInstanceHandles')\n .dontMock('ReactTestUtils');\n@@ -32,11 +32,11 @@ var AnalyticsEventPluginFactory = require('AnalyticsEventPluginFactory');\n var EventPluginHub = require('EventPluginHub');\n var mocks = require('mocks');\n var React = require('React');\n-var ReactEvent = require('ReactEvent');\n+var ReactEventEmitter = require('ReactEventEmitter');\n var ReactEventTopLevelCallback = require('ReactEventTopLevelCallback');\n var ReactTestUtils = require('ReactTestUtils');\n \n-ReactEvent.ensureListening(false, ReactEventTopLevelCallback);\n+ReactEventEmitter.ensureListening(false, ReactEventTopLevelCallback);\n \n describe('AnalyticsEventPlugin', function() {\n it('should count events correctly', function() {\ndiff --git a\/src\/eventPlugins\/__tests__\/ResponderEventPlugin-test.js b\/src\/eventPlugins\/__tests__\/ResponderEventPlugin-test.js\nindex 2c8a51a949..58f478991a 100644\n--- a\/src\/eventPlugins\/__tests__\/ResponderEventPlugin-test.js\n+++ b\/src\/eventPlugins\/__tests__\/ResponderEventPlugin-test.js\n@@ -167,8 +167,9 @@ var existsInExtraction = function(extracted, test) {\n function assertGrantEvent(id, extracted) {\n var test = function(abstractEvent) {\n return abstractEvent instanceof AbstractEvent &&\n- abstractEvent.type === responderAbstractEventTypes.responderGrant &&\n- abstractEvent.abstractTargetID === id;\n+ abstractEvent.reactEventType ===\n+ responderAbstractEventTypes.responderGrant &&\n+ abstractEvent.reactTargetID === id;\n };\n expect(ResponderEventPlugin.getResponderID()).toBe(id);\n expect(existsInExtraction(extracted, test)).toBe(true);\n@@ -177,8 +178,9 @@ function assertGrantEvent(id, extracted) {\n function assertResponderMoveEvent(id, extracted) {\n var test = function(abstractEvent) {\n return abstractEvent instanceof AbstractEvent &&\n- abstractEvent.type === responderAbstractEventTypes.responderMove &&\n- abstractEvent.abstractTargetID === id;\n+ abstractEvent.reactEventType ===\n+ responderAbstractEventTypes.responderMove &&\n+ abstractEvent.reactTargetID === id;\n };\n expect(ResponderEventPlugin.getResponderID()).toBe(id);\n expect(existsInExtraction(extracted, test)).toBe(true);\n@@ -187,8 +189,9 @@ function assertResponderMoveEvent(id, extracted) {\n function assertTerminateEvent(id, extracted) {\n var test = function(abstractEvent) {\n return abstractEvent instanceof AbstractEvent &&\n- abstractEvent.type === responderAbstractEventTypes.responderTerminate &&\n- abstractEvent.abstractTargetID === id;\n+ abstractEvent.reactEventType ===\n+ responderAbstractEventTypes.responderTerminate &&\n+ abstractEvent.reactTargetID === id;\n };\n expect(ResponderEventPlugin.getResponderID()).not.toBe(id);\n expect(existsInExtraction(extracted, test)).toBe(true);\n@@ -197,8 +200,9 @@ function assertTerminateEvent(id, extracted) {\n function assertRelease(id, extracted) {\n var test = function(abstractEvent) {\n return abstractEvent instanceof AbstractEvent &&\n- abstractEvent.type === responderAbstractEventTypes.responderRelease &&\n- abstractEvent.abstractTargetID === id;\n+ abstractEvent.reactEventType ===\n+ responderAbstractEventTypes.responderRelease &&\n+ abstractEvent.reactTargetID === id;\n };\n expect(ResponderEventPlugin.getResponderID()).toBe(null);\n expect(existsInExtraction(extracted, test)).toBe(true);\ndiff --git a\/src\/test\/ReactTestUtils.js b\/src\/test\/ReactTestUtils.js\nindex aa9fdd31b8..a3520ede64 100644\n--- a\/src\/test\/ReactTestUtils.js\n+++ b\/src\/test\/ReactTestUtils.js\n@@ -19,7 +19,7 @@\n var EventConstants = require('EventConstants');\n var React = require('React');\n var ReactComponent = require('ReactComponent');\n-var ReactEvent = require('ReactEvent');\n+var ReactEventEmitter = require('ReactEventEmitter');\n var ReactTextComponent = require('ReactTextComponent');\n \n var ge = require('ge');\n@@ -191,7 +191,9 @@ var ReactTestUtils = {\n *\/\n simulateEventOnNode: function(topLevelType, node, fakeNativeEvent) {\n var virtualHandler =\n- ReactEvent.TopLevelCallbackCreator.createTopLevelCallback(topLevelType);\n+ ReactEventEmitter.TopLevelCallbackCreator.createTopLevelCallback(\n+ topLevelType\n+ );\n fakeNativeEvent.target = node;\n virtualHandler(fakeNativeEvent);\n },\n@@ -209,7 +211,9 @@ var ReactTestUtils = {\n throw new Error('Simulating event on non-rendered component');\n }\n var virtualHandler =\n- ReactEvent.TopLevelCallbackCreator.createTopLevelCallback(topLevelType);\n+ ReactEventEmitter.TopLevelCallbackCreator.createTopLevelCallback(\n+ topLevelType\n+ );\n var node = ge(reactRootID);\n fakeNativeEvent.target = node;\n \/* jsdom is returning nodes without id's - fixing that issue here. *\/\ndiff --git a\/src\/test\/reactComponentExpect.js b\/src\/test\/reactComponentExpect.js\nindex b17caea96d..0a359fe2d2 100644\n--- a\/src\/test\/reactComponentExpect.js\n+++ b\/src\/test\/reactComponentExpect.js\n@@ -20,7 +20,7 @@\n var ReactComponent = require('ReactComponent');\n var ReactTestUtils = require('ReactTestUtils');\n \n-var copyProperties = require('copyProperties');\n+var mergeInto = require('mergeInto');\n \n function reactComponentExpect(instance) {\n if (instance instanceof reactComponentExpect) {\n@@ -35,7 +35,7 @@ function reactComponentExpect(instance) {\n this.toBeValidReactComponent();\n }\n \n-copyProperties(reactComponentExpect.prototype, {\n+mergeInto(reactComponentExpect.prototype, {\n \/\/ Getters -------------------------------------------------------------------\n \n \/**\ndiff --git a\/src\/utils\/__tests__\/mapChildren-test.js b\/src\/utils\/__tests__\/mapChildren-test.js\nnew file mode 100644\nindex 0000000000..7933e0c211\n--- \/dev\/null\n+++ b\/src\/utils\/__tests__\/mapChildren-test.js\n@@ -0,0 +1,131 @@\n+\/**\n+ * Copyright 2013 Facebook, Inc.\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ *\n+ * @emails react-core\n+ * @jsx React.DOM\n+ *\/\n+\n+\"use strict\";\n+\n+describe('mapChildren', function() {\n+\n+ var React;\n+ var ReactTestUtils;\n+\n+ var mapChildren;\n+ var reactComponentExpect;\n+\n+ var Wrap;\n+\n+ beforeEach(function() {\n+ React = require('React');\n+ ReactTestUtils = require('ReactTestUtils');\n+\n+ mapChildren = require('mapChildren');\n+ reactComponentExpect = require('reactComponentExpect');\n+\n+ Wrap = React.createClass({\n+ render: function() {\n+ return (\n+

\n+ {mapChildren(this.props.children, this.props.mapFn, this)}\n+ <\/div>\n+ );\n+ }\n+ });\n+\n+ this.addMatchers({\n+ toHaveKeys: function(expected) {\n+ if (this.actual.length != expected.length) {\n+ return false;\n+ }\n+ return this.actual.every(function(component, index) {\n+ return component._key === expected[index];\n+ }, this);\n+ }\n+ });\n+ });\n+\n+\n+ it('should support identity for simple', function() {\n+ var mapFn = jasmine.createSpy().andCallFake(function (kid, key, index) {\n+ return kid;\n+ });\n+\n+ var simpleKid = ;\n+\n+ var instance = {simpleKid}<\/Wrap>;\n+ ReactTestUtils.renderIntoDocument(instance);\n+\n+ var rendered = reactComponentExpect(instance)\n+ .expectRenderedChild()\n+ .instance();\n+\n+ expect(mapFn).toHaveBeenCalledWith(simpleKid, 'simple', 0);\n+ expect(rendered.props.children[0]).toBe(simpleKid);\n+ expect(rendered.props.children).toHaveKeys(['simple']);\n+ });\n+\n+ it('should pass key to returned component', function() {\n+ var mapFn = function (kid, key, index) {\n+ return

{kid}<\/div>;\n+ };\n+\n+ var simpleKid = ;\n+\n+ var instance = {simpleKid}<\/Wrap>;\n+ ReactTestUtils.renderIntoDocument(instance);\n+\n+ var rendered = reactComponentExpect(instance)\n+ .expectRenderedChild()\n+ .instance();\n+\n+ expect(rendered.props.children[0]).not.toBe(simpleKid);\n+ expect(rendered.props.children[0].props.children[0]).toBe(simpleKid);\n+ expect(rendered.props.children).toHaveKeys(['simple']);\n+ expect(rendered.props.children[0].props.children).toHaveKeys(['simple']);\n+ });\n+\n+ it('should be called for each child', function() {\n+ var mapFn = jasmine.createSpy().andCallFake(function (kid, key, index) {\n+ return

{kid}<\/div>;\n+ });\n+\n+ var kidOne =

;\n+ var kidTwo =

;\n+ var kidThree =

dillon1000/react

Files changed