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.
This commit is contained in:
Sebastian Markbage committed 2016-12-02 19:52:56 -08:00
1 parent 910044a41d
commit 2336b8183d
3 files changed
+8 -23

No files matched your search

@@ -11,7 +11,6 @@
'use strict';
var ReactTreeTraversal = require('ReactTreeTraversal');
var ReactErrorUtils = require('ReactErrorUtils');
var invariant = require('invariant');
@@ -226,21 +225,6 @@ var EventPluginUtils = {
getNodeFromInstance: function(node) {
return ComponentTree.getNodeFromInstance(node);
},
isAncestor: function(a, b) {
return ReactTreeTraversal.isAncestor(a, b);
},
getLowestCommonAncestor: function(a, b) {
return ReactTreeTraversal.getLowestCommonAncestor(a, b);
},
getParentInstance: function(inst) {
return ReactTreeTraversal.getParentInstance(inst);
},
traverseTwoPhase: function(target, fn, arg) {
return ReactTreeTraversal.traverseTwoPhase(target, fn, arg);
},
traverseEnterLeave: function(from, to, fn, argFrom, argTo) {
return ReactTreeTraversal.traverseEnterLeave(from, to, fn, argFrom, argTo);
},
injection: injection,
};
@@ -12,7 +12,7 @@
'use strict';
var EventPluginHub = require('EventPluginHub');
var EventPluginUtils = require('EventPluginUtils');
var ReactTreeTraversal = require('ReactTreeTraversal');
var accumulateInto = require('accumulateInto');
var forEachAccumulated = require('forEachAccumulated');
@@ -62,7 +62,7 @@ function accumulateDirectionalDispatches(inst, phase, event) {
*/
function accumulateTwoPhaseDispatchesSingle(event) {
if (event && event.dispatchConfig.phasedRegistrationNames) {
EventPluginUtils.traverseTwoPhase(
ReactTreeTraversal.traverseTwoPhase(
event._targetInst,
accumulateDirectionalDispatches,
event
@@ -77,8 +77,8 @@ function accumulateTwoPhaseDispatchesSingleSkipTarget(event) {
if (event && event.dispatchConfig.phasedRegistrationNames) {
var targetInst = event._targetInst;
var parentInst =
targetInst ? EventPluginUtils.getParentInstance(targetInst) : null;
EventPluginUtils.traverseTwoPhase(
targetInst ? ReactTreeTraversal.getParentInstance(targetInst) : null;
ReactTreeTraversal.traverseTwoPhase(
parentInst,
accumulateDirectionalDispatches,
event
@@ -124,7 +124,7 @@ function accumulateTwoPhaseDispatchesSkipTarget(events) {
}
function accumulateEnterLeaveDispatches(leave, enter, from, to) {
EventPluginUtils.traverseEnterLeave(
ReactTreeTraversal.traverseEnterLeave(
from,
to,
accumulateDispatches,
@@ -13,6 +13,7 @@
var EventPluginUtils = require('EventPluginUtils');
var EventPropagators = require('EventPropagators');
var ReactTreeTraversal = require('ReactTreeTraversal');
var ResponderSyntheticEvent = require('ResponderSyntheticEvent');
var ResponderTouchHistoryStore = require('ResponderTouchHistoryStore');
@@ -331,7 +332,7 @@ function setResponderAndExtractTransfer(
// TODO: stop one short of the current responder.
var bubbleShouldSetFrom = !responderInst ?
targetInst :
EventPluginUtils.getLowestCommonAncestor(responderInst, targetInst);
ReactTreeTraversal.getLowestCommonAncestor(responderInst, targetInst);
// When capturing/bubbling the "shouldSet" event, we want to skip the target
// (deepest ID) if it happens to be the current responder. The reasoning:
@@ -454,7 +455,7 @@ function noResponderTouches(nativeEvent) {
if (target !== null && target !== undefined && target !== 0) {
// Is the original touch location inside of the current responder?
var targetInst = EventPluginUtils.getInstanceFromNode(target);
if (EventPluginUtils.isAncestor(responderInst, targetInst)) {
if (ReactTreeTraversal.isAncestor(responderInst, targetInst)) {
return false;
}
}