@office-iss/react-native-win32 0.0.0-canary.302 → 0.0.0-canary.303

package/Libraries/Network/RCTNetworking.ios.js

@@ -23,7 +23,7 @@ const RCTNetworking = {
     listener: (...RCTNetworkingEventDefinitions[K]) => mixed,
     context?: mixed,
   ): EventSubscription {
-    // $FlowFixMe[incompatible-call]
+    // $FlowFixMe[incompatible-type]
     return RCTDeviceEventEmitter.addListener(eventType, listener, context);
   },
 

package/Libraries/Network/RCTNetworking.win32.js

@@ -23,7 +23,7 @@ const RCTNetworking = {
     listener: (...RCTNetworkingEventDefinitions[K]) => mixed,
     context?: mixed,
   ): EventSubscription {
-    // $FlowFixMe[incompatible-call]
+    // $FlowFixMe[incompatible-type]
     return RCTDeviceEventEmitter.addListener(eventType, listener, context);
   },
 

package/Libraries/Network/convertRequestBody.js

@@ -36,7 +36,7 @@ function convertRequestBody(body: RequestBody): Object {
     return {formData: body.getParts()};
   }
   if (body instanceof ArrayBuffer || ArrayBuffer.isView(body)) {
-    /* $FlowFixMe[incompatible-call] : no way to assert that 'body' is indeed
+    /* $FlowFixMe[incompatible-type] : no way to assert that 'body' is indeed
      * an ArrayBufferView */
     return {base64: binaryToBase64(body)};
   }

package/Libraries/PermissionsAndroid/PermissionsAndroid.js

@@ -8,6 +8,8 @@
  * @format
  */
 
+import type {DialogOptions} from '../../src/private/specs_DEPRECATED/modules/NativeDialogManagerAndroid';
+
 import NativeDialogManagerAndroid from '../NativeModules/specs/NativeDialogManagerAndroid';
 import NativePermissionsAndroid from './NativePermissionsAndroid';
 import invariant from 'invariant';
@@ -249,24 +251,24 @@ class PermissionsAndroidImpl {
 
       if (shouldShowRationale && !!NativeDialogManagerAndroid) {
         return new Promise((resolve, reject) => {
-          const options = {
+          /* $FlowFixMe[incompatible-exact] (>=0.111.0 site=react_native_fb)
+           * This comment suppresses an error found when Flow v0.111 was
+           * deployed. To see the error, delete this comment and run Flow.
+           */
+          const options: DialogOptions = {
             ...rationale,
           };
           NativeDialogManagerAndroid.showAlert(
-            /* $FlowFixMe[incompatible-exact] (>=0.111.0 site=react_native_fb)
-             * This comment suppresses an error found when Flow v0.111 was
-             * deployed. To see the error, delete this comment and run Flow.
-             */
             options,
             () => reject(new Error('Error showing rationale')),
             () =>
-              // $FlowFixMe[incompatible-call]
+              // $FlowFixMe[incompatible-type]
               resolve(NativePermissionsAndroid.requestPermission(permission)),
           );
         });
       }
     }
-    // $FlowFixMe[incompatible-return]
+    // $FlowFixMe[incompatible-type]
     return NativePermissionsAndroid.requestPermission(permission);
   }
 
@@ -291,8 +293,7 @@ class PermissionsAndroidImpl {
       NativePermissionsAndroid,
       'PermissionsAndroid is not installed correctly.',
     );
-    // $FlowFixMe[incompatible-return]
-    // $FlowFixMe[incompatible-call]
+    // $FlowFixMe[incompatible-type]
     return NativePermissionsAndroid.requestMultiplePermissions(permissions);
   }
 }

package/Libraries/Pressability/HoverState.js

@@ -14,6 +14,8 @@ let isEnabled = false;
 
 /* $FlowFixMe[incompatible-type] Error found due to incomplete typing of
  * Platform.flow.js */
