Simplify ReactNoop fix

Author: gaearon

src/renderers/noop/ReactNoopEntry.js

@@ -20,6 +20,7 @@
 import type {Fiber} from 'ReactFiber';
 import type {UpdateQueue} from 'ReactFiberUpdateQueue';
 
+var ReactFeatureFlags = require('ReactFeatureFlags');
 var ReactFiberInstrumentation = require('ReactFiberInstrumentation');
 var ReactFiberReconciler = require('ReactFiberReconciler');
 var ReactInstanceMap = require('ReactInstanceMap');
@@ -178,105 +179,94 @@ var SharedHostConfig = {
   },
 };
 
-var MutationHostConfig = {
-  commitMount(instance: Instance, type: string, newProps: Props): void {
-    // Noop
-  },
-
-  commitUpdate(
-    instance: Instance,
-    updatePayload: Object,
-    type: string,
-    oldProps: Props,
-    newProps: Props,
-  ): void {
-    instance.prop = newProps.prop;
-  },
-
-  commitTextUpdate(
-    textInstance: TextInstance,
-    oldText: string,
-    newText: string,
-  ): void {
-    textInstance.text = newText;
-  },
-
-  appendChild: appendChild,
-  appendChildToContainer: appendChild,
-  insertBefore: insertBefore,
-  insertInContainerBefore: insertBefore,
-  removeChild: removeChild,
-  removeChildFromContainer: removeChild,
-
-  resetTextContent(instance: Instance): void {},
-};
-
-var PersistenceHostConfig = {
-  cloneInstance(
-    instance: Instance,
-    updatePayload: null | Object,
-    type: string,
-    oldProps: Props,
-    newProps: Props,
-    internalInstanceHandle: Object,
-    keepChildren: boolean,
-    recyclableInstance: null | Instance,
-  ): Instance {
-    const clone = {
-      id: instance.id,
-      type: type,
-      children: keepChildren ? instance.children : [],
-      prop: newProps.prop,
-    };
-    Object.defineProperty(clone, 'id', {
-      value: clone.id,
-      enumerable: false,
-    });
-    return clone;
-  },
-
-  cloneContainer(
-    container: Container,
-    recyclableContainer: Container,
-  ): Container {
-    return {rootID: container.rootID, children: []};
-  },
-
-  appendInititalChildToContainer(
-    parentInstance: Container,
-    child: Instance | TextInstance,
-  ) {
-    parentInstance.children.push(child);
-  },
-
-  finalizeContainerChildren(container: Container): void {},
-
-  replaceContainer(oldContainer: Container, newContainer: Container): void {
-    rootContainers.set(oldContainer.rootID, newContainer);
-  },
-};
-
-// They are created lazily because only one can be created per test file.
-var renderer = null;
-var persistentRenderer = null;
-function getRenderer() {
-  return (
-    renderer ||
-    (renderer = ReactFiberReconciler({
+var NoopRenderer = ReactFiberReconciler({
+  ...SharedHostConfig,
+  mutation: {
+    commitMount(instance: Instance, type: string, newProps: Props): void {
+      // Noop
+    },
+
+    commitUpdate(
+      instance: Instance,
+      updatePayload: Object,
+      type: string,
+      oldProps: Props,
+      newProps: Props,
+    ): void {
+      instance.prop = newProps.prop;
+    },
+
+    commitTextUpdate(
+      textInstance: TextInstance,
+      oldText: string,
+      newText: string,
+    ): void {
+      textInstance.text = newText;
+    },
+
+    appendChild: appendChild,
+    appendChildToContainer: appendChild,
+    insertBefore: insertBefore,
+    insertInContainerBefore: insertBefore,
+    removeChild: removeChild,
+    removeChildFromContainer: removeChild,
+
+    resetTextContent(instance: Instance): void {},
+  },
+});
+
+var PersistentNoopRenderer = ReactFeatureFlags.enablePersistentReconciler
+  ? ReactFiberReconciler({
       ...SharedHostConfig,
-      mutation: MutationHostConfig,
-    }))
-  );
-}
-function getPersistentRenderer() {
-  return (
-    persistentRenderer ||
-    (persistentRenderer = ReactFiberReconciler({
-      ...SharedHostConfig,
-      persistence: PersistenceHostConfig,
-    }))
-  );
-}
+      persistence: {
+        cloneInstance(
+          instance: Instance,
+          updatePayload: null | Object,
+          type: string,
+          oldProps: Props,
+          newProps: Props,
+          internalInstanceHandle: Object,
+          keepChildren: boolean,
+          recyclableInstance: null | Instance,
+        ): Instance {
+          const clone = {
+            id: instance.id,
+            type: type,
+            children: keepChildren ? instance.children : [],
+            prop: newProps.prop,
+          };
+          Object.defineProperty(clone, 'id', {
+            value: clone.id,
+            enumerable: false,
+          });
+          return clone;
+        },
+
+        cloneContainer(
+          container: Container,
+          recyclableContainer: Container,
+        ): Container {
+          return {rootID: container.rootID, children: []};
+        },
+
+        appendInititalChildToContainer(
+          parentInstance: Container,
+          child: Instance | TextInstance,
+        ) {
+          parentInstance.children.push(child);
+        },
+
+        finalizeContainerChildren(container: Container): void {},
+
+        replaceContainer(
+          oldContainer: Container,
+          newContainer: Container,
+        ): void {
+          rootContainers.set(oldContainer.rootID, newContainer);
+        },
+      },
+    })
+  : null;
 
 var rootContainers = new Map();
 var roots = new Map();
