Resolve merge conflicts for RN 0.85.0-nightly-20260114-f15985f4f integration

Author: Harini Malothu

packages/@office-iss/react-native-win32/src-win/Libraries/Components/TextInput/TextInput.flow.win32.js

@@ -512,20 +512,17 @@ export type TextInputAndroidProps = Readonly<{
   underlineColorAndroid?: ?ColorValue,
 }>;
 
-<<<<<<< Upstream
-type TextInputBaseProps = Readonly<{
-=======
 // [Windows
 
-type SubmitKeyEvent = $ReadOnly<{|
+type SubmitKeyEvent = Readonly<{|
   altKey?: ?boolean,
   ctrlKey?: ?boolean,
   metaKey?: ?boolean,
   shiftKey?: ?boolean,
   code: string,
 |}>;
 
-export type TextInputWindowsProps = $ReadOnly<{|
+export type TextInputWindowsProps = Readonly<{|
   /**
    * If `true`, clears the text field synchronously before `onSubmitEditing` is emitted.
    * @platform windows
@@ -541,8 +538,7 @@ export type TextInputWindowsProps = $ReadOnly<{|
 
 // Windows]
 
-type TextInputBaseProps = $ReadOnly<{
->>>>>>> Override
+type TextInputBaseProps = Readonly<{
   /**
    * When provided, the text input will only accept drag and drop events for the specified
    * types. If null or not provided, the text input will accept all types of drag and drop events.
@@ -1068,13 +1064,8 @@ type TextInputBaseProps = $ReadOnly<{
   textAlign?: ?('left' | 'center' | 'right'),
 }>;
 
-<<<<<<< Upstream
 export type TextInputProps = Readonly<{
-  ...Omit<ViewProps, 'style' | 'experimental_accessibilityOrder'>,
-=======
-export type TextInputProps = $ReadOnly<{
   ...Omit<ViewProps, 'style'>,
->>>>>>> Override
   ...TextInputIOSProps,
   ...TextInputAndroidProps,
   ...TextInputBaseProps,

packages/@office-iss/react-native-win32/src-win/Libraries/Components/View/ViewPropTypes.win32.js

@@ -532,11 +532,8 @@ type ViewBaseProps = Readonly<{
   accessibilityControls?: ?string,
 }>;
 
-<<<<<<< Upstream
-export type ViewProps = Readonly<{
-=======
 // [Windows
-export type HandledKeyboardEvent = $ReadOnly<{|
+export type HandledKeyboardEvent = Readonly<{|
   altKey?: ?boolean,
   ctrlKey?: ?boolean,
   metaKey?: ?boolean,
@@ -545,7 +542,7 @@ export type HandledKeyboardEvent = $ReadOnly<{|
   handledEventPhase?: number,
 |}>;
 
-type ViewPropsWindows = $ReadOnly<{|
+type ViewPropsWindows = Readonly<{|
   /**
    * Key up event
    *
@@ -593,8 +590,7 @@ type ViewPropsWindows = $ReadOnly<{|
 |}>;
 // Windows]
 
-export type ViewProps = $ReadOnly<{
->>>>>>> Override
+export type ViewProps = Readonly<{
   ...DirectEventProps,
   ...GestureResponderHandlers,
   ...MouseEventProps,

packages/@office-iss/react-native-win32/src-win/Libraries/Types/CoreEventTypes.win32.js

@@ -230,14 +230,10 @@ export interface NativePointerEvent extends NativeMouseEvent {
 
 export type PointerEvent = NativeSyntheticEvent<NativePointerEvent>;
 
-<<<<<<< Upstream
 export type NativeTouchEvent = Readonly<{
-=======
-export type NativeTouchEvent = $ReadOnly<{
   altKey: ?boolean, // TODO(macOS)
 
   button: ?number, // TODO(macOS)
->>>>>>> Override
   /**
    * Array of all touch events that have changed since the last event
    */
@@ -342,13 +338,9 @@ export type FocusEvent = NativeSyntheticEvent<TargetedEvent>;
 // introduced for react-native-web. Replace typings with our values to catch
 // anything dependent on react-native-web specific values
 export type MouseEvent = NativeSyntheticEvent<
-<<<<<<< Upstream
   Readonly<{
-=======
-  $ReadOnly<{
     target: number,
     identifier: number,
->>>>>>> Override
     clientX: number,
     clientY: number,
     pageX: number,
@@ -369,13 +361,8 @@ export type MouseEvent = NativeSyntheticEvent<
     altKey: boolean,
   }>,
 >;
-<<<<<<< Upstream
-
-export type KeyEvent = Readonly<{
-=======
 // Windows]
-export type KeyEvent = $ReadOnly<{
->>>>>>> Override
+export type KeyEvent = Readonly<{
   /**
    * The actual key that was pressed. For example, F would be "f" or "F" depending on the shift key.
    * @see https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key

packages/@office-iss/react-native-win32/src-win/Libraries/Utilities/Dimensions.win32.js

@@ -64,14 +64,7 @@ class Dimensions {
    *
    * @param {DimensionsPayload} dims Simple string-keyed object of dimensions to set
    */
-<<<<<<< Upstream
   static set(dims: Readonly<DimensionsPayload>): void {
-    // We calculate the window dimensions in JS so that we don't encounter loss of
-    // precision in transferring the dimensions (which could be non-integers) over
-    // the bridge.
-=======
-  static set(dims: $ReadOnly<DimensionsPayload>): void {
->>>>>>> Override
     let {screen, window} = dims;
     const {windowPhysicalPixels} = dims;
     if (windowPhysicalPixels) {

packages/@react-native-windows/tester/src/js/examples/FlatList/BaseFlatListExample.windows.js

@@ -59,11 +59,7 @@ const Item = ({item, separators}: ListRenderItemInfo<string>) => {
   );
 };
 
-<<<<<<< Upstream
-type Props = Readonly<{
-=======
 type Props = {
->>>>>>> Override
   exampleProps: Partial<React.ElementConfig<typeof FlatList>>,
   onTest?: ?() => void,
   testLabel?: ?string,

packages/@react-native-windows/tester/src/js/examples/FlatList/FlatList-basic.windows.js

@@ -55,13 +55,8 @@ const VIEWABILITY_CONFIG = {
   waitForInteraction: true,
 };
 
-<<<<<<< Upstream
-type Props = Readonly<{}>;
-type State = {
-=======
-type Props = $ReadOnly<{||}>;
+type Props = Readonly<{||}>;  
 type State = {|
->>>>>>> Override
   data: Array<Item>,
   first: number,
   last: number,

vnext/src-win/Libraries/Components/ScrollView/ScrollView.windows.js

@@ -673,13 +673,8 @@ type ScrollViewBaseProps = Readonly<{
   scrollViewRef?: React.RefSetter<PublicScrollViewInstance>,
 }>;
 
-<<<<<<< Upstream
 export type ScrollViewProps = Readonly<{
-  ...Omit<ViewProps, 'experimental_accessibilityOrder'>,
-=======
-export type ScrollViewProps = $ReadOnly<{
   ...ViewProps,
->>>>>>> Override
   ...ScrollViewPropsIOS,
   ...ScrollViewPropsAndroid,
   ...ScrollViewBaseProps,

vnext/src-win/Libraries/Components/TextInput/TextInput.flow.windows.js

@@ -517,20 +517,17 @@ export type TextInputAndroidProps = Readonly<{
   underlineColorAndroid?: ?ColorValue,
 }>;
 
-<<<<<<< Upstream
-type TextInputBaseProps = Readonly<{
-=======
 // [Windows
 
-type SubmitKeyEvent = $ReadOnly<{|
+type SubmitKeyEvent = Readonly<{|
   altKey?: ?boolean,
   ctrlKey?: ?boolean,
   metaKey?: ?boolean,
   shiftKey?: ?boolean,
   code: string,
 |}>;
 
-export type TextInputWindowsProps = $ReadOnly<{|
+export type TextInputWindowsProps = Readonly<{|
   /**
    * If `true`, clears the text field synchronously before `onSubmitEditing` is emitted.
    * @platform windows
@@ -579,8 +576,7 @@ export type TextInputWindowsProps = $ReadOnly<{|
 
 // Windows]
 
-type TextInputBaseProps = $ReadOnly<{
->>>>>>> Override
+type TextInputBaseProps = Readonly<{
   /**
    * When provided, the text input will only accept drag and drop events for the specified
    * types. If null or not provided, the text input will accept all types of drag and drop events.
@@ -1106,13 +1102,8 @@ type TextInputBaseProps = $ReadOnly<{
   textAlign?: ?('left' | 'center' | 'right'),
 }>;
 
-<<<<<<< Upstream
 export type TextInputProps = Readonly<{
-  ...Omit<ViewProps, 'style' | 'experimental_accessibilityOrder'>,
-=======
-export type TextInputProps = $ReadOnly<{
   ...Omit<ViewProps, 'style'>,
->>>>>>> Override
   ...TextInputIOSProps,
   ...TextInputAndroidProps,
   ...TextInputBaseProps,

vnext/src-win/Libraries/Components/TextInput/WindowsTextInputNativeComponent.js

@@ -63,11 +63,7 @@ export type ReturnKeyType =
 
 export type SubmitBehavior = 'submit' | 'blurAndSubmit' | 'newline';
 
-<<<<<<< Upstream
-export type AndroidTextInputNativeProps = Readonly<{
-=======
-export type NativeProps = $ReadOnly<{
->>>>>>> Override
+export type NativeProps = Readonly<{
   // This allows us to inherit everything from ViewProps except for style (see below)
   // This must be commented for Fabric codegen to work.
   ...Omit<ViewProps, 'style'>,

vnext/src-win/Libraries/Components/Touchable/TouchableHighlight.windows.js

@@ -37,20 +37,16 @@ type IOSProps = Readonly<{
   hasTVPreferredFocus?: ?boolean,
 }>;
 
-<<<<<<< Upstream
-type TouchableHighlightBaseProps = Readonly<{
-=======
 // [Windows
-type WindowProps = $ReadOnly<{
+type WindowProps = Readonly<{
   onAccessibilityTap?: ?() => void,
   //onMouseEnter: ?() => void,
   //onMouseLeave: ?() => void,
   //tabIndex: ?number,
 }>;
 // Windows]
 
-type TouchableHighlightBaseProps = $ReadOnly<{
->>>>>>> Override
+type TouchableHighlightBaseProps = Readonly<{
   /**
    * Determines what the opacity of the wrapped view should be when touch is active.
    */