Revert "Extracted definition and access to public instances to a sepa…

…rate module in Fabric (facebook#26321)"

This reverts commit f828bad.

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

@@ -38,7 +38,6 @@ import {
   findNodeHandle,
   dispatchCommand,
   sendAccessibilityEvent,
-  getNodeFromInternalInstanceHandle,
 } from './ReactNativePublicCompat';
 
 // $FlowFixMe[missing-local-annot]
@@ -120,10 +119,6 @@ export {
   // This export is typically undefined in production builds.
   // See the "enableGetInspectorDataForInstanceInProduction" flag.
   getInspectorDataForInstance,
-  // The public instance has a reference to the internal instance handle.
-  // This method allows it to acess the most recent shadow node for
-  // the instance (it's only accessible through it).
-  getNodeFromInternalInstanceHandle,
 };
 
 injectIntoDevTools({

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

@@ -20,12 +20,6 @@ import {getPublicInstance} from './ReactFabricHostConfig';
 // This is ok in DOM because they types are interchangeable, but in React Native
 // they aren't.
 function getInstanceFromNode(node: Instance | TextInstance): Fiber | null {
-  const instance: Instance = (node: $FlowFixMe); // In React Native, node is never a text instance
-
-  if (instance.internalInstanceHandle != null) {
-    return instance.internalInstanceHandle;
-  }
-
   // $FlowFixMe[incompatible-return] DevTools incorrectly passes a fiber in React Native.
   return node;
 }
@@ -41,7 +35,7 @@ function getNodeFromInstance(fiber: Fiber): PublicInstance {
 }
 
 function getFiberCurrentPropsFromNode(instance: Instance): Props {
-  return instance.currentProps;
+  return instance.canonical.currentProps;
 }
 
 export {

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

@@ -7,13 +7,22 @@
  * @flow
  */
 
-import type {TouchedViewDataAtPoint, ViewConfig} from './ReactNativeTypes';
-import {
-  createPublicInstance,
-  type ReactFabricHostComponent,
-} from './ReactFabricPublicInstance';
+import type {ElementRef} from 'react';
+import type {
+  HostComponent,
+  MeasureInWindowOnSuccessCallback,
+  MeasureLayoutOnSuccessCallback,
+  MeasureOnSuccessCallback,
+  INativeMethods,
+  ViewConfig,
+  TouchedViewDataAtPoint,
+} from './ReactNativeTypes';
+
+import {warnForStyleProps} from './NativeMethodsMixinUtils';
 import {create, diff} from './ReactNativeAttributePayload';
+
 import {dispatchEvent} from './ReactFabricEventEmitter';
+
 import {
   DefaultEventPriority,
   DiscreteEventPriority,
@@ -22,6 +31,7 @@ import {
 // Modules provided by RN:
 import {
   ReactNativeViewConfigRegistry,
+  TextInputState,
   deepFreezeAndThrowOnMutationInDev,
 } from 'react-native/Libraries/ReactPrivate/ReactNativePrivateInterface';
 
@@ -36,9 +46,14 @@ const {
   appendChildToSet: appendChildNodeToSet,
   completeRoot,
   registerEventHandler,
+  measure: fabricMeasure,
+  measureInWindow: fabricMeasureInWindow,
+  measureLayout: fabricMeasureLayout,
   unstable_DefaultEventPriority: FabricDefaultPriority,
   unstable_DiscreteEventPriority: FabricDiscretePriority,
   unstable_getCurrentEventPriority: fabricGetCurrentEventPriority,
+  setNativeProps,
+  getBoundingClientRect: fabricGetBoundingClientRect,
 } = nativeFabricUIManager;
 
 const {get: getViewConfigForType} = ReactNativeViewConfigRegistry;
@@ -53,15 +68,9 @@ type Node = Object;
 export type Type = string;
 export type Props = Object;
 export type Instance = {
-  // Reference to the shadow node.
   node: Node,
-  nativeTag: number,
-  viewConfig: ViewConfig,
-  currentProps: Props,
-  // Reference to the React handle (the fiber)
-  internalInstanceHandle: Object,
-  // Exposed through refs.
-  publicInstance: ReactFabricHostComponent,
+  canonical: ReactFabricHostComponent,
+  ...
 };
 export type TextInstance = {node: Node, ...};
 export type HydratableInstance = Instance | TextInstance;
@@ -95,6 +104,137 @@ if (registerEventHandler) {
   registerEventHandler(dispatchEvent);
 }
 
+const noop = () => {};
+
+/**
+ * This is used for refs on host components.
+ */
+class ReactFabricHostComponent implements INativeMethods {
+  _nativeTag: number;
+  viewConfig: ViewConfig;
+  currentProps: Props;
+  _internalInstanceHandle: Object;
+
+  constructor(
+    tag: number,
+    viewConfig: ViewConfig,
+    props: Props,
+    internalInstanceHandle: Object,
+  ) {
+    this._nativeTag = tag;
+    this.viewConfig = viewConfig;
+    this.currentProps = props;
+    this._internalInstanceHandle = internalInstanceHandle;
+  }
+
+  blur() {
+    TextInputState.blurTextInput(this);
+  }
+
+  focus() {
+    TextInputState.focusTextInput(this);
+  }
+
+  measure(callback: MeasureOnSuccessCallback) {
+    const node = getShadowNodeFromInternalInstanceHandle(
+      this._internalInstanceHandle,
+    );
+    if (node != null) {
+      fabricMeasure(node, callback);
+    }
+  }
+
+  measureInWindow(callback: MeasureInWindowOnSuccessCallback) {
+    const node = getShadowNodeFromInternalInstanceHandle(
+      this._internalInstanceHandle,
+    );
+    if (node != null) {
+      fabricMeasureInWindow(node, callback);
+    }
+  }
+
+  measureLayout(
+    relativeToNativeNode: number | ElementRef<HostComponent<mixed>>,
+    onSuccess: MeasureLayoutOnSuccessCallback,
+    onFail?: () => void /* currently unused */,
+  ) {
+    if (
+      typeof relativeToNativeNode === 'number' ||
+      !(relativeToNativeNode instanceof ReactFabricHostComponent)
+    ) {
+      if (__DEV__) {
+        console.error(
+          'Warning: ref.measureLayout must be called with a ref to a native component.',
+        );
+      }
+
+      return;
+    }
+
+    const toStateNode = getShadowNodeFromInternalInstanceHandle(
+      this._internalInstanceHandle,
+    );
+    const fromStateNode = getShadowNodeFromInternalInstanceHandle(
+      relativeToNativeNode._internalInstanceHandle,
+    );
+
+    if (toStateNode != null && fromStateNode != null) {
+      fabricMeasureLayout(
+        toStateNode,
+        fromStateNode,
+        onFail != null ? onFail : noop,
+        onSuccess != null ? onSuccess : noop,
+      );
+    }
+  }
+
+  unstable_getBoundingClientRect(): DOMRect {
+    const node = getShadowNodeFromInternalInstanceHandle(
+      this._internalInstanceHandle,
+    );
+    if (node != null) {
+      const rect = fabricGetBoundingClientRect(node);
+
+      if (rect) {
+        return new DOMRect(rect[0], rect[1], rect[2], rect[3]);
+      }
+    }
+
+    // Empty rect if any of the above failed
+    return new DOMRect(0, 0, 0, 0);
+  }
+
+  setNativeProps(nativeProps: Object) {
+    if (__DEV__) {
+      warnForStyleProps(nativeProps, this.viewConfig.validAttributes);
+    }
+    const updatePayload = create(nativeProps, this.viewConfig.validAttributes);
+
+    const node = getShadowNodeFromInternalInstanceHandle(
+      this._internalInstanceHandle,
+    );
+    if (node != null && updatePayload != null) {
+      setNativeProps(node, updatePayload);
+    }
+  }
+}
+
+type ParamOf<Fn> = $Call<<T>((arg: T) => mixed) => T, Fn>;
+type ShadowNode = ParamOf<(typeof nativeFabricUIManager)['measure']>;
+
+export function getShadowNodeFromInternalInstanceHandle(
+  internalInstanceHandle: mixed,
+): ?ShadowNode {
+  return (
+    // $FlowExpectedError[incompatible-return] internalInstanceHandle is opaque but we need to make an exception here.
+    internalInstanceHandle &&
+    // $FlowExpectedError[incompatible-return]
+    internalInstanceHandle.stateNode &&
+    // $FlowExpectedError[incompatible-use]
+    internalInstanceHandle.stateNode.node
+  );
+}
+
 export * from 'react-reconciler/src/ReactFiberHostConfigWithNoMutation';
 export * from 'react-reconciler/src/ReactFiberHostConfigWithNoHydration';
 export * from 'react-reconciler/src/ReactFiberHostConfigWithNoScopes';
@@ -140,19 +280,16 @@ export function createInstance(
     internalInstanceHandle, // internalInstanceHandle
   );
 
-  const component = createPublicInstance(
+  const component = new ReactFabricHostComponent(
     tag,
     viewConfig,
+    props,
     internalInstanceHandle,
   );
 
   return {
     node: node,
-    nativeTag: tag,
-    viewConfig,
-    currentProps: props,
-    internalInstanceHandle,
-    publicInstance: component,
+    canonical: component,
   };
 }
 
@@ -222,15 +359,12 @@ export function getChildHostContext(
 }
 
 export function getPublicInstance(instance: Instance): null | PublicInstance {
-  if (instance.publicInstance != null) {
-    return instance.publicInstance;
+  if (instance.canonical) {
+    return instance.canonical;
   }
 
-  // For compatibility with the legacy renderer, in case it's used with Fabric
-  // in the same app.
-  // $FlowExpectedError[prop-missing]
+  // For compatibility with Paper
   if (instance._nativeTag != null) {
-    // $FlowExpectedError[incompatible-return]
     return instance;
   }
 
@@ -249,12 +383,12 @@ export function prepareUpdate(
   newProps: Props,
   hostContext: HostContext,
 ): null | Object {
-  const viewConfig = instance.viewConfig;
+  const viewConfig = instance.canonical.viewConfig;
   const updatePayload = diff(oldProps, newProps, viewConfig.validAttributes);
   // TODO: If the event handlers have changed, we need to update the current props
   // in the commit phase but there is no host config hook to do it yet.
   // So instead we hack it by updating it in the render phase.
-  instance.currentProps = newProps;
+  instance.canonical.currentProps = newProps;
   return updatePayload;
 }
 
@@ -333,11 +467,7 @@ export function cloneInstance(
   }
   return {
     node: clone,
-    nativeTag: instance.nativeTag,
-    viewConfig: instance.viewConfig,
-    currentProps: instance.currentProps,
-    internalInstanceHandle: instance.internalInstanceHandle,
-    publicInstance: instance.publicInstance,
+    canonical: instance.canonical,
   };
 }
 
@@ -347,19 +477,15 @@ export function cloneHiddenInstance(
   props: Props,
   internalInstanceHandle: Object,
 ): Instance {
-  const viewConfig = instance.viewConfig;
+  const viewConfig = instance.canonical.viewConfig;
   const node = instance.node;
   const updatePayload = create(
     {style: {display: 'none'}},
     viewConfig.validAttributes,
   );
   return {
     node: cloneNodeWithNewProps(node, updatePayload),
-    nativeTag: instance.nativeTag,
-    viewConfig: instance.viewConfig,
-    currentProps: instance.currentProps,
-    internalInstanceHandle: instance.internalInstanceHandle,
-    publicInstance: instance.publicInstance,
+    canonical: instance.canonical,
   };
 }