@office-iss/react-native-win32 0.0.0-canary.298 → 0.0.0-canary.299

package/src/private/components/virtualview/VirtualView.js

@@ -0,0 +1,145 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+import type {ViewStyleProp} from '../../../../Libraries/StyleSheet/StyleSheet';
+import type {NativeSyntheticEvent} from '../../../../Libraries/Types/CoreEventTypes';
+import type ReadOnlyElement from '../../webapis/dom/nodes/ReadOnlyElement';
+import type {NativeModeChangeEvent} from './VirtualViewNativeComponent';
+
+import StyleSheet from '../../../../Libraries/StyleSheet/StyleSheet';
+import VirtualViewNativeComponent from './VirtualViewNativeComponent';
+import nullthrows from 'nullthrows';
+import * as React from 'react';
+import {startTransition, useState} from 'react';
+
+// @see VirtualViewNativeComponent
+export enum VirtualViewMode {
+  Visible = 0,
+  Prerender = 1,
+  Hidden = 2,
+}
+
+// @see VirtualViewNativeComponent
+export enum VirtualViewRenderState {
+  Unknown = 0,
+  Rendered = 1,
+  None = 2,
+}
+
+export type Rect = $ReadOnly<{
+  x: number,
+  y: number,
+  width: number,
+  height: number,
+}>;
+
+export type ModeChangeEvent = $ReadOnly<{
+  ...Omit<NativeModeChangeEvent, 'mode'>,
+  mode: VirtualViewMode,
+  target: ReadOnlyElement,
+}>;
+
+type VirtualViewComponent = component(
+  children?: React.Node,
+  nativeID?: string,
+  ref?: ?React.RefSetter<React.ElementRef<typeof VirtualViewNativeComponent>>,
+  style?: ?ViewStyleProp,
+  onModeChange?: (event: ModeChangeEvent) => void,
+);
+
+type HiddenHeight = number;
+const NotHidden = null;
+
+type State = HiddenHeight | typeof NotHidden;
+
+function createVirtualView(initialState: State): VirtualViewComponent {
+  const initialHidden = initialState !== NotHidden;
+
+  component VirtualView(
+    children?: React.Node,
+    nativeID?: string,
+    ref?: ?React.RefSetter<React.ElementRef<typeof VirtualViewNativeComponent>>,
+    style?: ?ViewStyleProp,
+    onModeChange?: (event: ModeChangeEvent) => void,
+  ) {
+    const [state, setState] = useState<State>(initialState);
+    if (__DEV__) {
+      _logs.states?.push(state);
+    }
+    const isHidden = state !== NotHidden;
+
+    const handleModeChange = (
+      event: NativeSyntheticEvent<NativeModeChangeEvent>,
+    ) => {
+      const mode = nullthrows(VirtualViewMode.cast(event.nativeEvent.mode));
+      const emitModeChange =
+        onModeChange == null
+          ? null
+          : onModeChange.bind(null, {
+              mode,
+              // $FlowIgnore[incompatible-cast]
+              target: event.currentTarget as ReadOnlyElement,
+              targetRect: event.nativeEvent.targetRect,
+              thresholdRect: event.nativeEvent.thresholdRect,
+            });
+
+      match (mode) {
+        VirtualViewMode.Visible => {
+          setState(NotHidden);
+          emitModeChange?.();
+        }
+        VirtualViewMode.Prerender => {
+          startTransition(() => {
+            setState(NotHidden);
+            emitModeChange?.();
+          });
+        }
+        VirtualViewMode.Hidden => {
+          const {height} = event.nativeEvent.targetRect;
+          startTransition(() => {
+            setState(height as HiddenHeight);
+            emitModeChange?.();
+          });
+        }
+      }
+    };
+
+    return (
+      <VirtualViewNativeComponent
+        initialHidden={initialHidden}
+        nativeID={nativeID}
+        ref={ref}
+        renderState={
+          (isHidden
+            ? VirtualViewRenderState.None
+            : VirtualViewRenderState.Rendered) as number
+        }
+        style={
+          isHidden
+            ? StyleSheet.compose(style, {
+                height: Math.abs(nullthrows(state) as HiddenHeight),
+              })
+            : style
+        }
+        onModeChange={handleModeChange}>
+        {isHidden ? null : children}
+      </VirtualViewNativeComponent>
+    );
+  }
+  return VirtualView;
+}
+
+export default createVirtualView(NotHidden) as VirtualViewComponent;
+
+export function createHiddenVirtualView(height: number): VirtualViewComponent {
+  return createVirtualView(height as HiddenHeight);
+}
+
+export const _logs: {states?: Array<State>} = {};

