Align ProgressBarAndroid types with OSS (facebook#49663)

Summary:
Pull Request resolved: facebook#49663

Changelog: [Internal]

Reviewed By: huntie

Differential Revision: D70176068

fbshipit-source-id: 0a1febb390affc2a3123e49e88b039b390a34387

Author: j-piasecki

packages/react-native/Libraries/Components/ActivityIndicator/ActivityIndicator.js

@@ -112,7 +112,7 @@ const ActivityIndicator = (
         // $FlowFixMe[prop-missing] Flow doesn't know when this is the android component
         <PlatformActivityIndicator {...nativeProps} {...androidProps} />
       ) : (
-        /* $FlowFixMe[prop-missing] (>=0.106.0 site=react_native_android_fb) This comment
+        /* $FlowFixMe[incompatible-type] (>=0.106.0 site=react_native_android_fb) This comment
          * suppresses an error found when Flow v0.106 was deployed. To see the
          * error, delete this comment and run Flow. */
         <PlatformActivityIndicator {...nativeProps} />

packages/react-native/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;

packages/react-native/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.js

@@ -10,11 +10,15 @@
 
 'use strict';
 
-import typeof UnimplementedViewType from '../UnimplementedViews/UnimplementedView';
 import typeof ProgressBarAndroidNativeComponentType from './ProgressBarAndroidNativeComponent';
+import type {ProgressBarAndroidProps} from './ProgressBarAndroidTypes';
 
-export type {ProgressBarAndroidProps} from './ProgressBarAndroid.android';
+export type {ProgressBarAndroidProps};
 
-export default require('../UnimplementedViews/UnimplementedView').default as
-  | UnimplementedViewType
-  | ProgressBarAndroidNativeComponentType;
+export default require('../UnimplementedViews/UnimplementedView')
+  .default as $FlowFixMe as component(
+  ref?: React.RefSetter<
+    React.ElementRef<ProgressBarAndroidNativeComponentType>,
+  >,
+  ...props: ProgressBarAndroidProps
+);

packages/react-native/Libraries/Components/ProgressBarAndroid/ProgressBarAndroidTypes.js

@@ -0,0 +1,54 @@
+/**
+ * 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 {ColorValue} from '../../StyleSheet/StyleSheet';
+import type {ViewProps} from '../View/ViewPropTypes';
+
+/**
+ * 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.
+ */
+type ProgressBarAndroidStyleAttrProp =
+  | {
+      styleAttr: 'Horizontal',
+      indeterminate: false,
+      progress: number,
+    }
+  | {
+      styleAttr:
+        | 'Horizontal'
+        | 'Normal'
+        | 'Small'
+        | 'Large'
+        | 'Inverse'
+        | 'SmallInverse'
+        | 'LargeInverse',
+      indeterminate: true,
+    };
+
+export type ProgressBarAndroidProps = $ReadOnly<{
+  ...ViewProps,
+  ...ProgressBarAndroidStyleAttrProp,
+
+  /**
+   * 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,
+}>;

packages/react-native/Libraries/__tests__/__snapshots__/public-api-test.js.snap

@@ -1754,10 +1754,13 @@ declare export default function useAndroidRippleForView(
 `;
 
 exports[`public API should not change unintentionally Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.js 1`] = `
-"export type { ProgressBarAndroidProps } from \\"./ProgressBarAndroid.android\\";
-declare export default
-  | UnimplementedViewType
-  | ProgressBarAndroidNativeComponentType;
+"export type { ProgressBarAndroidProps };
+declare export default component(
+  ref?: React.RefSetter<
+    React.ElementRef<ProgressBarAndroidNativeComponentType>,
+  >,
+  ...props: ProgressBarAndroidProps
+);
 "
 `;
 
@@ -1767,6 +1770,34 @@ declare export default typeof ProgressBarAndroidNativeComponent;
 "
 `;
 
+exports[`public API should not change unintentionally Libraries/Components/ProgressBarAndroid/ProgressBarAndroidTypes.js 1`] = `
+"type ProgressBarAndroidStyleAttrProp =
+  | {
+      styleAttr: \\"Horizontal\\",
+      indeterminate: false,
+      progress: number,
+    }
+  | {
+      styleAttr:
+        | \\"Horizontal\\"
+        | \\"Normal\\"
+        | \\"Small\\"
+        | \\"Large\\"
+        | \\"Inverse\\"
+        | \\"SmallInverse\\"
+        | \\"LargeInverse\\",
+      indeterminate: true,
+    };
+export type ProgressBarAndroidProps = $ReadOnly<{
+  ...ViewProps,
+  ...ProgressBarAndroidStyleAttrProp,
+  animating?: ?boolean,
+  color?: ?ColorValue,
+  testID?: ?string,
+}>;
+"
+`;
+
 exports[`public API should not change unintentionally Libraries/Components/RefreshControl/AndroidSwipeRefreshLayoutNativeComponent.js 1`] = `
 "export * from \\"../../../src/private/specs_DEPRECATED/components/AndroidSwipeRefreshLayoutNativeComponent\\";
 declare export default typeof AndroidSwipeRefreshLayoutNativeComponent;

scripts/build/build-types/buildTypes.js

@@ -44,6 +44,7 @@ const ENTRY_POINTS = [
   'packages/react-native/Libraries/Components/Keyboard/Keyboard.js',
   'packages/react-native/Libraries/Components/Keyboard/KeyboardAvoidingView.js',
   'packages/react-native/Libraries/Components/Pressable/Pressable.js',
+  'packages/react-native/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.js',
   'packages/react-native/Libraries/Components/ToastAndroid/ToastAndroid.js',
   'packages/react-native/Libraries/Components/ScrollView/ScrollView.js',
   'packages/react-native/Libraries/Interaction/InteractionManager.js',