Remove forwarding from tree traversal in EventPluginUtils
This is unnecessary forwarding since this is no longer injectable. However, I'd like to use the injectable getInstanceFromNode from TreeTraversal so this avoids a cyclic dependency.
Sebastian Markbage committed
Dec 2, 2016 at 19:52 UTC
2336b8183d7b2ef6edba34bb2472cf5e3aa90a21
3 files changed
+8
-23
src/renderers/shared/shared/event/EventPluginUtils.js
-16
@@ -11,7 +11,6 @@
11
12
'use strict';
13
14
-var ReactTreeTraversal = require('ReactTreeTraversal');
14
var ReactErrorUtils = require('ReactErrorUtils');
15
16
var invariant = require('invariant');
@@ -226,21 +225,6 @@ var EventPluginUtils = {
225
getNodeFromInstance: function(node) {
226
return ComponentTree.getNodeFromInstance(node);
227
},
229
- isAncestor: function(a, b) {
230
- return ReactTreeTraversal.isAncestor(a, b);
231
- },
232
- getLowestCommonAncestor: function(a, b) {
233
- return ReactTreeTraversal.getLowestCommonAncestor(a, b);
234
- },
235
- getParentInstance: function(inst) {
236
- return ReactTreeTraversal.getParentInstance(inst);
237
- },
238
- traverseTwoPhase: function(target, fn, arg) {
239
- return ReactTreeTraversal.traverseTwoPhase(target, fn, arg);
240
- },
241
- traverseEnterLeave: function(from, to, fn, argFrom, argTo) {
242
- return ReactTreeTraversal.traverseEnterLeave(from, to, fn, argFrom, argTo);
243
- },
228
229
injection: injection,
230
};
src/renderers/shared/shared/event/EventPropagators.js
+5
-5
@@ -12,7 +12,7 @@
12
'use strict';
13
14
var EventPluginHub = require('EventPluginHub');
15
-var EventPluginUtils = require('EventPluginUtils');
15
+var ReactTreeTraversal = require('ReactTreeTraversal');
16
17
var accumulateInto = require('accumulateInto');
18
var forEachAccumulated = require('forEachAccumulated');
@@ -62,7 +62,7 @@ function accumulateDirectionalDispatches(inst, phase, event) {
62
*/
63
function accumulateTwoPhaseDispatchesSingle(event) {
64
if (event && event.dispatchConfig.phasedRegistrationNames) {
65
- EventPluginUtils.traverseTwoPhase(
65
+ ReactTreeTraversal.traverseTwoPhase(
66
event._targetInst,
67
accumulateDirectionalDispatches,
68
event
@@ -77,8 +77,8 @@ function accumulateTwoPhaseDispatchesSingleSkipTarget(event) {
77
if (event && event.dispatchConfig.phasedRegistrationNames) {
78
var targetInst = event._targetInst;
79
var parentInst =
80
- targetInst ? EventPluginUtils.getParentInstance(targetInst) : null;
81
- EventPluginUtils.traverseTwoPhase(
80
+ targetInst ? ReactTreeTraversal.getParentInstance(targetInst) : null;
81
+ ReactTreeTraversal.traverseTwoPhase(
82
parentInst,
83
accumulateDirectionalDispatches,
84
event
@@ -124,7 +124,7 @@ function accumulateTwoPhaseDispatchesSkipTarget(events) {
124
}
125
126
function accumulateEnterLeaveDispatches(leave, enter, from, to) {
127
- EventPluginUtils.traverseEnterLeave(
127
+ ReactTreeTraversal.traverseEnterLeave(
128
from,
129
to,
130
accumulateDispatches,
src/renderers/shared/shared/event/eventPlugins/ResponderEventPlugin.js
+3
-2
@@ -13,6 +13,7 @@
13
14
var EventPluginUtils = require('EventPluginUtils');
15
var EventPropagators = require('EventPropagators');
16
+var ReactTreeTraversal = require('ReactTreeTraversal');
17
var ResponderSyntheticEvent = require('ResponderSyntheticEvent');
18
var ResponderTouchHistoryStore = require('ResponderTouchHistoryStore');
19
@@ -331,7 +332,7 @@ function setResponderAndExtractTransfer(
332
// TODO: stop one short of the current responder.
333
var bubbleShouldSetFrom = !responderInst ?
334
targetInst :
334
- EventPluginUtils.getLowestCommonAncestor(responderInst, targetInst);
335
+ ReactTreeTraversal.getLowestCommonAncestor(responderInst, targetInst);
336
337
// When capturing/bubbling the "shouldSet" event, we want to skip the target
338
// (deepest ID) if it happens to be the current responder. The reasoning:
@@ -454,7 +455,7 @@ function noResponderTouches(nativeEvent) {
455
if (target !== null && target !== undefined && target !== 0) {
456
// Is the original touch location inside of the current responder?
457
var targetInst = EventPluginUtils.getInstanceFromNode(target);
457
- if (EventPluginUtils.isAncestor(responderInst, targetInst)) {
458
+ if (ReactTreeTraversal.isAncestor(responderInst, targetInst)) {
459
return false;
460
}
461
}