Skip to content

Commit 6834477

Browse files
committed
Use getCurrentFiber in ReactTestUtils
1 parent 39f39e6 commit 6834477

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

src/test/ReactTestUtils.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ var ReactTypeOfWork = require('ReactTypeOfWork');
2525
var ReactUpdates = require('ReactUpdates');
2626
var SyntheticEvent = require('SyntheticEvent');
2727
var ReactShallowRenderer = require('ReactShallowRenderer');
28+
var { getCurrentFiber } = require('ReactFiberTreeReflection');
2829

2930
var findDOMNode = require('findDOMNode');
3031
var invariant = require('invariant');
@@ -213,13 +214,10 @@ var ReactTestUtils = {
213214
var internalInstance = ReactInstanceMap.get(inst);
214215
if (internalInstance && typeof internalInstance.tag === 'number') {
215216
var fiber = internalInstance;
216-
var root = fiber;
217-
while (root.return) {
218-
root = root.return;
217+
var current = getCurrentFiber(fiber);
218+
if (!current) {
219+
return [];
219220
}
220-
var isRootCurrent = root.tag === HostContainer && root.stateNode.current === root;
221-
// Make sure we're introspecting the current tree
222-
var current = isRootCurrent ? fiber : fiber.alternate;
223221
return findAllInRenderedFiberTreeInternal(current, test);
224222
} else {
225223
return findAllInRenderedStackTreeInternal(internalInstance, test);

0 commit comments

Comments
 (0)