@office-iss/react-native-win32 0.0.0-canary.286 → 0.0.0-canary.288

package/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.js

@@ -10,8 +10,68 @@
 
 'use strict';
 
-// $FlowFixMe[cannot-resolve-module]
-import typeof DrawerLayoutAndroid from './DrawerLayoutAndroid.android';
+// import typeof DrawerLayoutAndroid from './DrawerLayoutAndroid.android';
+import type {
+  MeasureInWindowOnSuccessCallback,
+  MeasureLayoutOnSuccessCallback,
+  MeasureOnSuccessCallback,
+} from '../../../src/private/types/HostInstance';
+import type {
+  DrawerLayoutAndroidMethods,
+  DrawerLayoutAndroidProps,
+  DrawerLayoutAndroidState,
+} from './DrawerLayoutAndroidTypes';
 
-export default require('../UnimplementedViews/UnimplementedView')
-  .default as $FlowFixMe as DrawerLayoutAndroid;
+import UnimplementedView from '../UnimplementedViews/UnimplementedView';
+import * as React from 'react';
+
+export type {
+  DrawerLayoutAndroidProps,
+  DrawerSlideEvent,
+} from './DrawerLayoutAndroidTypes';
+
+export default class DrawerLayoutAndroid
+  extends React.Component<DrawerLayoutAndroidProps, DrawerLayoutAndroidState>
+  implements DrawerLayoutAndroidMethods
+{
+  render(): React.Node {
+    return <UnimplementedView {...this.props} />;
+  }
+
+  openDrawer(): void {
+    throw new Error('DrawerLayoutAndroid is only available on Android');
+  }
+
+  closeDrawer(): void {
+    throw new Error('DrawerLayoutAndroid is only available on Android');
+  }
+
+  blur(): void {
+    throw new Error('DrawerLayoutAndroid is only available on Android');
+  }
+
+  focus(): void {
+    throw new Error('DrawerLayoutAndroid is only available on Android');
+  }
+
+  measure(callback: MeasureOnSuccessCallback): void {
+    throw new Error('DrawerLayoutAndroid is only available on Android');
+  }
+
+  measureInWindow(callback: MeasureInWindowOnSuccessCallback): void {
+    throw new Error('DrawerLayoutAndroid is only available on Android');
+  }
+
+  measureLayout(
+    relativeToNativeNode: number,
+    onSuccess: MeasureLayoutOnSuccessCallback,
+    onFail?: () => void,
+  ): void {
+    throw new Error('DrawerLayoutAndroid is only available on Android');
+  }
+
+  // $FlowFixMe[unclear-type]
+  setNativeProps(nativeProps: Object): void {
+    throw new Error('DrawerLayoutAndroid is only available on Android');
+  }
+}

package/Libraries/Components/DrawerAndroid/DrawerLayoutAndroidTypes.js

