refactor: fork isChildPublicInstance implementation per renderer

Author: hoxyq

packages/react-native-renderer/src/ReactFabric.js

@@ -33,15 +33,16 @@ import {
   getInspectorDataForInstance,
 } from './ReactNativeFiberInspector';
 import {LegacyRoot, ConcurrentRoot} from 'react-reconciler/src/ReactRootTags';
+import {doesFiberContain} from 'react-reconciler/src/ReactFiberTreeReflection';
 import {
   findHostInstance_DEPRECATED,
   findNodeHandle,
   dispatchCommand,
   sendAccessibilityEvent,
   getNodeFromInternalInstanceHandle,
-  isChildPublicInstance,
 } from './ReactNativePublicCompat';
 import {getPublicInstanceFromInternalInstanceHandle} from './ReactFiberConfigFabric';
+import {getInternalInstanceHandleFromPublicInstance} from 'react-native/Libraries/ReactPrivate/ReactNativePrivateInterface';
 
 // $FlowFixMe[missing-local-annot]
 function onRecoverableError(error) {
@@ -101,6 +102,36 @@ function createPortal(
   return createPortalImpl(children, containerTag, null, key);
 }
 
+type FabricPublicInstance = mixed; // Should have been PublicInstance from ReactFiberConfigFabric
+type PaperPublicInstance = mixed; // Should be unknown for Fabric
+function isChildPublicInstance(
+  parentInstance: FabricPublicInstance | PaperPublicInstance,
+  childInstance: FabricPublicInstance | PaperPublicInstance,
+): boolean {
+  if (__DEV__) {
+    const parentInternalInstanceHandle =
+      // $FlowExpectedError[incompatible-call] Type for parentInstance should have been PublicInstance from ReactFiberConfigFabric.
+      getInternalInstanceHandleFromPublicInstance(parentInstance);
+    const childInternalInstanceHandle =
+      // $FlowExpectedError[incompatible-call] Type for childInstance should have been PublicInstance from ReactFiberConfigFabric.
+      getInternalInstanceHandleFromPublicInstance(childInstance);
+
+    if (
+      parentInternalInstanceHandle != null &&
+      childInternalInstanceHandle != null
+    ) {
+      return doesFiberContain(
+        parentInternalInstanceHandle,
+        childInternalInstanceHandle,
+      );
+    }
+
+    return false;
+  } else {
+    throw new Error('isChildPublicInstance() is not available in production.');
+  }
+}
+
 setBatchingImplementation(batchedUpdatesImpl, discreteUpdates);
 
 const roots = new Map<number, FiberRoot>();

packages/react-native-renderer/src/ReactNativePublicCompat.js

@@ -16,19 +16,15 @@ import {
   legacySendAccessibilityEvent,
   getNodeFromPublicInstance,
   getNativeTagFromPublicInstance,
-  getInternalInstanceHandleFromPublicInstance,
 } from 'react-native/Libraries/ReactPrivate/ReactNativePrivateInterface';
 
 import {
   findHostInstance,
   findHostInstanceWithWarning,
 } from 'react-reconciler/src/ReactFiberReconciler';
-import {doesFiberContain} from 'react-reconciler/src/ReactFiberTreeReflection';
 import ReactSharedInternals from 'shared/ReactSharedInternals';
 import getComponentNameFromType from 'shared/getComponentNameFromType';
 
-import ReactNativeFiberHostComponent from './ReactNativeFiberHostComponent';
-
 const ReactCurrentOwner = ReactSharedInternals.ReactCurrentOwner;
 
 export function findHostInstance_DEPRECATED<TElementType: ElementType>(
@@ -222,57 +218,3 @@ export function getNodeFromInternalInstanceHandle(
     internalInstanceHandle.stateNode.node
   );
 }
-
-// Should have been PublicInstance from ReactFiberConfigFabric
-type FabricPublicInstance = mixed;
-// Should have been PublicInstance from ReactFiberConfigNative
-type PaperPublicInstance = HostComponent<mixed>;
-
-// Remove this once Paper is no longer supported and DOM Node API are enabled by default in RN.
-export function isChildPublicInstance(
-  parentInstance: FabricPublicInstance | PaperPublicInstance,
-  childInstance: FabricPublicInstance | PaperPublicInstance,
-): boolean {
-  if (__DEV__) {
-    // Paper
-    if (
-      parentInstance instanceof ReactNativeFiberHostComponent ||
-      childInstance instanceof ReactNativeFiberHostComponent
-    ) {
-      if (
-        parentInstance instanceof ReactNativeFiberHostComponent &&
-        childInstance instanceof ReactNativeFiberHostComponent
-      ) {
-        return doesFiberContain(
-          parentInstance._internalFiberInstanceHandleDEV,
-          childInstance._internalFiberInstanceHandleDEV,
-        );
-      }
-
-      // Means that one instance is from Fabric and other is from Paper.
-      return false;
-    }
-
-    const parentInternalInstanceHandle =
-      // $FlowExpectedError[incompatible-call] Type for parentInstance should have been PublicInstance from ReactFiberConfigFabric.
-      getInternalInstanceHandleFromPublicInstance(parentInstance);
-    const childInternalInstanceHandle =
-      // $FlowExpectedError[incompatible-call] Type for childInstance should have been PublicInstance from ReactFiberConfigFabric.
-      getInternalInstanceHandleFromPublicInstance(childInstance);
-
-    // Fabric
-    if (
-      parentInternalInstanceHandle != null &&
-      childInternalInstanceHandle != null
-    ) {
-      return doesFiberContain(
-        parentInternalInstanceHandle,
-        childInternalInstanceHandle,
-      );
-    }
-
-    return false;
-  } else {
-    throw new Error('isChildPublicInstance() is not available in production.');
-  }
-}

packages/react-native-renderer/src/ReactNativeRenderer.js

@@ -10,6 +10,7 @@
 import type {ReactPortal, ReactNodeList} from 'shared/ReactTypes';
 import type {ElementRef, Element, ElementType} from 'react';
 import type {FiberRoot} from 'react-reconciler/src/ReactInternalTypes';
+import type {HostComponent} from './ReactNativeTypes';
 
 import './ReactNativeInjection';
 
@@ -39,13 +40,14 @@ import {
   getInspectorDataForInstance,
 } from './ReactNativeFiberInspector';
 import {LegacyRoot} from 'react-reconciler/src/ReactRootTags';
+import {doesFiberContain} from 'react-reconciler/src/ReactFiberTreeReflection';
 import {
   findHostInstance_DEPRECATED,
   findNodeHandle,
   dispatchCommand,
   sendAccessibilityEvent,
-  isChildPublicInstance,
 } from './ReactNativePublicCompat';
+import ReactNativeFiberHostComponent from './ReactNativeFiberHostComponent';
 
 // $FlowFixMe[missing-local-annot]
 function onRecoverableError(error) {
@@ -106,6 +108,37 @@ function createPortal(
   return createPortalImpl(children, containerTag, null, key);
 }
 
+type PaperPublicInstance = HostComponent<mixed>; // Should have been PublicInstance from ReactFiberConfigNative
+type FabricPublicInstance = mixed; // Should be unknown for Paper
+function isChildPublicInstance(
+  parentInstance: PaperPublicInstance | FabricPublicInstance,
+  childInstance: PaperPublicInstance | FabricPublicInstance,
+): boolean {
+  if (__DEV__) {
+    if (
+      parentInstance instanceof ReactNativeFiberHostComponent ||
+      childInstance instanceof ReactNativeFiberHostComponent
+    ) {
+      if (
+        parentInstance instanceof ReactNativeFiberHostComponent &&
+        childInstance instanceof ReactNativeFiberHostComponent
+      ) {
+        return doesFiberContain(
+          parentInstance._internalFiberInstanceHandleDEV,
+          childInstance._internalFiberInstanceHandleDEV,
+        );
+      }
+
+      // Means that one instance is from Fabric and other is from Paper.
+      return false;
+    }
+
+    return false;
+  } else {
+    throw new Error('isChildPublicInstance() is not available in production.');
+  }
+}
+
 setBatchingImplementation(batchedUpdatesImpl, discreteUpdates);
 
 function computeComponentStackForErrorReporting(reactTag: number): string {