Fixed incorrect value returned as public instance from reconciler (#26283)

## Summary
A few methods in `ReactFiberReconciler` are supposed to return
`PublicInstance` values, but they return the `stateNode` from the fiber
directly. This assumes that the `stateNode` always matches the public
instance (which it does on Web) but that's not the case in React Native,
where the public instance is a field in that object.
This hasn't caused issues because everywhere where we use that method in
React Native we actually extract the real public instance from this
"fake" public instance.
This PR fixes the inconsistency and cleans up some code.
## How did you test this change?
Existing tests.

Author: rubennorte

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

@@ -90,15 +90,6 @@ function findHostInstance_DEPRECATED<TElementType: ElementType>(
 hostInstance=findHostInstance(componentOrHandle);
 }
 
- if (hostInstance == null) {
-returnhostInstance;
-}
- if ((hostInstance: any).canonical) {
-// Fabric
-return(hostInstance: any).canonical;
-}
- // $FlowFixMe[incompatible-return]
- // $FlowFixMe[incompatible-exact]
  return hostInstance;
 }
 
@@ -146,12 +137,7 @@ function findNodeHandle(componentOrHandle: any): ?number {
  if (hostInstance == null) {
 returnhostInstance;
 }
- // TODO: the code is right but the types here are wrong.
- // https://github.com/facebook/react/pull/12863
- if ((hostInstance: any).canonical) {
-// Fabric
-return(hostInstance: any).canonical._nativeTag;
-}
+
  return hostInstance._nativeTag;
 }
 

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

@@ -110,7 +110,7 @@ if (registerEventHandler) {
 /**
  * This is used for refs on host components.
  */
-classReactFabricHostComponent{
+classReactFabricHostComponentimplementsNativeMethods{
 _nativeTag: number;
 viewConfig: ViewConfig;
 currentProps: Props;
@@ -215,10 +215,6 @@ class ReactFabricHostComponent {
 }
 }
 
-// $FlowFixMe[class-object-subtyping] found when upgrading Flow
-// $FlowFixMe[method-unbinding] found when upgrading Flow
-(ReactFabricHostComponent.prototype: $ReadOnly<{...NativeMethods, ...}>);
-
 export*from'react-reconciler/src/ReactFiberHostConfigWithNoMutation';
 export*from'react-reconciler/src/ReactFiberHostConfigWithNoHydration';
 export*from'react-reconciler/src/ReactFiberHostConfigWithNoScopes';
@@ -342,8 +338,17 @@ export function getChildHostContext(
 }
 }
 
-exportfunctiongetPublicInstance(instance: Instance): *{
-returninstance.canonical;
+exportfunctiongetPublicInstance(instance: Instance): null|PublicInstance{
+if(instance.canonical){
+returninstance.canonical;
+}
+
+// For compatibility with Paper
+if(instance._nativeTag!=null){
+returninstance;
+}
+
+returnnull;
 }
 
 exportfunctionprepareForCommit(containerInfo: Container): null|Object{

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

@@ -30,7 +30,7 @@ import {
 warnForStyleProps,
 }from'./NativeMethodsMixinUtils';
 
-classReactNativeFiberHostComponent{
+classReactNativeFiberHostComponentimplementsNativeMethods{
 _children: Array<Instance|number>;
 _nativeTag: number;
 _internalFiberInstanceHandleDEV: Object;
@@ -127,8 +127,4 @@ class ReactNativeFiberHostComponent {
 }
 }
 
-// $FlowFixMe[class-object-subtyping] found when upgrading Flow
-// $FlowFixMe[method-unbinding] found when upgrading Flow
-(ReactNativeFiberHostComponent.prototype: $ReadOnly<{...NativeMethods, ...}>);
-
 exportdefaultReactNativeFiberHostComponent;

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

@@ -217,6 +217,11 @@ export function getChildHostContext(
 }
 
 exportfunctiongetPublicInstance(instance: Instance): *{
+// $FlowExpectedError[prop-missing] For compatibility with Fabric
+if(instance.canonical){
+returninstance.canonical;
+}
+
 returninstance;
 }
 

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

@@ -89,15 +89,6 @@ function findHostInstance_DEPRECATED(
 hostInstance=findHostInstance(componentOrHandle);
 }
 
-if(hostInstance==null){
-returnhostInstance;
-}
-if((hostInstance: any).canonical){
-// Fabric
-return(hostInstance: any).canonical;
-}
-// $FlowFixMe[incompatible-return]
-// $FlowFixMe[incompatible-exact]
 returnhostInstance;
 }
 
@@ -145,10 +136,7 @@ function findNodeHandle(componentOrHandle: any): ?number {
 if(hostInstance==null){
 returnhostInstance;
 }
-if((hostInstance: any).canonical){
-// Fabric
-return(hostInstance: any).canonical._nativeTag;
-}
+
 returnhostInstance._nativeTag;
 }
 

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

@@ -95,18 +95,18 @@ export type PartialViewConfig = $ReadOnly<{
 validAttributes?: PartialAttributeConfiguration,
 }>;
 
-exporttypeNativeMethods=$ReadOnly<{
-blur(): void,
-focus(): void,
-measure(callback: MeasureOnSuccessCallback): void,
-measureInWindow(callback: MeasureInWindowOnSuccessCallback): void,
+exportinterfaceNativeMethods{
+blur(): void;
+focus(): void;
+measure(callback: MeasureOnSuccessCallback): void;
+measureInWindow(callback: MeasureInWindowOnSuccessCallback): void;
 measureLayout(
 relativeToNativeNode: number|ElementRef<HostComponent<mixed>>,
 onSuccess: MeasureLayoutOnSuccessCallback,
 onFail?: ()=>void,
-): void,
-setNativeProps(nativeProps: {...}): void,
-}>;
+): void;
+setNativeProps(nativeProps: {...}): void;
+}
 
 exporttypeHostComponent<T>=AbstractComponent<T,$ReadOnly<NativeMethods>>;
 

packages/react-reconciler/src/ReactFiberReconciler.js

@@ -175,7 +175,7 @@ function findHostInstance(component: Object): PublicInstance | null {
 if(hostFiber===null){
 returnnull;
 }
-returnhostFiber.stateNode;
+returngetPublicInstance(hostFiber.stateNode);
 }
 
 functionfindHostInstanceWithWarning(
@@ -240,7 +240,7 @@ function findHostInstanceWithWarning(
 }
 }
 }
-returnhostFiber.stateNode;
+returngetPublicInstance(hostFiber.stateNode);
 }
 returnfindHostInstance(component);
 }
@@ -524,7 +524,7 @@ export function findHostInstanceWithNoPortals(
 if(hostFiber===null){
 returnnull;
 }
-returnhostFiber.stateNode;
+returngetPublicInstance(hostFiber.stateNode);
 }
 
 letshouldErrorImpl: Fiber=> ?boolean=fiber=>null;