Rename ReactEventListener to ReactDOMEventListener (#9640)
`ReactEventListener` is a DOM-specific module although the name suggests otherwise. This change renames the module to the more specific `ReactDOMEventListener`.
Philipp Spieß committed
May 10, 2017 at 01:17 UTC
c0e32a1b03b99de1399f5abf8b7cb402e88d0609
6 files changed
+56
-55
scripts/fiber/tests-passing.txt
+8
-8
@@ -946,6 +946,14 @@ src/renderers/dom/shared/__tests__/ReactDOMComponentTree-test.js
946
* finds nodes for instances
947
* finds instances for nodes
948
949
+src/renderers/dom/shared/__tests__/ReactDOMEventListener-test.js
950
+* should dispatch events from outside React tree
951
+* should propagate events one level down
952
+* should propagate events two levels down
953
+* should not get confused by disappearing elements
954
+* should batch between handlers from different roots
955
+* should not fire duplicate events for a React DOM tree
956
+
957
src/renderers/dom/shared/__tests__/ReactDOMInvalidARIAHook-test.js
958
* should allow valid aria-* props
959
* should warn for one invalid aria-* prop
@@ -1230,14 +1238,6 @@ src/renderers/dom/shared/__tests__/ReactEventIndependence-test.js
1238
* does not crash with other react outside
1239
* does not when event fired on unmounted tree
1240
1233
-src/renderers/dom/shared/__tests__/ReactEventListener-test.js
1234
-* should dispatch events from outside React tree
1235
-* should propagate events one level down
1236
-* should propagate events two levels down
1237
-* should not get confused by disappearing elements
1238
-* should batch between handlers from different roots
1239
-* should not fire duplicate events for a React DOM tree
1240
-
1241
src/renderers/dom/shared/__tests__/ReactMount-test.js
1242
* throws when given a non-node
1243
* returns false on non-React containers
src/renderers/dom/shared/ReactBrowserEventEmitter.js
+23
-22
@@ -22,8 +22,9 @@ var {topLevelTypes} = require('BrowserEventConstants');
22
*
23
* - Top-level delegation is used to trap most native browser events. This
24
* may only occur in the main thread and is the responsibility of
25
- * ReactEventListener, which is injected and can therefore support pluggable
26
- * event sources. This is the only work that occurs in the main thread.
25
+ * ReactDOMEventListener, which is injected and can therefore support
26
+ * pluggable event sources. This is the only work that occurs in the main
27
+ * thread.
28
*
29
* - We normalize and de-duplicate events to account for browser quirks. This
30
* may be done in the worker thread.
@@ -94,17 +95,17 @@ var ReactBrowserEventEmitter = Object.assign({}, ReactEventEmitterMixin, {
95
/**
96
* Injectable event backend
97
*/
97
- ReactEventListener: null,
98
+ ReactDOMEventListener: null,
99
100
injection: {
101
/**
101
- * @param {object} ReactEventListener
102
+ * @param {object} ReactDOMEventListener
103
*/
103
- injectReactEventListener: function(ReactEventListener) {
104
- ReactEventListener.setHandleTopLevel(
104
+ injectReactDOMEventListener: function(ReactDOMEventListener) {
105
+ ReactDOMEventListener.setHandleTopLevel(
106
ReactBrowserEventEmitter.handleTopLevel,
107
);
107
- ReactBrowserEventEmitter.ReactEventListener = ReactEventListener;
108
+ ReactBrowserEventEmitter.ReactDOMEventListener = ReactDOMEventListener;
109
},
110
},
111
@@ -114,8 +115,8 @@ var ReactBrowserEventEmitter = Object.assign({}, ReactEventEmitterMixin, {
115
* @param {boolean} enabled True if callbacks should be enabled.
116
*/
117
setEnabled: function(enabled) {
117
- if (ReactBrowserEventEmitter.ReactEventListener) {
118
- ReactBrowserEventEmitter.ReactEventListener.setEnabled(enabled);
118
+ if (ReactBrowserEventEmitter.ReactDOMEventListener) {
119
+ ReactBrowserEventEmitter.ReactDOMEventListener.setEnabled(enabled);
120
}
121
},
122
@@ -123,8 +124,8 @@ var ReactBrowserEventEmitter = Object.assign({}, ReactEventEmitterMixin, {
124
* @return {boolean} True if callbacks are enabled.
125
*/
126
isEnabled: function() {
126
- return !!(ReactBrowserEventEmitter.ReactEventListener &&
127
- ReactBrowserEventEmitter.ReactEventListener.isEnabled());
127
+ return !!(ReactBrowserEventEmitter.ReactDOMEventListener &&
128
+ ReactBrowserEventEmitter.ReactDOMEventListener.isEnabled());
129
},
130
131
/**
@@ -161,13 +162,13 @@ var ReactBrowserEventEmitter = Object.assign({}, ReactEventEmitterMixin, {
162
) {
163
if (dependency === 'topWheel') {
164
if (isEventSupported('wheel')) {
164
- ReactBrowserEventEmitter.ReactEventListener.trapBubbledEvent(
165
+ ReactBrowserEventEmitter.ReactDOMEventListener.trapBubbledEvent(
166
'topWheel',
167
'wheel',
168
mountAt,
169
);
170
} else if (isEventSupported('mousewheel')) {
170
- ReactBrowserEventEmitter.ReactEventListener.trapBubbledEvent(
171
+ ReactBrowserEventEmitter.ReactDOMEventListener.trapBubbledEvent(
172
'topWheel',
173
'mousewheel',
174
mountAt,
@@ -175,25 +176,25 @@ var ReactBrowserEventEmitter = Object.assign({}, ReactEventEmitterMixin, {
176
} else {
177
// Firefox needs to capture a different mouse scroll event.
178
// @see http://www.quirksmode.org/dom/events/tests/scroll.html
178
- ReactBrowserEventEmitter.ReactEventListener.trapBubbledEvent(
179
+ ReactBrowserEventEmitter.ReactDOMEventListener.trapBubbledEvent(
180
'topWheel',
181
'DOMMouseScroll',
182
mountAt,
183
);
184
}
185
} else if (dependency === 'topScroll') {
185
- ReactBrowserEventEmitter.ReactEventListener.trapCapturedEvent(
186
+ ReactBrowserEventEmitter.ReactDOMEventListener.trapCapturedEvent(
187
'topScroll',
188
'scroll',
189
mountAt,
190
);
191
} else if (dependency === 'topFocus' || dependency === 'topBlur') {
191
- ReactBrowserEventEmitter.ReactEventListener.trapCapturedEvent(
192
+ ReactBrowserEventEmitter.ReactDOMEventListener.trapCapturedEvent(
193
'topFocus',
194
'focus',
195
mountAt,
196
);
196
- ReactBrowserEventEmitter.ReactEventListener.trapCapturedEvent(
197
+ ReactBrowserEventEmitter.ReactDOMEventListener.trapCapturedEvent(
198
'topBlur',
199
'blur',
200
mountAt,
@@ -204,7 +205,7 @@ var ReactBrowserEventEmitter = Object.assign({}, ReactEventEmitterMixin, {
205
isListening.topFocus = true;
206
} else if (dependency === 'topCancel') {
207
if (isEventSupported('cancel', true)) {
207
- ReactBrowserEventEmitter.ReactEventListener.trapCapturedEvent(
208
+ ReactBrowserEventEmitter.ReactDOMEventListener.trapCapturedEvent(
209
'topCancel',
210
'cancel',
211
mountAt,
@@ -213,7 +214,7 @@ var ReactBrowserEventEmitter = Object.assign({}, ReactEventEmitterMixin, {
214
isListening.topCancel = true;
215
} else if (dependency === 'topClose') {
216
if (isEventSupported('close', true)) {
216
- ReactBrowserEventEmitter.ReactEventListener.trapCapturedEvent(
217
+ ReactBrowserEventEmitter.ReactDOMEventListener.trapCapturedEvent(
218
'topClose',
219
'close',
220
mountAt,
@@ -221,7 +222,7 @@ var ReactBrowserEventEmitter = Object.assign({}, ReactEventEmitterMixin, {
222
}
223
isListening.topClose = true;
224
} else if (topLevelTypes.hasOwnProperty(dependency)) {
224
- ReactBrowserEventEmitter.ReactEventListener.trapBubbledEvent(
225
+ ReactBrowserEventEmitter.ReactDOMEventListener.trapBubbledEvent(
226
dependency,
227
topLevelTypes[dependency],
228
mountAt,
@@ -249,7 +250,7 @@ var ReactBrowserEventEmitter = Object.assign({}, ReactEventEmitterMixin, {
250
},
251
252
trapBubbledEvent: function(topLevelType, handlerBaseName, handle) {
252
- return ReactBrowserEventEmitter.ReactEventListener.trapBubbledEvent(
253
+ return ReactBrowserEventEmitter.ReactDOMEventListener.trapBubbledEvent(
254
topLevelType,
255
handlerBaseName,
256
handle,
@@ -257,7 +258,7 @@ var ReactBrowserEventEmitter = Object.assign({}, ReactEventEmitterMixin, {
258
},
259
260
trapCapturedEvent: function(topLevelType, handlerBaseName, handle) {
260
- return ReactBrowserEventEmitter.ReactEventListener.trapCapturedEvent(
261
+ return ReactBrowserEventEmitter.ReactDOMEventListener.trapCapturedEvent(
262
topLevelType,
263
handlerBaseName,
264
handle,
src/renderers/dom/shared/ReactDOMEventListener.js
renamed
+10
-10
@@ -6,7 +6,7 @@
6
* LICENSE file in the root directory of this source tree. An additional grant
7
* of patent rights can be found in the PATENTS file in the same directory.
8
*
9
- * @providesModule ReactEventListener
9
+ * @providesModule ReactDOMEventListener
10
*/
11
12
'use strict';
@@ -92,7 +92,7 @@ function handleTopLevelImpl(bookKeeping) {
92
93
for (var i = 0; i < bookKeeping.ancestors.length; i++) {
94
targetInst = bookKeeping.ancestors[i];
95
- ReactEventListener._handleTopLevel(
95
+ ReactDOMEventListener._handleTopLevel(
96
bookKeeping.topLevelType,
97
targetInst,
98
bookKeeping.nativeEvent,
@@ -106,20 +106,20 @@ function scrollValueMonitor(cb) {
106
cb(scrollPosition);
107
}
108
109
-var ReactEventListener = {
109
+var ReactDOMEventListener = {
110
_enabled: true,
111
_handleTopLevel: null,
112
113
setHandleTopLevel: function(handleTopLevel) {
114
- ReactEventListener._handleTopLevel = handleTopLevel;
114
+ ReactDOMEventListener._handleTopLevel = handleTopLevel;
115
},
116
117
setEnabled: function(enabled) {
118
- ReactEventListener._enabled = !!enabled;
118
+ ReactDOMEventListener._enabled = !!enabled;
119
},
120
121
isEnabled: function() {
122
- return ReactEventListener._enabled;
122
+ return ReactDOMEventListener._enabled;
123
},
124
125
/**
@@ -139,7 +139,7 @@ var ReactEventListener = {
139
return EventListener.listen(
140
element,
141
handlerBaseName,
142
- ReactEventListener.dispatchEvent.bind(null, topLevelType),
142
+ ReactDOMEventListener.dispatchEvent.bind(null, topLevelType),
143
);
144
},
145
@@ -160,7 +160,7 @@ var ReactEventListener = {
160
return EventListener.capture(
161
element,
162
handlerBaseName,
163
- ReactEventListener.dispatchEvent.bind(null, topLevelType),
163
+ ReactDOMEventListener.dispatchEvent.bind(null, topLevelType),
164
);
165
},
166
@@ -170,7 +170,7 @@ var ReactEventListener = {
170
},
171
172
dispatchEvent: function(topLevelType, nativeEvent) {
173
- if (!ReactEventListener._enabled) {
173
+ if (!ReactDOMEventListener._enabled) {
174
return;
175
}
176
@@ -195,4 +195,4 @@ var ReactEventListener = {
195
},
196
};
197
198
-module.exports = ReactEventListener;
198
+module.exports = ReactDOMEventListener;
src/renderers/dom/shared/ReactDOMInjection.js
+3
-3
@@ -22,7 +22,7 @@ var EventPluginUtils = require('EventPluginUtils');
22
var HTMLDOMPropertyConfig = require('HTMLDOMPropertyConfig');
23
var ReactBrowserEventEmitter = require('ReactBrowserEventEmitter');
24
var ReactDOMComponentTree = require('ReactDOMComponentTree');
25
-var ReactEventListener = require('ReactEventListener');
25
+var ReactDOMEventListener = require('ReactDOMEventListener');
26
var SVGDOMPropertyConfig = require('SVGDOMPropertyConfig');
27
var SelectEventPlugin = require('SelectEventPlugin');
28
var SimpleEventPlugin = require('SimpleEventPlugin');
@@ -38,8 +38,8 @@ function inject() {
38
}
39
alreadyInjected = true;
40
41
- ReactBrowserEventEmitter.injection.injectReactEventListener(
42
- ReactEventListener,
41
+ ReactBrowserEventEmitter.injection.injectReactDOMEventListener(
42
+ ReactDOMEventListener,
43
);
44
45
/**
src/renderers/dom/shared/__tests__/ReactDOMEventListener-test.js
renamed
+11
-11
@@ -13,11 +13,11 @@
13
14
var EVENT_TARGET_PARAM = 1;
15
16
-describe('ReactEventListener', () => {
16
+describe('ReactDOMEventListener', () => {
17
var React;
18
var ReactDOM;
19
var ReactDOMComponentTree;
20
- var ReactEventListener;
20
+ var ReactDOMEventListener;
21
var ReactTestUtils;
22
var handleTopLevel;
23
@@ -26,18 +26,18 @@ describe('ReactEventListener', () => {
26
React = require('react');
27
ReactDOM = require('react-dom');
28
ReactDOMComponentTree = require('ReactDOMComponentTree');
29
- ReactEventListener = require('ReactEventListener');
29
+ ReactDOMEventListener = require('ReactDOMEventListener');
30
ReactTestUtils = require('ReactTestUtils');
31
32
handleTopLevel = jest.fn();
33
- ReactEventListener._handleTopLevel = handleTopLevel;
33
+ ReactDOMEventListener._handleTopLevel = handleTopLevel;
34
});
35
36
it('should dispatch events from outside React tree', () => {
37
var otherNode = document.createElement('h1');
38
var component = ReactDOM.render(<div />, document.createElement('div'));
39
expect(handleTopLevel.mock.calls.length).toBe(0);
40
- ReactEventListener.dispatchEvent('topMouseOut', {
40
+ ReactDOMEventListener.dispatchEvent('topMouseOut', {
41
type: 'mouseout',
42
fromElement: otherNode,
43
target: otherNode,
@@ -60,7 +60,7 @@ describe('ReactEventListener', () => {
60
parentControl = ReactDOM.render(parentControl, parentContainer);
61
ReactDOM.findDOMNode(parentControl).appendChild(childContainer);
62
63
- var callback = ReactEventListener.dispatchEvent.bind(null, 'test');
63
+ var callback = ReactDOMEventListener.dispatchEvent.bind(null, 'test');
64
callback({
65
target: ReactDOM.findDOMNode(childControl),
66
});
@@ -91,7 +91,7 @@ describe('ReactEventListener', () => {
91
ReactDOM.findDOMNode(parentControl).appendChild(childContainer);
92
ReactDOM.findDOMNode(grandParentControl).appendChild(parentContainer);
93
94
- var callback = ReactEventListener.dispatchEvent.bind(null, 'test');
94
+ var callback = ReactDOMEventListener.dispatchEvent.bind(null, 'test');
95
callback({
96
target: ReactDOM.findDOMNode(childControl),
97
});
@@ -134,7 +134,7 @@ describe('ReactEventListener', () => {
134
}
135
});
136
137
- var callback = ReactEventListener.dispatchEvent.bind(null, 'test');
137
+ var callback = ReactDOMEventListener.dispatchEvent.bind(null, 'test');
138
callback({
139
target: childNode,
140
});
@@ -173,8 +173,8 @@ describe('ReactEventListener', () => {
173
expect(childNode.textContent).toBe('Child');
174
});
175
176
- var callback = ReactEventListener.dispatchEvent.bind(
177
- ReactEventListener,
176
+ var callback = ReactDOMEventListener.dispatchEvent.bind(
177
+ ReactDOMEventListener,
178
'test',
179
);
180
callback({
@@ -201,7 +201,7 @@ describe('ReactEventListener', () => {
201
202
var instance = ReactTestUtils.renderIntoDocument(<Wrapper />);
203
204
- var callback = ReactEventListener.dispatchEvent.bind(null, 'test');
204
+ var callback = ReactDOMEventListener.dispatchEvent.bind(null, 'test');
205
callback({
206
target: ReactDOM.findDOMNode(instance.getInner()),
207
});
src/renderers/dom/test/ReactTestUtils.js
+1
-1
@@ -395,7 +395,7 @@ var ReactTestUtils = {
395
*/
396
simulateNativeEventOnNode: function(topLevelType, node, fakeNativeEvent) {
397
fakeNativeEvent.target = node;
398
- ReactBrowserEventEmitter.ReactEventListener.dispatchEvent(
398
+ ReactBrowserEventEmitter.ReactDOMEventListener.dispatchEvent(
399
topLevelType,
400
fakeNativeEvent,
401
);