@@ -333,7 +323,6 @@ var ReactNoop = {
     rootID: string,
     callback: ?Function,
   ) {
-    const NoopRenderer = getRenderer();
     let root = roots.get(rootID);
     if (!root) {
       const container = {rootID: rootID, children: []};
@@ -349,7 +338,11 @@ var ReactNoop = {
     rootID: string,
     callback: ?Function,
   ) {
-    const PersistentNoopRenderer = getPersistentRenderer();
+    if (PersistentNoopRenderer === null) {
+      throw new Error(
+        'Enable ReactFeatureFlags.enablePersistentReconciler to use it in tests.',
+      );
+    }
     let root = persistentRoots.get(rootID);
     if (!root) {
       const container = {rootID: rootID, children: []};
@@ -361,7 +354,6 @@ var ReactNoop = {
   },
 
   unmountRootWithID(rootID: string) {
-    const NoopRenderer = getRenderer();
     const root = roots.get(rootID);
     if (root) {
       NoopRenderer.updateContainer(null, root, null, () => {
@@ -374,7 +366,6 @@ var ReactNoop = {
   findInstance(
     componentOrElement: Element | ?React$Component<any, any>,
   ): null | Instance | TextInstance {
-    const NoopRenderer = getRenderer();
     if (componentOrElement == null) {
       return null;
     }
@@ -451,25 +442,13 @@ var ReactNoop = {
     return !!scheduledCallback;
   },
 
-  batchedUpdates(...args: Array<any>) {
-    const NoopRenderer = getRenderer();
-    return NoopRenderer.batchedUpdates(...args);
-  },
+  batchedUpdates: NoopRenderer.batchedUpdates,
 
-  deferredUpdates(...args: Array<any>) {
-    const NoopRenderer = getRenderer();
-    return NoopRenderer.deferredUpdates(...args);
-  },
+  deferredUpdates: NoopRenderer.deferredUpdates,
 
-  unbatchedUpdates(...args: Array<any>) {
-    const NoopRenderer = getRenderer();
-    return NoopRenderer.unbatchedUpdates(...args);
-  },
+  unbatchedUpdates: NoopRenderer.unbatchedUpdates,
 
-  flushSync(...args: Array<any>) {
-    const NoopRenderer = getRenderer();
-    return NoopRenderer.flushSync(...args);
-  },
+  flushSync: NoopRenderer.flushSync,
 
   // Logs the current state of the tree.
   dumpTree(rootID: string = DEFAULT_ROOT_ID) {