diff --git a/src/renderers/dom/client/ReactDOMComponentTree.js b/src/renderers/dom/client/ReactDOMComponentTree.js
index a2d0339a2e..dfd128ac2e 100644
--- a/src/renderers/dom/client/ReactDOMComponentTree.js
+++ b/src/renderers/dom/client/ReactDOMComponentTree.js
@@ -148,6 +148,13 @@ function getInstanceFromNode(node) {
* DOM node.
*/
function getNodeFromInstance(inst) {
+ // Without this first invariant, passing a non-DOM-component triggers the next
+ // invariant for a missing parent, which is super confusing.
+ invariant(
+ inst._nativeNode !== undefined,
+ 'getNodeFromInstance: Invalid argument.'
+ );
+
if (inst._nativeNode) {
return inst._nativeNode;
}
diff --git a/src/renderers/dom/client/ReactDOMTreeTraversal.js b/src/renderers/dom/client/ReactDOMTreeTraversal.js
new file mode 100644
index 0000000000..40025f2f26
--- /dev/null
+++ b/src/renderers/dom/client/ReactDOMTreeTraversal.js
@@ -0,0 +1,83 @@
+/**
+ * Copyright 2015, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule ReactDOMTreeTraversal
+ */
+
+'use strict';
+
+var invariant = require('invariant');
+
+/**
+ * Return the lowest common ancestor of A and B, or null if they are in
+ * different trees.
+ */
+function getLowestCommonAncestor(instA, instB) {
+ invariant('_nativeNode' in instA, 'getNodeFromInstance: Invalid argument.');
+ invariant('_nativeNode' in instB, 'getNodeFromInstance: Invalid argument.');
+
+ var depthA = 0;
+ for (var tempA = instA; tempA; tempA = tempA._nativeParent) {
+ depthA++;
+ }
+ var depthB = 0;
+ for (var tempB = instB; tempB; tempB = tempB._nativeParent) {
+ depthB++;
+ }
+
+ // If A is deeper, crawl up.
+ while (depthA - depthB > 0) {
+ instA = instA._nativeParent;
+ depthA--;
+ }
+
+ // If B is deeper, crawl up.
+ while (depthB - depthA > 0) {
+ instB = instB._nativeParent;
+ depthB--;
+ }
+
+ // Walk in lockstep until we find a match.
+ var depth = depthA;
+ while (depth--) {
+ if (instA === instB) {
+ return instA;
+ }
+ instA = instA._nativeParent;
+ instB = instB._nativeParent;
+ }
+ return null;
+}
+
+/**
+ * Return if A is an ancestor of B.
+ */
+function isAncestor(instA, instB) {
+ invariant('_nativeNode' in instA, 'isAncestor: Invalid argument.');
+ invariant('_nativeNode' in instB, 'isAncestor: Invalid argument.');
+
+ while (instB) {
+ if (instB === instA) {
+ return true;
+ }
+ instB = instB._nativeParent;
+ }
+ return false;
+}
+
+function getParentInstance(inst) {
+ invariant('_nativeNode' in inst, 'getParentInstance: Invalid argument.');
+
+ return inst._nativeParent;
+}
+
+module.exports = {
+ isAncestor: isAncestor,
+ getLowestCommonAncestor: getLowestCommonAncestor,
+ getParentInstance: getParentInstance,
+};
diff --git a/src/renderers/dom/client/ReactEventListener.js b/src/renderers/dom/client/ReactEventListener.js
index 422b0ee650..307e5debad 100644
--- a/src/renderers/dom/client/ReactEventListener.js
+++ b/src/renderers/dom/client/ReactEventListener.js
@@ -15,32 +15,28 @@
var EventListener = require('EventListener');
var ExecutionEnvironment = require('ExecutionEnvironment');
var PooledClass = require('PooledClass');
-var ReactInstanceHandles = require('ReactInstanceHandles');
-var ReactMount = require('ReactMount');
+var ReactDOMComponentTree = require('ReactDOMComponentTree');
var ReactUpdates = require('ReactUpdates');
var assign = require('Object.assign');
var getEventTarget = require('getEventTarget');
var getUnboundedScrollPosition = require('getUnboundedScrollPosition');
-var DOCUMENT_FRAGMENT_NODE_TYPE = 11;
-
/**
- * Finds the parent React component of `node`.
- *
- * @param {*} node
- * @return {?DOMEventTarget} Parent container, or `null` if the specified node
- * is not nested.
+ * Find the deepest React component completely containing the root of the
+ * passed-in instance (for use when entire React trees are nested within each
+ * other). If React trees are not nested, returns null.
*/
-function findParent(node) {
+function findParent(inst) {
// TODO: It may be a good idea to cache this to prevent unnecessary DOM
// traversal, but caching is difficult to do correctly without using a
// mutation observer to listen for all DOM changes.
- var nodeID = ReactMount.getID(node);
- var rootID = ReactInstanceHandles.getReactRootIDFromNodeID(nodeID);
- var container = ReactMount.findReactContainerForID(rootID);
- var parent = ReactMount.getFirstReactDOM(container);
- return parent;
+ while (inst._nativeParent) {
+ inst = inst._nativeParent;
+ }
+ var rootNode = ReactDOMComponentTree.getNodeFromInstance(inst);
+ var container = rootNode.parentNode;
+ return ReactDOMComponentTree.getClosestInstanceFromNode(container);
}
// Used to store ancestor hierarchy in top level callback
@@ -62,91 +58,26 @@ PooledClass.addPoolingTo(
);
function handleTopLevelImpl(bookKeeping) {
- // TODO: Re-enable event.path handling
- //
- // if (bookKeeping.nativeEvent.path && bookKeeping.nativeEvent.path.length > 1) {
- // // New browsers have a path attribute on native events
- // handleTopLevelWithPath(bookKeeping);
- // } else {
- // // Legacy browsers don't have a path attribute on native events
- // handleTopLevelWithoutPath(bookKeeping);
- // }
-
- void handleTopLevelWithPath; // temporarily unused
- handleTopLevelWithoutPath(bookKeeping);
-}
-
-// Legacy browsers don't have a path attribute on native events
-function handleTopLevelWithoutPath(bookKeeping) {
- var topLevelTarget = ReactMount.getFirstReactDOM(
- getEventTarget(bookKeeping.nativeEvent)
- ) || window;
+ var nativeEventTarget = getEventTarget(bookKeeping.nativeEvent);
+ var targetInst = ReactDOMComponentTree.getClosestInstanceFromNode(
+ nativeEventTarget
+ );
// Loop through the hierarchy, in case there's any nested components.
// It's important that we build the array of ancestors before calling any
// event handlers, because event handlers can modify the DOM, leading to
// inconsistencies with ReactMount's node cache. See #1105.
- var ancestor = topLevelTarget;
- while (ancestor) {
+ var ancestor = targetInst;
+ do {
bookKeeping.ancestors.push(ancestor);
- ancestor = findParent(ancestor);
- }
+ ancestor = ancestor && findParent(ancestor);
+ } while (ancestor);
for (var i = 0; i < bookKeeping.ancestors.length; i++) {
- topLevelTarget = bookKeeping.ancestors[i];
- var topLevelTargetID = ReactMount.getID(topLevelTarget) || '';
+ targetInst = bookKeeping.ancestors[i];
ReactEventListener._handleTopLevel(
bookKeeping.topLevelType,
- topLevelTarget,
- topLevelTargetID,
- bookKeeping.nativeEvent,
- getEventTarget(bookKeeping.nativeEvent)
- );
- }
-}
-
-// New browsers have a path attribute on native events
-function handleTopLevelWithPath(bookKeeping) {
- var path = bookKeeping.nativeEvent.path;
- var currentNativeTarget = path[0];
- var eventsFired = 0;
- for (var i = 0; i < path.length; i++) {
- var currentPathElement = path[i];
- if (currentPathElement.nodeType === DOCUMENT_FRAGMENT_NODE_TYPE) {
- currentNativeTarget = path[i + 1];
- }
- // TODO: slow
- var reactParent = ReactMount.getFirstReactDOM(currentPathElement);
- if (reactParent === currentPathElement) {
- var currentPathElementID = ReactMount.getID(currentPathElement);
- var newRootID = ReactInstanceHandles.getReactRootIDFromNodeID(
- currentPathElementID
- );
- bookKeeping.ancestors.push(currentPathElement);
-
- var topLevelTargetID = ReactMount.getID(currentPathElement) || '';
- eventsFired++;
- ReactEventListener._handleTopLevel(
- bookKeeping.topLevelType,
- currentPathElement,
- topLevelTargetID,
- bookKeeping.nativeEvent,
- currentNativeTarget
- );
-
- // Jump to the root of this React render tree
- while (currentPathElementID !== newRootID) {
- i++;
- currentPathElement = path[i];
- currentPathElementID = ReactMount.getID(currentPathElement);
- }
- }
- }
- if (eventsFired === 0) {
- ReactEventListener._handleTopLevel(
- bookKeeping.topLevelType,
- window,
- '',
+ targetInst,
bookKeeping.nativeEvent,
getEventTarget(bookKeeping.nativeEvent)
);
diff --git a/src/renderers/dom/client/__tests__/ReactBrowserEventEmitter-test.js b/src/renderers/dom/client/__tests__/ReactBrowserEventEmitter-test.js
index 7d84831a68..7d2cf19e96 100644
--- a/src/renderers/dom/client/__tests__/ReactBrowserEventEmitter-test.js
+++ b/src/renderers/dom/client/__tests__/ReactBrowserEventEmitter-test.js
@@ -13,25 +13,17 @@
var keyOf = require('keyOf');
-var ReactMount = require('ReactMount');
-var idToNode = {};
-var getID = ReactMount.getID;
-var setID = function(el, id) {
- ReactMount.setID(el, id);
- idToNode[id] = el;
-};
-var oldGetNode;
-var oldGetFirstReactDOM;
-
+var EventListener;
var EventPluginHub;
var EventPluginRegistry;
+var React;
var ReactBrowserEventEmitter;
+var ReactDOMComponentTree;
var ReactTestUtils;
var TapEventPlugin;
-var EventListener;
var tapMoveThreshold;
-var idCallOrder = [];
+var idCallOrder;
var recordID = function(id) {
idCallOrder.push(id);
};
@@ -49,21 +41,9 @@ var ON_TOUCH_TAP_KEY = keyOf({onTouchTap: null});
var ON_CHANGE_KEY = keyOf({onChange: null});
var ON_MOUSE_ENTER_KEY = keyOf({onMouseEnter: null});
-
-/**
- * Since `ReactBrowserEventEmitter` is fairly well separated from the DOM, we
- * can test almost all of `ReactBrowserEventEmitter` without ever rendering
- * anything in the DOM. As long as we provide IDs that follow `React's`
- * conventional id namespace hierarchy. The only reason why we create these DOM
- * nodes is so that when we feed them into `ReactBrowserEventEmitter` (through
- * `ReactTestUtils`), the event handlers may receive a DOM node to inspect.
- */
-var CHILD = document.createElement('div');
-var PARENT = document.createElement('div');
-var GRANDPARENT = document.createElement('div');
-setID(CHILD, '.0.0.0.0');
-setID(PARENT, '.0.0.0');
-setID(GRANDPARENT, '.0.0');
+var GRANDPARENT;
+var PARENT;
+var CHILD;
function registerSimpleTestHandler() {
EventPluginHub.putListener(getID(CHILD), ON_CLICK_KEY, LISTENER);
@@ -72,27 +52,31 @@ function registerSimpleTestHandler() {
return EventPluginHub.getListener(getID(CHILD), ON_CLICK_KEY);
}
+function getID(node) {
+ return ReactDOMComponentTree.getInstanceFromNode(node)._rootNodeID;
+}
+
describe('ReactBrowserEventEmitter', function() {
beforeEach(function() {
jest.resetModuleRegistry();
LISTENER.mockClear();
+ EventListener = require('EventListener');
EventPluginHub = require('EventPluginHub');
EventPluginRegistry = require('EventPluginRegistry');
- TapEventPlugin = require('TapEventPlugin');
- ReactMount = require('ReactMount');
- EventListener = require('EventListener');
+ React = require('React');
ReactBrowserEventEmitter = require('ReactBrowserEventEmitter');
+ ReactDOMComponentTree = require('ReactDOMComponentTree');
ReactTestUtils = require('ReactTestUtils');
+ TapEventPlugin = require('TapEventPlugin');
- oldGetNode = ReactMount.getNode;
- oldGetFirstReactDOM = ReactMount.oldGetFirstReactDOM;
- ReactMount.getNode = function(id) {
- return idToNode[id];
- };
- ReactMount.getFirstReactDOM = function(node) {
- return node;
- };
+ ReactTestUtils.renderIntoDocument(
+
GRANDPARENT = c}>
+
PARENT = c}>
+
CHILD = c} />
+
+
+ );
idCallOrder = [];
tapMoveThreshold = TapEventPlugin.tapMoveThreshold;
@@ -101,11 +85,6 @@ describe('ReactBrowserEventEmitter', function() {
});
});
- afterEach(function() {
- ReactMount.getNode = oldGetNode;
- ReactMount.getFirstReactDOM = oldGetFirstReactDOM;
- });
-
it('should store a listener correctly', function() {
registerSimpleTestHandler();
var listener = EventPluginHub.getListener(getID(CHILD), ON_CLICK_KEY);
diff --git a/src/renderers/dom/client/__tests__/ReactEventListener-test.js b/src/renderers/dom/client/__tests__/ReactEventListener-test.js
index 42e5dbc552..6e53f1a12c 100644
--- a/src/renderers/dom/client/__tests__/ReactEventListener-test.js
+++ b/src/renderers/dom/client/__tests__/ReactEventListener-test.js
@@ -16,10 +16,8 @@ var EVENT_TARGET_PARAM = 1;
describe('ReactEventListener', function() {
var React;
-
var ReactDOM;
-
- var ReactMount;
+ var ReactDOMComponentTree;
var ReactEventListener;
var ReactTestUtils;
var handleTopLevel;
@@ -27,10 +25,8 @@ describe('ReactEventListener', function() {
beforeEach(function() {
jest.resetModuleRegistry();
React = require('React');
-
ReactDOM = require('ReactDOM');
-
- ReactMount = require('ReactMount');
+ ReactDOMComponentTree = require('ReactDOMComponentTree');
ReactEventListener = require('ReactEventListener');
ReactTestUtils = require('ReactTestUtils');
@@ -40,7 +36,7 @@ describe('ReactEventListener', function() {
it('should dispatch events from outside React tree', function() {
var otherNode = document.createElement('h1');
- var component = ReactMount.render(
, document.createElement('div'));
+ var component = ReactDOM.render(
, document.createElement('div'));
expect(handleTopLevel.mock.calls.length).toBe(0);
ReactEventListener.dispatchEvent(
'topMouseOut',
@@ -64,9 +60,9 @@ describe('ReactEventListener', function() {
var childControl =
Child
;
var parentContainer = document.createElement('div');
var parentControl =
Parent
;
- childControl = ReactMount.render(childControl, childContainer);
+ childControl = ReactDOM.render(childControl, childContainer);
parentControl =
- ReactMount.render(parentControl, parentContainer);
+ ReactDOM.render(parentControl, parentContainer);
ReactDOM.findDOMNode(parentControl).appendChild(childContainer);
var callback = ReactEventListener.dispatchEvent.bind(null, 'test');
@@ -77,9 +73,9 @@ describe('ReactEventListener', function() {
var calls = handleTopLevel.mock.calls;
expect(calls.length).toBe(2);
expect(calls[0][EVENT_TARGET_PARAM])
- .toBe(ReactDOM.findDOMNode(childControl));
+ .toBe(ReactDOMComponentTree.getInstanceFromNode(childControl));
expect(calls[1][EVENT_TARGET_PARAM])
- .toBe(ReactDOM.findDOMNode(parentControl));
+ .toBe(ReactDOMComponentTree.getInstanceFromNode(parentControl));
});
it('should propagate events two levels down', function() {
@@ -89,11 +85,11 @@ describe('ReactEventListener', function() {
var parentControl =
Parent
;
var grandParentContainer = document.createElement('div');
var grandParentControl =
Parent
;
- childControl = ReactMount.render(childControl, childContainer);
+ childControl = ReactDOM.render(childControl, childContainer);
parentControl =
- ReactMount.render(parentControl, parentContainer);
+ ReactDOM.render(parentControl, parentContainer);
grandParentControl =
- ReactMount.render(grandParentControl, grandParentContainer);
+ ReactDOM.render(grandParentControl, grandParentContainer);
ReactDOM.findDOMNode(parentControl).appendChild(childContainer);
ReactDOM.findDOMNode(grandParentControl).appendChild(parentContainer);
@@ -105,11 +101,11 @@ describe('ReactEventListener', function() {
var calls = handleTopLevel.mock.calls;
expect(calls.length).toBe(3);
expect(calls[0][EVENT_TARGET_PARAM])
- .toBe(ReactDOM.findDOMNode(childControl));
+ .toBe(ReactDOMComponentTree.getInstanceFromNode(childControl));
expect(calls[1][EVENT_TARGET_PARAM])
- .toBe(ReactDOM.findDOMNode(parentControl));
+ .toBe(ReactDOMComponentTree.getInstanceFromNode(parentControl));
expect(calls[2][EVENT_TARGET_PARAM])
- .toBe(ReactDOM.findDOMNode(grandParentControl));
+ .toBe(ReactDOMComponentTree.getInstanceFromNode(grandParentControl));
});
it('should not get confused by disappearing elements', function() {
@@ -117,9 +113,9 @@ describe('ReactEventListener', function() {
var childControl =
Child
;
var parentContainer = document.createElement('div');
var parentControl =
Parent
;
- childControl = ReactMount.render(childControl, childContainer);
+ childControl = ReactDOM.render(childControl, childContainer);
parentControl =
- ReactMount.render(parentControl, parentContainer);
+ ReactDOM.render(parentControl, parentContainer);
ReactDOM.findDOMNode(parentControl).appendChild(childContainer);
// ReactBrowserEventEmitter.handleTopLevel might remove the
@@ -130,7 +126,7 @@ describe('ReactEventListener', function() {
handleTopLevel.mockImplementation(
function(topLevelType, topLevelTarget, topLevelTargetID, nativeEvent) {
if (topLevelTarget === childNode) {
- ReactMount.unmountComponentAtNode(childContainer);
+ ReactDOM.unmountComponentAtNode(childContainer);
}
}
);
@@ -142,19 +138,20 @@ describe('ReactEventListener', function() {
var calls = handleTopLevel.mock.calls;
expect(calls.length).toBe(2);
- expect(calls[0][EVENT_TARGET_PARAM]).toBe(childNode);
+ expect(calls[0][EVENT_TARGET_PARAM])
+ .toBe(ReactDOMComponentTree.getInstanceFromNode(childNode));
expect(calls[1][EVENT_TARGET_PARAM])
- .toBe(ReactDOM.findDOMNode(parentControl));
+ .toBe(ReactDOMComponentTree.getInstanceFromNode(parentControl));
});
it('should batch between handlers from different roots', function() {
var childContainer = document.createElement('div');
var parentContainer = document.createElement('div');
- var childControl = ReactMount.render(
+ var childControl = ReactDOM.render(
Child
,
childContainer
);
- var parentControl = ReactMount.render(
+ var parentControl = ReactDOM.render(
Parent
,
parentContainer
);
@@ -165,7 +162,7 @@ describe('ReactEventListener', function() {
var childNode = ReactDOM.findDOMNode(childControl);
handleTopLevel.mockImplementation(
function(topLevelType, topLevelTarget, topLevelTargetID, nativeEvent) {
- ReactMount.render(
+ ReactDOM.render(
{topLevelTarget === childNode ? '1' : '2'}
,
childContainer
);
@@ -210,6 +207,6 @@ describe('ReactEventListener', function() {
var calls = handleTopLevel.mock.calls;
expect(calls.length).toBe(1);
expect(calls[0][EVENT_TARGET_PARAM])
- .toBe(ReactDOM.findDOMNode(instance.getInner()));
+ .toBe(ReactDOMComponentTree.getInstanceFromNode(instance.getInner()));
});
});
diff --git a/src/renderers/dom/client/eventPlugins/BeforeInputEventPlugin.js b/src/renderers/dom/client/eventPlugins/BeforeInputEventPlugin.js
index fdcf0bf8de..278104917f 100644
--- a/src/renderers/dom/client/eventPlugins/BeforeInputEventPlugin.js
+++ b/src/renderers/dom/client/eventPlugins/BeforeInputEventPlugin.js
@@ -227,16 +227,11 @@ function getDataFromCustomEvent(nativeEvent) {
var currentComposition = null;
/**
- * @param {string} topLevelType Record from `EventConstants`.
- * @param {DOMEventTarget} topLevelTarget The listening component root node.
- * @param {string} topLevelTargetID ID of `topLevelTarget`.
- * @param {object} nativeEvent Native browser event.
* @return {?object} A SyntheticCompositionEvent.
*/
function extractCompositionEvent(
topLevelType,
- topLevelTarget,
- topLevelTargetID,
+ targetInst,
nativeEvent,
nativeEventTarget
) {
@@ -261,7 +256,8 @@ function extractCompositionEvent(
// The current composition is stored statically and must not be
// overwritten while composition continues.
if (!currentComposition && eventType === eventTypes.compositionStart) {
- currentComposition = FallbackCompositionState.getPooled(topLevelTarget);
+ currentComposition =
+ FallbackCompositionState.getPooled(nativeEventTarget);
} else if (eventType === eventTypes.compositionEnd) {
if (currentComposition) {
fallbackData = currentComposition.getData();
@@ -271,7 +267,7 @@ function extractCompositionEvent(
var event = SyntheticCompositionEvent.getPooled(
eventType,
- topLevelTargetID,
+ targetInst,
nativeEvent,
nativeEventTarget
);
@@ -403,16 +399,11 @@ function getFallbackBeforeInputChars(topLevelType, nativeEvent) {
* Extract a SyntheticInputEvent for `beforeInput`, based on either native
* `textInput` or fallback behavior.
*
- * @param {string} topLevelType Record from `EventConstants`.
- * @param {DOMEventTarget} topLevelTarget The listening component root node.
- * @param {string} topLevelTargetID ID of `topLevelTarget`.
- * @param {object} nativeEvent Native browser event.
* @return {?object} A SyntheticInputEvent.
*/
function extractBeforeInputEvent(
topLevelType,
- topLevelTarget,
- topLevelTargetID,
+ targetInst,
nativeEvent,
nativeEventTarget
) {
@@ -432,7 +423,7 @@ function extractBeforeInputEvent(
var event = SyntheticInputEvent.getPooled(
eventTypes.beforeInput,
- topLevelTargetID,
+ targetInst,
nativeEvent,
nativeEventTarget
);
@@ -464,33 +455,22 @@ var BeforeInputEventPlugin = {
eventTypes: eventTypes,
- /**
- * @param {string} topLevelType Record from `EventConstants`.
- * @param {DOMEventTarget} topLevelTarget The listening component root node.
- * @param {string} topLevelTargetID ID of `topLevelTarget`.
- * @param {object} nativeEvent Native browser event.
- * @return {*} An accumulation of synthetic events.
- * @see {EventPluginHub.extractEvents}
- */
extractEvents: function(
topLevelType,
- topLevelTarget,
- topLevelTargetID,
+ targetInst,
nativeEvent,
nativeEventTarget
) {
return [
extractCompositionEvent(
topLevelType,
- topLevelTarget,
- topLevelTargetID,
+ targetInst,
nativeEvent,
nativeEventTarget
),
extractBeforeInputEvent(
topLevelType,
- topLevelTarget,
- topLevelTargetID,
+ targetInst,
nativeEvent,
nativeEventTarget
),
diff --git a/src/renderers/dom/client/eventPlugins/ChangeEventPlugin.js b/src/renderers/dom/client/eventPlugins/ChangeEventPlugin.js
index f990004abd..c78827f70e 100644
--- a/src/renderers/dom/client/eventPlugins/ChangeEventPlugin.js
+++ b/src/renderers/dom/client/eventPlugins/ChangeEventPlugin.js
@@ -15,6 +15,7 @@ var EventConstants = require('EventConstants');
var EventPluginHub = require('EventPluginHub');
var EventPropagators = require('EventPropagators');
var ExecutionEnvironment = require('ExecutionEnvironment');
+var ReactDOMComponentTree = require('ReactDOMComponentTree');
var ReactUpdates = require('ReactUpdates');
var SyntheticEvent = require('SyntheticEvent');
@@ -48,7 +49,7 @@ var eventTypes = {
* For IE shims
*/
var activeElement = null;
-var activeElementID = null;
+var activeElementInst = null;
var activeElementValue = null;
var activeElementValueProp = null;
@@ -74,7 +75,7 @@ if (ExecutionEnvironment.canUseDOM) {
function manualDispatchChangeEvent(nativeEvent) {
var event = SyntheticEvent.getPooled(
eventTypes.change,
- activeElementID,
+ activeElementInst,
nativeEvent,
getEventTarget(nativeEvent)
);
@@ -99,9 +100,9 @@ function runEventInBatch(event) {
EventPluginHub.processEventQueue(false);
}
-function startWatchingForChangeEventIE8(target, targetID) {
+function startWatchingForChangeEventIE8(target, targetInst) {
activeElement = target;
- activeElementID = targetID;
+ activeElementInst = targetInst;
activeElement.attachEvent('onchange', manualDispatchChangeEvent);
}
@@ -111,28 +112,27 @@ function stopWatchingForChangeEventIE8() {
}
activeElement.detachEvent('onchange', manualDispatchChangeEvent);
activeElement = null;
- activeElementID = null;
+ activeElementInst = null;
}
-function getTargetIDForChangeEvent(
+function getTargetInstForChangeEvent(
topLevelType,
- topLevelTarget,
- topLevelTargetID
+ targetInst
) {
if (topLevelType === topLevelTypes.topChange) {
- return topLevelTargetID;
+ return targetInst;
}
}
function handleEventsForChangeEventIE8(
topLevelType,
- topLevelTarget,
- topLevelTargetID
+ target,
+ targetInst
) {
if (topLevelType === topLevelTypes.topFocus) {
// stopWatching() should be a noop here but we call it just in case we
// missed a blur event somehow.
stopWatchingForChangeEventIE8();
- startWatchingForChangeEventIE8(topLevelTarget, topLevelTargetID);
+ startWatchingForChangeEventIE8(target, targetInst);
} else if (topLevelType === topLevelTypes.topBlur) {
stopWatchingForChangeEventIE8();
}
@@ -173,9 +173,9 @@ var newValueProp = {
* and override the value property so that we can distinguish user events from
* value changes in JS.
*/
-function startWatchingForValueChange(target, targetID) {
+function startWatchingForValueChange(target, targetInst) {
activeElement = target;
- activeElementID = targetID;
+ activeElementInst = targetInst;
activeElementValue = target.value;
activeElementValueProp = Object.getOwnPropertyDescriptor(
target.constructor.prototype,
@@ -211,7 +211,7 @@ function stopWatchingForValueChange() {
}
activeElement = null;
- activeElementID = null;
+ activeElementInst = null;
activeElementValue = null;
activeElementValueProp = null;
}
@@ -236,22 +236,21 @@ function handlePropertyChange(nativeEvent) {
/**
* If a `change` event should be fired, returns the target's ID.
*/
-function getTargetIDForInputEvent(
+function getTargetInstForInputEvent(
topLevelType,
- topLevelTarget,
- topLevelTargetID
+ targetInst
) {
if (topLevelType === topLevelTypes.topInput) {
// In modern browsers (i.e., not IE8 or IE9), the input event is exactly
// what we want so fall through here and trigger an abstract event
- return topLevelTargetID;
+ return targetInst;
}
}
function handleEventsForInputEventIE(
topLevelType,
- topLevelTarget,
- topLevelTargetID
+ target,
+ targetInst
) {
if (topLevelType === topLevelTypes.topFocus) {
// In IE8, we can capture almost all .value changes by adding a
@@ -268,17 +267,16 @@ function handleEventsForInputEventIE(
// stopWatching() should be a noop here but we call it just in case we
// missed a blur event somehow.
stopWatchingForValueChange();
- startWatchingForValueChange(topLevelTarget, topLevelTargetID);
+ startWatchingForValueChange(target, targetInst);
} else if (topLevelType === topLevelTypes.topBlur) {
stopWatchingForValueChange();
}
}
// For IE8 and IE9.
-function getTargetIDForInputEventIE(
+function getTargetInstForInputEventIE(
topLevelType,
- topLevelTarget,
- topLevelTargetID
+ targetInst
) {
if (topLevelType === topLevelTypes.topSelectionChange ||
topLevelType === topLevelTypes.topKeyUp ||
@@ -295,7 +293,7 @@ function getTargetIDForInputEventIE(
// fire selectionchange normally.
if (activeElement && activeElement.value !== activeElementValue) {
activeElementValue = activeElement.value;
- return activeElementID;
+ return activeElementInst;
}
}
}
@@ -314,13 +312,12 @@ function shouldUseClickEvent(elem) {
);
}
-function getTargetIDForClickEvent(
+function getTargetInstForClickEvent(
topLevelType,
- topLevelTarget,
- topLevelTargetID
+ targetInst
) {
if (topLevelType === topLevelTypes.topClick) {
- return topLevelTargetID;
+ return targetInst;
}
}
@@ -338,49 +335,39 @@ var ChangeEventPlugin = {
eventTypes: eventTypes,
- /**
- * @param {string} topLevelType Record from `EventConstants`.
- * @param {DOMEventTarget} topLevelTarget The listening component root node.
- * @param {string} topLevelTargetID ID of `topLevelTarget`.
- * @param {object} nativeEvent Native browser event.
- * @return {*} An accumulation of synthetic events.
- * @see {EventPluginHub.extractEvents}
- */
extractEvents: function(
- topLevelType,
- topLevelTarget,
- topLevelTargetID,
- nativeEvent,
- nativeEventTarget) {
+ topLevelType,
+ targetInst,
+ nativeEvent,
+ nativeEventTarget
+ ) {
+ var targetNode = targetInst ?
+ ReactDOMComponentTree.getNodeFromInstance(targetInst) : window;
- var getTargetIDFunc, handleEventFunc;
- if (shouldUseChangeEvent(topLevelTarget)) {
+ var getTargetInstFunc, handleEventFunc;
+ if (shouldUseChangeEvent(targetNode)) {
if (doesChangeEventBubble) {
- getTargetIDFunc = getTargetIDForChangeEvent;
+ getTargetInstFunc = getTargetInstForChangeEvent;
} else {
handleEventFunc = handleEventsForChangeEventIE8;
}
- } else if (isTextInputElement(topLevelTarget)) {
+ } else if (isTextInputElement(targetNode)) {
if (isInputEventSupported) {
- getTargetIDFunc = getTargetIDForInputEvent;
+ getTargetInstFunc = getTargetInstForInputEvent;
} else {
- getTargetIDFunc = getTargetIDForInputEventIE;
+ getTargetInstFunc = getTargetInstForInputEventIE;
handleEventFunc = handleEventsForInputEventIE;
}
- } else if (shouldUseClickEvent(topLevelTarget)) {
- getTargetIDFunc = getTargetIDForClickEvent;
+ } else if (shouldUseClickEvent(targetNode)) {
+ getTargetInstFunc = getTargetInstForClickEvent;
}
- if (getTargetIDFunc) {
- var targetID = getTargetIDFunc(
- topLevelType,
- topLevelTarget,
- topLevelTargetID
- );
- if (targetID) {
+ if (getTargetInstFunc) {
+ var inst = getTargetInstFunc(topLevelType, targetInst);
+ if (inst) {
var event = SyntheticEvent.getPooled(
eventTypes.change,
- targetID,
+ inst,
nativeEvent,
nativeEventTarget
);
@@ -393,8 +380,8 @@ var ChangeEventPlugin = {
if (handleEventFunc) {
handleEventFunc(
topLevelType,
- topLevelTarget,
- topLevelTargetID
+ targetNode,
+ targetInst
);
}
},
diff --git a/src/renderers/dom/client/eventPlugins/EnterLeaveEventPlugin.js b/src/renderers/dom/client/eventPlugins/EnterLeaveEventPlugin.js
index 6eccf1779e..27a9afce51 100644
--- a/src/renderers/dom/client/eventPlugins/EnterLeaveEventPlugin.js
+++ b/src/renderers/dom/client/eventPlugins/EnterLeaveEventPlugin.js
@@ -14,13 +14,12 @@
var EventConstants = require('EventConstants');
var EventPropagators = require('EventPropagators');
+var ReactDOMComponentTree = require('ReactDOMComponentTree');
var SyntheticMouseEvent = require('SyntheticMouseEvent');
-var ReactMount = require('ReactMount');
var keyOf = require('keyOf');
var topLevelTypes = EventConstants.topLevelTypes;
-var getFirstReactDOM = ReactMount.getFirstReactDOM;
var eventTypes = {
mouseEnter: {
@@ -39,8 +38,6 @@ var eventTypes = {
},
};
-var extractedEvents = [null, null];
-
var EnterLeaveEventPlugin = {
eventTypes: eventTypes,
@@ -51,20 +48,13 @@ var EnterLeaveEventPlugin = {
* we do not extract duplicate events. However, moving the mouse into the
* browser from outside will not fire a `mouseout` event. In this case, we use
* the `mouseover` top-level event.
- *
- * @param {string} topLevelType Record from `EventConstants`.
- * @param {DOMEventTarget} topLevelTarget The listening component root node.
- * @param {string} topLevelTargetID ID of `topLevelTarget`.
- * @param {object} nativeEvent Native browser event.
- * @return {*} An accumulation of synthetic events.
- * @see {EventPluginHub.extractEvents}
*/
extractEvents: function(
- topLevelType,
- topLevelTarget,
- topLevelTargetID,
- nativeEvent,
- nativeEventTarget) {
+ topLevelType,
+ targetInst,
+ nativeEvent,
+ nativeEventTarget
+ ) {
if (topLevelType === topLevelTypes.topMouseOver &&
(nativeEvent.relatedTarget || nativeEvent.fromElement)) {
return null;
@@ -76,12 +66,12 @@ var EnterLeaveEventPlugin = {
}
var win;
- if (topLevelTarget.window === topLevelTarget) {
- // `topLevelTarget` is probably a window object.
- win = topLevelTarget;
+ if (nativeEventTarget.window === nativeEventTarget) {
+ // `nativeEventTarget` is probably a window object.
+ win = nativeEventTarget;
} else {
// TODO: Figure out why `ownerDocument` is sometimes undefined in IE8.
- var doc = topLevelTarget.ownerDocument;
+ var doc = nativeEventTarget.ownerDocument;
if (doc) {
win = doc.defaultView || doc.parentWindow;
} else {
@@ -91,22 +81,15 @@ var EnterLeaveEventPlugin = {
var from;
var to;
- var fromID = '';
- var toID = '';
if (topLevelType === topLevelTypes.topMouseOut) {
- from = topLevelTarget;
- fromID = topLevelTargetID;
- to = getFirstReactDOM(nativeEvent.relatedTarget || nativeEvent.toElement);
- if (to) {
- toID = ReactMount.getID(to);
- } else {
- to = win;
- }
- to = to || win;
+ from = targetInst;
+ var related = nativeEvent.relatedTarget || nativeEvent.toElement;
+ to = related ?
+ ReactDOMComponentTree.getClosestInstanceFromNode(related) : null;
} else {
- from = win;
- to = topLevelTarget;
- toID = topLevelTargetID;
+ // Moving to a node from outside the window.
+ from = null;
+ to = targetInst;
}
if (from === to) {
@@ -114,32 +97,34 @@ var EnterLeaveEventPlugin = {
return null;
}
+ var fromNode =
+ from == null ? win : ReactDOMComponentTree.getNodeFromInstance(from);
+ var toNode =
+ to == null ? win : ReactDOMComponentTree.getNodeFromInstance(to);
+
var leave = SyntheticMouseEvent.getPooled(
eventTypes.mouseLeave,
- fromID,
+ from,
nativeEvent,
nativeEventTarget
);
leave.type = 'mouseleave';
- leave.target = from;
- leave.relatedTarget = to;
+ leave.target = fromNode;
+ leave.relatedTarget = toNode;
var enter = SyntheticMouseEvent.getPooled(
eventTypes.mouseEnter,
- toID,
+ to,
nativeEvent,
nativeEventTarget
);
enter.type = 'mouseenter';
- enter.target = to;
- enter.relatedTarget = from;
+ enter.target = toNode;
+ enter.relatedTarget = fromNode;
- EventPropagators.accumulateEnterLeaveDispatches(leave, enter, fromID, toID);
+ EventPropagators.accumulateEnterLeaveDispatches(leave, enter, from, to);
- extractedEvents[0] = leave;
- extractedEvents[1] = enter;
-
- return extractedEvents;
+ return [leave, enter];
},
};
diff --git a/src/renderers/dom/client/eventPlugins/SelectEventPlugin.js b/src/renderers/dom/client/eventPlugins/SelectEventPlugin.js
index bda881154a..a8c111cbc4 100644
--- a/src/renderers/dom/client/eventPlugins/SelectEventPlugin.js
+++ b/src/renderers/dom/client/eventPlugins/SelectEventPlugin.js
@@ -14,6 +14,7 @@
var EventConstants = require('EventConstants');
var EventPropagators = require('EventPropagators');
var ExecutionEnvironment = require('ExecutionEnvironment');
+var ReactDOMComponentTree = require('ReactDOMComponentTree');
var ReactInputSelection = require('ReactInputSelection');
var SyntheticEvent = require('SyntheticEvent');
@@ -49,12 +50,12 @@ var eventTypes = {
};
var activeElement = null;
-var activeElementID = null;
+var activeElementInst = null;
var lastSelection = null;
var mouseDown = false;
// Track whether a listener exists for this plugin. If none exist, we do
-// not extract events.
+// not extract events. See #3639.
var hasListener = false;
var ON_SELECT_KEY = keyOf({onSelect: null});
@@ -117,7 +118,7 @@ function constructSelectEvent(nativeEvent, nativeEventTarget) {
var syntheticEvent = SyntheticEvent.getPooled(
eventTypes.select,
- activeElementID,
+ activeElementInst,
nativeEvent,
nativeEventTarget
);
@@ -151,37 +152,32 @@ var SelectEventPlugin = {
eventTypes: eventTypes,
- /**
- * @param {string} topLevelType Record from `EventConstants`.
- * @param {DOMEventTarget} topLevelTarget The listening component root node.
- * @param {string} topLevelTargetID ID of `topLevelTarget`.
- * @param {object} nativeEvent Native browser event.
- * @return {*} An accumulation of synthetic events.
- * @see {EventPluginHub.extractEvents}
- */
extractEvents: function(
- topLevelType,
- topLevelTarget,
- topLevelTargetID,
- nativeEvent,
- nativeEventTarget) {
+ topLevelType,
+ targetInst,
+ nativeEvent,
+ nativeEventTarget
+ ) {
if (!hasListener) {
return null;
}
+ var targetNode = targetInst ?
+ ReactDOMComponentTree.getNodeFromInstance(targetInst) : window;
+
switch (topLevelType) {
// Track the input node that has focus.
case topLevelTypes.topFocus:
- if (isTextInputElement(topLevelTarget) ||
- topLevelTarget.contentEditable === 'true') {
- activeElement = topLevelTarget;
- activeElementID = topLevelTargetID;
+ if (isTextInputElement(targetNode) ||
+ targetNode.contentEditable === 'true') {
+ activeElement = targetNode;
+ activeElementInst = targetInst;
lastSelection = null;
}
break;
case topLevelTypes.topBlur:
activeElement = null;
- activeElementID = null;
+ activeElementInst = null;
lastSelection = null;
break;
diff --git a/src/renderers/dom/client/eventPlugins/SimpleEventPlugin.js b/src/renderers/dom/client/eventPlugins/SimpleEventPlugin.js
index 1009a12fa2..d2220869c5 100644
--- a/src/renderers/dom/client/eventPlugins/SimpleEventPlugin.js
+++ b/src/renderers/dom/client/eventPlugins/SimpleEventPlugin.js
@@ -457,20 +457,11 @@ var SimpleEventPlugin = {
eventTypes: eventTypes,
- /**
- * @param {string} topLevelType Record from `EventConstants`.
- * @param {DOMEventTarget} topLevelTarget The listening component root node.
- * @param {string} topLevelTargetID ID of `topLevelTarget`.
- * @param {object} nativeEvent Native browser event.
- * @return {*} An accumulation of synthetic events.
- * @see {EventPluginHub.extractEvents}
- */
extractEvents: function(
- topLevelType,
- topLevelTarget,
- topLevelTargetID,
- nativeEvent,
- nativeEventTarget
+ topLevelType,
+ targetInst,
+ nativeEvent,
+ nativeEventTarget
) {
var dispatchConfig = topLevelEventsToDispatchConfig[topLevelType];
if (!dispatchConfig) {
@@ -511,7 +502,7 @@ var SimpleEventPlugin = {
EventConstructor = SyntheticEvent;
break;
case topLevelTypes.topKeyPress:
- // FireFox creates a keypress event for function keys too. This removes
+ // Firefox creates a keypress event for function keys too. This removes
// the unwanted keypress events. Enter is however both printable and
// non-printable. One would expect Tab to be as well (but it isn't).
if (getEventCharCode(nativeEvent) === 0) {
@@ -577,7 +568,7 @@ var SimpleEventPlugin = {
);
var event = EventConstructor.getPooled(
dispatchConfig,
- topLevelTargetID,
+ targetInst,
nativeEvent,
nativeEventTarget
);
diff --git a/src/renderers/dom/client/eventPlugins/TapEventPlugin.js b/src/renderers/dom/client/eventPlugins/TapEventPlugin.js
index 794d5ee8ba..18140b2025 100644
--- a/src/renderers/dom/client/eventPlugins/TapEventPlugin.js
+++ b/src/renderers/dom/client/eventPlugins/TapEventPlugin.js
@@ -89,20 +89,12 @@ var TapEventPlugin = {
eventTypes: eventTypes,
- /**
- * @param {string} topLevelType Record from `EventConstants`.
- * @param {DOMEventTarget} topLevelTarget The listening component root node.
- * @param {string} topLevelTargetID ID of `topLevelTarget`.
- * @param {object} nativeEvent Native browser event.
- * @return {*} An accumulation of synthetic events.
- * @see {EventPluginHub.extractEvents}
- */
extractEvents: function(
- topLevelType,
- topLevelTarget,
- topLevelTargetID,
- nativeEvent,
- nativeEventTarget) {
+ topLevelType,
+ targetInst,
+ nativeEvent,
+ nativeEventTarget
+ ) {
if (!isStartish(topLevelType) && !isEndish(topLevelType)) {
return null;
}
@@ -122,7 +114,7 @@ var TapEventPlugin = {
if (isEndish(topLevelType) && distance < tapMoveThreshold) {
event = SyntheticUIEvent.getPooled(
eventTypes.touchTap,
- topLevelTargetID,
+ targetInst,
nativeEvent,
nativeEventTarget
);
diff --git a/src/renderers/dom/client/eventPlugins/__tests__/EnterLeaveEventPlugin-test.js b/src/renderers/dom/client/eventPlugins/__tests__/EnterLeaveEventPlugin-test.js
index 5d3afd3ee8..21d588f7f4 100644
--- a/src/renderers/dom/client/eventPlugins/__tests__/EnterLeaveEventPlugin-test.js
+++ b/src/renderers/dom/client/eventPlugins/__tests__/EnterLeaveEventPlugin-test.js
@@ -15,7 +15,7 @@ var EnterLeaveEventPlugin;
var EventConstants;
var React;
var ReactDOM;
-var ReactMount;
+var ReactDOMComponentTree;
var topLevelTypes;
@@ -27,7 +27,7 @@ describe('EnterLeaveEventPlugin', function() {
EventConstants = require('EventConstants');
React = require('React');
ReactDOM = require('ReactDOM');
- ReactMount = require('ReactMount');
+ ReactDOMComponentTree = require('ReactDOMComponentTree');
topLevelTypes = EventConstants.topLevelTypes;
});
@@ -48,8 +48,7 @@ describe('EnterLeaveEventPlugin', function() {
var extracted = EnterLeaveEventPlugin.extractEvents(
topLevelTypes.topMouseOver,
- div,
- ReactMount.getID(div),
+ ReactDOMComponentTree.getInstanceFromNode(div),
{target: div},
div
);
diff --git a/src/renderers/dom/client/eventPlugins/__tests__/SelectEventPlugin-test.js b/src/renderers/dom/client/eventPlugins/__tests__/SelectEventPlugin-test.js
index e9b8be7347..ef845a0670 100644
--- a/src/renderers/dom/client/eventPlugins/__tests__/SelectEventPlugin-test.js
+++ b/src/renderers/dom/client/eventPlugins/__tests__/SelectEventPlugin-test.js
@@ -14,7 +14,7 @@
var EventConstants;
var React;
var ReactDOM;
-var ReactMount;
+var ReactDOMComponentTree;
var ReactTestUtils;
var SelectEventPlugin;
@@ -24,8 +24,7 @@ describe('SelectEventPlugin', function() {
function extract(node, topLevelEvent) {
return SelectEventPlugin.extractEvents(
topLevelEvent,
- node,
- ReactMount.getID(node),
+ ReactDOMComponentTree.getInstanceFromNode(node),
{target: node},
node
);
@@ -35,7 +34,7 @@ describe('SelectEventPlugin', function() {
EventConstants = require('EventConstants');
React = require('React');
ReactDOM = require('ReactDOM');
- ReactMount = require('ReactMount');
+ ReactDOMComponentTree = require('ReactDOMComponentTree');
ReactTestUtils = require('ReactTestUtils');
SelectEventPlugin = require('SelectEventPlugin');
diff --git a/src/renderers/dom/client/syntheticEvents/SyntheticEvent.js b/src/renderers/dom/client/syntheticEvents/SyntheticEvent.js
index fe76ae7c03..eff39b69f8 100644
--- a/src/renderers/dom/client/syntheticEvents/SyntheticEvent.js
+++ b/src/renderers/dom/client/syntheticEvents/SyntheticEvent.js
@@ -50,12 +50,13 @@ var EventInterface = {
* DOM interface; custom application-specific events can also subclass this.
*
* @param {object} dispatchConfig Configuration used to dispatch this event.
- * @param {string} dispatchMarker Marker identifying the event target.
+ * @param {*} targetInst Marker identifying the event target.
* @param {object} nativeEvent Native browser event.
*/
-function SyntheticEvent(dispatchConfig, dispatchMarker, nativeEvent, nativeEventTarget) {
+function SyntheticEvent(dispatchConfig, targetInst, nativeEvent, nativeEventTarget) {
this.dispatchConfig = dispatchConfig;
- this.dispatchMarker = dispatchMarker;
+ this._targetInst = targetInst;
+
this.nativeEvent = nativeEvent;
this.target = nativeEventTarget;
this.currentTarget = nativeEventTarget;
@@ -158,7 +159,7 @@ assign(SyntheticEvent.prototype, {
this[propName] = null;
}
this.dispatchConfig = null;
- this.dispatchMarker = null;
+ this._targetInst = null;
this.nativeEvent = null;
},
diff --git a/src/renderers/dom/shared/ReactDefaultInjection.js b/src/renderers/dom/shared/ReactDefaultInjection.js
index 5c6dbb979a..f569499aac 100644
--- a/src/renderers/dom/shared/ReactDefaultInjection.js
+++ b/src/renderers/dom/shared/ReactDefaultInjection.js
@@ -20,17 +20,19 @@ var HTMLDOMPropertyConfig = require('HTMLDOMPropertyConfig');
var ReactBrowserComponentMixin = require('ReactBrowserComponentMixin');
var ReactComponentBrowserEnvironment =
require('ReactComponentBrowserEnvironment');
-var ReactDefaultBatchingStrategy = require('ReactDefaultBatchingStrategy');
var ReactDOMComponent = require('ReactDOMComponent');
+var ReactDOMComponentTree = require('ReactDOMComponentTree');
+var ReactDOMTreeTraversal = require('ReactDOMTreeTraversal');
var ReactDOMTextComponent = require('ReactDOMTextComponent');
+var ReactDefaultBatchingStrategy = require('ReactDefaultBatchingStrategy');
var ReactEventListener = require('ReactEventListener');
var ReactInjection = require('ReactInjection');
var ReactInstanceHandles = require('ReactInstanceHandles');
var ReactMount = require('ReactMount');
var ReactReconcileTransaction = require('ReactReconcileTransaction');
+var SVGDOMPropertyConfig = require('SVGDOMPropertyConfig');
var SelectEventPlugin = require('SelectEventPlugin');
var SimpleEventPlugin = require('SimpleEventPlugin');
-var SVGDOMPropertyConfig = require('SVGDOMPropertyConfig');
var alreadyInjected = false;
@@ -52,7 +54,9 @@ function inject() {
*/
ReactInjection.EventPluginHub.injectEventPluginOrder(DefaultEventPluginOrder);
ReactInjection.EventPluginHub.injectInstanceHandle(ReactInstanceHandles);
- ReactInjection.EventPluginHub.injectMount(ReactMount);
+ ReactInjection.EventPluginUtils.injectComponentTree(ReactDOMComponentTree);
+ ReactInjection.EventPluginUtils.injectTreeTraversal(ReactDOMTreeTraversal);
+ ReactInjection.EventPluginUtils.injectMount(ReactMount);
/**
* Some important event plugins included by default (without having to require
diff --git a/src/renderers/dom/shared/ReactInjection.js b/src/renderers/dom/shared/ReactInjection.js
index dc114c4661..0e8c0dc90e 100644
--- a/src/renderers/dom/shared/ReactInjection.js
+++ b/src/renderers/dom/shared/ReactInjection.js
@@ -13,6 +13,7 @@
var DOMProperty = require('DOMProperty');
var EventPluginHub = require('EventPluginHub');
+var EventPluginUtils = require('EventPluginUtils');
var ReactComponentEnvironment = require('ReactComponentEnvironment');
var ReactClass = require('ReactClass');
var ReactEmptyComponent = require('ReactEmptyComponent');
@@ -27,6 +28,7 @@ var ReactInjection = {
DOMProperty: DOMProperty.injection,
EmptyComponent: ReactEmptyComponent.injection,
EventPluginHub: EventPluginHub.injection,
+ EventPluginUtils: EventPluginUtils.injection,
EventEmitter: ReactBrowserEventEmitter.injection,
NativeComponent: ReactNativeComponent.injection,
Perf: ReactPerf.injection,
diff --git a/src/renderers/shared/event/EventPluginHub.js b/src/renderers/shared/event/EventPluginHub.js
index d5078f5e00..6ed5103979 100644
--- a/src/renderers/shared/event/EventPluginHub.js
+++ b/src/renderers/shared/event/EventPluginHub.js
@@ -100,12 +100,6 @@ var EventPluginHub = {
*/
injection: {
- /**
- * @param {object} InjectedMount
- * @public
- */
- injectMount: EventPluginUtils.injection.injectMount,
-
/**
* @param {object} InjectedInstanceHandle
* @public
@@ -217,17 +211,12 @@ var EventPluginHub = {
* Allows registered plugins an opportunity to extract events from top-level
* native browser events.
*
- * @param {string} topLevelType Record from `EventConstants`.
- * @param {DOMEventTarget} topLevelTarget The listening component root node.
- * @param {string} topLevelTargetID ID of `topLevelTarget`.
- * @param {object} nativeEvent Native browser event.
* @return {*} An accumulation of synthetic events.
* @internal
*/
extractEvents: function(
topLevelType,
- topLevelTarget,
- topLevelTargetID,
+ targetInst,
nativeEvent,
nativeEventTarget) {
var events;
@@ -238,8 +227,7 @@ var EventPluginHub = {
if (possiblePlugin) {
var extractedEvents = possiblePlugin.extractEvents(
topLevelType,
- topLevelTarget,
- topLevelTargetID,
+ targetInst,
nativeEvent,
nativeEventTarget
);
diff --git a/src/renderers/shared/event/EventPluginUtils.js b/src/renderers/shared/event/EventPluginUtils.js
index bff374799e..9883becf5c 100644
--- a/src/renderers/shared/event/EventPluginUtils.js
+++ b/src/renderers/shared/event/EventPluginUtils.js
@@ -22,21 +22,47 @@ var warning = require('warning');
*/
/**
+ * - `ComponentTree`: [required] Module that can convert between React instances
+ * and actual node references.
* - `Mount`: [required] Module that can convert between React dom IDs and
* actual node references.
*/
+var ComponentTree;
+var Mount;
+var TreeTraversal;
var injection = {
- Mount: null,
- injectMount: function(InjectedMount) {
- injection.Mount = InjectedMount;
+ injectComponentTree: function(Injected) {
+ ComponentTree = Injected;
if (__DEV__) {
warning(
- InjectedMount && InjectedMount.getNode && InjectedMount.getID,
+ Injected &&
+ Injected.getNodeFromInstance &&
+ Injected.getInstanceFromNode,
+ 'EventPluginUtils.injection.injectComponentTree(...): Injected ' +
+ 'module is missing getNodeFromInstance or getInstanceFromNode.'
+ );
+ }
+ },
+ injectMount: function(Injected) {
+ Mount = Injected;
+ if (__DEV__) {
+ warning(
+ Injected && Injected.getNode && Injected.getID,
'EventPluginUtils.injection.injectMount(...): Injected Mount ' +
'module is missing getNode or getID.'
);
}
},
+ injectTreeTraversal: function(Injected) {
+ TreeTraversal = Injected;
+ if (__DEV__) {
+ warning(
+ Injected && Injected.isAncestor && Injected.getLowestCommonAncestor,
+ 'EventPluginUtils.injection.injectTreeTraversal(...): Injected ' +
+ 'module is missing isAncestor or getLowestCommonAncestor.'
+ );
+ }
+ },
};
var topLevelTypes = EventConstants.topLevelTypes;
@@ -86,7 +112,7 @@ if (__DEV__) {
*/
function executeDispatch(event, simulated, listener, domID) {
var type = event.type || 'unknown-event';
- event.currentTarget = injection.Mount.getNode(domID);
+ event.currentTarget = EventPluginUtils.getNode(domID);
if (simulated) {
ReactErrorUtils.invokeGuardedCallbackWithCatch(
type,
@@ -214,10 +240,19 @@ var EventPluginUtils = {
hasDispatches: hasDispatches,
getNode: function(id) {
- return injection.Mount.getNode(id);
+ return Mount.getNode(id);
},
- getID: function(node) {
- return injection.Mount.getID(node);
+ getInstanceFromNode: function(node) {
+ return ComponentTree.getInstanceFromNode(node);
+ },
+ isAncestor: function(a, b) {
+ return TreeTraversal.isAncestor(a, b);
+ },
+ getLowestCommonAncestor: function(a, b) {
+ return TreeTraversal.getLowestCommonAncestor(a, b);
+ },
+ getParentInstance: function(inst) {
+ return TreeTraversal.getParentInstance(inst);
},
injection: injection,
diff --git a/src/renderers/shared/event/EventPropagators.js b/src/renderers/shared/event/EventPropagators.js
index 896382aba0..000f4300d2 100644
--- a/src/renderers/shared/event/EventPropagators.js
+++ b/src/renderers/shared/event/EventPropagators.js
@@ -22,6 +22,10 @@ var forEachAccumulated = require('forEachAccumulated');
var PropagationPhases = EventConstants.PropagationPhases;
var getListener = EventPluginHub.getListener;
+function getID(inst) {
+ return inst ? inst._rootNodeID : '';
+}
+
/**
* Some event types have a notion of different registration names for different
* "phases" of propagation. This finds listeners by a given phase.
@@ -64,7 +68,7 @@ function accumulateDirectionalDispatches(domID, upwards, event) {
function accumulateTwoPhaseDispatchesSingle(event) {
if (event && event.dispatchConfig.phasedRegistrationNames) {
EventPluginHub.injection.getInstanceHandle().traverseTwoPhase(
- event.dispatchMarker,
+ getID(event._targetInst),
accumulateDirectionalDispatches,
event
);
@@ -77,7 +81,7 @@ function accumulateTwoPhaseDispatchesSingle(event) {
function accumulateTwoPhaseDispatchesSingleSkipTarget(event) {
if (event && event.dispatchConfig.phasedRegistrationNames) {
EventPluginHub.injection.getInstanceHandle().traverseTwoPhaseSkipTarget(
- event.dispatchMarker,
+ getID(event._targetInst),
accumulateDirectionalDispatches,
event
);
@@ -109,7 +113,7 @@ function accumulateDispatches(id, ignoredDirection, event) {
*/
function accumulateDirectDispatchesSingle(event) {
if (event && event.dispatchConfig.registrationName) {
- accumulateDispatches(event.dispatchMarker, null, event);
+ accumulateDispatches(getID(event._targetInst), null, event);
}
}
@@ -121,10 +125,10 @@ function accumulateTwoPhaseDispatchesSkipTarget(events) {
forEachAccumulated(events, accumulateTwoPhaseDispatchesSingleSkipTarget);
}
-function accumulateEnterLeaveDispatches(leave, enter, fromID, toID) {
+function accumulateEnterLeaveDispatches(leave, enter, from, to) {
EventPluginHub.injection.getInstanceHandle().traverseEnterLeave(
- fromID,
- toID,
+ getID(from),
+ getID(to),
accumulateDispatches,
leave,
enter
diff --git a/src/renderers/shared/event/eventPlugins/ResponderEventPlugin.js b/src/renderers/shared/event/eventPlugins/ResponderEventPlugin.js
index 065cee28ab..15f0e4fa0e 100644
--- a/src/renderers/shared/event/eventPlugins/ResponderEventPlugin.js
+++ b/src/renderers/shared/event/eventPlugins/ResponderEventPlugin.js
@@ -14,7 +14,6 @@
var EventConstants = require('EventConstants');
var EventPluginUtils = require('EventPluginUtils');
var EventPropagators = require('EventPropagators');
-var ReactInstanceHandles = require('ReactInstanceHandles');
var ResponderSyntheticEvent = require('ResponderSyntheticEvent');
var ResponderTouchHistoryStore = require('ResponderTouchHistoryStore');
@@ -31,10 +30,10 @@ var executeDispatchesInOrderStopAtTrue =
EventPluginUtils.executeDispatchesInOrderStopAtTrue;
/**
- * ID of element that should respond to touch/move types of interactions, as
+ * Instance of element that should respond to touch/move types of interactions, as
* indicated explicitly by relevant callbacks.
*/
-var responderID = null;
+var responderInst = null;
/**
* Count of current touches. A textInput should become responder iff the
@@ -47,13 +46,13 @@ var trackedTouchCount = 0;
*/
var previousActiveTouches = 0;
-var changeResponder = function(nextResponderID) {
- var oldResponderID = responderID;
- responderID = nextResponderID;
+var changeResponder = function(nextResponderInst) {
+ var oldResponderInst = responderInst;
+ responderInst = nextResponderInst;
if (ResponderEventPlugin.GlobalResponderHandler !== null) {
ResponderEventPlugin.GlobalResponderHandler.onChange(
- oldResponderID,
- nextResponderID
+ oldResponderInst,
+ nextResponderInst
);
}
};
@@ -149,7 +148,7 @@ var eventTypes = {
* - If nothing is currently the responder, the "appropriate place" is the
* initiating event's `targetID`.
* - If something *is* already the responder, the "appropriate place" is the
- * first common ancestor of the event target and the current `responderID`.
+ * first common ancestor of the event target and the current `responderInst`.
* - Some negotiation happens: See the timing diagram below.
* - Scrolled views automatically become responder. The reasoning is that a
* platform scroll view that isn't built on top of the responder system has
@@ -158,7 +157,7 @@ var eventTypes = {
*
* - Responder being released:
* As soon as no more touches that *started* inside of descendents of the
- * *current* responderID, an `onResponderRelease` event is dispatched to the
+ * *current* responderInst, an `onResponderRelease` event is dispatched to the
* current responder, and the responder lock is released.
*
* TODO:
@@ -316,15 +315,11 @@ to return true:wantsResponderID| |
* - `touchStartCapture` (`EventPluginHub` dispatches as usual)
* - `touchStart` (`EventPluginHub` dispatches as usual)
* - `responderGrant/Reject` (`EventPluginHub` dispatches as usual)
- *
- * @param {string} topLevelType Record from `EventConstants`.
- * @param {string} topLevelTargetID ID of deepest React rendered element.
- * @param {object} nativeEvent Native browser event.
- * @return {*} An accumulation of synthetic events.
*/
+
function setResponderAndExtractTransfer(
topLevelType,
- topLevelTargetID,
+ targetInst,
nativeEvent,
nativeEventTarget
) {
@@ -336,15 +331,15 @@ function setResponderAndExtractTransfer(
eventTypes.scrollShouldSetResponder;
// TODO: stop one short of the the current responder.
- var bubbleShouldSetFrom = !responderID ?
- topLevelTargetID :
- ReactInstanceHandles.getFirstCommonAncestorID(responderID, topLevelTargetID);
+ var bubbleShouldSetFrom = !responderInst ?
+ targetInst :
+ EventPluginUtils.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:
// It's strange to get an `onMoveShouldSetResponder` when you're *already*
// the responder.
- var skipOverBubbleShouldSetFrom = bubbleShouldSetFrom === responderID;
+ var skipOverBubbleShouldSetFrom = bubbleShouldSetFrom === responderInst;
var shouldSetEvent = ResponderSyntheticEvent.getPooled(
shouldSetEventType,
bubbleShouldSetFrom,
@@ -362,24 +357,43 @@ function setResponderAndExtractTransfer(
shouldSetEvent.constructor.release(shouldSetEvent);
}
- if (!wantsResponderID || wantsResponderID === responderID) {
+ if (!wantsResponderID) {
+ return null;
+ }
+
+ // HACK: Temporary tree-crawling until executeDispatchesInOrderStopAtTrue
+ // returns the instance instead of the ID.
+ var wantsResponderInst;
+ for (
+ var inst = bubbleShouldSetFrom;
+ inst;
+ inst = EventPluginUtils.getParentInstance(inst)
+ ) {
+ if (wantsResponderID === inst._rootNodeID) {
+ wantsResponderInst = inst;
+ break;
+ }
+ }
+ invariant(wantsResponderInst, 'Requested responder instance not found.');
+
+ if (wantsResponderInst === responderInst) {
return null;
}
var extracted;
var grantEvent = ResponderSyntheticEvent.getPooled(
eventTypes.responderGrant,
- wantsResponderID,
+ wantsResponderInst,
nativeEvent,
nativeEventTarget
);
grantEvent.touchHistory = ResponderTouchHistoryStore.touchHistory;
EventPropagators.accumulateDirectDispatches(grantEvent);
- if (responderID) {
+ if (responderInst) {
var terminationRequestEvent = ResponderSyntheticEvent.getPooled(
eventTypes.responderTerminationRequest,
- responderID,
+ responderInst,
nativeEvent,
nativeEventTarget
);
@@ -392,21 +406,20 @@ function setResponderAndExtractTransfer(
}
if (shouldSwitch) {
- var terminateType = eventTypes.responderTerminate;
var terminateEvent = ResponderSyntheticEvent.getPooled(
- terminateType,
- responderID,
+ eventTypes.responderTerminate,
+ responderInst,
nativeEvent,
nativeEventTarget
);
terminateEvent.touchHistory = ResponderTouchHistoryStore.touchHistory;
EventPropagators.accumulateDirectDispatches(terminateEvent);
extracted = accumulate(extracted, [grantEvent, terminateEvent]);
- changeResponder(wantsResponderID);
+ changeResponder(wantsResponderInst);
} else {
var rejectEvent = ResponderSyntheticEvent.getPooled(
eventTypes.responderReject,
- wantsResponderID,
+ wantsResponderInst,
nativeEvent,
nativeEventTarget
);
@@ -416,7 +429,7 @@ function setResponderAndExtractTransfer(
}
} else {
extracted = accumulate(extracted, grantEvent);
- changeResponder(wantsResponderID);
+ changeResponder(wantsResponderInst);
}
return extracted;
}
@@ -424,13 +437,13 @@ function setResponderAndExtractTransfer(
/**
* A transfer is a negotiation between a currently set responder and the next
* element to claim responder status. Any start event could trigger a transfer
- * of responderID. Any move event could trigger a transfer.
+ * of responderInst. Any move event could trigger a transfer.
*
* @param {string} topLevelType Record from `EventConstants`.
* @return {boolean} True if a transfer of responder could possibly occur.
*/
-function canTriggerTransfer(topLevelType, topLevelTargetID) {
- return topLevelTargetID && (
+function canTriggerTransfer(topLevelType, targetInst) {
+ return !!targetInst && (
topLevelType === EventConstants.topLevelTypes.topScroll ||
(trackedTouchCount > 0 &&
topLevelType === EventConstants.topLevelTypes.topSelectionChange) ||
@@ -441,7 +454,7 @@ function canTriggerTransfer(topLevelType, topLevelTargetID) {
/**
* Returns whether or not this touch end event makes it such that there are no
- * longer any touches that started inside of the current `responderID`.
+ * longer any touches that started inside of the current `responderInst`.
*
* @param {NativeEvent} nativeEvent Native touch end event.
* @return {boolean} Whether or not this touch end event ends the responder.
@@ -456,12 +469,8 @@ function noResponderTouches(nativeEvent) {
var target = activeTouch.target;
if (target !== null && target !== undefined && target !== 0) {
// Is the original touch location inside of the current responder?
- var isAncestor =
- ReactInstanceHandles.isAncestorIDOf(
- responderID,
- EventPluginUtils.getID(target)
- );
- if (isAncestor) {
+ var targetInst = EventPluginUtils.getInstanceFromNode(target);
+ if (EventPluginUtils.isAncestor(responderInst, targetInst)) {
return false;
}
}
@@ -472,30 +481,24 @@ function noResponderTouches(nativeEvent) {
var ResponderEventPlugin = {
- getResponderID: function() {
- return responderID;
+ /* For unit testing only */
+ _getResponderID: function() {
+ return responderInst ? responderInst._rootNodeID : null;
},
eventTypes: eventTypes,
/**
- * We must be resilient to `topLevelTargetID` being `undefined` on
- * `touchMove`, or `touchEnd`. On certain platforms, this means that a native
- * scroll has assumed control and the original touch targets are destroyed.
- *
- * @param {string} topLevelType Record from `EventConstants`.
- * @param {DOMEventTarget} topLevelTarget The listening component root node.
- * @param {string} topLevelTargetID ID of `topLevelTarget`.
- * @param {object} nativeEvent Native browser event.
- * @return {*} An accumulation of synthetic events.
- * @see {EventPluginHub.extractEvents}
+ * We must be resilient to `targetInst` being `null` on `touchMove` or
+ * `touchEnd`. On certain platforms, this means that a native scroll has
+ * assumed control and the original touch targets are destroyed.
*/
extractEvents: function(
- topLevelType,
- topLevelTarget,
- topLevelTargetID,
- nativeEvent,
- nativeEventTarget) {
+ topLevelType,
+ targetInst,
+ nativeEvent,
+ nativeEventTarget
+ ) {
if (isStartish(topLevelType)) {
trackedTouchCount += 1;
} else if (isEndish(topLevelType)) {
@@ -508,10 +511,10 @@ var ResponderEventPlugin = {
ResponderTouchHistoryStore.recordTouchTrack(topLevelType, nativeEvent, nativeEventTarget);
- var extracted = canTriggerTransfer(topLevelType, topLevelTargetID) ?
+ var extracted = canTriggerTransfer(topLevelType, targetInst) ?
setResponderAndExtractTransfer(
topLevelType,
- topLevelTargetID,
+ targetInst,
nativeEvent,
nativeEventTarget) :
null;
@@ -525,9 +528,9 @@ var ResponderEventPlugin = {
// These multiple individual change touch events are are always bookended
// by `onResponderGrant`, and one of
// (`onResponderRelease/onResponderTerminate`).
- var isResponderTouchStart = responderID && isStartish(topLevelType);
- var isResponderTouchMove = responderID && isMoveish(topLevelType);
- var isResponderTouchEnd = responderID && isEndish(topLevelType);
+ var isResponderTouchStart = responderInst && isStartish(topLevelType);
+ var isResponderTouchMove = responderInst && isMoveish(topLevelType);
+ var isResponderTouchEnd = responderInst && isEndish(topLevelType);
var incrementalTouch =
isResponderTouchStart ? eventTypes.responderStart :
isResponderTouchMove ? eventTypes.responderMove :
@@ -538,7 +541,7 @@ var ResponderEventPlugin = {
var gesture =
ResponderSyntheticEvent.getPooled(
incrementalTouch,
- responderID,
+ responderInst,
nativeEvent,
nativeEventTarget
);
@@ -548,10 +551,10 @@ var ResponderEventPlugin = {
}
var isResponderTerminate =
- responderID &&
+ responderInst &&
topLevelType === EventConstants.topLevelTypes.topTouchCancel;
var isResponderRelease =
- responderID &&
+ responderInst &&
!isResponderTerminate &&
isEndish(topLevelType) &&
noResponderTouches(nativeEvent);
@@ -560,8 +563,9 @@ var ResponderEventPlugin = {
isResponderRelease ? eventTypes.responderRelease :
null;
if (finalTouch) {
- var finalEvent =
- ResponderSyntheticEvent.getPooled(finalTouch, responderID, nativeEvent, nativeEventTarget);
+ var finalEvent = ResponderSyntheticEvent.getPooled(
+ finalTouch, responderInst, nativeEvent, nativeEventTarget
+ );
finalEvent.touchHistory = ResponderTouchHistoryStore.touchHistory;
EventPropagators.accumulateDirectDispatches(finalEvent);
extracted = accumulate(extracted, finalEvent);
diff --git a/src/renderers/shared/event/eventPlugins/__tests__/ResponderEventPlugin-test.js b/src/renderers/shared/event/eventPlugins/__tests__/ResponderEventPlugin-test.js
index 21c719aabe..533fc15b22 100644
--- a/src/renderers/shared/event/eventPlugins/__tests__/ResponderEventPlugin-test.js
+++ b/src/renderers/shared/event/eventPlugins/__tests__/ResponderEventPlugin-test.js
@@ -17,11 +17,6 @@ var ReactInstanceHandles;
var ResponderEventPlugin;
var EventPluginUtils;
-var GRANDPARENT_ID = '.0';
-var PARENT_ID = '.0.0';
-var CHILD_ID = '.0.0.0';
-var CHILD_ID2 = '.0.0.1';
-
var topLevelTypes;
var touch = function(nodeHandle, i) {
@@ -89,8 +84,7 @@ var _touchConfig = function(
changedTouchObjects
),
topLevelType: topType,
- target: targetNodeHandle,
- targetID: targetNodeHandle,
+ targetInst: idToInstance[targetNodeHandle],
};
};
@@ -296,8 +290,7 @@ var run = function(config, hierarchyConfig, nativeEventConfig) {
// Trigger the event
var extractedEvents = ResponderEventPlugin.extractEvents(
nativeEventConfig.topLevelType,
- nativeEventConfig.target,
- nativeEventConfig.targetID,
+ nativeEventConfig.targetInst,
nativeEventConfig.nativeEvent,
nativeEventConfig.target
);
@@ -316,6 +309,16 @@ var run = function(config, hierarchyConfig, nativeEventConfig) {
); // +1 for extra ++
};
+var GRANDPARENT_ID = '.0';
+var PARENT_ID = '.0.0';
+var CHILD_ID = '.0.0.0';
+var CHILD_ID2 = '.0.0.1';
+
+var idToInstance = {};
+[GRANDPARENT_ID, PARENT_ID, CHILD_ID, CHILD_ID2].forEach(function(id) {
+ idToInstance[id] = {_rootNodeID: id};
+});
+
var three = {
grandParent: GRANDPARENT_ID,
parent: PARENT_ID,
@@ -351,6 +354,39 @@ describe('ResponderEventPlugin', function() {
},
});
+ EventPluginUtils.injection.injectComponentTree({
+ getInstanceFromNode: function(id) {
+ return idToInstance[id];
+ },
+ getNodeFromInstance: function(inst) {
+ return inst._rootNodeID;
+ },
+ });
+
+ EventPluginUtils.injection.injectTreeTraversal({
+ isAncestor: function(a, b) {
+ return ReactInstanceHandles.isAncestorIDOf(
+ a._rootNodeID,
+ b._rootNodeID
+ );
+ },
+ getLowestCommonAncestor: function(a, b) {
+ if (!a || !b) {
+ return null;
+ }
+ var commonID = ReactInstanceHandles.getFirstCommonAncestorID(
+ a._rootNodeID,
+ b._rootNodeID
+ );
+ return idToInstance[commonID] || null;
+ },
+ getParentInstance: function(inst) {
+ var id = inst._rootNodeID;
+ var parentID = id.substr(0, id.lastIndexOf('.'));
+ return idToInstance[parentID] || null;
+ },
+ });
+
topLevelTypes = EventConstants.topLevelTypes;
});
@@ -363,12 +399,12 @@ describe('ResponderEventPlugin', function() {
config.startShouldSetResponder.bubbled.parent = {order: 4, returnVal: false};
config.startShouldSetResponder.bubbled.grandParent = {order: 5, returnVal: false};
run(config, three, startConfig(three.child, [three.child], [0]));
- expect(ResponderEventPlugin.getResponderID()).toBe(null);
+ expect(ResponderEventPlugin._getResponderID()).toBe(null);
// Now no handlers should be called on `touchEnd`.
config = oneEventLoopTestConfig(three);
run(config, three, endConfig(three.child, [three.child], [0]));
- expect(ResponderEventPlugin.getResponderID()).toBe(null);
+ expect(ResponderEventPlugin._getResponderID()).toBe(null);
});
@@ -384,13 +420,13 @@ describe('ResponderEventPlugin', function() {
config.responderGrant.grandParent = {order: 1};
config.responderStart.grandParent = {order: 2};
run(config, three, startConfig(three.child, [three.child], [0]));
- expect(ResponderEventPlugin.getResponderID()).toBe(GRANDPARENT_ID);
+ expect(ResponderEventPlugin._getResponderID()).toBe(three.grandParent);
config = oneEventLoopTestConfig(three);
config.responderEnd.grandParent = {order: 0};
config.responderRelease.grandParent = {order: 1};
run(config, three, endConfig(three.child, [three.child], [0]));
- expect(ResponderEventPlugin.getResponderID()).toBe(null);
+ expect(ResponderEventPlugin._getResponderID()).toBe(null);
});
it('should grant responder parent while capturing', () => {
@@ -400,13 +436,13 @@ describe('ResponderEventPlugin', function() {
config.responderGrant.parent = {order: 2};
config.responderStart.parent = {order: 3};
run(config, three, startConfig(three.child, [three.child], [0]));
- expect(ResponderEventPlugin.getResponderID()).toBe(PARENT_ID);
+ expect(ResponderEventPlugin._getResponderID()).toBe(three.parent);
config = oneEventLoopTestConfig(three);
config.responderEnd.parent = {order: 0};
config.responderRelease.parent = {order: 1};
run(config, three, endConfig(three.child, [three.child], [0]));
- expect(ResponderEventPlugin.getResponderID()).toBe(null);
+ expect(ResponderEventPlugin._getResponderID()).toBe(null);
});
it('should grant responder child while capturing', () => {
@@ -417,13 +453,13 @@ describe('ResponderEventPlugin', function() {
config.responderGrant.child = {order: 3};
config.responderStart.child = {order: 4};
run(config, three, startConfig(three.child, [three.child], [0]));
- expect(ResponderEventPlugin.getResponderID()).toBe(three.child);
+ expect(ResponderEventPlugin._getResponderID()).toBe(three.child);
config = oneEventLoopTestConfig(three);
config.responderEnd.child = {order: 0};
config.responderRelease.child = {order: 1};
run(config, three, endConfig(three.child, [three.child], [0]));
- expect(ResponderEventPlugin.getResponderID()).toBe(null);
+ expect(ResponderEventPlugin._getResponderID()).toBe(null);
});
it('should grant responder child while bubbling', () => {
@@ -435,13 +471,13 @@ describe('ResponderEventPlugin', function() {
config.responderGrant.child = {order: 4};
config.responderStart.child = {order: 5};
run(config, three, startConfig(three.child, [three.child], [0]));
- expect(ResponderEventPlugin.getResponderID()).toBe(three.child);
+ expect(ResponderEventPlugin._getResponderID()).toBe(three.child);
config = oneEventLoopTestConfig(three);
config.responderEnd.child = {order: 0};
config.responderRelease.child = {order: 1};
run(config, three, endConfig(three.child, [three.child], [0]));
- expect(ResponderEventPlugin.getResponderID()).toBe(null);
+ expect(ResponderEventPlugin._getResponderID()).toBe(null);
});
it('should grant responder parent while bubbling', () => {
@@ -454,13 +490,13 @@ describe('ResponderEventPlugin', function() {
config.responderGrant.parent = {order: 5};
config.responderStart.parent = {order: 6};
run(config, three, startConfig(three.child, [three.child], [0]));
- expect(ResponderEventPlugin.getResponderID()).toBe(PARENT_ID);
+ expect(ResponderEventPlugin._getResponderID()).toBe(three.parent);
config = oneEventLoopTestConfig(three);
config.responderEnd.parent = {order: 0};
config.responderRelease.parent = {order: 1};
run(config, three, endConfig(three.child, [three.child], [0]));
- expect(ResponderEventPlugin.getResponderID()).toBe(null);
+ expect(ResponderEventPlugin._getResponderID()).toBe(null);
});
it('should grant responder grandParent while bubbling', () => {
@@ -474,13 +510,13 @@ describe('ResponderEventPlugin', function() {
config.responderGrant.grandParent = {order: 6};
config.responderStart.grandParent = {order: 7};
run(config, three, startConfig(three.child, [three.child], [0]));
- expect(ResponderEventPlugin.getResponderID()).toBe(GRANDPARENT_ID);
+ expect(ResponderEventPlugin._getResponderID()).toBe(three.grandParent);
config = oneEventLoopTestConfig(three);
config.responderEnd.grandParent = {order: 0};
config.responderRelease.grandParent = {order: 1};
run(config, three, endConfig(three.child, [three.child], [0]));
- expect(ResponderEventPlugin.getResponderID()).toBe(null);
+ expect(ResponderEventPlugin._getResponderID()).toBe(null);
});
@@ -506,13 +542,13 @@ describe('ResponderEventPlugin', function() {
config.responderGrant.grandParent = {order: 1};
config.responderMove.grandParent = {order: 2};
run(config, three, moveConfig(three.child, [three.child], [0]));
- expect(ResponderEventPlugin.getResponderID()).toBe(GRANDPARENT_ID);
+ expect(ResponderEventPlugin._getResponderID()).toBe(three.grandParent);
config = oneEventLoopTestConfig(three);
config.responderEnd.grandParent = {order: 0};
config.responderRelease.grandParent = {order: 1};
run(config, three, endConfig(three.child, [three.child], [0]));
- expect(ResponderEventPlugin.getResponderID()).toBe(null);
+ expect(ResponderEventPlugin._getResponderID()).toBe(null);
});
it('should grant responder parent while capturing move', () => {
@@ -532,13 +568,13 @@ describe('ResponderEventPlugin', function() {
config.responderGrant.parent = {order: 2};
config.responderMove.parent = {order: 3};
run(config, three, moveConfig(three.child, [three.child], [0]));
- expect(ResponderEventPlugin.getResponderID()).toBe(PARENT_ID);
+ expect(ResponderEventPlugin._getResponderID()).toBe(three.parent);
config = oneEventLoopTestConfig(three);
config.responderEnd.parent = {order: 0};
config.responderRelease.parent = {order: 1};
run(config, three, endConfig(three.child, [three.child], [0]));
- expect(ResponderEventPlugin.getResponderID()).toBe(null);
+ expect(ResponderEventPlugin._getResponderID()).toBe(null);
});
it('should grant responder child while capturing move', () => {
@@ -559,13 +595,13 @@ describe('ResponderEventPlugin', function() {
config.responderGrant.child = {order: 3};
config.responderMove.child = {order: 4};
run(config, three, moveConfig(three.child, [three.child], [0]));
- expect(ResponderEventPlugin.getResponderID()).toBe(three.child);
+ expect(ResponderEventPlugin._getResponderID()).toBe(three.child);
config = oneEventLoopTestConfig(three);
config.responderEnd.child = {order: 0};
config.responderRelease.child = {order: 1};
run(config, three, endConfig(three.child, [three.child], [0]));
- expect(ResponderEventPlugin.getResponderID()).toBe(null);
+ expect(ResponderEventPlugin._getResponderID()).toBe(null);
});
it('should grant responder child while bubbling move', () => {
@@ -587,13 +623,13 @@ describe('ResponderEventPlugin', function() {
config.responderGrant.child = {order: 4};
config.responderMove.child = {order: 5};
run(config, three, moveConfig(three.child, [three.child], [0]));
- expect(ResponderEventPlugin.getResponderID()).toBe(three.child);
+ expect(ResponderEventPlugin._getResponderID()).toBe(three.child);
config = oneEventLoopTestConfig(three);
config.responderEnd.child = {order: 0};
config.responderRelease.child = {order: 1};
run(config, three, endConfig(three.child, [three.child], [0]));
- expect(ResponderEventPlugin.getResponderID()).toBe(null);
+ expect(ResponderEventPlugin._getResponderID()).toBe(null);
});
it('should grant responder parent while bubbling move', () => {
@@ -616,13 +652,13 @@ describe('ResponderEventPlugin', function() {
config.responderGrant.parent = {order: 5};
config.responderMove.parent = {order: 6};
run(config, three, moveConfig(three.child, [three.child], [0]));
- expect(ResponderEventPlugin.getResponderID()).toBe(PARENT_ID);
+ expect(ResponderEventPlugin._getResponderID()).toBe(three.parent);
config = oneEventLoopTestConfig(three);
config.responderEnd.parent = {order: 0};
config.responderRelease.parent = {order: 1};
run(config, three, endConfig(three.child, [three.child], [0]));
- expect(ResponderEventPlugin.getResponderID()).toBe(null);
+ expect(ResponderEventPlugin._getResponderID()).toBe(null);
});
it('should grant responder grandParent while bubbling move', () => {
@@ -646,13 +682,13 @@ describe('ResponderEventPlugin', function() {
config.responderGrant.grandParent = {order: 6};
config.responderMove.grandParent = {order: 7};
run(config, three, moveConfig(three.child, [three.child], [0]));
- expect(ResponderEventPlugin.getResponderID()).toBe(GRANDPARENT_ID);
+ expect(ResponderEventPlugin._getResponderID()).toBe(three.grandParent);
config = oneEventLoopTestConfig(three);
config.responderEnd.grandParent = {order: 0};
config.responderRelease.grandParent = {order: 1};
run(config, three, endConfig(three.child, [three.child], [0]));
- expect(ResponderEventPlugin.getResponderID()).toBe(null);
+ expect(ResponderEventPlugin._getResponderID()).toBe(null);
});
@@ -668,9 +704,9 @@ describe('ResponderEventPlugin', function() {
config.responderGrant.parent = {order: 2};
config.responderStart.parent = {order: 3};
run(config, three, startConfig(three.child, [three.child], [0]));
- expect(ResponderEventPlugin.getResponderID()).toBe(PARENT_ID);
+ expect(ResponderEventPlugin._getResponderID()).toBe(three.parent);
- // While `PARENT_ID` is still responder, we create new handlers that verify
+ // While `parent` is still responder, we create new handlers that verify
// the ordering of propagation, restarting the count at `0`.
config = oneEventLoopTestConfig(three);
config.startShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
@@ -678,13 +714,13 @@ describe('ResponderEventPlugin', function() {
config.startShouldSetResponder.bubbled.grandParent = {order: 1, returnVal: false};
config.responderStart.parent = {order: 2};
run(config, three, startConfig(three.child, [three.child], [0]));
- expect(ResponderEventPlugin.getResponderID()).toBe(PARENT_ID);
+ expect(ResponderEventPlugin._getResponderID()).toBe(three.parent);
config = oneEventLoopTestConfig(three);
config.responderEnd.parent = {order: 0};
config.responderRelease.parent = {order: 1};
run(config, three, endConfig(three.child, [three.child], [0]));
- expect(ResponderEventPlugin.getResponderID()).toBe(null);
+ expect(ResponderEventPlugin._getResponderID()).toBe(null);
});
it('should bubble negotiation to first common ancestor of responder then transfer', () => {
@@ -694,7 +730,7 @@ describe('ResponderEventPlugin', function() {
config.responderGrant.parent = {order: 2};
config.responderStart.parent = {order: 3};
run(config, three, startConfig(three.child, [three.child], [0]));
- expect(ResponderEventPlugin.getResponderID()).toBe(PARENT_ID);
+ expect(ResponderEventPlugin._getResponderID()).toBe(three.parent);
config = oneEventLoopTestConfig(three);
@@ -705,19 +741,19 @@ describe('ResponderEventPlugin', function() {
config.responderTerminate.parent = {order: 3};
config.responderStart.grandParent = {order: 4};
run(config, three, startConfig(three.child, [three.child, three.child], [1]));
- expect(ResponderEventPlugin.getResponderID()).toBe(GRANDPARENT_ID);
+ expect(ResponderEventPlugin._getResponderID()).toBe(three.grandParent);
config = oneEventLoopTestConfig(three);
config.responderEnd.grandParent = {order: 0};
// one remains\ /one ended \
run(config, three, endConfig(three.child, [three.child, three.child], [1]));
- expect(ResponderEventPlugin.getResponderID()).toBe(GRANDPARENT_ID);
+ expect(ResponderEventPlugin._getResponderID()).toBe(three.grandParent);
config = oneEventLoopTestConfig(three);
config.responderEnd.grandParent = {order: 0};
config.responderRelease.grandParent = {order: 1};
run(config, three, endConfig(three.child, [three.child], [0]));
- expect(ResponderEventPlugin.getResponderID()).toBe(null);
+ expect(ResponderEventPlugin._getResponderID()).toBe(null);
});
/**
@@ -733,7 +769,7 @@ describe('ResponderEventPlugin', function() {
config.startShouldSetResponder.bubbled.grandParent = {order: 3, returnVal: false};
run(config, three, startConfig(three.parent, [three.parent], [0]));
- expect(ResponderEventPlugin.getResponderID()).toBe(null);
+ expect(ResponderEventPlugin._getResponderID()).toBe(null);
config = oneEventLoopTestConfig(three);
@@ -749,7 +785,7 @@ describe('ResponderEventPlugin', function() {
config.responderStart.child = {order: 5};
// / Two active touches \ /one of them new\
run(config, three, startConfig(three.child, [three.parent, three.child], [1]));
- expect(ResponderEventPlugin.getResponderID()).toBe(three.child);
+ expect(ResponderEventPlugin._getResponderID()).toBe(three.child);
// Now we remove the original first touch, keeping the second touch that
@@ -759,7 +795,7 @@ describe('ResponderEventPlugin', function() {
config.responderEnd.child = {order: 0};
// / one ended\ /one remains \
run(config, three, endConfig(three.child, [three.parent, three.child], [0]));
- expect(ResponderEventPlugin.getResponderID()).toBe(three.child);
+ expect(ResponderEventPlugin._getResponderID()).toBe(three.child);
// Okay, now let's add back that first touch (nothing should change) and
// then we'll try peeling back the touches in the opposite order to make
@@ -775,7 +811,7 @@ describe('ResponderEventPlugin', function() {
config.responderStart.child = {order: 4};
// / Two active touches \ /one of them new\
run(config, three, startConfig(three.parent, [three.child, three.parent], [1]));
- expect(ResponderEventPlugin.getResponderID()).toBe(three.child);
+ expect(ResponderEventPlugin._getResponderID()).toBe(three.child);
// Now, move that new touch that had no effect, and did not start within
@@ -790,7 +826,7 @@ describe('ResponderEventPlugin', function() {
config.responderMove.child = {order: 4};
// / Two active touches \ /one of them moved\
run(config, three, moveConfig(three.parent, [three.child, three.parent], [1]));
- expect(ResponderEventPlugin.getResponderID()).toBe(three.child);
+ expect(ResponderEventPlugin._getResponderID()).toBe(three.child);
config = oneEventLoopTestConfig(three);
@@ -798,7 +834,7 @@ describe('ResponderEventPlugin', function() {
config.responderRelease.child = {order: 1};
// /child end \ /parent remain\
run(config, three, endConfig(three.child, [three.child, three.parent], [0]));
- expect(ResponderEventPlugin.getResponderID()).toBe(null);
+ expect(ResponderEventPlugin._getResponderID()).toBe(null);
});
@@ -816,7 +852,7 @@ describe('ResponderEventPlugin', function() {
config.responderStart.childOne = {order: 4};
run(config, siblings, startConfig(siblings.childOne, [siblings.childOne], [0]));
- expect(ResponderEventPlugin.getResponderID()).toBe(siblings.childOne);
+ expect(ResponderEventPlugin._getResponderID()).toBe(siblings.childOne);
// If the touch target is the sibling item, the negotiation should only
// propagate to first common ancestor of current responder and sibling (so
@@ -829,7 +865,7 @@ describe('ResponderEventPlugin', function() {
var touchConfig =
startConfig(siblings.childTwo, [siblings.childOne, siblings.childTwo], [1]);
run(config, siblings, touchConfig);
- expect(ResponderEventPlugin.getResponderID()).toBe(siblings.childOne);
+ expect(ResponderEventPlugin._getResponderID()).toBe(siblings.childOne);
// move childOne
@@ -838,7 +874,7 @@ describe('ResponderEventPlugin', function() {
config.moveShouldSetResponder.bubbled.parent = {order: 1, returnVal: false};
config.responderMove.childOne = {order: 2};
run(config, siblings, moveConfig(siblings.childOne, [siblings.childOne, siblings.childTwo], [0]));
- expect(ResponderEventPlugin.getResponderID()).toBe(siblings.childOne);
+ expect(ResponderEventPlugin._getResponderID()).toBe(siblings.childOne);
// move childTwo: Only negotiates to `parent`.
config = oneEventLoopTestConfig(siblings);
@@ -846,7 +882,7 @@ describe('ResponderEventPlugin', function() {
config.moveShouldSetResponder.bubbled.parent = {order: 1, returnVal: false};
config.responderMove.childOne = {order: 2};
run(config, siblings, moveConfig(siblings.childTwo, [siblings.childOne, siblings.childTwo], [1]));
- expect(ResponderEventPlugin.getResponderID()).toBe(siblings.childOne);
+ expect(ResponderEventPlugin._getResponderID()).toBe(siblings.childOne);
});
@@ -862,7 +898,7 @@ describe('ResponderEventPlugin', function() {
config.responderStart.child = {order: 5};
run(config, three, startConfig(three.child, [three.child], [0]));
- expect(ResponderEventPlugin.getResponderID()).toBe(three.child);
+ expect(ResponderEventPlugin._getResponderID()).toBe(three.child);
// Suppose parent wants to become responder on move, and is rejected
config = oneEventLoopTestConfig(three);
@@ -877,7 +913,7 @@ describe('ResponderEventPlugin', function() {
var touchConfig =
moveConfig(three.child, [three.child], [0]);
run(config, three, touchConfig);
- expect(ResponderEventPlugin.getResponderID()).toBe(three.child);
+ expect(ResponderEventPlugin._getResponderID()).toBe(three.child);
config = oneEventLoopTestConfig(three);
config.startShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
@@ -891,7 +927,7 @@ describe('ResponderEventPlugin', function() {
touchConfig =
startConfig(three.child, [three.child, three.child], [1]);
run(config, three, touchConfig);
- expect(ResponderEventPlugin.getResponderID()).toBe(three.child);
+ expect(ResponderEventPlugin._getResponderID()).toBe(three.child);
});
@@ -907,7 +943,7 @@ describe('ResponderEventPlugin', function() {
config.responderStart.child = {order: 5};
run(config, three, startConfig(three.child, [three.child], [0]));
- expect(ResponderEventPlugin.getResponderID()).toBe(three.child);
+ expect(ResponderEventPlugin._getResponderID()).toBe(three.child);
// If the touch target is the sibling item, the negotiation should only
// propagate to first common ancestor of current responder and sibling (so
@@ -921,11 +957,10 @@ describe('ResponderEventPlugin', function() {
run(config, three, {
topLevelType: topLevelTypes.topScroll,
- target: three.parent,
- targetID: three.parent,
+ targetInst: idToInstance[three.parent],
nativeEvent: {},
});
- expect(ResponderEventPlugin.getResponderID()).toBe(three.child);
+ expect(ResponderEventPlugin._getResponderID()).toBe(three.child);
// Now lets let the scroll take control this time.
@@ -939,11 +974,10 @@ describe('ResponderEventPlugin', function() {
run(config, three, {
topLevelType: topLevelTypes.topScroll,
- target: three.parent,
- targetID: three.parent,
+ targetInst: idToInstance[three.parent],
nativeEvent: {},
});
- expect(ResponderEventPlugin.getResponderID()).toBe(three.parent);
+ expect(ResponderEventPlugin._getResponderID()).toBe(three.parent);
});
@@ -959,7 +993,7 @@ describe('ResponderEventPlugin', function() {
config.responderStart.child = {order: 5};
run(config, three, startConfig(three.child, [three.child], [0]));
- expect(ResponderEventPlugin.getResponderID()).toBe(three.child);
+ expect(ResponderEventPlugin._getResponderID()).toBe(three.child);
config = oneEventLoopTestConfig(three);
config.responderEnd.child = {order: 0};
@@ -972,6 +1006,6 @@ describe('ResponderEventPlugin', function() {
[0]
);
run(config, three, nativeEvent);
- expect(ResponderEventPlugin.getResponderID()).toBe(null);
+ expect(ResponderEventPlugin._getResponderID()).toBe(null);
});
});
diff --git a/src/renderers/shared/reconciler/ReactEventEmitterMixin.js b/src/renderers/shared/reconciler/ReactEventEmitterMixin.js
index 6ab34f0050..9295e2675e 100644
--- a/src/renderers/shared/reconciler/ReactEventEmitterMixin.js
+++ b/src/renderers/shared/reconciler/ReactEventEmitterMixin.js
@@ -23,22 +23,15 @@ var ReactEventEmitterMixin = {
/**
* Streams a fired top-level event to `EventPluginHub` where plugins have the
* opportunity to create `ReactEvent`s to be dispatched.
- *
- * @param {string} topLevelType Record from `EventConstants`.
- * @param {object} topLevelTarget The listening component root node.
- * @param {string} topLevelTargetID ID of `topLevelTarget`.
- * @param {object} nativeEvent Native environment event.
*/
handleTopLevel: function(
topLevelType,
- topLevelTarget,
- topLevelTargetID,
+ targetInst,
nativeEvent,
nativeEventTarget) {
var events = EventPluginHub.extractEvents(
topLevelType,
- topLevelTarget,
- topLevelTargetID,
+ targetInst,
nativeEvent,
nativeEventTarget
);
diff --git a/src/test/ReactTestUtils.js b/src/test/ReactTestUtils.js
index 8be0366f4b..464502638a 100644
--- a/src/test/ReactTestUtils.js
+++ b/src/test/ReactTestUtils.js
@@ -18,12 +18,12 @@ var EventPluginRegistry = require('EventPluginRegistry');
var EventPropagators = require('EventPropagators');
var React = require('React');
var ReactDOM = require('ReactDOM');
+var ReactDOMComponentTree = require('ReactDOMComponentTree');
var ReactElement = require('ReactElement');
var ReactBrowserEventEmitter = require('ReactBrowserEventEmitter');
var ReactCompositeComponent = require('ReactCompositeComponent');
var ReactInstanceHandles = require('ReactInstanceHandles');
var ReactInstanceMap = require('ReactInstanceMap');
-var ReactMount = require('ReactMount');
var ReactUpdates = require('ReactUpdates');
var SyntheticEvent = require('SyntheticEvent');
@@ -490,7 +490,7 @@ function makeSimulator(eventType) {
// properly destroying any properties assigned from `eventData` upon release
var event = new SyntheticEvent(
dispatchConfig,
- ReactMount.getID(node),
+ ReactDOMComponentTree.getInstanceFromNode(node),
fakeNativeEvent,
node
);