From f8cb22ad83dca56aca5efd87105d48d2c0fbe423 Mon Sep 17 00:00:00 2001 From: Brian Vaughn Date: Mon, 12 Dec 2016 10:12:43 -0800 Subject: [PATCH] Add rootContainerInstance param to createTextInstance. This mirrors a recent change in params passed to and cleans up a HACK currently required for the native fiber renderer to create text views. --- src/renderers/art/ReactARTFiber.js | 2 +- src/renderers/dom/fiber/ReactDOMFiber.js | 2 +- src/renderers/noop/ReactNoop.js | 2 +- src/renderers/shared/fiber/ReactFiberCompleteWork.js | 3 ++- src/renderers/shared/fiber/ReactFiberReconciler.js | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/renderers/art/ReactARTFiber.js b/src/renderers/art/ReactARTFiber.js index 8655b8b8e2..c4fa6d7f5e 100644 --- a/src/renderers/art/ReactARTFiber.js +++ b/src/renderers/art/ReactARTFiber.js @@ -446,7 +446,7 @@ const ARTRenderer = ReactFiberReconciler({ return instance; }, - createTextInstance(text, internalInstanceHandle) { + createTextInstance(text, rootContainerInstance, internalInstanceHandle) { return text; }, diff --git a/src/renderers/dom/fiber/ReactDOMFiber.js b/src/renderers/dom/fiber/ReactDOMFiber.js index 5b579517c9..eecdb8181e 100644 --- a/src/renderers/dom/fiber/ReactDOMFiber.js +++ b/src/renderers/dom/fiber/ReactDOMFiber.js @@ -152,7 +152,7 @@ var DOMRenderer = ReactFiberReconciler({ domElement.textContent = ''; }, - createTextInstance(text : string, internalInstanceHandle : Object) : TextInstance { + createTextInstance(text : string, rootContainerInstance : Container, internalInstanceHandle : Object) : TextInstance { var textNode : TextInstance = document.createTextNode(text); precacheFiberNode(internalInstanceHandle, textNode); return textNode; diff --git a/src/renderers/noop/ReactNoop.js b/src/renderers/noop/ReactNoop.js index a365648f34..97cb1578fa 100644 --- a/src/renderers/noop/ReactNoop.js +++ b/src/renderers/noop/ReactNoop.js @@ -81,7 +81,7 @@ var NoopRenderer = ReactFiberReconciler({ resetTextContent(instance : Instance) : void {}, - createTextInstance(text : string) : TextInstance { + createTextInstance(text : string, rootContainerInstance : Container, internalInstanceHandle : Object) : TextInstance { var inst = { text : text, id: instanceCounter++ }; // Hide from unit tests Object.defineProperty(inst, 'id', { value: inst.id, enumerable: false }); diff --git a/src/renderers/shared/fiber/ReactFiberCompleteWork.js b/src/renderers/shared/fiber/ReactFiberCompleteWork.js index a4a0143069..84af8a456d 100644 --- a/src/renderers/shared/fiber/ReactFiberCompleteWork.js +++ b/src/renderers/shared/fiber/ReactFiberCompleteWork.js @@ -292,7 +292,8 @@ module.exports = function( return null; } } - const textInstance = createTextInstance(newText, workInProgress); + const rootContainerInstance = getRootHostContainer(); + const textInstance = createTextInstance(newText, rootContainerInstance, workInProgress); workInProgress.stateNode = textInstance; } workInProgress.memoizedProps = newText; diff --git a/src/renderers/shared/fiber/ReactFiberReconciler.js b/src/renderers/shared/fiber/ReactFiberReconciler.js index f3b894d924..08204a048b 100644 --- a/src/renderers/shared/fiber/ReactFiberReconciler.js +++ b/src/renderers/shared/fiber/ReactFiberReconciler.js @@ -54,7 +54,7 @@ export type HostConfig = { shouldSetTextContent(props : P) : boolean, resetTextContent(instance : I) : void, - createTextInstance(text : string, internalInstanceHandle : OpaqueNode) : TI, + createTextInstance(text : string, rootContainerInstance : C, internalInstanceHandle : OpaqueNode) : TI, commitTextUpdate(textInstance : TI, oldText : string, newText : string) : void, appendChild(parentInstance : I | C, child : I | TI) : void,