Fix findCurrentFiberUsingSlowPath w/ no alternate

facebook · Dec 6, 2018 · 6a7d3a0 · 6a7d3a0
1 parent 5c306e6
commit 6a7d3a0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/packages/react-dom/src/__tests__/ReactDOMSuspensePlaceholder-test.internal.js b/packages/react-dom/src/__tests__/ReactDOMSuspensePlaceholder-test.internal.js
@@ -262,8 +262,8 @@ describe('ReactDOMSuspensePlaceholder', () => {
     }
 
     ReactDOM.render(<App />, container);
-    // expect(log).toEqual([]);
+    expect(log).toEqual(['cDM']);
     ReactDOM.render(<App />, container);
-    // expect(log).toEqual(['cDM']);
+    expect(log).toEqual(['cDM', 'cDU']);
   });
 });
diff --git a/packages/react-reconciler/src/ReactFiberTreeReflection.js b/packages/react-reconciler/src/ReactFiberTreeReflection.js
@@ -117,16 +117,17 @@ export function findCurrentFiberUsingSlowPath(fiber: Fiber): Fiber | null {
   let b = alternate;
   while (true) {
     let parentA = a.return;
-    let parentB = parentA ? parentA.alternate : null;
-    if (!parentA || !parentB) {
+    if (!parentA) {
       // We're at the root.
       break;
     }
 
-    // If both copies of the parent fiber point to the same child, we can
-    // assume that the child is current. This happens when we bailout on low
-    // priority: the bailed out fiber's child reuses the current child.
-    if (parentA.child === parentB.child) {
+    // If both copies of the parent fiber point to the same child (or if there
+    // is only a single parent fiber), we can assume that the child is current.
+    // This happens when we bailout on low priority: the bailed out fiber's
+    // child reuses the current child.
+    let parentB = parentA.alternate;
+    if (parentB === null || parentA.child === parentB.child) {
       let child = parentA.child;
       while (child) {
         if (child === a) {