+/* $FlowFixMe[invalid-compare] Error discovered during Constant Condition roll
+ * out. See https://fburl.com/workplace/4oq3zi07. */
 if (Platform.OS === 'web') {
   const canUseDOM = Boolean(
     typeof window !== 'undefined' &&

package/Libraries/Pressability/HoverState.win32.js

@@ -14,6 +14,8 @@ let isEnabled = false;
 
 /* $FlowFixMe[incompatible-type] Error found due to incomplete typing of
  * Platform.flow.js */
+/* $FlowFixMe[invalid-compare] Error discovered during Constant Condition roll
+ * out. See https://fburl.com/workplace/4oq3zi07. */
 if (Platform.OS === 'web') {
   const canUseDOM = Boolean(
     typeof window !== 'undefined' &&

package/Libraries/PushNotificationIOS/PushNotificationIOS.js

@@ -210,7 +210,7 @@ class PushNotificationIOS {
       NativePushNotificationManagerIOS,
       'PushNotificationManager is not available.',
     );
-    // $FlowFixMe[prop-missing]
+    // $FlowFixMe[incompatible-type]
     NativePushNotificationManagerIOS.presentLocalNotification(details);
   }
 
@@ -235,7 +235,7 @@ class PushNotificationIOS {
       NativePushNotificationManagerIOS,
       'PushNotificationManager is not available.',
     );
-    // $FlowFixMe[prop-missing]
+    // $FlowFixMe[incompatible-type]
     NativePushNotificationManagerIOS.scheduleLocalNotification(details);
   }
 

package/Libraries/ReactNative/ReactFabricPublicInstance/ReactFabricHostComponent.js

@@ -58,10 +58,12 @@ export default class ReactFabricHostComponent implements NativeMethods {
   }
 
   blur() {
+    // $FlowFixMe - Error supressed during the migration of HostInstance to ReactNativeElement
     TextInputState.blurTextInput(this);
   }
 
   focus() {
+    // $FlowFixMe - Error supressed during the migration of HostInstance to ReactNativeElement
     TextInputState.focusTextInput(this);
   }
 

package/Libraries/ReactNative/ReactFabricPublicInstance/ReactFabricPublicInstance.js

@@ -132,7 +132,7 @@ export function getNodeFromPublicInstance(
     RendererProxy = require('../../ReactNative/RendererProxy');
   }
   return RendererProxy.getNodeFromInternalInstanceHandle(
-    // $FlowExpectedError[incompatible-call] __internalInstanceHandle is always an InternalInstanceHandle from React when we get here.
+    // $FlowExpectedError[incompatible-type] __internalInstanceHandle is always an InternalInstanceHandle from React when we get here.
     publicInstance.__internalInstanceHandle,
   );
 }
@@ -143,10 +143,10 @@ export function getInternalInstanceHandleFromPublicInstance(
   // TODO(T174762768): Remove this once OSS versions of renderers will be synced.
   // $FlowExpectedError[prop-missing] Keeping this for backwards-compatibility with the renderers versions in open source.
   if (publicInstance._internalInstanceHandle != null) {
-    // $FlowExpectedError[incompatible-return] Keeping this for backwards-compatibility with the renderers versions in open source.
+    // $FlowExpectedError[incompatible-type] Keeping this for backwards-compatibility with the renderers versions in open source.
     return publicInstance._internalInstanceHandle;
   }
 
-  // $FlowExpectedError[incompatible-return] __internalInstanceHandle is always an InternalInstanceHandle from React when we get here.
+  // $FlowExpectedError[incompatible-type] __internalInstanceHandle is always an InternalInstanceHandle from React when we get here.
   return publicInstance.__internalInstanceHandle;
 }

package/Libraries/ReactNative/RendererImplementation.js

@@ -9,19 +9,71 @@
  */
 
 import type {HostInstance} from '../../src/private/types/HostInstance';
-import type {
-  InternalInstanceHandle,
-  Node,
-} from '../Renderer/shims/ReactNativeTypes';
+import typeof ReactFabricType from '../Renderer/shims/ReactFabric';
+import typeof ReactNativeType from '../Renderer/shims/ReactNative';
+import type {RootTag} from './RootTag';
 
 import {
   onCaughtError,
   onRecoverableError,
   onUncaughtError,
 } from '../../src/private/renderer/errorhandling/ErrorHandlers';
-import {type RootTag} from './RootTag';
 import * as React from 'react';
 
+let cachedFabricRenderer;
+let cachedPaperRenderer;
+
+function getFabricRenderer(): ReactFabricType {
+  if (cachedFabricRenderer == null) {
+    cachedFabricRenderer = require('../Renderer/shims/ReactFabric').default;
+  }
+  return cachedFabricRenderer;
+}
+
+function getPaperRenderer(): ReactNativeType {
+  if (cachedPaperRenderer == null) {
+    cachedPaperRenderer = require('../Renderer/shims/ReactNative').default;
+  }
+  return cachedPaperRenderer;
+}
+
+const getMethod: (<MethodName: $Keys<ReactFabricType>>(
+  () => ReactFabricType,
+  MethodName,
+) => ReactFabricType[MethodName]) &
+  (<MethodName: $Keys<ReactNativeType>>(
+    () => ReactNativeType,
+    MethodName,
+  ) => ReactNativeType[MethodName]) = (getRenderer, methodName) => {
+  let cachedImpl;
+
+  // $FlowExpectedError
+  return function (arg1, arg2, arg3, arg4, arg5, arg6) {
+    if (cachedImpl == null) {
+      // $FlowExpectedError
+      cachedImpl = getRenderer()[methodName];
+    }
+
+    // $FlowExpectedError
+    return cachedImpl(arg1, arg2, arg3, arg4, arg5);
+  };
+};
+
+function getFabricMethod<MethodName: $Keys<ReactFabricType>>(
+  methodName: MethodName,
+): ReactFabricType[MethodName] {
+  return getMethod(getFabricRenderer, methodName);
+}
+
+function getPaperMethod<MethodName: $Keys<ReactNativeType>>(
+  methodName: MethodName,
+): ReactNativeType[MethodName] {
+  return getMethod(getPaperRenderer, methodName);
+}
+
+let cachedFabricRender;
+let cachedPaperRender;
+
 export function renderElement({
   element,
   rootTag,
@@ -34,50 +86,30 @@ export function renderElement({
   useConcurrentRoot: boolean,
 }): void {
   if (useFabric) {
-    require('../Renderer/shims/ReactFabric').default.render(
-      element,
-      rootTag,
-      null,
-      useConcurrentRoot,
-      {
-        onCaughtError,
-        onUncaughtError,
-        onRecoverableError,
-      },
-    );
+    if (cachedFabricRender == null) {
+      cachedFabricRender = getFabricRenderer().render;
+    }
+
+    cachedFabricRender(element, rootTag, null, useConcurrentRoot, {
+      onCaughtError,
+      onUncaughtError,
+      onRecoverableError,
+    });
   } else {
-    require('../Renderer/shims/ReactNative').default.render(
-      element,
-      rootTag,
-      undefined,
-      {
-        onCaughtError,
-        onUncaughtError,
-        onRecoverableError,
-      },
-    );
-  }
-}
+    if (cachedPaperRender == null) {
+      cachedPaperRender = getPaperRenderer().render;
+    }
 
-export function findHostInstance_DEPRECATED<TElementType: React.ElementType>(
-  // $FlowFixMe[incompatible-call]
-  componentOrHandle: ?(React.ElementRef<TElementType> | number),
-): ?HostInstance {
-  return require('../Renderer/shims/ReactNative').default.findHostInstance_DEPRECATED(
-    // $FlowFixMe[incompatible-call]
-    componentOrHandle,
-  );
+    cachedPaperRender(element, rootTag, undefined, {
+      onCaughtError,
+      onUncaughtError,
+      onRecoverableError,
+    });
+  }
 }
 
-export function findNodeHandle<TElementType: React.ElementType>(
-  // $FlowFixMe[incompatible-call]
-  componentOrHandle: ?(React.ElementRef<TElementType> | number),
-): ?number {
-  return require('../Renderer/shims/ReactNative').default.findNodeHandle(
-    // $FlowFixMe[incompatible-call]
-    componentOrHandle,
-  );
-}
+let cachedFabricDispatchCommand;
+let cachedPaperDispatchCommand;
 
 export function dispatchCommand(
   handle: HostInstance,
@@ -87,90 +119,58 @@ export function dispatchCommand(
   if (global.RN$Bridgeless === true) {
     // Note: this function has the same implementation in the legacy and new renderer.
     // However, evaluating the old renderer comes with some side effects.
-    return require('../Renderer/shims/ReactFabric').default.dispatchCommand(
-      handle,
-      command,
-      args,
-    );
+    if (cachedFabricDispatchCommand == null) {
+      cachedFabricDispatchCommand = getFabricRenderer().dispatchCommand;
+    }
+
+    return cachedFabricDispatchCommand(handle, command, args);
   } else {
-    return require('../Renderer/shims/ReactNative').default.dispatchCommand(
-      handle,
-      command,
-      args,
-    );
+    if (cachedPaperDispatchCommand == null) {
+      cachedPaperDispatchCommand = getPaperRenderer().dispatchCommand;
+    }
+
+    return cachedPaperDispatchCommand(handle, command, args);
   }
 }
 
-export function sendAccessibilityEvent(
-  handle: HostInstance,
-  eventType: string,
-): void {
-  return require('../Renderer/shims/ReactNative').default.sendAccessibilityEvent(
-    handle,
-    eventType,
-  );
-}
+export const findHostInstance_DEPRECATED: <TElementType: React.ElementType>(
+  // $FlowExpectedError[incompatible-type]
+  componentOrHandle: ?(React.ElementRef<TElementType> | number),
+) => ?HostInstance = getPaperMethod('findHostInstance_DEPRECATED');
+
+export const findNodeHandle: <TElementType: React.ElementType>(
+  // $FlowExpectedError[incompatible-type]
+  componentOrHandle: ?(React.ElementRef<TElementType> | number),
+) => ?number = getPaperMethod('findNodeHandle');
+
+export const sendAccessibilityEvent: ReactNativeType['sendAccessibilityEvent'] =
+  getPaperMethod('sendAccessibilityEvent');
 
 /**
  * This method is used by AppRegistry to unmount a root when using the old
  * React Native renderer (Paper).
  */
-export function unmountComponentAtNodeAndRemoveContainer(rootTag: RootTag) {
-  // $FlowExpectedError[incompatible-type] rootTag is an opaque type so we can't really cast it as is.
-  const rootTagAsNumber: number = rootTag;
-  require('../Renderer/shims/ReactNative').default.unmountComponentAtNodeAndRemoveContainer(
-    rootTagAsNumber,
-  );
-}
+export const unmountComponentAtNodeAndRemoveContainer: (
+  rootTag: RootTag,
+) => void =
+  // $FlowExpectedError[incompatible-type]
+  getPaperMethod('unmountComponentAtNodeAndRemoveContainer');
 
-export function unstable_batchedUpdates<T>(
-  fn: T => void,
-  bookkeeping: T,
-): void {
-  // This doesn't actually do anything when batching updates for a Fabric root.
-  return require('../Renderer/shims/ReactNative').default.unstable_batchedUpdates(
-    fn,
-    bookkeeping,
-  );
-}
+export const unstable_batchedUpdates: ReactNativeType['unstable_batchedUpdates'] =
+  getPaperMethod('unstable_batchedUpdates');
 
-export function isProfilingRenderer(): boolean {
-  return Boolean(__DEV__);
-}
+export const isChildPublicInstance: ReactNativeType['isChildPublicInstance'] =
+  getPaperMethod('isChildPublicInstance');
 
-export function isChildPublicInstance(
-  parentInstance: HostInstance,
-  childInstance: HostInstance,
-): boolean {
-  return require('../Renderer/shims/ReactNative').default.isChildPublicInstance(
-    parentInstance,
-    childInstance,
-  );
-}
+export const getNodeFromInternalInstanceHandle: ReactFabricType['getNodeFromInternalInstanceHandle'] =
+  getFabricMethod('getNodeFromInternalInstanceHandle');
 
-export function getNodeFromInternalInstanceHandle(
-  internalInstanceHandle: InternalInstanceHandle,
-): ?Node {
-  // This is only available in Fabric
-  return require('../Renderer/shims/ReactFabric').default.getNodeFromInternalInstanceHandle(
-    internalInstanceHandle,
-  );
-}
+export const getPublicInstanceFromInternalInstanceHandle: ReactFabricType['getPublicInstanceFromInternalInstanceHandle'] =
+  getFabricMethod('getPublicInstanceFromInternalInstanceHandle');
 
-export function getPublicInstanceFromInternalInstanceHandle(
-  internalInstanceHandle: InternalInstanceHandle,
-): mixed /*PublicInstance | PublicTextInstance | null*/ {
-  // This is only available in Fabric
-  return require('../Renderer/shims/ReactFabric').default.getPublicInstanceFromInternalInstanceHandle(
-    internalInstanceHandle,
-  );
-}
+export const getPublicInstanceFromRootTag: ReactFabricType['getPublicInstanceFromRootTag'] =
+  getFabricMethod('getPublicInstanceFromRootTag');
 
-export function getPublicInstanceFromRootTag(
-  rootTag: number,
-): mixed /*PublicRootInstance | null*/ {
-  // This is only available in Fabric
-  return require('../Renderer/shims/ReactFabric').default.getPublicInstanceFromRootTag(
-    rootTag,
-  );
+export function isProfilingRenderer(): boolean {
+  return Boolean(__DEV__);
 }

package/Libraries/ReactNative/UIManager.js

@@ -45,7 +45,7 @@ const UIManager: UIManagerJSInterface = {
         FabricUIManager.measure(shadowNode, callback);
       } else {
         console.warn(`measure cannot find view with tag #${reactTag}`);
-        // $FlowFixMe[incompatible-call]
+        // $FlowFixMe[incompatible-type]
         callback();
       }
     } else {
@@ -71,7 +71,7 @@ const UIManager: UIManagerJSInterface = {
         FabricUIManager.measureInWindow(shadowNode, callback);
       } else {
         console.warn(`measure cannot find view with tag #${reactTag}`);
-        // $FlowFixMe[incompatible-call]
+        // $FlowFixMe[incompatible-type]
         callback();
       }
     } else {
@@ -182,7 +182,7 @@ const UIManager: UIManagerJSInterface = {
       UIManagerImpl.dispatchViewManagerCommand(
         reactTag,
         // We have some legacy components that are actually already using strings. ¯\_(ツ)_/¯
-        // $FlowFixMe[incompatible-call]
+        // $FlowFixMe[incompatible-type]
         commandName,
         commandArgs,
       );

package/Libraries/ReactPrivate/ReactNativePrivateInterface.js

@@ -86,7 +86,7 @@ module.exports = {
   // TODO: Remove when React has migrated to `createAttributePayload` and `diffAttributePayloads`
   get flattenStyle(): flattenStyle<DangerouslyImpreciseStyleProp> {
     // $FlowFixMe[underconstrained-implicit-instantiation]
-    // $FlowFixMe[incompatible-return]
+    // $FlowFixMe[incompatible-type]
     return require('../StyleSheet/flattenStyle').default;
   },
   get ReactFiberErrorDialog(): ReactFiberErrorDialog {

package/Libraries/Renderer/shims/ReactFabric.js

@@ -7,9 +7,7 @@
  * @noformat
  * @nolint
  * @flow
- * @generated SignedSource<<16b364e89f43b8a47832b0dfb98af11e>>
- *
- * This file was sync'd from the facebook/react repository.
+ * @generated SignedSource<<cf323fc5ca893bab5669c7d321660412>>
  */
 
 'use strict';

package/Libraries/Renderer/shims/ReactFeatureFlags.js

@@ -7,9 +7,7 @@
  * @noformat
  * @nolint
  * @flow strict-local
- * @generated SignedSource<<1dd9e9c3f20e37ae14e485fc6ee3d9e9>>
- *
- * This file was sync'd from the facebook/react repository.
+ * @generated SignedSource<<908f5fb85384725318e261f40e49d9a6>>
  */
 
 'use strict';

package/Libraries/Renderer/shims/ReactNative.js

@@ -7,9 +7,7 @@
  * @noformat
  * @nolint
  * @flow
- * @generated SignedSource<<e2c46705ed927302dbe9332dafba459d>>
- *
- * This file was sync'd from the facebook/react repository.
+ * @generated SignedSource<<8f46fdc9267fcc4fdc9e76842fe24066>>
  */
 'use strict';
 

package/Libraries/Renderer/shims/ReactNativeViewConfigRegistry.js

@@ -7,9 +7,7 @@
  * @noformat
  * @nolint
  * @flow strict-local
- * @generated SignedSource<<e8dce0e82b831c91465d04b49fb48ab2>>
- *
- * This file was sync'd from the facebook/react repository.
+ * @generated SignedSource<<83073425aa3f71ced2c8c51f25a25938>>
  */
 
 'use strict';

package/Libraries/Renderer/shims/createReactNativeComponentClass.js

@@ -7,9 +7,7 @@
  * @noformat
  * @nolint
  * @flow strict-local
- * @generated SignedSource<<556d1487de0b9e4a09cbc67dd130a884>>
- *
- * This file was sync'd from the facebook/react repository.
+ * @generated SignedSource<<52163887de05f1cff05388145cf85b3b>>
  */
 
 'use strict';

package/Libraries/StyleSheet/PlatformColorValueTypes.android.js

@@ -17,7 +17,7 @@ type LocalNativeColorValue = {
 };
 
 export const PlatformColor = (...names: Array<string>): ColorValue => {
-  /* $FlowExpectedError[incompatible-return]
+  /* $FlowExpectedError[incompatible-type]
    * LocalNativeColorValue is the actual type of the opaque NativeColorValue on Android platform */
   return ({resource_paths: names}: LocalNativeColorValue);
 };
@@ -25,7 +25,7 @@ export const PlatformColor = (...names: Array<string>): ColorValue => {
 export const normalizeColorObject = (
   color: NativeColorValue,
 ): ?ProcessedColorValue => {
-  /* $FlowExpectedError[incompatible-cast]
+  /* $FlowExpectedError[incompatible-type]
    * LocalNativeColorValue is the actual type of the opaque NativeColorValue on Android platform */
   if ('resource_paths' in (color: LocalNativeColorValue)) {
     return color;

package/Libraries/StyleSheet/PlatformColorValueTypes.ios.js

@@ -23,7 +23,7 @@ type LocalNativeColorValue = {
 };
 
 export const PlatformColor = (...names: Array<string>): ColorValue => {
-  // $FlowExpectedError[incompatible-return] LocalNativeColorValue is the iOS LocalNativeColorValue type
+  // $FlowExpectedError[incompatible-type] LocalNativeColorValue is the iOS LocalNativeColorValue type
   return ({semantic: names}: LocalNativeColorValue);
 };
 
@@ -44,7 +44,7 @@ export const DynamicColorIOSPrivate = (
       highContrastLight: tuple.highContrastLight,
       highContrastDark: tuple.highContrastDark,
     },
-    /* $FlowExpectedError[incompatible-return]
+    /* $FlowExpectedError[incompatible-type]
      * LocalNativeColorValue is the actual type of the opaque NativeColorValue on iOS platform */
   }: LocalNativeColorValue);
 };

package/Libraries/StyleSheet/PlatformColorValueTypes.win32.js

@@ -32,6 +32,7 @@ type LocalNativeColorValue =
 
 export const PlatformColor = (...names: Array<string>): ColorValue => {
   // $FlowExpectedError[incompatible-return] LocalNativeColorValue is the Windows LocalNativeColorValue type
+  // $FlowExpectedError[incompatible-type]
   return ({resource_paths: names}: LocalNativeColorValue);
 };
 
@@ -39,6 +40,7 @@ export const ColorGradientWin32Private = (
   gradientColor: GradientColorValueWin32,
 ): ColorValue => {
   // $FlowExpectedError[incompatible-return]
+  // $FlowExpectedError[incompatible-type]
   return gradientColor;
 };
 
@@ -49,8 +51,10 @@ export const normalizeColorObject = (
    * LocalNativeColorValue is the actual type of the opaque NativeColorValue on Windows platform */
   if (
     // $FlowExpectedError[incompatible-cast]
+    // $FlowExpectedError[incompatible-type]
     'resource_paths' in (color: LocalNativeColorValue) ||
     // $FlowExpectedError[incompatible-cast]
+    // $FlowExpectedError[incompatible-type]
     'gradientDirection' in (color: LocalNativeColorValue)
   ) {
     return color;

package/Libraries/StyleSheet/flattenStyle.js

@@ -31,7 +31,7 @@ function flattenStyle<
   }
 
   if (!Array.isArray(style)) {
-    // $FlowFixMe[incompatible-return]
+    // $FlowFixMe[incompatible-type]
     return style;
   }
 
@@ -49,7 +49,7 @@ function flattenStyle<
       }
     }
   }
-  // $FlowFixMe[incompatible-return]
+  // $FlowFixMe[incompatible-type]
   return result;
 }
 

package/Libraries/StyleSheet/splitLayoutProps.js

@@ -18,9 +18,9 @@ export default function splitLayoutProps(props: ?____ViewStyle_Internal): {
   let inner: ?____ViewStyle_Internal = null;
 
   if (props != null) {
-    // $FlowIgnore[incompatible-exact] Will contain a subset of keys from `props`.
+    // $FlowFixMe[incompatible-exact] Will contain a subset of keys from `props`.
     outer = {};
-    // $FlowIgnore[incompatible-exact] Will contain a subset of keys from `props`.
+    // $FlowFixMe[incompatible-exact] Will contain a subset of keys from `props`.
     inner = {};
 
     for (const prop of Object.keys(props)) {