Update React Native types (#20883)

facebook · Feb 25, 2021 · 8336f19 · 8336f19
1 parent 9209c30
commit 8336f19
Show file tree

Hide file tree

Showing 6 changed files with 114 additions and 85 deletions.
diff --git a/packages/react-native-renderer/src/ReactFabric.js b/packages/react-native-renderer/src/ReactFabric.js
@@ -9,7 +9,7 @@
 
 import type {HostComponent} from './ReactNativeTypes';
 import type {ReactNodeList} from 'shared/ReactTypes';
-import type {ElementRef} from 'react';
+import type {ElementRef, Element, ElementType} from 'react';
 
 import './ReactFabricInjection';
 
@@ -47,8 +47,8 @@ import getComponentName from 'shared/getComponentName';
 
 const ReactCurrentOwner = ReactSharedInternals.ReactCurrentOwner;
 
-function findHostInstance_DEPRECATED(
- componentOrHandle: any,
+function findHostInstance_DEPRECATED<TElementType: ElementType>(
+ componentOrHandle: ?(ElementRef<TElementType> | number),
 ): ?ElementRef<HostComponent<mixed>> {
  if (__DEV__) {
  const owner = ReactCurrentOwner.current;
@@ -70,10 +70,14 @@ function findHostInstance_DEPRECATED(
  if (componentOrHandle == null) {
  return null;
  }
+ // $FlowIssue Flow has hardcoded values for React DOM that don't work with RN
  if (componentOrHandle._nativeTag) {
+ // $FlowIssue Flow has hardcoded values for React DOM that don't work with RN
  return componentOrHandle;
  }
+ // $FlowIssue Flow has hardcoded values for React DOM that don't work with RN
  if (componentOrHandle.canonical && componentOrHandle.canonical._nativeTag) {
+ // $FlowIssue Flow has hardcoded values for React DOM that don't work with RN
  return componentOrHandle.canonical;
  }
  let hostInstance;
@@ -194,10 +198,10 @@ function sendAccessibilityEvent(handle: any, eventType: string) {
 }
 
 function render(
- element: React$Element<any>,
- containerTag: any,
- callback: ?Function,
-) {
+ element: Element<ElementType>,
+ containerTag: number,
+ callback: ?() => void,
+): ?ElementRef<ElementType> {
  let root = roots.get(containerTag);
 
  if (!root) {
@@ -208,6 +212,7 @@ function render(
  }
  updateContainer(element, root, null, callback);
 
+ // $FlowIssue Flow has hardcoded values for React DOM that don't work with RN
  return getPublicRootInstance(root);
 }
 

diff --git a/packages/react-native-renderer/src/ReactFabricHostConfig.js b/packages/react-native-renderer/src/ReactFabricHostConfig.js
@@ -14,7 +14,7 @@ import type {
  MeasureLayoutOnSuccessCallback,
  MeasureOnSuccessCallback,
  NativeMethods,
- ReactNativeBaseComponentViewConfig,
+ ViewConfig,
  TouchedViewDataAtPoint,
 } from './ReactNativeTypes';
 
@@ -111,13 +111,13 @@ if (registerEventHandler) {
  */
 class ReactFabricHostComponent {
  _nativeTag: number;
- viewConfig: ReactNativeBaseComponentViewConfig<>;
+ viewConfig: ViewConfig;
  currentProps: Props;
  _internalInstanceHandle: Object;
 
  constructor(
  tag: number,
- viewConfig: ReactNativeBaseComponentViewConfig<>,
+ viewConfig: ViewConfig,
  props: Props,
  internalInstanceHandle: Object,
  ) {

diff --git a/packages/react-native-renderer/src/ReactNativeAttributePayload.js b/packages/react-native-renderer/src/ReactNativeAttributePayload.js
@@ -49,7 +49,7 @@ function defaultDiffer(prevProp: mixed, nextProp: mixed): boolean {
 function restoreDeletedValuesInNestedArray(
  updatePayload: Object,
  node: NestedNode,
- validAttributes: AttributeConfiguration<>,
+ validAttributes: AttributeConfiguration,
 ) {
  if (Array.isArray(node)) {
  let i = node.length;
@@ -107,7 +107,7 @@ function diffNestedArrayProperty(
  updatePayload: null | Object,
  prevArray: Array<NestedNode>,
  nextArray: Array<NestedNode>,
- validAttributes: AttributeConfiguration<>,
+ validAttributes: AttributeConfiguration,
 ): null | Object {
  const minLength =
  prevArray.length < nextArray.length ? prevArray.length : nextArray.length;
@@ -145,7 +145,7 @@ function diffNestedProperty(
  updatePayload: null | Object,
  prevProp: NestedNode,
  nextProp: NestedNode,
- validAttributes: AttributeConfiguration<>,
+ validAttributes: AttributeConfiguration,
 ): null | Object {
  if (!updatePayload && prevProp === nextProp) {
  // If no properties have been added, then we can bail out quickly on object
@@ -206,7 +206,7 @@ function diffNestedProperty(
 function addNestedProperty(
  updatePayload: null | Object,
  nextProp: NestedNode,
- validAttributes: AttributeConfiguration<>,
+ validAttributes: AttributeConfiguration,
 ) {
  if (!nextProp) {
  return updatePayload;
@@ -236,7 +236,7 @@ function addNestedProperty(
 function clearNestedProperty(
  updatePayload: null | Object,
  prevProp: NestedNode,
- validAttributes: AttributeConfiguration<>,
+ validAttributes: AttributeConfiguration,
 ): null | Object {
  if (!prevProp) {
  return updatePayload;
@@ -268,7 +268,7 @@ function diffProperties(
  updatePayload: null | Object,
  prevProps: Object,
  nextProps: Object,
- validAttributes: AttributeConfiguration<>,
+ validAttributes: AttributeConfiguration,
 ): null | Object {
  let attributeConfig;
  let nextProp;
@@ -369,13 +369,13 @@ function diffProperties(
  updatePayload,
  prevProp,
  nextProp,
- ((attributeConfig: any): AttributeConfiguration<>),
+ ((attributeConfig: any): AttributeConfiguration),
  );
  if (removedKeyCount > 0 && updatePayload) {
  restoreDeletedValuesInNestedArray(
  updatePayload,
  nextProp,
- ((attributeConfig: any): AttributeConfiguration<>),
+ ((attributeConfig: any): AttributeConfiguration),
  );
  removedKeys = null;
  }
@@ -426,7 +426,7 @@ function diffProperties(
  updatePayload = clearNestedProperty(
  updatePayload,
  prevProp,
- ((attributeConfig: any): AttributeConfiguration<>),
+ ((attributeConfig: any): AttributeConfiguration),
  );
  }
  }
@@ -439,7 +439,7 @@ function diffProperties(
 function addProperties(
  updatePayload: null | Object,
  props: Object,
- validAttributes: AttributeConfiguration<>,
+ validAttributes: AttributeConfiguration,
 ): null | Object {
  // TODO: Fast path
  return diffProperties(updatePayload, emptyObject, props, validAttributes);
@@ -452,15 +452,15 @@ function addProperties(
 function clearProperties(
  updatePayload: null | Object,
  prevProps: Object,
- validAttributes: AttributeConfiguration<>,
+ validAttributes: AttributeConfiguration,
 ): null | Object {
  // TODO: Fast path
  return diffProperties(updatePayload, prevProps, emptyObject, validAttributes);
 }
 
 export function create(
  props: Object,
- validAttributes: AttributeConfiguration<>,
+ validAttributes: AttributeConfiguration,
 ): null | Object {
  return addProperties(
  null, // updatePayload
@@ -472,7 +472,7 @@ export function create(
 export function diff(
  prevProps: Object,
  nextProps: Object,
- validAttributes: AttributeConfiguration<>,
+ validAttributes: AttributeConfiguration,
 ): null | Object {
  return diffProperties(
  null, // updatePayload

diff --git a/packages/react-native-renderer/src/ReactNativeFiberHostComponent.js b/packages/react-native-renderer/src/ReactNativeFiberHostComponent.js
@@ -14,7 +14,7 @@ import type {
  MeasureLayoutOnSuccessCallback,
  MeasureOnSuccessCallback,
  NativeMethods,
- ReactNativeBaseComponentViewConfig,
+ ViewConfig,
 } from './ReactNativeTypes';
 import type {Instance} from './ReactNativeHostConfig';
 
@@ -34,11 +34,11 @@ class ReactNativeFiberHostComponent {
  _children: Array<Instance | number>;
  _nativeTag: number;
  _internalFiberInstanceHandleDEV: Object;
- viewConfig: ReactNativeBaseComponentViewConfig<>;
+ viewConfig: ViewConfig;
 
  constructor(
  tag: number,
- viewConfig: ReactNativeBaseComponentViewConfig<>,
+ viewConfig: ViewConfig,
  internalInstanceHandleDEV: Object,
  ) {
  this._nativeTag = tag;

diff --git a/packages/react-native-renderer/src/ReactNativeRenderer.js b/packages/react-native-renderer/src/ReactNativeRenderer.js
@@ -9,6 +9,7 @@
 
 import type {HostComponent} from './ReactNativeTypes';
 import type {ReactNodeList} from 'shared/ReactTypes';
+import type {ElementRef, Element, ElementType} from 'react';
 
 import './ReactNativeInjection';
 
@@ -193,10 +194,10 @@ function sendAccessibilityEvent(handle: any, eventType: string) {
 }
 
 function render(
- element: React$Element<any>,
- containerTag: any,
- callback: ?Function,
-) {
+ element: Element<ElementType>,
+ containerTag: number,
+ callback: ?() => void,
+): ?ElementRef<ElementType> {
  let root = roots.get(containerTag);
 
  if (!root) {
@@ -207,6 +208,7 @@ function render(
  }
  updateContainer(element, root, null, callback);
 
+ // $FlowIssue Flow has hardcoded values for React DOM that don't work with RN
  return getPublicRootInstance(root);
 }