@@ -0,0 +1,138 @@
+/**
+ * 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
+ * @format
+ */
+
+import type {
+  MeasureInWindowOnSuccessCallback,
+  MeasureLayoutOnSuccessCallback,
+  MeasureOnSuccessCallback,
+} from '../../../src/private/types/HostInstance';
+import type {ColorValue} from '../../StyleSheet/StyleSheet';
+import type {NativeSyntheticEvent} from '../../Types/CoreEventTypes';
+import type {ViewProps} from '../View/ViewPropTypes';
+
+import * as React from 'react';
+
+export type DrawerStates = 'Idle' | 'Dragging' | 'Settling';
+
+export type DrawerSlideEvent = NativeSyntheticEvent<
+  $ReadOnly<{
+    offset: number,
+  }>,
+>;
+
+export type DrawerLayoutAndroidProps = $ReadOnly<{
+  ...ViewProps,
+
+  /**
+   * Determines whether the keyboard gets dismissed in response to a drag.
+   *   - 'none' (the default), drags do not dismiss the keyboard.
+   *   - 'on-drag', the keyboard is dismissed when a drag begins.
+   */
+  keyboardDismissMode?: ?('none' | 'on-drag'),
+
+  /**
+   * Specifies the background color of the drawer. The default value is white.
+   * If you want to set the opacity of the drawer, use rgba. Example:
+   *
+   * ```
+   * return (
+   *   <DrawerLayoutAndroid drawerBackgroundColor="rgba(0,0,0,0.5)">
+   *   </DrawerLayoutAndroid>
+   * );
+   * ```
+   */
+  drawerBackgroundColor?: ?ColorValue,
+
+  /**
+   * Specifies the side of the screen from which the drawer will slide in.
+   */
+  drawerPosition: ?('left' | 'right'),
+
+  /**
+   * Specifies the width of the drawer, more precisely the width of the view that be pulled in
+   * from the edge of the window.
+   */
+  drawerWidth?: ?number,
+
+  /**
+   * Specifies the lock mode of the drawer. The drawer can be locked in 3 states:
+   * - unlocked (default), meaning that the drawer will respond (open/close) to touch gestures.
+   * - locked-closed, meaning that the drawer will stay closed and not respond to gestures.
+   * - locked-open, meaning that the drawer will stay opened and not respond to gestures.
+   * The drawer may still be opened and closed programmatically (`openDrawer`/`closeDrawer`).
+   */
+  drawerLockMode?: ?('unlocked' | 'locked-closed' | 'locked-open'),
+
+  /**
+   * Function called whenever there is an interaction with the navigation view.
+   */
+  onDrawerSlide?: ?(event: DrawerSlideEvent) => mixed,
+
+  /**
+   * Function called when the drawer state has changed. The drawer can be in 3 states:
+   * - Idle, meaning there is no interaction with the navigation view happening at the time
+   * - Dragging, meaning there is currently an interaction with the navigation view
+   * - Settling, meaning that there was an interaction with the navigation view, and the
+   * navigation view is now finishing its closing or opening animation
+   */
+  onDrawerStateChanged?: ?(state: DrawerStates) => mixed,
+
+  /**
+   * Function called whenever the navigation view has been opened.
+   */
+  onDrawerOpen?: ?() => mixed,
+
+  /**
+   * Function called whenever the navigation view has been closed.
+   */
+  onDrawerClose?: ?() => mixed,
+
+  /**
+   * The navigation view that will be rendered to the side of the screen and can be pulled in.
+   */
+  renderNavigationView: () => React.MixedElement,
+
+  /**
+   * Make the drawer take the entire screen and draw the background of the
+   * status bar to allow it to open over the status bar. It will only have an
+   * effect on API 21+.
+   */
+  statusBarBackgroundColor?: ?ColorValue,
+}>;
+
+export type DrawerLayoutAndroidState = {
+  drawerOpened: boolean,
+};
+
+export interface DrawerLayoutAndroidMethods {
+  /**
+   * Opens the drawer.
+   */
+  openDrawer(): void;
+
+  /**
+   * Closes the drawer.
+   */
+  closeDrawer(): void;
+
+  /**
+   * Native methods
+   */
+  blur(): void;
+  focus(): void;
+  measure(callback: MeasureOnSuccessCallback): void;
+  measureInWindow(callback: MeasureInWindowOnSuccessCallback): void;
+  measureLayout(
+    relativeToNativeNode: number,
+    onSuccess: MeasureLayoutOnSuccessCallback,
+    onFail?: () => void,
+  ): void;
+  setNativeProps(nativeProps: Object): void;
+}

package/Libraries/Components/Keyboard/KeyboardAvoidingView.js

@@ -25,7 +25,7 @@ import View from '../View/View';
 import Keyboard from './Keyboard';
 import * as React from 'react';
 
