@office-iss/react-native-win32 0.0.0-canary.287 → 0.0.0-canary.289

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;

package/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.js

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

package/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,
+}>;

package/Libraries/Components/RefreshControl/RefreshControl.js

@@ -21,7 +21,7 @@ import React from 'react';
 
 const Platform = require('../../Utilities/Platform').default;
 
-type IOSProps = $ReadOnly<{
+export type RefreshControlPropsIOS = $ReadOnly<{
   /**
    * The color of the refresh indicator.
    */
@@ -36,7 +36,7 @@ type IOSProps = $ReadOnly<{
   title?: ?string,
 }>;
 
-type AndroidProps = $ReadOnly<{
+export type RefreshControlPropsAndroid = $ReadOnly<{
   /**
    * Whether the pull to refresh functionality is enabled.
    */
@@ -55,11 +55,7 @@ type AndroidProps = $ReadOnly<{
   size?: ?('default' | 'large'),
 }>;
 
-export type RefreshControlProps = $ReadOnly<{
-  ...ViewProps,
-  ...IOSProps,
-  ...AndroidProps,
-
+type RefreshControlBaseProps = $ReadOnly<{
   /**
    * Called when the view starts refreshing.
    */
@@ -76,6 +72,13 @@ export type RefreshControlProps = $ReadOnly<{
   progressViewOffset?: ?number,
 }>;
 
+export type RefreshControlProps = $ReadOnly<{
+  ...ViewProps,
+  ...RefreshControlPropsIOS,
+  ...RefreshControlPropsAndroid,
+  ...RefreshControlBaseProps,
+}>;
+
 /**
  * This component is used inside a ScrollView or ListView to add pull to refresh
  * functionality. When the ScrollView is at `scrollY: 0`, swiping down

package/Libraries/Components/RefreshControl/__mocks__/RefreshControlMock.js

@@ -9,7 +9,8 @@
  */
 
 'use strict';
-import type {HostComponent} from '../../../Renderer/shims/ReactNativeTypes';
+
+import type {HostComponent} from '../../../../src/private/types/HostComponent';
 
 import requireNativeComponent from '../../../ReactNative/requireNativeComponent';
 import * as React from 'react';

package/Libraries/Components/SafeAreaView/SafeAreaView.js

@@ -24,7 +24,7 @@ import * as React from 'react';
  * sensor housing area on iPhone X).
  */
 const exported: component(
-  ref: React.RefSetter<React.ElementRef<typeof View>>,
+  ref?: React.RefSetter<React.ElementRef<typeof View>>,
   ...props: ViewProps
 ) = Platform.select({
   ios: require('./RCTSafeAreaViewNativeComponent').default,

package/Libraries/Components/SafeAreaView/SafeAreaView.win32.js

@@ -24,7 +24,7 @@ import * as React from 'react';
  * sensor housing area on iPhone X).
  */
 const exported: component(
-  ref: React.RefSetter<React.ElementRef<typeof View>>,
+  ref?: React.RefSetter<React.ElementRef<typeof View>>,
   ...props: ViewProps
 ) = Platform.select({
   ios: require('./RCTSafeAreaViewNativeComponent').default,

package/Libraries/Components/ScrollView/AndroidHorizontalScrollViewNativeComponent.js

@@ -8,10 +8,8 @@
  * @format
  */
 
-import type {
-  HostComponent,
-  PartialViewConfig,
-} from '../../Renderer/shims/ReactNativeTypes';
+import type {HostComponent} from '../../../src/private/types/HostComponent';
+import type {PartialViewConfig} from '../../Renderer/shims/ReactNativeTypes';
 import type {ScrollViewNativeProps as Props} from './ScrollViewNativeComponentType';
 
 import * as NativeComponentRegistry from '../../NativeComponent/NativeComponentRegistry';

package/Libraries/Components/ScrollView/ScrollContentViewNativeComponent.js

@@ -8,10 +8,8 @@
  * @flow strict-local
  */
 
-import type {
-  HostComponent,
-  PartialViewConfig,
-} from '../../Renderer/shims/ReactNativeTypes';
+import type {HostComponent} from '../../../src/private/types/HostComponent';
+import type {PartialViewConfig} from '../../Renderer/shims/ReactNativeTypes';
 import type {ViewProps as Props} from '../View/ViewPropTypes';
 
 import * as NativeComponentRegistry from '../../NativeComponent/NativeComponentRegistry';