react-native-windows 0.84.0-preview.9 → 0.85.0-preview.1

package/Libraries/Components/LayoutConformance/LayoutConformance.js

@@ -12,7 +12,7 @@ import StyleSheet from '../../StyleSheet/StyleSheet';
 import LayoutConformanceNativeComponent from './LayoutConformanceNativeComponent';
 import * as React from 'react';
 
-export type LayoutConformanceProps = $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

package/Libraries/Components/LayoutConformance/LayoutConformanceNativeComponent.js

@@ -13,7 +13,7 @@ import type {ViewProps} from '../View/ViewPropTypes';
 
 import * as NativeComponentRegistry from '../../NativeComponent/NativeComponentRegistry';
 
-type Props = $ReadOnly<{
+type Props = Readonly<{
   mode: 'strict' | 'compatibility',
   ...ViewProps,
 }>;

package/Libraries/Components/Pressable/Pressable.d.ts

@@ -55,6 +55,11 @@ export interface PressableProps
    */
   onPressIn?: null | ((event: GestureResponderEvent) => void) | undefined;
 
+  /**
+   * Called when the press location moves.
+   */
+  onPressMove?: null | ((event: GestureResponderEvent) => void) | undefined;
+
   /**
    * Called when a touch is released before `onPress`.
    */

package/Libraries/Components/Pressable/Pressable.js

@@ -29,11 +29,11 @@ import {memo, useMemo, useRef, useState} from 'react';
 
 export type {PressableAndroidRippleConfig};
 
-export type PressableStateCallbackType = $ReadOnly<{
+export type PressableStateCallbackType = Readonly<{
   pressed: boolean,
 }>;
 
-type PressableBaseProps = $ReadOnly<{
+type PressableBaseProps = Readonly<{
   /**
    * Whether a press gesture can be interrupted by a parent gesture such as a
    * scroll event. Defaults to true.
@@ -156,7 +156,7 @@ type PressableBaseProps = $ReadOnly<{
   unstable_pressDelay?: ?number,
 }>;
 
-export type PressableProps = $ReadOnly<{
+export type PressableProps = Readonly<{
   // 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.

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

@@ -35,11 +35,11 @@ import type {HandledKeyboardEvent} from '../../Components/View/ViewPropTypes';
 
 export type {PressableAndroidRippleConfig};
 
-export type PressableStateCallbackType = $ReadOnly<{
+export type PressableStateCallbackType = Readonly<{
   pressed: boolean,
 }>;
 
-type PressableBaseProps = $ReadOnly<{
+type PressableBaseProps = Readonly<{
   /**
    * Whether a press gesture can be interrupted by a parent gesture such as a
    * scroll event. Defaults to true.
@@ -210,7 +210,7 @@ type PressableBaseProps = $ReadOnly<{
   unstable_pressDelay?: ?number,
 }>;
 
-export type PressableProps = $ReadOnly<{
+export type PressableProps = Readonly<{
   // 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.

package/Libraries/Components/Pressable/useAndroidRippleForView.js

@@ -19,7 +19,7 @@ import invariant from 'invariant';
 import * as React from 'react';
 import {useMemo} from 'react';
 
-type NativeBackgroundProp = $ReadOnly<{
+type NativeBackgroundProp = Readonly<{
   type: 'RippleAndroid',
   color: ?number,
   borderless: boolean,
@@ -40,13 +40,13 @@ export type PressableAndroidRippleConfig = {
 export default function useAndroidRippleForView(
   rippleConfig: ?PressableAndroidRippleConfig,
   viewRef: {current: null | React.ElementRef<typeof View>},
-): ?$ReadOnly<{
+): ?Readonly<{
   onPressIn: (event: GestureResponderEvent) => void,
   onPressMove: (event: GestureResponderEvent) => void,
   onPressOut: (event: GestureResponderEvent) => void,
   viewProps:
-    | $ReadOnly<{nativeBackgroundAndroid: NativeBackgroundProp}>
-    | $ReadOnly<{nativeForegroundAndroid: NativeBackgroundProp}>,
+    | Readonly<{nativeBackgroundAndroid: NativeBackgroundProp}>
+    | Readonly<{nativeForegroundAndroid: NativeBackgroundProp}>,
 }> {
   const {color, borderless, radius, foreground} = rippleConfig ?? {};
 

package/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.js

@@ -21,7 +21,7 @@ export type {ProgressBarAndroidProps};
 // 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;
+type Omit<T, K> = T extends any ? Pick<T, Exclude<keyof T, K>> : T;
 
 /**
  * ProgressBarAndroid has been extracted from react-native core and will be removed in a future release.

package/Libraries/Components/ProgressBarAndroid/ProgressBarAndroidTypes.js

@@ -35,7 +35,7 @@ type IndeterminateProgressBarAndroidStyleAttrProp = {
   indeterminate: true,
 };
 
-type ProgressBarAndroidBaseProps = $ReadOnly<{
+type ProgressBarAndroidBaseProps = Readonly<{
   /**
    * Whether to show the ProgressBar (true, the default) or hide it (false).
    */
@@ -51,12 +51,12 @@ type ProgressBarAndroidBaseProps = $ReadOnly<{
 }>;
 
 export type ProgressBarAndroidProps =
-  | $ReadOnly<{
+  | Readonly<{
       ...ViewProps,
       ...ProgressBarAndroidBaseProps,
       ...DeterminateProgressBarAndroidStyleAttrProp,
     }>
-  | $ReadOnly<{
+  | Readonly<{
       ...ViewProps,
       ...ProgressBarAndroidBaseProps,
       ...IndeterminateProgressBarAndroidStyleAttrProp,

package/Libraries/Components/RefreshControl/RefreshControl.js

@@ -21,7 +21,7 @@ import * as React from 'react';
 
 const Platform = require('../../Utilities/Platform').default;
 
-export type RefreshControlPropsIOS = $ReadOnly<{
+export type RefreshControlPropsIOS = Readonly<{
   /**
    * The color of the refresh indicator.
    */
@@ -36,7 +36,7 @@ export type RefreshControlPropsIOS = $ReadOnly<{
   title?: ?string,
 }>;
 
-export type RefreshControlPropsAndroid = $ReadOnly<{
+export type RefreshControlPropsAndroid = Readonly<{
   /**
    * Whether the pull to refresh functionality is enabled.
    */
@@ -44,7 +44,7 @@ export type RefreshControlPropsAndroid = $ReadOnly<{
   /**
    * The colors (at least one) that will be used to draw the refresh indicator.
    */
-  colors?: ?$ReadOnlyArray<ColorValue>,
+  colors?: ?ReadonlyArray<ColorValue>,
   /**
    * The background color of the refresh indicator.
    */
@@ -55,7 +55,7 @@ export type RefreshControlPropsAndroid = $ReadOnly<{
   size?: ?('default' | 'large'),
 }>;
 
-type RefreshControlBaseProps = $ReadOnly<{
+type RefreshControlBaseProps = Readonly<{
   /**
    * Called when the view starts refreshing.
    */
@@ -72,7 +72,7 @@ type RefreshControlBaseProps = $ReadOnly<{
   progressViewOffset?: ?number,
 }>;
 
-export type RefreshControlProps = $ReadOnly<{
+export type RefreshControlProps = Readonly<{
   ...ViewProps,
   ...RefreshControlPropsIOS,
   ...RefreshControlPropsAndroid,

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

@@ -21,7 +21,7 @@ import * as React from 'react';
 
 const Platform = require('../../Utilities/Platform').default;
 
-export type RefreshControlPropsIOS = $ReadOnly<{
+export type RefreshControlPropsIOS = Readonly<{
   /**
    * The color of the refresh indicator.
    */
@@ -36,7 +36,7 @@ export type RefreshControlPropsIOS = $ReadOnly<{
   title?: ?string,
 }>;
 
-export type RefreshControlPropsAndroid = $ReadOnly<{
+export type RefreshControlPropsAndroid = Readonly<{
   /**
    * Whether the pull to refresh functionality is enabled.
    */
@@ -44,7 +44,7 @@ export type RefreshControlPropsAndroid = $ReadOnly<{
   /**
    * The colors (at least one) that will be used to draw the refresh indicator.
    */
-  colors?: ?$ReadOnlyArray<ColorValue>,
+  colors?: ?ReadonlyArray<ColorValue>,
   /**
    * The background color of the refresh indicator.
    */
@@ -55,7 +55,7 @@ export type RefreshControlPropsAndroid = $ReadOnly<{
   size?: ?('default' | 'large'),
 }>;
 
-type RefreshControlBaseProps = $ReadOnly<{
+type RefreshControlBaseProps = Readonly<{
   /**
    * Called when the view starts refreshing.
    */
@@ -72,7 +72,7 @@ type RefreshControlBaseProps = $ReadOnly<{
   progressViewOffset?: ?number,
 }>;
 
-export type RefreshControlProps = $ReadOnly<{
+export type RefreshControlProps = Readonly<{
   ...ViewProps,
   ...RefreshControlPropsIOS,
   ...RefreshControlPropsAndroid,

package/Libraries/Components/ScrollView/AndroidHorizontalScrollViewNativeComponent.js

@@ -13,6 +13,7 @@ import type {PartialViewConfig} from '../../Renderer/shims/ReactNativeTypes';
 import type {ScrollViewNativeProps as Props} from './ScrollViewNativeComponentType';
 
 import * as NativeComponentRegistry from '../../NativeComponent/NativeComponentRegistry';
+import {colorAttribute} from '../View/ReactNativeStyleAttributes';
 
 export const __INTERNAL_VIEW_CONFIG: PartialViewConfig = {
   uiViewClassName: 'AndroidHorizontalScrollView',
@@ -22,7 +23,7 @@ export const __INTERNAL_VIEW_CONFIG: PartialViewConfig = {
     decelerationRate: true,
     disableIntervalMomentum: true,
     maintainVisibleContentPosition: true,
-    endFillColor: {process: require('../../StyleSheet/processColor').default},
+    endFillColor: colorAttribute,
     fadingEdgeLength: true,
     nestedScrollEnabled: true,
     overScrollMode: true,
@@ -44,21 +45,16 @@ export const __INTERNAL_VIEW_CONFIG: PartialViewConfig = {
     borderBottomRightRadius: true,
     borderRadius: true,
     borderStyle: true,
-    borderRightColor: {
-      process: require('../../StyleSheet/processColor').default,
-    },
-    borderColor: {process: require('../../StyleSheet/processColor').default},
-    borderBottomColor: {
-      process: require('../../StyleSheet/processColor').default,
-    },
+    borderRightColor: colorAttribute,
+    borderColor: colorAttribute,
+    borderBottomColor: colorAttribute,
     borderTopLeftRadius: true,
-    borderTopColor: {process: require('../../StyleSheet/processColor').default},
+    borderTopColor: colorAttribute,
     removeClippedSubviews: true,
     borderTopRightRadius: true,
-    borderLeftColor: {
-      process: require('../../StyleSheet/processColor').default,
-    },
+    borderLeftColor: colorAttribute,
     pointerEvents: true,
+    scrollsChildToFocus: true,
   },
 };
 

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

@@ -586,6 +586,15 @@ export interface ScrollViewPropsAndroid {
    * Causes the scrollbars not to turn transparent when they are not in use. The default value is false.
    */
   persistentScrollbar?: boolean | undefined;
+
+  /**
+   * When false, the ScrollView will not automatically scroll to a focused child when
+   * the child requests focus. This can be useful when you want to control the scroll
+   * position programmatically. The default value is true.
+   *
+   * @platform android
+   */
+  scrollsChildToFocus?: boolean | undefined;
 }
 
 export interface ScrollViewProps

package/Libraries/Components/ScrollView/ScrollView.js

@@ -174,7 +174,7 @@ export interface PublicScrollViewInstance
 
 type InnerViewInstance = React.ElementRef<typeof View>;
 
-export type ScrollViewPropsIOS = $ReadOnly<{
+export type ScrollViewPropsIOS = Readonly<{
   /**
    * Controls whether iOS should automatically adjust the content inset
    * for scroll views that are placed behind a navigation bar or
@@ -330,7 +330,7 @@ export type ScrollViewPropsIOS = $ReadOnly<{
   ),
 }>;
 
-export type ScrollViewPropsAndroid = $ReadOnly<{
+export type ScrollViewPropsAndroid = Readonly<{
   /**
    * Enables nested scrolling for Android API level 21+.
    * Nested scrolling is supported by default on iOS
@@ -388,14 +388,22 @@ export type ScrollViewPropsAndroid = $ReadOnly<{
    * @platform android
    */
   fadingEdgeLength?: ?number | {start: number, end: number},
+  /**
+   * When false, the ScrollView will not automatically scroll to a focused child when
+   * the child requests focus. This can be useful when you want to control the scroll
+   * position programmatically. The default value is true.
+   *
+   * @platform android
+   */
+  scrollsChildToFocus?: ?boolean,
 }>;
 
 type StickyHeaderComponentType = component(
-  ref?: React.RefSetter<$ReadOnly<interface {setNextHeaderY: number => void}>>,
+  ref?: React.RefSetter<Readonly<interface {setNextHeaderY: number => void}>>,
   ...ScrollViewStickyHeaderProps
 );
 
-type ScrollViewBaseProps = $ReadOnly<{
+type ScrollViewBaseProps = Readonly<{
   /**
    * These styles will be applied to the scroll view content container which
    * wraps all of the child views. Example:
@@ -514,7 +522,7 @@ type ScrollViewBaseProps = $ReadOnly<{
    * whether content is "visible" or not.
    *
    */
-  maintainVisibleContentPosition?: ?$ReadOnly<{
+  maintainVisibleContentPosition?: ?Readonly<{
     minIndexForVisible: number,
     autoscrollToTopThreshold?: ?number,
   }>,
@@ -591,7 +599,7 @@ type ScrollViewBaseProps = $ReadOnly<{
    * top of the scroll view. This property is not supported in conjunction
    * with `horizontal={true}`.
    */
-  stickyHeaderIndices?: ?$ReadOnlyArray<number>,
+  stickyHeaderIndices?: ?ReadonlyArray<number>,
   /**
    * A React Component that will be used to render sticky headers.
    * To be used together with `stickyHeaderIndices` or with `SectionList`, defaults to `ScrollViewStickyHeader`.
@@ -625,7 +633,7 @@ type ScrollViewBaseProps = $ReadOnly<{
    *
    * Overrides less configurable `pagingEnabled` and `snapToInterval` props.
    */
-  snapToOffsets?: ?$ReadOnlyArray<number>,
+  snapToOffsets?: ?ReadonlyArray<number>,
   /**
    * Use in conjunction with `snapToOffsets`. By default, the beginning
    * of the list counts as a snap offset. Set `snapToStart` to false to disable
@@ -673,7 +681,7 @@ type ScrollViewBaseProps = $ReadOnly<{
   scrollViewRef?: React.RefSetter<PublicScrollViewInstance>,
 }>;
 
-export type ScrollViewProps = $ReadOnly<{
+export type ScrollViewProps = Readonly<{
   ...Omit<ViewProps, 'experimental_accessibilityOrder'>,
   ...ScrollViewPropsIOS,
   ...ScrollViewPropsAndroid,
@@ -686,7 +694,7 @@ type ScrollViewState = {
 
 const IS_ANIMATING_TOUCH_START_THRESHOLD_MS = 16;
 
-export type ScrollViewComponentStatics = $ReadOnly<{
+export type ScrollViewComponentStatics = Readonly<{
   Context: typeof ScrollViewContext,
 }>;
 
@@ -1850,6 +1858,8 @@ class ScrollView extends React.Component<ScrollViewProps, ScrollViewState> {
           {style: StyleSheet.compose(baseStyle, outer)},
           <NativeScrollView
             {...props}
+            // Nested scroll should always be enabled to allow the child scroll view to handle events before passing them to the refresh control parent
+            nestedScrollEnabled={props.nestedScrollEnabled ?? true}
             style={StyleSheet.compose(baseStyle, inner)}
             // $FlowFixMe[incompatible-type] - Flow only knows element refs.
             ref={scrollViewRef}>

package/Libraries/Components/ScrollView/ScrollView.windows.js

@@ -174,7 +174,7 @@ export interface PublicScrollViewInstance
 
 type InnerViewInstance = React.ElementRef<typeof View>;
 
-export type ScrollViewPropsIOS = $ReadOnly<{
+export type ScrollViewPropsIOS = Readonly<{
   /**
    * Controls whether iOS should automatically adjust the content inset
    * for scroll views that are placed behind a navigation bar or
@@ -330,7 +330,7 @@ export type ScrollViewPropsIOS = $ReadOnly<{
   ),
 }>;
 
-export type ScrollViewPropsAndroid = $ReadOnly<{
+export type ScrollViewPropsAndroid = Readonly<{
   /**
    * Enables nested scrolling for Android API level 21+.
    * Nested scrolling is supported by default on iOS
@@ -388,14 +388,22 @@ export type ScrollViewPropsAndroid = $ReadOnly<{
    * @platform android
    */
   fadingEdgeLength?: ?number | {start: number, end: number},
+  /**
+   * When false, the ScrollView will not automatically scroll to a focused child when
+   * the child requests focus. This can be useful when you want to control the scroll
+   * position programmatically. The default value is true.
+   *
+   * @platform android
+   */
+  scrollsChildToFocus?: ?boolean,
 }>;
 
 type StickyHeaderComponentType = component(
-  ref?: React.RefSetter<$ReadOnly<interface {setNextHeaderY: number => void}>>,
+  ref?: React.RefSetter<Readonly<interface {setNextHeaderY: number => void}>>,
   ...ScrollViewStickyHeaderProps
 );
 
-type ScrollViewBaseProps = $ReadOnly<{
+type ScrollViewBaseProps = Readonly<{
   /**
    * These styles will be applied to the scroll view content container which
    * wraps all of the child views. Example:
@@ -514,7 +522,7 @@ type ScrollViewBaseProps = $ReadOnly<{
    * whether content is "visible" or not.
    *
    */
-  maintainVisibleContentPosition?: ?$ReadOnly<{
+  maintainVisibleContentPosition?: ?Readonly<{
     minIndexForVisible: number,
     autoscrollToTopThreshold?: ?number,
   }>,
@@ -591,7 +599,7 @@ type ScrollViewBaseProps = $ReadOnly<{
    * top of the scroll view. This property is not supported in conjunction
    * with `horizontal={true}`.
    */
-  stickyHeaderIndices?: ?$ReadOnlyArray<number>,
+  stickyHeaderIndices?: ?ReadonlyArray<number>,
   /**
    * A React Component that will be used to render sticky headers.
    * To be used together with `stickyHeaderIndices` or with `SectionList`, defaults to `ScrollViewStickyHeader`.
@@ -625,7 +633,7 @@ type ScrollViewBaseProps = $ReadOnly<{
    *
    * Overrides less configurable `pagingEnabled` and `snapToInterval` props.
    */
-  snapToOffsets?: ?$ReadOnlyArray<number>,
+  snapToOffsets?: ?ReadonlyArray<number>,
   /**
    * Use in conjunction with `snapToOffsets`. By default, the beginning
    * of the list counts as a snap offset. Set `snapToStart` to false to disable
@@ -673,7 +681,7 @@ type ScrollViewBaseProps = $ReadOnly<{
   scrollViewRef?: React.RefSetter<PublicScrollViewInstance>,
 }>;
 
-export type ScrollViewProps = $ReadOnly<{
+export type ScrollViewProps = Readonly<{
   ...ViewProps,
   ...ScrollViewPropsIOS,
   ...ScrollViewPropsAndroid,
@@ -686,7 +694,7 @@ type ScrollViewState = {
 
 const IS_ANIMATING_TOUCH_START_THRESHOLD_MS = 16;
 
-export type ScrollViewComponentStatics = $ReadOnly<{
+export type ScrollViewComponentStatics = Readonly<{
   Context: typeof ScrollViewContext,
 }>;
 
@@ -1853,6 +1861,8 @@ class ScrollView extends React.Component<ScrollViewProps, ScrollViewState> {
           {style: StyleSheet.compose(baseStyle, outer)},
           <NativeScrollView
             {...props}
+            // Nested scroll should always be enabled to allow the child scroll view to handle events before passing them to the refresh control parent
+            nestedScrollEnabled={props.nestedScrollEnabled ?? true}
             style={StyleSheet.compose(baseStyle, inner)}
             // $FlowFixMe[incompatible-type] - Flow only knows element refs.
             ref={scrollViewRef}>

package/Libraries/Components/ScrollView/ScrollViewNativeComponent.js

@@ -15,6 +15,7 @@ import type {ScrollViewNativeProps as Props} from './ScrollViewNativeComponentTy
 import * as NativeComponentRegistry from '../../NativeComponent/NativeComponentRegistry';
 import {ConditionallyIgnoredEventHandlers} from '../../NativeComponent/ViewConfigIgnore';
 import Platform from '../../Utilities/Platform';
+import {colorAttribute} from '../View/ReactNativeStyleAttributes';
 
 export const __INTERNAL_VIEW_CONFIG: PartialViewConfig =
   Platform.OS === 'android'
@@ -60,34 +61,23 @@ export const __INTERNAL_VIEW_CONFIG: PartialViewConfig =
           nestedScrollEnabled: true,
           scrollEventThrottle: true,
           borderStyle: true,
-          borderRightColor: {
-            process: require('../../StyleSheet/processColor').default,
-          },
-          borderColor: {
-            process: require('../../StyleSheet/processColor').default,
-          },
-          borderBottomColor: {
-            process: require('../../StyleSheet/processColor').default,
-          },
+          borderRightColor: colorAttribute,
+          borderColor: colorAttribute,
+          borderBottomColor: colorAttribute,
           persistentScrollbar: true,
           horizontal: true,
-          endFillColor: {
-            process: require('../../StyleSheet/processColor').default,
-          },
+          endFillColor: colorAttribute,
           fadingEdgeLength: true,
           overScrollMode: true,
           borderTopLeftRadius: true,
           scrollPerfTag: true,
-          borderTopColor: {
-            process: require('../../StyleSheet/processColor').default,
-          },
+          borderTopColor: colorAttribute,
           removeClippedSubviews: true,
           borderTopRightRadius: true,
-          borderLeftColor: {
-            process: require('../../StyleSheet/processColor').default,
-          },
+          borderLeftColor: colorAttribute,
           pointerEvents: true,
           isInvertedVirtualizedList: true,
+          scrollsChildToFocus: true,
         },
       }
     : {

package/Libraries/Components/ScrollView/ScrollViewNativeComponent.windows.js

@@ -15,6 +15,7 @@ import type {ScrollViewNativeProps as Props} from './ScrollViewNativeComponentTy
 import * as NativeComponentRegistry from '../../NativeComponent/NativeComponentRegistry';
 import {ConditionallyIgnoredEventHandlers} from '../../NativeComponent/ViewConfigIgnore';
 import Platform from '../../Utilities/Platform';
+import {colorAttribute} from '../View/ReactNativeStyleAttributes';
 
 export const __INTERNAL_VIEW_CONFIG: PartialViewConfig =
   Platform.OS === 'android'
@@ -60,34 +61,23 @@ export const __INTERNAL_VIEW_CONFIG: PartialViewConfig =
           nestedScrollEnabled: true,
           scrollEventThrottle: true,
           borderStyle: true,
-          borderRightColor: {
-            process: require('../../StyleSheet/processColor').default,
-          },
-          borderColor: {
-            process: require('../../StyleSheet/processColor').default,
-          },
-          borderBottomColor: {
-            process: require('../../StyleSheet/processColor').default,
-          },
+          borderRightColor: colorAttribute,
+          borderColor: colorAttribute,
+          borderBottomColor: colorAttribute,
           persistentScrollbar: true,
           horizontal: true,
-          endFillColor: {
-            process: require('../../StyleSheet/processColor').default,
-          },
+          endFillColor: colorAttribute,
           fadingEdgeLength: true,
           overScrollMode: true,
           borderTopLeftRadius: true,
           scrollPerfTag: true,
-          borderTopColor: {
-            process: require('../../StyleSheet/processColor').default,
-          },
+          borderTopColor: colorAttribute,
           removeClippedSubviews: true,
           borderTopRightRadius: true,
-          borderLeftColor: {
-            process: require('../../StyleSheet/processColor').default,
-          },
+          borderLeftColor: colorAttribute,
           pointerEvents: true,
           isInvertedVirtualizedList: true,
+          scrollsChildToFocus: true,
         },
       }
     : {

package/Libraries/Components/ScrollView/ScrollViewNativeComponentType.js

@@ -19,7 +19,7 @@ import type {
 } from '../../Types/CoreEventTypes';
 import type {ViewProps} from '../View/ViewPropTypes';
 
-export type ScrollViewNativeProps = $ReadOnly<{
+export type ScrollViewNativeProps = Readonly<{
   ...ViewProps,
   alwaysBounceHorizontal?: ?boolean,
   alwaysBounceVertical?: ?boolean,
@@ -46,7 +46,7 @@ export type ScrollViewNativeProps = $ReadOnly<{
   indicatorStyle?: ?('default' | 'black' | 'white'),
   isInvertedVirtualizedList?: ?boolean,
   keyboardDismissMode?: ?('none' | 'on-drag' | 'interactive'),
-  maintainVisibleContentPosition?: ?$ReadOnly<{
+  maintainVisibleContentPosition?: ?Readonly<{
     minIndexForVisible: number,
     autoscrollToTopThreshold?: ?number,
   }>,
@@ -69,13 +69,14 @@ export type ScrollViewNativeProps = $ReadOnly<{
   scrollPerfTag?: ?string,
   scrollToOverflowEnabled?: ?boolean,
   scrollsToTop?: ?boolean,
+  scrollsChildToFocus?: ?boolean,
   sendMomentumEvents?: ?boolean,
   showsHorizontalScrollIndicator?: ?boolean,
   showsVerticalScrollIndicator?: ?boolean,
   snapToAlignment?: ?('start' | 'center' | 'end'),
   snapToEnd?: ?boolean,
   snapToInterval?: ?number,
-  snapToOffsets?: ?$ReadOnlyArray<number>,
+  snapToOffsets?: ?ReadonlyArray<number>,
   snapToStart?: ?boolean,
   zoomScale?: ?number,
   // Overrides

package/Libraries/Components/ScrollView/ScrollViewStickyHeader.js

@@ -25,7 +25,7 @@ import {
   useState,
 } from 'react';
 
-export type ScrollViewStickyHeaderProps = $ReadOnly<{
+export type ScrollViewStickyHeaderProps = Readonly<{
   children?: React.Node,
   nextHeaderLayoutY: ?number,
   onLayout: (event: LayoutChangeEvent) => void,

package/Libraries/Components/StaticRenderer.js

@@ -12,7 +12,7 @@
 
 import * as React from 'react';
 
-type Props = $ReadOnly<{
+type Props = Readonly<{
   /**
    * Indicates whether the render function needs to be called again
    */