react-native-windows 0.79.2 → 0.80.0-preview.1

package/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.android.js

@@ -13,8 +13,6 @@ import type {
   MeasureLayoutOnSuccessCallback,
   MeasureOnSuccessCallback,
 } from '../../../src/private/types/HostInstance';
-import type {AccessibilityRole} from '../../Components/View/ViewAccessibility';
-import typeof DrawerLayoutAndroidCommon from './DrawerLayoutAndroid.js';
 import type {
   DrawerLayoutAndroidMethods,
   DrawerLayoutAndroidProps,
@@ -305,4 +303,4 @@ const styles = StyleSheet.create({
   },
 });
 
-export default DrawerLayoutAndroid as $FlowFixMe as DrawerLayoutAndroidCommon;
+export default DrawerLayoutAndroid as $FlowFixMe;

package/Libraries/{NewAppScreen/components/Colors.js → Components/DrawerAndroid/DrawerLayoutAndroid.ios.js}

@@ -4,16 +4,12 @@
  * 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
+ * @flow strict-local
  */
 
-export default {
-  primary: '#1292B4',
-  white: '#FFF',
-  lighter: '#F3F3F3',
-  light: '#DAE1E7',
-  dark: '#444',
-  darker: '#222',
-  black: '#000',
-};
+'use strict';
+
+import DrawerLayoutAndroidFallback from './DrawerLayoutAndroidFallback';
+
+export default DrawerLayoutAndroidFallback;

package/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.js

@@ -5,73 +5,13 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @flow strict-local
+ * @flow
  */
 
-'use strict';
+// NOTE: This file supports backwards compatibility of subpath (deep) imports
+// from 'react-native' with platform-specific extensions. It can be deleted
+// once we remove the "./*" mapping from package.json "exports".
 
-// import typeof DrawerLayoutAndroid from './DrawerLayoutAndroid.android';
-import type {
-  MeasureInWindowOnSuccessCallback,
-  MeasureLayoutOnSuccessCallback,
-  MeasureOnSuccessCallback,
-} from '../../../src/private/types/HostInstance';
-import type {
-  DrawerLayoutAndroidMethods,
-  DrawerLayoutAndroidProps,
-  DrawerLayoutAndroidState,
-} from './DrawerLayoutAndroidTypes';
+import DrawerLayoutAndroid from './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');
-  }
-}
+export default DrawerLayoutAndroid;

package/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.js.flow

@@ -0,0 +1,18 @@
+/**
+ * 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.
+ *
+ * @format
+ * @flow strict-local
+ */
+
+import DrawerLayoutAndroid from './DrawerLayoutAndroidFallback';
+
+export type {
+  DrawerLayoutAndroidProps,
+  DrawerSlideEvent,
+} from './DrawerLayoutAndroidTypes';
+
+export default DrawerLayoutAndroid;

package/Libraries/Components/DrawerAndroid/DrawerLayoutAndroidFallback.js

@@ -0,0 +1,71 @@
+/**
+ * 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.
+ *
+ * @format
+ * @flow strict-local
+ */
+
+'use strict';
+
+import type {
+  MeasureInWindowOnSuccessCallback,
+  MeasureLayoutOnSuccessCallback,
+  MeasureOnSuccessCallback,
+} from '../../../src/private/types/HostInstance';
+import type {
+  DrawerLayoutAndroidMethods,
+  DrawerLayoutAndroidProps,
+  DrawerLayoutAndroidState,
+} from './DrawerLayoutAndroidTypes';
+
+import UnimplementedView from '../UnimplementedViews/UnimplementedView';
+import * as React from 'react';
+
+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/Flyout/Flyout.js

@@ -10,6 +10,8 @@ import FlyoutNativeComponent from './FlyoutNativeComponent';
 import * as React from 'react';
 import {findNodeHandle, StyleSheet} from 'react-native';
 
+const warnOnce = require('../../Utilities/warnOnce').default;
+
 type Placement =
   | 'top'
   | 'bottom'
@@ -66,6 +68,8 @@ type State = $ReadOnly<{
   targetRef?: React.ReactNode,
 }>;
 
