From 1b388366c197516a2508a573146221fd126ff66a Mon Sep 17 00:00:00 2001 From: Andrew Clark Date: Fri, 14 Apr 2017 17:06:53 -0700 Subject: [PATCH] Inherit contextTag from the parent on creation A fiber has all the context flags of its parent. It may also add additional ones during construction/mount. After mounting, contextTag shouldn't change. --- src/renderers/shared/fiber/ReactChildFiber.js | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/renderers/shared/fiber/ReactChildFiber.js b/src/renderers/shared/fiber/ReactChildFiber.js index ca1022e3e2..49d3ce419c 100644 --- a/src/renderers/shared/fiber/ReactChildFiber.js +++ b/src/renderers/shared/fiber/ReactChildFiber.js @@ -307,6 +307,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) { // Insert const created = createFiberFromText(textContent, priority); created.return = returnFiber; + created.contextTag = returnFiber.contextTag; return created; } else { // Update @@ -328,6 +329,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) { const created = createFiberFromElement(element, priority); created.ref = coerceRef(current, element); created.return = returnFiber; + created.contextTag = returnFiber.contextTag; return created; } else { // Move based on index @@ -354,6 +356,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) { // Insert const created = createFiberFromCoroutine(coroutine, priority); created.return = returnFiber; + created.contextTag = returnFiber.contextTag; return created; } else { // Move based on index @@ -375,6 +378,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) { const created = createFiberFromYield(yieldNode, priority); created.type = yieldNode.value; created.return = returnFiber; + created.contextTag = returnFiber.contextTag; return created; } else { // Move based on index @@ -400,6 +404,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) { // Insert const created = createFiberFromPortal(portal, priority); created.return = returnFiber; + created.contextTag = returnFiber.contextTag; return created; } else { // Update @@ -420,6 +425,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) { // Insert const created = createFiberFromFragment(fragment, priority); created.return = returnFiber; + created.contextTag = returnFiber.contextTag; return created; } else { // Update @@ -441,6 +447,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) { // node. const created = createFiberFromText('' + newChild, priority); created.return = returnFiber; + created.contextTag = returnFiber.contextTag; return created; } @@ -450,12 +457,14 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) { const created = createFiberFromElement(newChild, priority); created.ref = coerceRef(null, newChild); created.return = returnFiber; + created.contextTag = returnFiber.contextTag; return created; } case REACT_COROUTINE_TYPE: { const created = createFiberFromCoroutine(newChild, priority); created.return = returnFiber; + created.contextTag = returnFiber.contextTag; return created; } @@ -463,12 +472,14 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) { const created = createFiberFromYield(newChild, priority); created.type = newChild.value; created.return = returnFiber; + created.contextTag = returnFiber.contextTag; return created; } case REACT_PORTAL_TYPE: { const created = createFiberFromPortal(newChild, priority); created.return = returnFiber; + created.contextTag = returnFiber.contextTag; return created; } } @@ -476,6 +487,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) { if (isArray(newChild) || getIteratorFn(newChild)) { const created = createFiberFromFragment(newChild, priority); created.return = returnFiber; + created.contextTag = returnFiber.contextTag; return created; } @@ -1013,6 +1025,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) { deleteRemainingChildren(returnFiber, currentFirstChild); const created = createFiberFromText(textContent, priority); created.return = returnFiber; + created.contextTag = returnFiber.contextTag; return created; } @@ -1052,6 +1065,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) { const created = createFiberFromElement(element, priority); created.ref = coerceRef(currentFirstChild, element); created.return = returnFiber; + created.contextTag = returnFiber.contextTag; return created; } @@ -1085,6 +1099,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) { const created = createFiberFromCoroutine(coroutine, priority); created.return = returnFiber; + created.contextTag = returnFiber.contextTag; return created; } @@ -1111,6 +1126,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) { const created = createFiberFromYield(yieldNode, priority); created.type = yieldNode.value; created.return = returnFiber; + created.contextTag = returnFiber.contextTag; return created; } @@ -1148,6 +1164,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) { const created = createFiberFromPortal(portal, priority); created.return = returnFiber; + created.contextTag = returnFiber.contextTag; return created; }