package/src/private/components/virtualview/VirtualViewNativeComponent.js

@@ -0,0 +1,90 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+import type {ViewProps} from '../../../../Libraries/Components/View/ViewPropTypes';
+import type {
+  DirectEventHandler,
+  Double,
+  Int32,
+} from '../../../../Libraries/Types/CodegenTypes';
+import type {HostComponent} from '../../types/HostComponent';
+
+import codegenNativeComponent from '../../../../Libraries/Utilities/codegenNativeComponent';
+
+export type NativeModeChangeEvent = $ReadOnly<{
+  /**
+   * Virtualization mode of the target view.
+   *
+   * - `0`: Target view is visible.
+   * - `1`: Target view is hidden, but can be prerendered.
+   * - `2`: Target view is hidden.
+   *
+   * WORKAROUND: As of this writing, codegen doesn't support enums, so we need
+   * to convert `number` into an enum in `VirtualView`.
+   */
+  mode: Int32,
+
+  /**
+   * Rect of the target view, relative to the nearest ancestor scroll container.
+   */
+  targetRect: $ReadOnly<{
+    x: Double,
+    y: Double,
+    width: Double,
+    height: Double,
+  }>,
+
+  /**
+   * Rect of the threshold that determines the mode of the target view, relative
+   * to the nearest ancestor scroll container.
+   *
+   * - `Visible`: Rect in which the target view is visible.
+   * - `Prerender`: Rect in which the target view is prerendered.
+   * - `Hidden`: Unused, without any guarantees.
+   *
+   * This can be used to determine whether and how much new content to render.
+   */
+  thresholdRect: $ReadOnly<{
+    x: Double,
+    y: Double,
+    width: Double,
+    height: Double,
+  }>,
+}>;
+
+type VirtualViewNativeProps = $ReadOnly<{
+  ...ViewProps,
+
+  /**
+   * Whether the initial mode should be `Hidden`.
+   */
+  initialHidden?: boolean,
+
+  /**
+   * Render state of children.
+   *
+   * - `0`: Reserved to represent unknown future values.
+   * - `1`: Children are rendered.
+   * - `2`: Children are not rendered.
+   *
+   * WORKAROUND: As of this writing, codegen doesn't support enums, so we need
+   * to convert `number` into an enum in `VirtualView`.
+   */
+  renderState: Int32,
+
+  /**
+   * See `NativeModeChangeEvent`.
+   */
+  onModeChange?: ?DirectEventHandler<NativeModeChangeEvent>,
+}>;
+
+export default codegenNativeComponent<VirtualViewNativeProps>('VirtualView', {
+  interfaceOnly: true,
+}) as HostComponent<VirtualViewNativeProps>;

package/src/private/featureflags/ReactNativeFeatureFlags.js

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<a4b4716b9b0e9f84c38d83c991ecfba7>>
+ * @generated SignedSource<<b75fccb46a36b07c692d890f0659f9a3>>
  * @flow strict
  * @noformat
  */