-type Props = $ReadOnly<{
+export type KeyboardAvoidingViewProps = $ReadOnly<{
   ...ViewProps,
 
   /**
@@ -59,7 +59,10 @@ type State = {
  * View that moves out of the way when the keyboard appears by automatically
  * adjusting its height, position, or bottom padding.
  */
-class KeyboardAvoidingView extends React.Component<Props, State> {
+class KeyboardAvoidingView extends React.Component<
+  KeyboardAvoidingViewProps,
+  State,
+> {
   _frame: ?ViewLayout = null;
   _keyboardEvent: ?KeyboardEvent = null;
   _subscriptions: Array<EventSubscription> = [];
@@ -67,7 +70,7 @@ class KeyboardAvoidingView extends React.Component<Props, State> {
   _initialFrameHeight: number = 0;
   _bottom: number = 0;
 
-  constructor(props: Props) {
+  constructor(props: KeyboardAvoidingViewProps) {
     super(props);
     this.state = {bottom: 0};
     this.viewRef = React.createRef();
@@ -175,7 +178,7 @@ class KeyboardAvoidingView extends React.Component<Props, State> {
     }
   };
 
-  componentDidUpdate(_: Props, prevState: State): void {
+  componentDidUpdate(_: KeyboardAvoidingViewProps, prevState: State): void {
     const enabled = this.props.enabled ?? true;
     if (enabled && this._bottom !== prevState.bottom) {
       this.setState({bottom: this._bottom});

package/Libraries/Components/LayoutConformance/LayoutConformance.js

@@ -13,7 +13,7 @@ import StyleSheet from '../../StyleSheet/StyleSheet';
 import LayoutConformanceNativeComponent from './LayoutConformanceNativeComponent';
 import * as React from 'react';
 
-type Props = $ReadOnly<{
+export type LayoutConformanceProps = $ReadOnly<{
   /**
    * strict: Layout in accordance with W3C spec, even when breaking
    * compatibility: Layout with the same behavior as previous versions of React Native
@@ -29,13 +29,15 @@ type Props = $ReadOnly<{
 // degrade the error experience).
 const isFabricUIManagerInstalled = global?.nativeFabricUIManager != null;
 
-function LayoutConformance(props: Props): React.Node {
+function LayoutConformance(props: LayoutConformanceProps): React.Node {
   return (
     <LayoutConformanceNativeComponent {...props} style={styles.container} />
   );
 }
 
-function UnimplementedLayoutConformance(props: Props): React.Node {
+function UnimplementedLayoutConformance(
+  props: LayoutConformanceProps,
+): React.Node {
   if (__DEV__) {
     const warnOnce = require('../../Utilities/warnOnce').default;
 
@@ -50,7 +52,7 @@ function UnimplementedLayoutConformance(props: Props): React.Node {
 
 export default (isFabricUIManagerInstalled
   ? LayoutConformance
-  : UnimplementedLayoutConformance) as component(...Props);
+  : UnimplementedLayoutConformance) as component(...LayoutConformanceProps);
 
 const styles = StyleSheet.create({
   container: {

package/Libraries/Components/LayoutConformance/LayoutConformanceNativeComponent.js

@@ -8,7 +8,7 @@
  * @format
  */
 
-import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
+import type {HostComponent} from '../../../src/private/types/HostComponent';
 import type {ViewProps} from '../View/ViewPropTypes';
 
 import * as NativeComponentRegistry from '../../NativeComponent/NativeComponentRegistry';

package/Libraries/Components/Pressable/Pressable.js

@@ -9,17 +9,11 @@
  */
 
 import type {
+  GestureResponderEvent,
   LayoutChangeEvent,
   MouseEvent,
-  GestureResponderEvent,
 } from '../../Types/CoreEventTypes';
-import type {
-  AccessibilityActionEvent,
-  AccessibilityActionInfo,
-  AccessibilityRole,
-  AccessibilityState,
-  AccessibilityValue,
-} from '../View/ViewAccessibility';
+import type {ViewProps} from '../View/ViewPropTypes';
 
 import {PressabilityDebugView} from '../../Pressability/PressabilityDebug';
 import usePressability from '../../Pressability/usePressability';
@@ -27,59 +21,18 @@ import {type RectOrSize} from '../../StyleSheet/Rect';
 import useMergeRefs from '../../Utilities/useMergeRefs';
 import View from '../View/View';
 import useAndroidRippleForView, {
-  type RippleConfig,
+  type PressableAndroidRippleConfig,
 } from './useAndroidRippleForView';
 import * as React from 'react';
 import {useMemo, useRef, useState} from 'react';
 
 type ViewStyleProp = $ElementType<React.ElementConfig<typeof View>, 'style'>;
 
-export type StateCallbackType = $ReadOnly<{
+export type PressableStateCallbackType = $ReadOnly<{
   pressed: boolean,
 }>;
 
-type Props = $ReadOnly<{
-  /**
-   * Accessibility.
-   */
-  accessibilityActions?: ?$ReadOnlyArray<AccessibilityActionInfo>,
-  accessibilityElementsHidden?: ?boolean,
-  accessibilityHint?: ?Stringish,
-  accessibilityLanguage?: ?Stringish,
-  accessibilityIgnoresInvertColors?: ?boolean,
-  accessibilityLabel?: ?Stringish,
-  accessibilityLiveRegion?: ?('none' | 'polite' | 'assertive'),
-  accessibilityRole?: ?AccessibilityRole,
-  accessibilityState?: ?AccessibilityState,
-  accessibilityValue?: ?AccessibilityValue,
-  'aria-valuemax'?: AccessibilityValue['max'],
-  'aria-valuemin'?: AccessibilityValue['min'],
-  'aria-valuenow'?: AccessibilityValue['now'],
-  'aria-valuetext'?: AccessibilityValue['text'],
-  accessibilityViewIsModal?: ?boolean,
-  'aria-modal'?: ?boolean,
-  accessible?: ?boolean,
-
-  /**
-   * alias for accessibilityState
-   *
-   * see https://reactnative.dev/docs/accessibility#accessibilitystate
-   */
-  'aria-busy'?: ?boolean,
-  'aria-checked'?: ?boolean | 'mixed',
-  'aria-disabled'?: ?boolean,
-  'aria-expanded'?: ?boolean,
-  'aria-selected'?: ?boolean,
-  /**
-   * A value indicating whether the accessibility elements contained within
-   * this accessibility element are hidden.
-   */
-  'aria-hidden'?: ?boolean,
-  'aria-live'?: ?('polite' | 'assertive' | 'off'),
-  focusable?: ?boolean,
-  importantForAccessibility?: ?('auto' | 'yes' | 'no' | 'no-hide-descendants'),
-  onAccessibilityAction?: ?(event: AccessibilityActionEvent) => mixed,
-
+type PressableBaseProps = $ReadOnly<{
   /**
    * Whether a press gesture can be interrupted by a parent gesture such as a
    * scroll event. Defaults to true.
@@ -90,7 +43,7 @@ type Props = $ReadOnly<{
    * Either children or a render prop that receives a boolean reflecting whether
    * the component is currently pressed.
    */
-  children: React.Node | ((state: StateCallbackType) => React.Node),
+  children: React.Node | ((state: PressableStateCallbackType) => React.Node),
 
   /**
    * Duration to wait after hover in before calling `onHoverIn`.
@@ -162,7 +115,9 @@ type Props = $ReadOnly<{
    * Either view styles or a function that receives a boolean reflecting whether
    * the component is currently pressed and returns view styles.
    */
-  style?: ViewStyleProp | ((state: StateCallbackType) => ViewStyleProp),
+  style?:
+    | ViewStyleProp
+    | ((state: PressableStateCallbackType) => ViewStyleProp),
 
   /**
    * Identifier used to find this view in tests.
@@ -177,7 +132,7 @@ type Props = $ReadOnly<{
   /**
    * Enables the Android ripple effect and configures its color.
    */
-  android_ripple?: ?RippleConfig,
+  android_ripple?: ?PressableAndroidRippleConfig,
 
   /**
    * Used only for documentation or testing (e.g. snapshot testing).
@@ -188,11 +143,11 @@ type Props = $ReadOnly<{
    * Duration to wait after press down before calling `onPressIn`.
    */
   unstable_pressDelay?: ?number,
-  /**
-   * Web to Native Accessibility props
-   * https://github.com/facebook/react-native/issues/34424
-   */
-  'aria-label'?: ?string,
+}>;
+
+export type PressableProps = $ReadOnly<{
+  ...ViewProps,
+  ...PressableBaseProps,
 }>;
 
 type Instance = React.ElementRef<typeof View>;
@@ -202,7 +157,7 @@ type Instance = React.ElementRef<typeof View>;
  * component is currently pressed or not.
  */
 function Pressable(
-  props: Props,
+  props: PressableProps,
   forwardedRef: React.RefSetter<Instance>,
 ): React.Node {
   const {
@@ -364,6 +319,6 @@ const MemoedPressable = React.memo(React.forwardRef(Pressable));
 MemoedPressable.displayName = 'Pressable';
 
 export default (MemoedPressable: component(
-  ref: React.RefSetter<React.ElementRef<typeof View>>,
-  ...props: Props
+  ref?: React.RefSetter<React.ElementRef<typeof View>>,
+  ...props: PressableProps
 ));

package/Libraries/Components/Pressable/Pressable.win32.js

@@ -9,28 +9,23 @@
  */
 
 import type {
+  GestureResponderEvent,
   LayoutChangeEvent,
   MouseEvent,
-  GestureResponderEvent,
   // [Windows
   BlurEvent,
   FocusEvent,
   KeyEvent, // Windows]
 } from '../../Types/CoreEventTypes';
-import type {
-  AccessibilityActionEvent,
-  AccessibilityActionInfo,
-  AccessibilityRole,
-  AccessibilityState,
-  AccessibilityValue,
-} from '../View/ViewAccessibility';
+
+import type {ViewProps} from '../View/ViewPropTypes';
 
 import {PressabilityDebugView} from '../../Pressability/PressabilityDebug';
 import usePressability from '../../Pressability/usePressability';
 import {type RectOrSize} from '../../StyleSheet/Rect';
 import useMergeRefs from '../../Utilities/useMergeRefs';
 import useAndroidRippleForView, {
-  type RippleConfig,
+  type PressableAndroidRippleConfig,
 } from './useAndroidRippleForView';
 import * as React from 'react';
 import {useMemo, useRef, useState} from 'react';
@@ -39,54 +34,11 @@ import View from '../View/View';
 
 type ViewStyleProp = $ElementType<React.ElementConfig<typeof View>, 'style'>;
 
-export type StateCallbackType = $ReadOnly<{
+export type PressableStateCallbackType = $ReadOnly<{
   pressed: boolean,
 }>;
 
-type Props = $ReadOnly<{
-  /**
-   * Accessibility.
-   */
-  accessibilityActions?: ?$ReadOnlyArray<AccessibilityActionInfo>,
-  accessibilityElementsHidden?: ?boolean,
-  accessibilityHint?: ?Stringish,
-  accessibilityLanguage?: ?Stringish,
-  accessibilityIgnoresInvertColors?: ?boolean,
-  accessibilityLabel?: ?Stringish,
-  accessibilityLiveRegion?: ?('none' | 'polite' | 'assertive'),
-  accessibilityRole?: ?AccessibilityRole,
-  accessibilityState?: ?AccessibilityState,
-  accessibilityValue?: ?AccessibilityValue,
-  'aria-valuemax'?: AccessibilityValue['max'],
-  'aria-valuemin'?: AccessibilityValue['min'],
-  'aria-valuenow'?: AccessibilityValue['now'],
-  'aria-valuetext'?: AccessibilityValue['text'],
-  accessibilityViewIsModal?: ?boolean,
-  'aria-modal'?: ?boolean,
-  accessible?: ?boolean,
-
-  /**
-   * alias for accessibilityState
-   *
-   * see https://reactnative.dev/docs/accessibility#accessibilitystate
-   */
-  'aria-busy'?: ?boolean,
-  'aria-checked'?: ?boolean | 'mixed',
-  'aria-disabled'?: ?boolean,
-  'aria-expanded'?: ?boolean,
-  'aria-selected'?: ?boolean,
-  'aria-multiselectable'?: ?boolean, // Win32
-  'aria-required'?: ?boolean, // Win32
-  /**
-   * A value indicating whether the accessibility elements contained within
-   * this accessibility element are hidden.
-   */
-  'aria-hidden'?: ?boolean,
-  'aria-live'?: ?('polite' | 'assertive' | 'off'),
-  focusable?: ?boolean,
-  importantForAccessibility?: ?('auto' | 'yes' | 'no' | 'no-hide-descendants'),
-  onAccessibilityAction?: ?(event: AccessibilityActionEvent) => mixed,
-
+type PressableBaseProps = $ReadOnly<{
   /**
    * Whether a press gesture can be interrupted by a parent gesture such as a
    * scroll event. Defaults to true.
@@ -97,7 +49,7 @@ type Props = $ReadOnly<{
    * Either children or a render prop that receives a boolean reflecting whether
    * the component is currently pressed.
    */
-  children: React.Node | ((state: StateCallbackType) => React.Node),
+  children: React.Node | ((state: PressableStateCallbackType) => React.Node),
 
   /**
    * Duration to wait after hover in before calling `onHoverIn`.
@@ -209,7 +161,9 @@ type Props = $ReadOnly<{
    * Either view styles or a function that receives a boolean reflecting whether
    * the component is currently pressed and returns view styles.
    */
-  style?: ViewStyleProp | ((state: StateCallbackType) => ViewStyleProp),
+  style?:
+    | ViewStyleProp
+    | ((state: PressableStateCallbackType) => ViewStyleProp),
 
   /**
    * Identifier used to find this view in tests.
@@ -224,7 +178,7 @@ type Props = $ReadOnly<{
   /**
    * Enables the Android ripple effect and configures its color.
    */
-  android_ripple?: ?RippleConfig,
+  android_ripple?: ?PressableAndroidRippleConfig,
 
   /**
    * Used only for documentation or testing (e.g. snapshot testing).
@@ -235,11 +189,11 @@ type Props = $ReadOnly<{
    * Duration to wait after press down before calling `onPressIn`.
    */
   unstable_pressDelay?: ?number,
-  /**
-   * Web to Native Accessibility props
-   * https://github.com/facebook/react-native/issues/34424
-   */
-  'aria-label'?: ?string,
+}>;
+
+export type PressableProps = $ReadOnly<{
+  ...ViewProps,
+  ...PressableBaseProps,
 }>;
 
 type Instance = React.ElementRef<typeof View>;
@@ -249,7 +203,7 @@ type Instance = React.ElementRef<typeof View>;
  * component is currently pressed or not.
  */
 function Pressable(
-  props: Props,
+  props: PressableProps,
   forwardedRef: React.RefSetter<Instance>,
 ): React.Node {
   const {
@@ -432,6 +386,6 @@ const MemoedPressable = React.memo(React.forwardRef(Pressable));
 MemoedPressable.displayName = 'Pressable';
 
 export default (MemoedPressable: component(
-  ref: React.RefSetter<React.ElementRef<typeof View>>,
-  ...props: Props
+  ref?: React.RefSetter<React.ElementRef<typeof View>>,
+  ...props: PressableProps
 ));

package/Libraries/Components/Pressable/useAndroidRippleForView.js

@@ -26,7 +26,7 @@ type NativeBackgroundProp = $ReadOnly<{
   rippleRadius: ?number,
 }>;
 
-export type RippleConfig = {
+export type PressableAndroidRippleConfig = {
   color?: ColorValue,
   borderless?: boolean,
   radius?: number,
@@ -38,7 +38,7 @@ export type RippleConfig = {
  * supported versions of Android.
  */
 export default function useAndroidRippleForView(
-  rippleConfig: ?RippleConfig,
+  rippleConfig: ?PressableAndroidRippleConfig,
   viewRef: {current: null | React.ElementRef<typeof View>},
 ): ?$ReadOnly<{
   onPressIn: (event: GestureResponderEvent) => void,

package/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.android.js

@@ -8,52 +8,13 @@
  * @format
  */
 
-import type {ColorValue} from '../../StyleSheet/StyleSheet';
-import type {ViewProps} from '../View/ViewPropTypes';
+import type {ProgressBarAndroidProps} from './ProgressBarAndroidTypes';
 
 import ProgressBarAndroidNativeComponent from './ProgressBarAndroidNativeComponent';
 
 const React = require('react');
 
-export type ProgressBarAndroidProps = $ReadOnly<{
-  ...ViewProps,
-
-  /**
-   * Style of the ProgressBar and whether it shows indeterminate progress (e.g. spinner).
-   *
-   * `indeterminate` can only be false if `styleAttr` is Horizontal, and requires a
-   * `progress` value.
-   */
-  ...
-    | {
-        styleAttr: 'Horizontal',
-        indeterminate: false,
-        progress: number,
-      }
-    | {
-        typeAttr:
-          | 'Horizontal'
-          | 'Normal'
-          | 'Small'
-          | 'Large'
-          | 'Inverse'
-          | 'SmallInverse'
-          | 'LargeInverse',
-        indeterminate: true,
-      },
-  /**
-   * Whether to show the ProgressBar (true, the default) or hide it (false).
-   */
-  animating?: ?boolean,
-  /**
-   * Color of the progress bar.
-   */
-  color?: ?ColorValue,
-  /**
-   * Used to locate this view in end-to-end tests.
-   */
-  testID?: ?string,
-}>;
+export type {ProgressBarAndroidProps};
 
 /**
  * React component that wraps the Android-only `ProgressBar`. This component is
@@ -79,7 +40,7 @@ export type ProgressBarAndroidProps = $ReadOnly<{
  * ```
  */
 const ProgressBarAndroidWithForwardedRef: component(
-  ref: React.RefSetter<
+  ref?: React.RefSetter<
     React.ElementRef<typeof ProgressBarAndroidNativeComponent>,
   >,
   ...props: ProgressBarAndroidProps
@@ -106,7 +67,4 @@ const ProgressBarAndroidWithForwardedRef: component(
   );
 });
 
-export default /* $FlowFixMe(>=0.89.0 site=react_native_android_fb) This comment suppresses an
- * error found when Flow v0.89 was deployed. To see the error, delete this
- * comment and run Flow. */
-(ProgressBarAndroidWithForwardedRef: typeof ProgressBarAndroidNativeComponent);
+export default ProgressBarAndroidWithForwardedRef;