@samitouri / QOS-React-2 / commits / 9d1055b3d2
Fork 0

The library for web and native user interfaces.

Rename `ReactEvent` to `ReactEventEmitter`

ReactEvent should be reserved for the actual object created when an event fires. The current ReactEvent is more like EventEmitter than anything (e.g. it sets up delegation, provides methods to attach and remove listeners).

CommitSyncScript committed Jun 4, 2013 at 14:05 UTC 9d1055b3d22cbed777c44ee7996c12268ab5041b
10 files changed +125 -129
src/core/ReactDOMForm.js
+2 -2
@@ -20,7 +20,7 @@
20
21 var ReactCompositeComponent = require('ReactCompositeComponent');
22 var ReactDOM = require('ReactDOM');
23 -var ReactEvent = require('ReactEvent');
23 +var ReactEventEmitter = require('ReactEventEmitter');
24 var EventConstants = require('EventConstants');
25
26 // Store a reference to the <form> `ReactNativeComponent`.
@@ -41,7 +41,7 @@ var ReactDOMForm = ReactCompositeComponent.createClass({
41 },
42
43 componentDidMount: function(node) {
44 - ReactEvent.trapBubbledEvent(
44 + ReactEventEmitter.trapBubbledEvent(
45 EventConstants.topLevelTypes.topSubmit,
46 'submit',
47 node
src/core/ReactEventEmitter.js renamed
+43 -58
@@ -13,7 +13,7 @@
13 * See the License for the specific language governing permissions and
14 * limitations under the License.
15 *
16 - * @providesModule ReactEvent
16 + * @providesModule ReactEventEmitter
17 */
18
19 "use strict";
@@ -33,9 +33,9 @@ var listen = NormalizedEventListener.listen;
33 var capture = NormalizedEventListener.capture;
34
35 /**
36 - * `ReactEvent` is used to attach top-level event listeners. For example:
36 + * `ReactEventEmitter` is used to attach top-level event listeners. For example:
37 *
38 - * ReactEvent.putListener('myID', 'onClick', myFunction);
38 + * ReactEventEmitter.putListener('myID', 'onClick', myFunction);
39 *
40 * This would allocate a "registration" of `('onClick', myFunction)` on 'myID'.
41 */
@@ -43,36 +43,32 @@ var capture = NormalizedEventListener.capture;
43 /**
44 * Overview of React and the event system:
45 *
46 - * .
47 - * +-------------+ .
48 - * | DOM | .
49 - * +-------------+ . +-----------+
50 - * + . +--------+|SimpleEvent|
51 - * | . | |Plugin |
52 - * +-----|-------+ . v +-----------+
53 - * | | | . +--------------+ +------------+
54 - * | +------------.---->|EventPluginHub| | Event |
55 - * | | . | | +-----------+ | Propagators|
56 - * | ReactEvent | . | | |TapEvent | |------------|
57 - * | | . | |<---+|Plugin | |other plugin|
58 - * | +------------.---------+ | +-----------+ | utilities |
59 - * | | | . | | | +------------+
60 - * | | | . +---|----------+
61 - * | | | . | ^ +-----------+
62 - * | | | . | | |Enter/Leave|
63 - * +-----| ------+ . | +-------+|Plugin |
64 - * | . v +-----------+
65 - * + . +--------+
66 - * +-------------+ . |callback|
67 - * | application | . |registry|
68 - * |-------------| . +--------+
69 - * | | .
70 - * | | .
71 - * | | .
72 - * | | .
73 - * +-------------+ .
74 - * .
75 - * React Core . General Purpose Event Plugin System
46 + * .
47 + * +------------+ .
48 + * | DOM | .
49 + * +------------+ . +-----------+
50 + * + . +--------+|SimpleEvent|
51 + * | . | |Plugin |
52 + * +-----|------+ . v +-----------+
53 + * | | | . +--------------+ +------------+
54 + * | +-----------.--->|EventPluginHub| | Event |
55 + * | | . | | +-----------+ | Propagators|
56 + * | ReactEvent | . | | |TapEvent | |------------|
57 + * | Emitter | . | |<---+|Plugin | |other plugin|
58 + * | | . | | +-----------+ | utilities |
59 + * | +-----------.---------+ | +------------+
60 + * | | | . +----|---------+
61 + * +-----|------+ . | ^ +-----------+
62 + * | . | | |Enter/Leave|
63 + * + . | +-------+|Plugin |
64 + * +-------------+ . v +-----------+
65 + * | application | . +----------+
66 + * |-------------| . | callback |
67 + * | | . | registry |
68 + * | | . +----------+
69 + * +-------------+ .
70 + * .
71 + * React Core . General Purpose Event Plugin System
72 */
73
74 /**
@@ -98,21 +94,6 @@ var capture = NormalizedEventListener.capture;
94
95 var _isListening = false;
96
101 -var EVENT_LISTEN_MISUSE;
102 -var WORKER_DISABLE;
103 -
104 -if (__DEV__) {
105 - EVENT_LISTEN_MISUSE =
106 - 'You must register listeners at the top of the document, only once - ' +
107 - 'and only in the main UI thread of a browser - if you are attempting ' +
108 - 'listen in a worker, the framework is probably doing something wrong ' +
109 - 'and you should report this immediately.';
110 - WORKER_DISABLE =
111 - 'Cannot disable event listening in Worker thread. This is likely a ' +
112 - 'bug in the framework. Please report immediately.';
113 -}
114 -
115 -
97 /**
98 * Traps top-level events that bubble. Delegates to the main dispatcher
99 * `handleTopLevel` after performing some basic normalization via
@@ -122,7 +103,9 @@ function trapBubbledEvent(topLevelType, handlerBaseName, onWhat) {
103 listen(
104 onWhat,
105 handlerBaseName,
125 - ReactEvent.TopLevelCallbackCreator.createTopLevelCallback(topLevelType)
106 + ReactEventEmitter.TopLevelCallbackCreator.createTopLevelCallback(
107 + topLevelType
108 + )
109 );
110 }
111
@@ -133,7 +116,9 @@ function trapCapturedEvent(topLevelType, handlerBaseName, onWhat) {
116 capture(
117 onWhat,
118 handlerBaseName,
136 - ReactEvent.TopLevelCallbackCreator.createTopLevelCallback(topLevelType)
119 + ReactEventEmitter.TopLevelCallbackCreator.createTopLevelCallback(
120 + topLevelType
121 + )
122 );
123 }
124
@@ -160,7 +145,7 @@ function registerDocumentResizeListener() {
145 }
146
147 /**
163 - * Summary of `ReactEvent` event handling:
148 + * Summary of `ReactEventEmitter` event handling:
149 *
150 * - We trap low level 'top-level' events.
151 *
@@ -241,8 +226,8 @@ function listenAtTopLevel(touchNotMouse) {
226 }
227
228 /**
244 - * This is the heart of `ReactEvent`. It simply streams the top-level native
245 - * events to `EventPluginHub`.
229 + * This is the heart of `ReactEventEmitter`. It simply streams the top-level
230 + * native events to `EventPluginHub`.
231 *
232 * @param {object} topLevelType Record from `EventConstants`.
233 * @param {Event} nativeEvent A Standard Event with fixed `target` property.
@@ -273,11 +258,11 @@ function setEnabled(enabled) {
258 'setEnabled(...): Cannot toggle event listening in a Worker thread. This ' +
259 'is likely a bug in the framework. Please report immediately.'
260 );
276 - ReactEvent.TopLevelCallbackCreator.setEnabled(enabled);
261 + ReactEventEmitter.TopLevelCallbackCreator.setEnabled(enabled);
262 }
263
264 function isEnabled() {
280 - return ReactEvent.TopLevelCallbackCreator.isEnabled();
265 + return ReactEventEmitter.TopLevelCallbackCreator.isEnabled();
266 }
267
268 /**
@@ -299,13 +284,13 @@ function ensureListening(touchNotMouse, TopLevelCallbackCreator) {
284 'This is likely a bug in the framework. Please report immediately.'
285 );
286 if (!_isListening) {
302 - ReactEvent.TopLevelCallbackCreator = TopLevelCallbackCreator;
287 + ReactEventEmitter.TopLevelCallbackCreator = TopLevelCallbackCreator;
288 listenAtTopLevel(touchNotMouse);
289 _isListening = true;
290 }
291 }
292
308 -var ReactEvent = {
293 +var ReactEventEmitter = {
294 TopLevelCallbackCreator: null, // Injectable callback creator.
295 handleTopLevel: handleTopLevel,
296 setEnabled: setEnabled,
@@ -319,4 +304,4 @@ var ReactEvent = {
304 trapCapturedEvent: trapCapturedEvent
305 };
306
322 -module.exports = ReactEvent;
307 +module.exports = ReactEventEmitter;
src/core/ReactEventTopLevelCallback.js
+7 -4
@@ -19,7 +19,7 @@
19 "use strict";
20
21 var ExecutionEnvironment = require('ExecutionEnvironment');
22 -var ReactEvent = require('ReactEvent');
22 +var ReactEventEmitter = require('ReactEventEmitter');
23 var ReactInstanceHandles = require('ReactInstanceHandles');
24
25 var getDOMNodeID = require('getDOMNodeID');
@@ -63,9 +63,12 @@ var ReactEventTopLevelCallback = {
63 fixedNativeEvent.target
64 ) || ExecutionEnvironment.global;
65 var renderedTargetID = getDOMNodeID(renderedTarget);
66 - var event = fixedNativeEvent;
67 - var target = renderedTarget;
68 - ReactEvent.handleTopLevel(topLevelType, event, renderedTargetID, target);
66 + ReactEventEmitter.handleTopLevel(
67 + topLevelType,
68 + fixedNativeEvent,
69 + renderedTargetID,
70 + renderedTarget
71 + );
72 };
73 }
74
src/core/ReactMount.js
+2 -2
@@ -18,7 +18,7 @@
18
19 "use strict";
20
21 -var ReactEvent = require('ReactEvent');
21 +var ReactEventEmitter = require('ReactEventEmitter');
22 var ReactInstanceHandles = require('ReactInstanceHandles');
23 var ReactEventTopLevelCallback = require('ReactEventTopLevelCallback');
24
@@ -86,7 +86,7 @@ var ReactMount = {
86 * @private
87 */
88 prepareTopLevelEvents: function(TopLevelCallbackCreator) {
89 - ReactEvent.ensureListening(
89 + ReactEventEmitter.ensureListening(
90 ReactMount.useTouchEvents,
91 TopLevelCallbackCreator
92 );
src/core/ReactNativeComponent.js
+4 -4
@@ -22,7 +22,7 @@
22 var CSSPropertyOperations = require('CSSPropertyOperations');
23 var DOMPropertyOperations = require('DOMPropertyOperations');
24 var ReactComponent = require('ReactComponent');
25 -var ReactEvent = require('ReactEvent');
25 +var ReactEventEmitter = require('ReactEventEmitter');
26 var ReactMultiChild = require('ReactMultiChild');
27
28 var escapeTextForBrowser = require('escapeTextForBrowser');
@@ -32,8 +32,8 @@ var keyOf = require('keyOf');
32 var merge = require('merge');
33 var mixInto = require('mixInto');
34
35 -var putListener = ReactEvent.putListener;
36 -var registrationNames = ReactEvent.registrationNames;
35 +var putListener = ReactEventEmitter.putListener;
36 +var registrationNames = ReactEventEmitter.registrationNames;
37
38 // For quickly matching children type, to test if can be treated as content.
39 var CONTENT_TYPES = {'string': true, 'number': true};
@@ -317,7 +317,7 @@ ReactNativeComponent.Mixin = {
317 * @internal
318 */
319 unmountComponent: function() {
320 - ReactEvent.deleteAllListeners(this._rootNodeID);
320 + ReactEventEmitter.deleteAllListeners(this._rootNodeID);
321 ReactComponent.Mixin.unmountComponent.call(this);
322 this.unmountMultiChild();
323 }
src/core/ReactReconcileTransaction.js
+6 -6
@@ -21,7 +21,7 @@
21
22 var ExecutionEnvironment = require('ExecutionEnvironment');
23 var PooledClass = require('PooledClass');
24 -var ReactEvent = require('ReactEvent');
24 +var ReactEventEmitter = require('ReactEventEmitter');
25 var ReactInputSelection = require('ReactInputSelection');
26 var ReactOnDOMReady = require('ReactOnDOMReady');
27 var Transaction = require('Transaction');
@@ -50,21 +50,21 @@ var SELECTION_RESTORATION = {
50 */
51 var EVENT_SUPPRESSION = {
52 /**
53 - * @return {boolean} The enabled status of `ReactEvent` before the
53 + * @return {boolean} The enabled status of `ReactEventEmitter` before the
54 * reconciliation.
55 */
56 initialize: function() {
57 - var currentlyEnabled = ReactEvent.isEnabled();
58 - ReactEvent.setEnabled(false);
57 + var currentlyEnabled = ReactEventEmitter.isEnabled();
58 + ReactEventEmitter.setEnabled(false);
59 return currentlyEnabled;
60 },
61
62 /**
63 - * @param {boolean} previouslyEnabled The enabled status of `ReactEvent`
63 + * @param {boolean} previouslyEnabled Enabled status of `ReactEventEmitter`
64 * before the reconciliation occured. `close` restores the previous value.
65 */
66 close: function(previouslyEnabled) {
67 - ReactEvent.setEnabled(previouslyEnabled);
67 + ReactEventEmitter.setEnabled(previouslyEnabled);
68 }
69 };
70
src/core/__tests__/ReactEvent-test.js
+44 -44
@@ -22,7 +22,7 @@ require('mock-modules')
22 .dontMock('BrowserScroll')
23 .dontMock('CallbackRegistry')
24 .dontMock('EventPluginHub')
25 - .dontMock('ReactEvent')
25 + .dontMock('ReactEventEmitter')
26 .dontMock('ReactInstanceHandles')
27 .dontMock('EventPluginHub')
28 .dontMock('TapEventPlugin')
@@ -34,7 +34,7 @@ var keyOf = require('keyOf');
34 var mocks = require('mocks');
35
36 var EventPluginHub;
37 -var ReactEvent;
37 +var ReactEventEmitter;
38 var ReactEventTopLevelCallback;
39 var ReactTestUtils;
40 var TapEventPlugin;
@@ -58,12 +58,12 @@ var ON_TOUCH_TAP_KEY = keyOf({onTouchTap: null});
58
59
60 /**
61 - * Since `ReactEvent` is fairly well separated from the DOM, we can test almost
62 - * all of `ReactEvent` without ever rendering anything in the DOM. As long as we
63 - * provide IDs that follow `React's` conventional id namespace hierarchy.
64 - * The only reason why we create these DOM nodes, is so that when we feed them
65 - * into `ReactEvent` (through `ReactTestUtils`), the event handlers may receive
66 - * a DOM node to inspect.
61 + * Since `ReactEventEmitter` is fairly well separated from the DOM, we can test
62 + * almost all of `ReactEventEmitter` without ever rendering anything in the DOM.
63 + * As long as we provide IDs that follow `React's` conventional id namespace
64 + * hierarchy. The only reason why we create these DOM nodes, is so that when we
65 + * feed them into `ReactEventEmitter` (through `ReactTestUtils`), the event
66 + * handlers may receive a DOM node to inspect.
67 */
68 var CHILD = document.createElement('div');
69 var PARENT = document.createElement('div');
@@ -73,24 +73,24 @@ PARENT.id = '.reactRoot.[0].[0]';
73 GRANDPARENT.id = '.reactRoot.[0]';
74
75 function registerSimpleTestHandler() {
76 - ReactEvent.putListener(CHILD.id, ON_CLICK_KEY, LISTENER);
77 - var listener = ReactEvent.getListener(CHILD.id, ON_CLICK_KEY);
76 + ReactEventEmitter.putListener(CHILD.id, ON_CLICK_KEY, LISTENER);
77 + var listener = ReactEventEmitter.getListener(CHILD.id, ON_CLICK_KEY);
78 expect(listener).toEqual(LISTENER);
79 - return ReactEvent.getListener(CHILD.id, ON_CLICK_KEY);
79 + return ReactEventEmitter.getListener(CHILD.id, ON_CLICK_KEY);
80 }
81
82
83 -describe('ReactEvent', function() {
83 +describe('ReactEventEmitter', function() {
84 beforeEach(function() {
85 require('mock-modules').dumpCache();
86 EventPluginHub = require('EventPluginHub');
87 TapEventPlugin = require('TapEventPlugin');
88 - ReactEvent = require('ReactEvent');
88 + ReactEventEmitter = require('ReactEventEmitter');
89 ReactTestUtils = require('ReactTestUtils');
90 ReactEventTopLevelCallback = require('ReactEventTopLevelCallback');
91 idCallOrder = [];
92 tapMoveThreshold = TapEventPlugin.tapMoveThreshold;
93 - ReactEvent.ensureListening(false, ReactEventTopLevelCallback);
93 + ReactEventEmitter.ensureListening(false, ReactEventTopLevelCallback);
94 EventPluginHub.injection.injectEventPluginsByName({
95 TapEventPlugin: TapEventPlugin
96 });
@@ -98,20 +98,20 @@ describe('ReactEvent', function() {
98
99 it('should store a listener correctly', function() {
100 registerSimpleTestHandler();
101 - var listener = ReactEvent.getListener(CHILD.id, ON_CLICK_KEY);
101 + var listener = ReactEventEmitter.getListener(CHILD.id, ON_CLICK_KEY);
102 expect(listener).toBe(LISTENER);
103 });
104
105 it('should retrieve a listener correctly', function() {
106 registerSimpleTestHandler();
107 - var listener = ReactEvent.getListener(CHILD.id, ON_CLICK_KEY);
107 + var listener = ReactEventEmitter.getListener(CHILD.id, ON_CLICK_KEY);
108 expect(listener).toEqual(LISTENER);
109 });
110
111 it('should clear all handlers when asked to', function() {
112 registerSimpleTestHandler();
113 - ReactEvent.deleteAllListeners(CHILD.id);
114 - var listener = ReactEvent.getListener(CHILD.id, ON_CLICK_KEY);
113 + ReactEventEmitter.deleteAllListeners(CHILD.id);
114 + var listener = ReactEventEmitter.getListener(CHILD.id, ON_CLICK_KEY);
115 expect(listener).toBe(undefined);
116 });
117
@@ -121,28 +121,28 @@ describe('ReactEvent', function() {
121 expect(LISTENER.mock.calls.length).toBe(1);
122 });
123
124 - it('should not invoke handlers when ReactEvent is disabled', function() {
124 + it('should not invoke handlers if ReactEventEmitter is disabled', function() {
125 registerSimpleTestHandler();
126 - ReactEvent.setEnabled(false);
126 + ReactEventEmitter.setEnabled(false);
127 ReactTestUtils.Simulate.click(CHILD);
128 expect(LISTENER.mock.calls.length).toBe(0);
129 - ReactEvent.setEnabled(true);
129 + ReactEventEmitter.setEnabled(true);
130 ReactTestUtils.Simulate.click(CHILD);
131 expect(LISTENER.mock.calls.length).toBe(1);
132 });
133
134 it('should bubble simply', function() {
135 - ReactEvent.putListener(
135 + ReactEventEmitter.putListener(
136 CHILD.id,
137 ON_CLICK_KEY,
138 recordID.bind(null, CHILD.id)
139 );
140 - ReactEvent.putListener(
140 + ReactEventEmitter.putListener(
141 PARENT.id,
142 ON_CLICK_KEY,
143 recordID.bind(null, PARENT.id)
144 );
145 - ReactEvent.putListener(
145 + ReactEventEmitter.putListener(
146 GRANDPARENT.id,
147 ON_CLICK_KEY,
148 recordID.bind(null, GRANDPARENT.id)
@@ -155,17 +155,17 @@ describe('ReactEvent', function() {
155 });
156
157 it('should support stopPropagation()', function() {
158 - ReactEvent.putListener(
158 + ReactEventEmitter.putListener(
159 CHILD.id,
160 ON_CLICK_KEY,
161 recordID.bind(null, CHILD.id)
162 );
163 - ReactEvent.putListener(
163 + ReactEventEmitter.putListener(
164 PARENT.id,
165 ON_CLICK_KEY,
166 recordIDAndStopPropagation.bind(null, PARENT.id)
167 );
168 - ReactEvent.putListener(
168 + ReactEventEmitter.putListener(
169 GRANDPARENT.id,
170 ON_CLICK_KEY,
171 recordID.bind(null, GRANDPARENT.id)
@@ -177,17 +177,17 @@ describe('ReactEvent', function() {
177 });
178
179 it('should stop after first dispatch if stopPropagation', function() {
180 - ReactEvent.putListener(
180 + ReactEventEmitter.putListener(
181 CHILD.id,
182 ON_CLICK_KEY,
183 recordIDAndStopPropagation.bind(null, CHILD.id)
184 );
185 - ReactEvent.putListener(
185 + ReactEventEmitter.putListener(
186 PARENT.id,
187 ON_CLICK_KEY,
188 recordID.bind(null, PARENT.id)
189 );
190 - ReactEvent.putListener(
190 + ReactEventEmitter.putListener(
191 GRANDPARENT.id,
192 ON_CLICK_KEY,
193 recordID.bind(null, GRANDPARENT.id)
@@ -198,17 +198,17 @@ describe('ReactEvent', function() {
198 });
199
200 it('should stopPropagation if false is returned', function() {
201 - ReactEvent.putListener(
201 + ReactEventEmitter.putListener(
202 CHILD.id,
203 ON_CLICK_KEY,
204 recordIDAndReturnFalse.bind(null, CHILD.id)
205 );
206 - ReactEvent.putListener(
206 + ReactEventEmitter.putListener(
207 PARENT.id,
208 ON_CLICK_KEY,
209 recordID.bind(null, PARENT.id)
210 );
211 - ReactEvent.putListener(
211 + ReactEventEmitter.putListener(
212 GRANDPARENT.id,
213 ON_CLICK_KEY,
214 recordID.bind(null, GRANDPARENT.id)
@@ -230,10 +230,10 @@ describe('ReactEvent', function() {
230 it('should invoke handlers that were removed while bubbling', function() {
231 var handleParentClick = mocks.getMockFunction();
232 var handleChildClick = function(abstractEvent) {
233 - ReactEvent.deleteAllListeners(PARENT.id);
233 + ReactEventEmitter.deleteAllListeners(PARENT.id);
234 };
235 - ReactEvent.putListener(CHILD.id, ON_CLICK_KEY, handleChildClick);
236 - ReactEvent.putListener(PARENT.id, ON_CLICK_KEY, handleParentClick);
235 + ReactEventEmitter.putListener(CHILD.id, ON_CLICK_KEY, handleChildClick);
236 + ReactEventEmitter.putListener(PARENT.id, ON_CLICK_KEY, handleParentClick);
237 ReactTestUtils.Simulate.click(CHILD);
238 expect(handleParentClick.mock.calls.length).toBe(1);
239 });
@@ -241,15 +241,15 @@ describe('ReactEvent', function() {
241 it('should not invoke newly inserted handlers while bubbling', function() {
242 var handleParentClick = mocks.getMockFunction();
243 var handleChildClick = function(abstractEvent) {
244 - ReactEvent.putListener(PARENT.id, ON_CLICK_KEY, handleParentClick);
244 + ReactEventEmitter.putListener(PARENT.id, ON_CLICK_KEY, handleParentClick);
245 };
246 - ReactEvent.putListener(CHILD.id, ON_CLICK_KEY, handleChildClick);
246 + ReactEventEmitter.putListener(CHILD.id, ON_CLICK_KEY, handleChildClick);
247 ReactTestUtils.Simulate.click(CHILD);
248 expect(handleParentClick.mock.calls.length).toBe(0);
249 });
250
251 it('should infer onTouchTap from a touchStart/End', function() {
252 - ReactEvent.putListener(
252 + ReactEventEmitter.putListener(
253 CHILD.id,
254 ON_TOUCH_TAP_KEY,
255 recordID.bind(null, CHILD.id)
@@ -267,7 +267,7 @@ describe('ReactEvent', function() {
267 });
268
269 it('should infer onTouchTap from when dragging below threshold', function() {
270 - ReactEvent.putListener(
270 + ReactEventEmitter.putListener(
271 CHILD.id,
272 ON_TOUCH_TAP_KEY,
273 recordID.bind(null, CHILD.id)
@@ -285,7 +285,7 @@ describe('ReactEvent', function() {
285 });
286
287 it('should not onTouchTap from when dragging beyond threshold', function() {
288 - ReactEvent.putListener(
288 + ReactEventEmitter.putListener(
289 CHILD.id,
290 ON_TOUCH_TAP_KEY,
291 recordID.bind(null, CHILD.id)
@@ -303,17 +303,17 @@ describe('ReactEvent', function() {
303
304
305 it('should bubble onTouchTap', function() {
306 - ReactEvent.putListener(
306 + ReactEventEmitter.putListener(
307 CHILD.id,
308 ON_TOUCH_TAP_KEY,
309 recordID.bind(null, CHILD.id)
310 );
311 - ReactEvent.putListener(
311 + ReactEventEmitter.putListener(
312 PARENT.id,
313 ON_TOUCH_TAP_KEY,
314 recordID.bind(null, PARENT.id)
315 );
316 - ReactEvent.putListener(
316 + ReactEventEmitter.putListener(
317 GRANDPARENT.id,
318 ON_TOUCH_TAP_KEY,
319 recordID.bind(null, GRANDPARENT.id)
src/core/__tests__/ReactNativeComponent-test.js
+7 -3
@@ -242,7 +242,7 @@ describe('ReactNativeComponent', function() {
242 describe('unmountComponent', function() {
243 it("should clean up listeners", function() {
244 var React = require('React');
245 - var ReactEvent = require('ReactEvent');
245 + var ReactEventEmitter = require('ReactEventEmitter');
246
247 var container = document.createElement('div');
248 document.documentElement.appendChild(container);
@@ -253,11 +253,15 @@ describe('ReactNativeComponent', function() {
253
254 var rootNode = instance.getDOMNode();
255 var rootNodeID = rootNode.id;
256 - expect(ReactEvent.getListener(rootNodeID, 'onClick')).toBe(callback);
256 + expect(
257 + ReactEventEmitter.getListener(rootNodeID, 'onClick')
258 + ).toBe(callback);
259
260 React.unmountAndReleaseReactRootNode(container);
261
260 - expect(ReactEvent.getListener(rootNodeID, 'onClick')).toBe(undefined);
262 + expect(
263 + ReactEventEmitter.getListener(rootNodeID, 'onClick')
264 + ).toBe(undefined);
265 });
266 });
267
src/eventPlugins/__tests__/AnalyticsEventPlugin-test.js
+3 -3
@@ -23,7 +23,7 @@ require('mock-modules')
23 .dontMock('AnalyticsEventPluginFactory')
24 .dontMock('EventPluginHub')
25 .dontMock('React')
26 - .dontMock('ReactEvent')
26 + .dontMock('ReactEventEmitter')
27 .dontMock('ReactEventTopLevelCallback')
28 .dontMock('ReactInstanceHandles')
29 .dontMock('ReactTestUtils');
@@ -32,11 +32,11 @@ var AnalyticsEventPluginFactory = require('AnalyticsEventPluginFactory');
32 var EventPluginHub = require('EventPluginHub');
33 var mocks = require('mocks');
34 var React = require('React');
35 -var ReactEvent = require('ReactEvent');
35 +var ReactEventEmitter = require('ReactEventEmitter');
36 var ReactEventTopLevelCallback = require('ReactEventTopLevelCallback');
37 var ReactTestUtils = require('ReactTestUtils');
38
39 -ReactEvent.ensureListening(false, ReactEventTopLevelCallback);
39 +ReactEventEmitter.ensureListening(false, ReactEventTopLevelCallback);
40
41 describe('AnalyticsEventPlugin', function() {
42 it('should count events correctly', function() {
src/test/ReactTestUtils.js
+7 -3
@@ -19,7 +19,7 @@
19 var EventConstants = require('EventConstants');
20 var React = require('React');
21 var ReactComponent = require('ReactComponent');
22 -var ReactEvent = require('ReactEvent');
22 +var ReactEventEmitter = require('ReactEventEmitter');
23 var ReactTextComponent = require('ReactTextComponent');
24
25 var ge = require('ge');
@@ -191,7 +191,9 @@ var ReactTestUtils = {
191 */
192 simulateEventOnNode: function(topLevelType, node, fakeNativeEvent) {
193 var virtualHandler =
194 - ReactEvent.TopLevelCallbackCreator.createTopLevelCallback(topLevelType);
194 + ReactEventEmitter.TopLevelCallbackCreator.createTopLevelCallback(
195 + topLevelType
196 + );
197 fakeNativeEvent.target = node;
198 virtualHandler(fakeNativeEvent);
199 },
@@ -209,7 +211,9 @@ var ReactTestUtils = {
211 throw new Error('Simulating event on non-rendered component');
212 }
213 var virtualHandler =
212 - ReactEvent.TopLevelCallbackCreator.createTopLevelCallback(topLevelType);
214 + ReactEventEmitter.TopLevelCallbackCreator.createTopLevelCallback(
215 + topLevelType
216 + );
217 var node = ge(reactRootID);
218 fakeNativeEvent.target = node;
219 /* jsdom is returning nodes without id's - fixing that issue here. */