@@ -33,9 +33,9 @@ export type ReactNativeFeatureFlagsJsOnly = $ReadOnly<{
   animatedShouldDebounceQueueFlush: Getter<boolean>,
   animatedShouldUseSingleOp: Getter<boolean>,
   avoidStateUpdateInAnimatedPropsMemo: Getter<boolean>,
+  deferFlatListFocusChangeRenderUpdate: Getter<boolean>,
   disableInteractionManager: Getter<boolean>,
   enableAccessToHostTreeInFabric: Getter<boolean>,
-  enableVirtualViewDebugFeatures: Getter<boolean>,
   fixVirtualizeListCollapseWindowSize: Getter<boolean>,
   isLayoutAnimationEnabled: Getter<boolean>,
   reduceDefaultPropsInView: Getter<boolean>,
@@ -53,13 +53,14 @@ export type ReactNativeFeatureFlags = $ReadOnly<{
   commonTestFlag: Getter<boolean>,
   commonTestFlagWithoutNativeImplementation: Getter<boolean>,
   animatedShouldSignalBatch: Getter<boolean>,
-  avoidCeilingAvailableAndroidTextWidth: Getter<boolean>,
   cxxNativeAnimatedEnabled: Getter<boolean>,
+  cxxNativeAnimatedRemoveJsSync: Getter<boolean>,
   disableMainQueueSyncDispatchIOS: Getter<boolean>,
   disableMountItemReorderingAndroid: Getter<boolean>,
   disableTextLayoutManagerCacheAndroid: Getter<boolean>,
   enableAccessibilityOrder: Getter<boolean>,
   enableAccumulatedUpdatesInRawPropsAndroid: Getter<boolean>,
+  enableAndroidTextMeasurementOptimizations: Getter<boolean>,
   enableBridgelessArchitecture: Getter<boolean>,
   enableCppPropsIteratorSetter: Getter<boolean>,
   enableCustomFocusSearchOnClippedElementsAndroid: Getter<boolean>,
@@ -72,7 +73,7 @@ export type ReactNativeFeatureFlags = $ReadOnly<{
   enableFontScaleChangesUpdatingLayout: Getter<boolean>,
   enableIOSTextBaselineOffsetPerLine: Getter<boolean>,
   enableIOSViewClipToPaddingBox: Getter<boolean>,
-  enableIntersectionObserverEventLoopIntegration: Getter<boolean>,
+  enableInteropViewManagerClassLookUpOptimizationIOS: Getter<boolean>,
   enableLayoutAnimationsOnAndroid: Getter<boolean>,
   enableLayoutAnimationsOnIOS: Getter<boolean>,
   enableMainQueueCoordinatorOnIOS: Getter<boolean>,
@@ -89,14 +90,17 @@ export type ReactNativeFeatureFlags = $ReadOnly<{
   enableViewRecycling: Getter<boolean>,
   enableViewRecyclingForText: Getter<boolean>,
   enableViewRecyclingForView: Getter<boolean>,
+  enableVirtualViewDebugFeatures: Getter<boolean>,
+  enableVirtualViewRenderState: Getter<boolean>,
+  enableVirtualViewWindowFocusDetection: Getter<boolean>,
   fixMappingOfEventPrioritiesBetweenFabricAndReact: Getter<boolean>,
   fuseboxEnabledRelease: Getter<boolean>,
   fuseboxNetworkInspectionEnabled: Getter<boolean>,
-  incorporateMaxLinesDuringAndroidLayout: Getter<boolean>,
+  hideOffscreenVirtualViewsOnIOS: Getter<boolean>,
+  preparedTextCacheSize: Getter<number>,
   traceTurboModulePromiseRejectionsOnAndroid: Getter<boolean>,
   updateRuntimeShadowNodeReferencesOnCommit: Getter<boolean>,
   useAlwaysAvailableJSErrorHandling: Getter<boolean>,
-  useAndroidTextLayoutWidthDirectly: Getter<boolean>,
   useFabricInterop: Getter<boolean>,
   useNativeViewConfigsInBridgelessMode: Getter<boolean>,
   useOptimizedEventBatchingOnAndroid: Getter<boolean>,
@@ -132,6 +136,11 @@ export const animatedShouldUseSingleOp: Getter<boolean> = createJavaScriptFlagGe
  */
 export const avoidStateUpdateInAnimatedPropsMemo: Getter<boolean> = createJavaScriptFlagGetter('avoidStateUpdateInAnimatedPropsMemo', true);
 
+/**
+ * Use the deferred cell render update mechanism for focus change in FlatList.
+ */
+export const deferFlatListFocusChangeRenderUpdate: Getter<boolean> = createJavaScriptFlagGetter('deferFlatListFocusChangeRenderUpdate', false);
+
 /**
  * Disables InteractionManager and replaces its scheduler with `setImmediate`.
  */
@@ -142,11 +151,6 @@ export const disableInteractionManager: Getter<boolean> = createJavaScriptFlagGe
  */
 export const enableAccessToHostTreeInFabric: Getter<boolean> = createJavaScriptFlagGetter('enableAccessToHostTreeInFabric', false);
 
-/**
- * Enables VirtualView debug features such as logging and overlays.
- */
-export const enableVirtualViewDebugFeatures: Getter<boolean> = createJavaScriptFlagGetter('enableVirtualViewDebugFeatures', false);
-
 /**
  * Fixing an edge case where the current window size is not properly calculated with fast scrolling. Window size collapsed to 1 element even if windowSize more than the current amount of elements
  */
@@ -199,14 +203,14 @@ export const commonTestFlagWithoutNativeImplementation: Getter<boolean> = create
  * Enables start- and finishOperationBatch on any platform.
  */
 export const animatedShouldSignalBatch: Getter<boolean> = createNativeFlagGetter('animatedShouldSignalBatch', false);
-/**
- * Do not incorrectly ceil the available width of an Android text layout
- */
-export const avoidCeilingAvailableAndroidTextWidth: Getter<boolean> = createNativeFlagGetter('avoidCeilingAvailableAndroidTextWidth', true);
 /**
  * Use a C++ implementation of Native Animated instead of the platform implementation.
  */
 export const cxxNativeAnimatedEnabled: Getter<boolean> = createNativeFlagGetter('cxxNativeAnimatedEnabled', false);
+/**
+ * Removes JS sync at end of native animation
+ */
+export const cxxNativeAnimatedRemoveJsSync: Getter<boolean> = createNativeFlagGetter('cxxNativeAnimatedRemoveJsSync', false);
 /**
  * Disable sync dispatch on the main queue on iOS
  */
@@ -227,6 +231,10 @@ export const enableAccessibilityOrder: Getter<boolean> = createNativeFlagGetter(
  * When enabled, Android will accumulate updates in rawProps to reduce the number of mounting instructions for cascading re-renders.
  */
 export const enableAccumulatedUpdatesInRawPropsAndroid: Getter<boolean> = createNativeFlagGetter('enableAccumulatedUpdatesInRawPropsAndroid', false);
+/**
+ * Enables various optimizations throughout the path of measuring text on Android.
+ */
+export const enableAndroidTextMeasurementOptimizations: Getter<boolean> = createNativeFlagGetter('enableAndroidTextMeasurementOptimizations', false);
 /**
  * Feature flag to enable the new bridgeless architecture. Note: Enabling this will force enable the following flags: `useTurboModules` & `enableFabricRenderer`.
  */
@@ -276,9 +284,9 @@ export const enableIOSTextBaselineOffsetPerLine: Getter<boolean> = createNativeF
  */
 export const enableIOSViewClipToPaddingBox: Getter<boolean> = createNativeFlagGetter('enableIOSViewClipToPaddingBox', false);
 /**
- * Integrates IntersectionObserver in the Event Loop in the new architecture, to dispatch the initial notifications for observations in the "Update the rendering" step.
+ * This is to fix the issue with interop view manager where component descriptor lookup is causing ViewManager to preload.
  */
-export const enableIntersectionObserverEventLoopIntegration: Getter<boolean> = createNativeFlagGetter('enableIntersectionObserverEventLoopIntegration', true);
+export const enableInteropViewManagerClassLookUpOptimizationIOS: Getter<boolean> = createNativeFlagGetter('enableInteropViewManagerClassLookUpOptimizationIOS', false);
 /**
  * When enabled, LayoutAnimations API will animate state changes on Android.
  */
@@ -343,6 +351,18 @@ export const enableViewRecyclingForText: Getter<boolean> = createNativeFlagGette
  * Enables View Recycling for <View> via ReactViewGroup/ReactViewManager.
  */
 export const enableViewRecyclingForView: Getter<boolean> = createNativeFlagGetter('enableViewRecyclingForView', true);
+/**
+ * Enables VirtualView debug features such as logging and overlays.
+ */
+export const enableVirtualViewDebugFeatures: Getter<boolean> = createNativeFlagGetter('enableVirtualViewDebugFeatures', false);
+/**
+ * Enables reading render state when dispatching VirtualView events.
+ */
+export const enableVirtualViewRenderState: Getter<boolean> = createNativeFlagGetter('enableVirtualViewRenderState', false);
+/**
+ * Enables window focus detection for prioritizing VirtualView events.
+ */
+export const enableVirtualViewWindowFocusDetection: Getter<boolean> = createNativeFlagGetter('enableVirtualViewWindowFocusDetection', false);
 /**
  * Uses the default event priority instead of the discreet event priority by default when dispatching events from Fabric to React.
  */
@@ -356,9 +376,13 @@ export const fuseboxEnabledRelease: Getter<boolean> = createNativeFlagGetter('fu
  */
 export const fuseboxNetworkInspectionEnabled: Getter<boolean> = createNativeFlagGetter('fuseboxNetworkInspectionEnabled', false);
 /**
- * Set maxLines and ellipsization during Android layout creation
+ * Hides offscreen VirtualViews on iOS by setting hidden = YES to avoid extra cost of views
+ */
+export const hideOffscreenVirtualViewsOnIOS: Getter<boolean> = createNativeFlagGetter('hideOffscreenVirtualViewsOnIOS', false);
+/**
+ * Number cached PreparedLayouts in TextLayoutManager cache
  */
-export const incorporateMaxLinesDuringAndroidLayout: Getter<boolean> = createNativeFlagGetter('incorporateMaxLinesDuringAndroidLayout', true);
+export const preparedTextCacheSize: Getter<number> = createNativeFlagGetter('preparedTextCacheSize', 200);
 /**
  * Enables storing js caller stack when creating promise in native module. This is useful in case of Promise rejection and tracing the cause.
  */
@@ -371,10 +395,6 @@ export const updateRuntimeShadowNodeReferencesOnCommit: Getter<boolean> = create
  * In Bridgeless mode, use the always available javascript error reporting pipeline.
  */
 export const useAlwaysAvailableJSErrorHandling: Getter<boolean> = createNativeFlagGetter('useAlwaysAvailableJSErrorHandling', false);
-/**
- * Trust the width of a text layout we create, instead of re-deriving it from its contents
- */
-export const useAndroidTextLayoutWidthDirectly: Getter<boolean> = createNativeFlagGetter('useAndroidTextLayoutWidthDirectly', true);
 /**
  * Should this application enable the Fabric Interop Layer for Android? If yes, the application will behave so that it can accept non-Fabric components and render them on Fabric. This toggle is controlling extra logic such as custom event dispatching that are needed for the Fabric Interop Layer to work correctly.
  */

package/src/private/featureflags/specs/NativeReactNativeFeatureFlags.js

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<afe099f339fe761a3856eb3f43dc6ae7>>
+ * @generated SignedSource<<55c1f0223345b5680bbdd888a358f210>>
  * @flow strict
  * @noformat
  */
@@ -27,13 +27,14 @@ export interface Spec extends TurboModule {
   +commonTestFlag?: () => boolean;
   +commonTestFlagWithoutNativeImplementation?: () => boolean;
   +animatedShouldSignalBatch?: () => boolean;
-  +avoidCeilingAvailableAndroidTextWidth?: () => boolean;
   +cxxNativeAnimatedEnabled?: () => boolean;
+  +cxxNativeAnimatedRemoveJsSync?: () => boolean;
   +disableMainQueueSyncDispatchIOS?: () => boolean;
   +disableMountItemReorderingAndroid?: () => boolean;
   +disableTextLayoutManagerCacheAndroid?: () => boolean;
   +enableAccessibilityOrder?: () => boolean;
   +enableAccumulatedUpdatesInRawPropsAndroid?: () => boolean;
+  +enableAndroidTextMeasurementOptimizations?: () => boolean;
   +enableBridgelessArchitecture?: () => boolean;
   +enableCppPropsIteratorSetter?: () => boolean;
   +enableCustomFocusSearchOnClippedElementsAndroid?: () => boolean;
@@ -46,7 +47,7 @@ export interface Spec extends TurboModule {
   +enableFontScaleChangesUpdatingLayout?: () => boolean;
   +enableIOSTextBaselineOffsetPerLine?: () => boolean;
   +enableIOSViewClipToPaddingBox?: () => boolean;
-  +enableIntersectionObserverEventLoopIntegration?: () => boolean;
+  +enableInteropViewManagerClassLookUpOptimizationIOS?: () => boolean;
   +enableLayoutAnimationsOnAndroid?: () => boolean;
   +enableLayoutAnimationsOnIOS?: () => boolean;
   +enableMainQueueCoordinatorOnIOS?: () => boolean;
@@ -63,14 +64,17 @@ export interface Spec extends TurboModule {
   +enableViewRecycling?: () => boolean;
   +enableViewRecyclingForText?: () => boolean;
   +enableViewRecyclingForView?: () => boolean;
+  +enableVirtualViewDebugFeatures?: () => boolean;
+  +enableVirtualViewRenderState?: () => boolean;
+  +enableVirtualViewWindowFocusDetection?: () => boolean;
   +fixMappingOfEventPrioritiesBetweenFabricAndReact?: () => boolean;
   +fuseboxEnabledRelease?: () => boolean;
   +fuseboxNetworkInspectionEnabled?: () => boolean;
-  +incorporateMaxLinesDuringAndroidLayout?: () => boolean;
+  +hideOffscreenVirtualViewsOnIOS?: () => boolean;
+  +preparedTextCacheSize?: () => number;
   +traceTurboModulePromiseRejectionsOnAndroid?: () => boolean;
   +updateRuntimeShadowNodeReferencesOnCommit?: () => boolean;
   +useAlwaysAvailableJSErrorHandling?: () => boolean;
-  +useAndroidTextLayoutWidthDirectly?: () => boolean;
   +useFabricInterop?: () => boolean;
   +useNativeViewConfigsInBridgelessMode?: () => boolean;
   +useOptimizedEventBatchingOnAndroid?: () => boolean;

package/src/private/setup/setUpPerformanceObserver.js

@@ -52,6 +52,13 @@ export default function setUpPerformanceObserver() {
     () => require('../webapis/performance/EventTiming').PerformanceEventTiming,
   );
 
+  polyfillGlobal(
+    'PerformanceResourceTiming',
+    () =>
+      require('../webapis/performance/ResourceTiming')
+        .PerformanceResourceTiming,
+  );
+
   polyfillGlobal(
     'TaskAttributionTiming',
     () => require('../webapis/performance/LongTasks').TaskAttributionTiming,

package/src/private/specs_DEPRECATED/components/ActivityIndicatorViewNativeComponent.js

@@ -15,7 +15,7 @@ import type {HostComponent} from '../../types/HostComponent';
 
 import codegenNativeComponent from '../../../../Libraries/Utilities/codegenNativeComponent';
 
-type NativeProps = $ReadOnly<{
+type RCTActivityIndicatorViewNativeProps = $ReadOnly<{
   ...ViewProps,
 
   /**
@@ -48,6 +48,9 @@ type NativeProps = $ReadOnly<{
   size?: WithDefault<'small' | 'large', 'small'>,
 }>;
 
-export default (codegenNativeComponent<NativeProps>('ActivityIndicatorView', {
-  paperComponentName: 'RCTActivityIndicatorView',
-}): HostComponent<NativeProps>);
+export default (codegenNativeComponent<RCTActivityIndicatorViewNativeProps>(
+  'ActivityIndicatorView',
+  {
+    paperComponentName: 'RCTActivityIndicatorView',
+  },
+): HostComponent<RCTActivityIndicatorViewNativeProps>);

package/src/private/specs_DEPRECATED/components/AndroidDrawerLayoutNativeComponent.js

@@ -30,7 +30,7 @@ type DrawerSlideEvent = $ReadOnly<{
   offset: Float,
 }>;
 
-type NativeProps = $ReadOnly<{
+type AndroidDrawerLayoutNativeProps = $ReadOnly<{
   ...ViewProps,
   /**
    * Determines whether the keyboard gets dismissed in response to a drag.
@@ -108,7 +108,7 @@ type NativeProps = $ReadOnly<{
   statusBarBackgroundColor?: ?ColorValue,
 }>;
 
-type NativeType = HostComponent<NativeProps>;
+type NativeType = HostComponent<AndroidDrawerLayoutNativeProps>;
 
 interface NativeCommands {
   +openDrawer: (viewRef: React.ElementRef<NativeType>) => void;
@@ -119,6 +119,6 @@ export const Commands: NativeCommands = codegenNativeCommands<NativeCommands>({
   supportedCommands: ['openDrawer', 'closeDrawer'],
 });
 
-export default (codegenNativeComponent<NativeProps>(
+export default (codegenNativeComponent<AndroidDrawerLayoutNativeProps>(
   'AndroidDrawerLayout',
 ): NativeType);

package/src/private/specs_DEPRECATED/components/AndroidHorizontalScrollContentViewNativeComponent.js

@@ -13,15 +13,15 @@ import type {HostComponent} from '../../types/HostComponent';
 
 import codegenNativeComponent from '../../../../Libraries/Utilities/codegenNativeComponent';
 
-type NativeProps = $ReadOnly<{
+type AndroidHorizontalScrollContentViewNativeProps = $ReadOnly<{
   ...ViewProps,
 
   removeClippedSubviews?: ?boolean,
 }>;
 
-type NativeType = HostComponent<NativeProps>;
+type NativeType = HostComponent<AndroidHorizontalScrollContentViewNativeProps>;
 
-export default (codegenNativeComponent<NativeProps>(
+export default (codegenNativeComponent<AndroidHorizontalScrollContentViewNativeProps>(
   'AndroidHorizontalScrollContentView',
   {interfaceOnly: true},
 ): NativeType);

package/src/private/specs_DEPRECATED/components/AndroidSwipeRefreshLayoutNativeComponent.js

@@ -21,7 +21,7 @@ import codegenNativeCommands from '../../../../Libraries/Utilities/codegenNative
 import codegenNativeComponent from '../../../../Libraries/Utilities/codegenNativeComponent';
 import * as React from 'react';
 
-type NativeProps = $ReadOnly<{
+type AndroidSwipeRefreshLayoutNativeProps = $ReadOnly<{
   ...ViewProps,
 
   /**
@@ -56,7 +56,7 @@ type NativeProps = $ReadOnly<{
   refreshing: boolean,
 }>;
 
-type NativeType = HostComponent<NativeProps>;
+type NativeType = HostComponent<AndroidSwipeRefreshLayoutNativeProps>;
 
 interface NativeCommands {
   +setNativeRefreshing: (
@@ -69,6 +69,6 @@ export const Commands: NativeCommands = codegenNativeCommands<NativeCommands>({
   supportedCommands: ['setNativeRefreshing'],
 });
 
-export default (codegenNativeComponent<NativeProps>(
+export default (codegenNativeComponent<AndroidSwipeRefreshLayoutNativeProps>(
   'AndroidSwipeRefreshLayout',
 ): NativeType);

package/src/private/specs_DEPRECATED/components/AndroidSwitchNativeComponent.js

@@ -21,12 +21,12 @@ import codegenNativeCommands from '../../../../Libraries/Utilities/codegenNative
 import codegenNativeComponent from '../../../../Libraries/Utilities/codegenNativeComponent';
 import * as React from 'react';
 
-type SwitchChangeEvent = $ReadOnly<{
+type AndroidSwitchChangeEvent = $ReadOnly<{
   value: boolean,
   target: Int32,
 }>;
 
-type NativeProps = $ReadOnly<{
+type AndroidSwitchNativeProps = $ReadOnly<{
   ...ViewProps,
 
   // Props
@@ -41,10 +41,10 @@ type NativeProps = $ReadOnly<{
   trackTintColor?: ?ColorValue,
 
   // Events
-  onChange?: BubblingEventHandler<SwitchChangeEvent>,
+  onChange?: BubblingEventHandler<AndroidSwitchChangeEvent>,
 }>;
 
-type NativeType = HostComponent<NativeProps>;
+type NativeType = HostComponent<AndroidSwitchNativeProps>;
 
 interface NativeCommands {
   +setNativeValue: (
@@ -57,6 +57,9 @@ export const Commands: NativeCommands = codegenNativeCommands<NativeCommands>({
   supportedCommands: ['setNativeValue'],
 });
 
-export default (codegenNativeComponent<NativeProps>('AndroidSwitch', {
-  interfaceOnly: true,
-}): NativeType);
+export default (codegenNativeComponent<AndroidSwitchNativeProps>(
+  'AndroidSwitch',
+  {
+    interfaceOnly: true,
+  },
+): NativeType);

package/src/private/specs_DEPRECATED/components/DebuggingOverlayNativeComponent.js

@@ -16,10 +16,11 @@ import codegenNativeCommands from '../../../../Libraries/Utilities/codegenNative
 import codegenNativeComponent from '../../../../Libraries/Utilities/codegenNativeComponent';
 import * as React from 'react';
 
-type NativeProps = $ReadOnly<{
+type DebuggingOverlayNativeProps = $ReadOnly<{
   ...ViewProps,
 }>;
-export type DebuggingOverlayNativeComponentType = HostComponent<NativeProps>;
+export type DebuggingOverlayNativeComponentType =
+  HostComponent<DebuggingOverlayNativeProps>;
 
 export type TraceUpdate = {
   id: number,
@@ -56,6 +57,6 @@ export const Commands: NativeCommands = codegenNativeCommands<NativeCommands>({
   ],
 });
 
-export default (codegenNativeComponent<NativeProps>(
+export default (codegenNativeComponent<DebuggingOverlayNativeProps>(
   'DebuggingOverlay',
-): HostComponent<NativeProps>);
+): HostComponent<DebuggingOverlayNativeProps>);

package/src/private/specs_DEPRECATED/components/ProgressBarAndroidNativeComponent.js

@@ -18,7 +18,7 @@ import type {HostComponent} from '../../types/HostComponent';
 
 import codegenNativeComponent from '../../../../Libraries/Utilities/codegenNativeComponent';
 
-type NativeProps = $ReadOnly<{
+type AndroidProgressBarNativeProps = $ReadOnly<{
   ...ViewProps,
 
   //Props
@@ -31,6 +31,9 @@ type NativeProps = $ReadOnly<{
   testID?: WithDefault<string, ''>,
 }>;
 
-export default (codegenNativeComponent<NativeProps>('AndroidProgressBar', {
-  interfaceOnly: true,
-}): HostComponent<NativeProps>);
+export default (codegenNativeComponent<AndroidProgressBarNativeProps>(
+  'AndroidProgressBar',
+  {
+    interfaceOnly: true,
+  },
+): HostComponent<AndroidProgressBarNativeProps>);