+const isFabric = global.nativeFabricUIManager;
+
 /**
  * Renders a flyout component.
  *
@@ -93,6 +97,13 @@ export class Flyout extends React.Component<Props, State> {
 
   constructor(props: Props) {
     super(props);
+
+    if (__DEV__ && isFabric) {
+      warnOnce(
+        'flyout-new-arch-deprecated',
+        '`Flyout` is deprecated and not supported in the New Architecture. Use the new `Modal` component instead.',
+      );
+    }
   }
 
   render(): React.Node {

package/Libraries/Components/Keyboard/Keyboard.js

@@ -103,7 +103,7 @@ type KeyboardEventDefinitions = {
  *```
  */
 
-class Keyboard {
+class KeyboardImpl {
   _currentlyShowing: ?KeyboardEvent;
 
   _emitter: NativeEventEmitter<KeyboardEventDefinitions> =
@@ -148,7 +148,7 @@ class Keyboard {
    */
   addListener<K: $Keys<KeyboardEventDefinitions>>(
     eventType: K,
-    listener: (...$ElementType<KeyboardEventDefinitions, K>) => mixed,
+    listener: (...KeyboardEventDefinitions[K]) => mixed,
     context?: mixed,
   ): EventSubscription {
     return this._emitter.addListener(eventType, listener);
@@ -202,4 +202,6 @@ class Keyboard {
   }
 }
 
-export default (new Keyboard(): Keyboard);
+const Keyboard: KeyboardImpl = new KeyboardImpl();
+
+export default Keyboard;

package/Libraries/Components/Keyboard/KeyboardAvoidingView.js

@@ -51,7 +51,7 @@ export type KeyboardAvoidingViewProps = $ReadOnly<{
   keyboardVerticalOffset?: number,
 }>;
 
-type State = {
+type KeyboardAvoidingViewState = {
   bottom: number,
 };
 
@@ -61,7 +61,7 @@ type State = {
  */
 class KeyboardAvoidingView extends React.Component<
   KeyboardAvoidingViewProps,
-  State,
+  KeyboardAvoidingViewState,
 > {
   _frame: ?ViewLayout = null;
   _keyboardEvent: ?KeyboardEvent = null;
@@ -178,7 +178,10 @@ class KeyboardAvoidingView extends React.Component<
     }
   };
 
-  componentDidUpdate(_: KeyboardAvoidingViewProps, prevState: State): void {
+  componentDidUpdate(
+    _: KeyboardAvoidingViewProps,
+    prevState: KeyboardAvoidingViewState,
+  ): void {
     const enabled = this.props.enabled ?? true;
     if (enabled && this._bottom !== prevState.bottom) {
       this.setState({bottom: this._bottom});

package/Libraries/Components/Keyboard/KeyboardExt.js.map

@@ -1 +1 @@
-{"version":3,"file":"KeyboardExt.js","sourceRoot":"","sources":["../../../src-win/Libraries/Components/Keyboard/KeyboardExt.tsx"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,YAAY,CAAC;;;;;;AAEb,kDAA0B;AAG1B;;GAEG;AACI,MAAM,eAAe,GAAG,CAC7B,gBAAwC,EACxC,EAAE;IAWF,MAAM,eAAgB,SAAQ,eAAK,CAAC,SAAgC;QAC3D,MAAM;YACX,MAAM,EAAC,YAAY,EAAE,GAAG,IAAI,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;YAC3C,OAAO,CACL,8BAAC,gBAAgB,IAAC,GAAG,EAAE,YAAY,KAAO,IAAqB,GAAI,CACpE,CAAC;QACJ,CAAC;KACF;IAED,OAAO,eAAK,CAAC,UAAU,CACrB,CACE,KAAsD,EACtD,GAAmB,EACnB,EAAE;QACF,OAAO,8BAAC,eAAe,OAAK,KAAK,EAAE,YAAY,EAAE,GAAG,GAAI,CAAC;IAC3D,CAAC,CACF,CAAC;AACJ,CAAC,CAAC;AA9BW,QAAA,eAAe,mBA8B1B","sourcesContent":["/**\n * Copyright (c) Microsoft Corporation.\n * Licensed under the MIT License.\n * @format\n */\n'use strict';\n\nimport React from 'react';\nimport {IKeyboardProps} from './KeyboardExtProps';\n\n/**\n * @deprecated - Exported types should already have the keyboarding properties on them\n */\nexport const supportKeyboard = <P extends Record<string, any>>(\n  WrappedComponent: React.ComponentType<P>,\n) => {\n  interface IForwardRefProps {\n    forwardedRef: React.Ref<any>;\n  }\n\n  // children is used to avoid error: Property 'children' does not exist on type 'IntrinsicAttributes & ViewProps &\n  // IKeyboardProps & RefAttributes<any>\n  type PropsWithoutForwardedRef = P & React.PropsWithChildren<IKeyboardProps>;\n  type PropsWithForwardedRef = React.PropsWithoutRef<PropsWithoutForwardedRef> &\n    IForwardRefProps;\n\n  class SupportKeyboard extends React.Component<PropsWithForwardedRef> {\n    public render(): JSX.Element {\n      const {forwardedRef, ...rest} = this.props;\n      return (\n        <WrappedComponent ref={forwardedRef} {...(rest as unknown as P)} />\n      );\n    }\n  }\n\n  return React.forwardRef(\n    (\n      props: React.PropsWithoutRef<PropsWithoutForwardedRef>,\n      ref: React.Ref<any>,\n    ) => {\n      return <SupportKeyboard {...props} forwardedRef={ref} />;\n    },\n  );\n};\n"]}
+{"version":3,"file":"KeyboardExt.js","sourceRoot":"","sources":["../../../src-win/Libraries/Components/Keyboard/KeyboardExt.tsx"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,YAAY,CAAC;;;;;;AAEb,kDAA0B;AAG1B;;GAEG;AACI,MAAM,eAAe,GAAG,CAC7B,gBAAwC,EACxC,EAAE;IAWF,MAAM,eAAgB,SAAQ,eAAK,CAAC,SAAgC;QAC3D,MAAM;YACX,MAAM,EAAC,YAAY,EAAE,GAAG,IAAI,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;YAC3C,OAAO,CACL,8BAAC,gBAAgB,IAAC,GAAG,EAAE,YAAY,KAAO,IAAqB,GAAI,CACpE,CAAC;QACJ,CAAC;KACF;IAED,OAAO,eAAK,CAAC,UAAU,CACrB,CACE,KAAsD,EACtD,GAAmB,EACnB,EAAE;QACF,OAAO,8BAAC,eAAe,OAAK,KAAK,EAAE,YAAY,EAAE,GAAG,GAAI,CAAC;IAC3D,CAAC,CACF,CAAC;AACJ,CAAC,CAAC;AA9BW,QAAA,eAAe,mBA8B1B","sourcesContent":["/**\n * Copyright (c) Microsoft Corporation.\n * Licensed under the MIT License.\n * @format\n */\n'use strict';\n\nimport React from 'react';\nimport {IKeyboardProps} from './KeyboardExtProps';\n\n/**\n * @deprecated - Exported types should already have the keyboarding properties on them\n */\nexport const supportKeyboard = <P extends Record<string, any>>(\n  WrappedComponent: React.ComponentType<P>,\n) => {\n  interface IForwardRefProps {\n    forwardedRef: React.Ref<any>;\n  }\n\n  // children is used to avoid error: Property 'children' does not exist on type 'IntrinsicAttributes & ViewProps &\n  // IKeyboardProps & RefAttributes<any>\n  type PropsWithoutForwardedRef = P & React.PropsWithChildren<IKeyboardProps>;\n  type PropsWithForwardedRef = React.PropsWithoutRef<PropsWithoutForwardedRef> &\n    IForwardRefProps;\n\n  class SupportKeyboard extends React.Component<PropsWithForwardedRef> {\n    public render() {\n      const {forwardedRef, ...rest} = this.props;\n      return (\n        <WrappedComponent ref={forwardedRef} {...(rest as unknown as P)} />\n      );\n    }\n  }\n\n  return React.forwardRef(\n    (\n      props: React.PropsWithoutRef<PropsWithoutForwardedRef>,\n      ref: React.Ref<any>,\n    ) => {\n      return <SupportKeyboard {...props} forwardedRef={ref} />;\n    },\n  );\n};\n"]}

package/Libraries/Components/Popup/Popup.js

@@ -11,6 +11,8 @@ import type {ViewProps} from '../View/ViewPropTypes';
 import {findNodeHandle} from '../../ReactNative/RendererProxy';
 import StyleSheet from '../../StyleSheet/StyleSheet';
 
+const warnOnce = require('../../Utilities/warnOnce').default;
+
 const styles = StyleSheet.create({
   rctPopup: {
     position: 'absolute',
@@ -49,6 +51,8 @@ type State = $ReadOnly<{|
   targetRef?: React.ReactNode,
 |}>;
 
+const isFabric = global.nativeFabricUIManager;
+
 /**
  * Renders a popup component.
  *
@@ -75,6 +79,13 @@ export class Popup extends React.Component<Props, State> {
   constructor(props: Props) {
     super(props);
     this.state = {target: undefined, targetRef: null};
+
+    if (__DEV__ && isFabric) {
+      warnOnce(
+        'popup-new-arch-deprecated',
+        '`Popup` is deprecated and not supported in the New Architecture. Use the new `Modal` component instead.',
+      );
+    }
   }
 
   render(): React.Node {

package/Libraries/Components/Pressable/Pressable.js

@@ -26,7 +26,9 @@ import useAndroidRippleForView, {
 import * as React from 'react';
 import {useMemo, useRef, useState} from 'react';
 
-type ViewStyleProp = $ElementType<React.ElementConfig<typeof View>, 'style'>;
+type ViewStyleProp = React.ElementConfig<typeof View>['style'];
+
+export type {PressableAndroidRippleConfig};
 
 export type PressableStateCallbackType = $ReadOnly<{
   pressed: boolean,
@@ -43,7 +45,7 @@ type PressableBaseProps = $ReadOnly<{
    * Either children or a render prop that receives a boolean reflecting whether
    * the component is currently pressed.
    */
-  children: React.Node | ((state: PressableStateCallbackType) => React.Node),
+  children?: React.Node | ((state: PressableStateCallbackType) => React.Node),
 
   /**
    * Duration to wait after hover in before calling `onHoverIn`.
@@ -105,6 +107,10 @@ type PressableBaseProps = $ReadOnly<{
    * Called when a touch is engaged before `onPress`.
    */
   onPressIn?: ?(event: GestureResponderEvent) => mixed,
+  /**
+   * Called when the press location moves.
+   */
+  onPressMove?: ?(event: GestureResponderEvent) => mixed,
 
   /**
    * Called when a touch is released before `onPress`.
@@ -146,7 +152,10 @@ type PressableBaseProps = $ReadOnly<{
 }>;
 
 export type PressableProps = $ReadOnly<{
-  ...ViewProps,
+  // Pressability may override `onMouseEnter` and `onMouseLeave` to
+  // implement `onHoverIn` and `onHoverOut` in a platform-agnostic way.
+  // Hover events should be used instead of mouse events.
+  ...Omit<ViewProps, 'onMouseEnter' | 'onMouseLeave'>,
   ...PressableBaseProps,
 }>;
 
@@ -185,6 +194,7 @@ function Pressable(
     onLongPress,
     onPress,
     onPressIn,
+    onPressMove,
     onPressOut,
     pressRetentionOffset,
     style,
@@ -263,7 +273,12 @@ function Pressable(
           onPressIn(event);
         }
       },
-      onPressMove: android_rippleConfig?.onPressMove,
+      onPressMove(event: GestureResponderEvent): void {
+        android_rippleConfig?.onPressMove(event);
+        if (onPressMove != null) {
+          onPressMove(event);
+        }
+      },
       onPressOut(event: GestureResponderEvent): void {
         if (android_rippleConfig != null) {
           android_rippleConfig.onPressOut(event);
@@ -288,6 +303,7 @@ function Pressable(
       onLongPress,
       onPress,
       onPressIn,
+      onPressMove,
       onPressOut,
       pressRetentionOffset,
       setPressed,

package/Libraries/Components/Pressable/Pressable.windows.js

@@ -31,7 +31,9 @@ import * as React from 'react';
 import {useMemo, useRef, useState} from 'react';
 import type {HandledKeyboardEvent} from '../../Components/View/ViewPropTypes';
 
-type ViewStyleProp = $ElementType<React.ElementConfig<typeof View>, 'style'>;
+type ViewStyleProp = React.ElementConfig<typeof View>['style'];
+
+export type {PressableAndroidRippleConfig};
 
 export type PressableStateCallbackType = $ReadOnly<{
   pressed: boolean,
@@ -48,7 +50,7 @@ type PressableBaseProps = $ReadOnly<{
    * Either children or a render prop that receives a boolean reflecting whether
    * the component is currently pressed.
    */
-  children: React.Node | ((state: PressableStateCallbackType) => React.Node),
+  children?: React.Node | ((state: PressableStateCallbackType) => React.Node),
 
   /**
    * Duration to wait after hover in before calling `onHoverIn`.
@@ -110,6 +112,10 @@ type PressableBaseProps = $ReadOnly<{
    * Called when a touch is engaged before `onPress`.
    */
   onPressIn?: ?(event: GestureResponderEvent) => mixed,
+  /**
+   * Called when the press location moves.
+   */
+  onPressMove?: ?(event: GestureResponderEvent) => mixed,
 
   /**
    * Called when a touch is released before `onPress`.
@@ -191,7 +197,10 @@ type PressableBaseProps = $ReadOnly<{
 }>;
 
 export type PressableProps = $ReadOnly<{
-  ...ViewProps,
+  // Pressability may override `onMouseEnter` and `onMouseLeave` to
+  // implement `onHoverIn` and `onHoverOut` in a platform-agnostic way.
+  // Hover events should be used instead of mouse events.
+  ...Omit<ViewProps, 'onMouseEnter' | 'onMouseLeave'>,
   ...PressableBaseProps,
 }>;
 
@@ -233,6 +242,7 @@ function Pressable(
     onLongPress,
     onPress,
     onPressIn,
+    onPressMove,
     onPressOut,
     // [Windows
     onBlur,
@@ -321,7 +331,12 @@ function Pressable(
           onPressIn(event);
         }
       },
-      onPressMove: android_rippleConfig?.onPressMove,
+      onPressMove(event: GestureResponderEvent): void {
+        android_rippleConfig?.onPressMove(event);
+        if (onPressMove != null) {
+          onPressMove(event);
+        }
+      },
       onPressOut(event: GestureResponderEvent): void {
         if (android_rippleConfig != null) {
           android_rippleConfig.onPressOut(event);
@@ -352,6 +367,7 @@ function Pressable(
       onLongPress,
       onPress,
       onPressIn,
+      onPressMove,
       onPressOut,
       // [Windows
       onBlur,

package/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.js

@@ -13,12 +13,34 @@
 import typeof ProgressBarAndroidNativeComponentType from './ProgressBarAndroidNativeComponent';
 import type {ProgressBarAndroidProps} from './ProgressBarAndroidTypes';
 
+import Platform from '../../Utilities/Platform';
+
 export type {ProgressBarAndroidProps};
 
-export default require('../UnimplementedViews/UnimplementedView')
-  .default as $FlowFixMe as component(
+// A utility type to preserve the semantics of the union uses in the definition
+// of ProgressBarAndroidProps. TS's Omit does not distribute over unions, so
+// we define our own version which does. This does not affect Flow.
+// $FlowExpectedError[unclear-type]
+type Omit<T, K> = T extends any ? Pick<T, Exclude<$Keys<T>, K>> : T;
+
+/**
+ * ProgressBarAndroid has been extracted from react-native core and will be removed in a future release.
+ * It can now be installed and imported from `@react-native-community/progress-bar-android` instead of 'react-native'.
+ * @see https://github.com/react-native-community/progress-bar-android
+ * @deprecated
+ */
+let ProgressBarAndroid: component(
   ref?: React.RefSetter<
     React.ElementRef<ProgressBarAndroidNativeComponentType>,
   >,
-  ...props: ProgressBarAndroidProps
+  ...props: Omit<ProgressBarAndroidProps, empty>
 );
+
+if (Platform.OS === 'android') {
+  ProgressBarAndroid = require('./ProgressBarAndroid').default;
+} else {
+  ProgressBarAndroid = require('../UnimplementedViews/UnimplementedView')
+    .default as $FlowFixMe;
+}
+
+export default ProgressBarAndroid;

package/Libraries/Components/ProgressBarAndroid/ProgressBarAndroidTypes.js

@@ -17,28 +17,25 @@ import type {ViewProps} from '../View/ViewPropTypes';
  * `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,
-    };
+type DeterminateProgressBarAndroidStyleAttrProp = {
+  styleAttr: 'Horizontal',
+  indeterminate: false,
+  progress: number,
+};
 
-export type ProgressBarAndroidProps = $ReadOnly<{
-  ...ViewProps,
-  ...ProgressBarAndroidStyleAttrProp,
+type IndeterminateProgressBarAndroidStyleAttrProp = {
+  styleAttr:
+    | 'Horizontal'
+    | 'Normal'
+    | 'Small'
+    | 'Large'
+    | 'Inverse'
+    | 'SmallInverse'
+    | 'LargeInverse',
+  indeterminate: true,
+};
 
+type ProgressBarAndroidBaseProps = $ReadOnly<{
   /**
    * Whether to show the ProgressBar (true, the default) or hide it (false).
    */
@@ -52,3 +49,15 @@ export type ProgressBarAndroidProps = $ReadOnly<{
    */
   testID?: ?string,
 }>;
+
+export type ProgressBarAndroidProps =
+  | $ReadOnly<{
+      ...ViewProps,
+      ...ProgressBarAndroidBaseProps,
+      ...DeterminateProgressBarAndroidStyleAttrProp,
+    }>
+  | $ReadOnly<{
+      ...ViewProps,
+      ...ProgressBarAndroidBaseProps,
+      ...IndeterminateProgressBarAndroidStyleAttrProp,
+    }>;

package/Libraries/Components/RefreshControl/RefreshControl.js

@@ -17,7 +17,7 @@ import AndroidSwipeRefreshLayoutNativeComponent, {
 import PullToRefreshViewNativeComponent, {
   Commands as PullToRefreshCommands,
 } from './PullToRefreshViewNativeComponent';
-import React from 'react';
+import * as React from 'react';
 
 const Platform = require('../../Utilities/Platform').default;
 

package/Libraries/Components/RefreshControl/RefreshControl.windows.js

@@ -17,7 +17,7 @@ import AndroidSwipeRefreshLayoutNativeComponent, {
 import PullToRefreshViewNativeComponent, {
   Commands as PullToRefreshCommands,
 } from './PullToRefreshViewNativeComponent';
-import React from 'react';
+import * as React from 'react';
 
 const Platform = require('../../Utilities/Platform').default;
 

package/Libraries/Components/ScrollView/ScrollView.d.ts

@@ -365,7 +365,7 @@ export interface ScrollViewPropsIOS {
 
   /**
    * When true the scroll view bounces when it reaches the end of the
-   * content if the content is larger then the scroll view along the axis of
+   * content if the content is larger than the scroll view along the axis of
    * the scroll direction. When false it disables all bouncing even if
    * the `alwaysBounce*` props are true. The default value is true.
    */
@@ -405,7 +405,7 @@ export interface ScrollViewPropsIOS {
 
   /**
    * This property specifies how the safe area insets are used to modify the content area of the scroll view.
-   * The default value of this property must be 'automatic'. But the default value is 'never' until RN@0.51.
+   * The default value of this property is "never".
    */
   contentInsetAdjustmentBehavior?:
     | 'automatic'
@@ -869,7 +869,7 @@ export class ScrollView extends ScrollViewBase {
    * This function sends props straight to native. They will not participate in
    * future diff process - this means that if you do not include them in the
    * next render, they will remain active (see [Direct
-   * Manipulation](https://reactnative.dev/docs/direct-manipulation)).
+   * Manipulation](https://reactnative.dev/docs/the-new-architecture/direct-manipulation-new-architecture)).
    */
   setNativeProps(nativeProps: object): void;
 }