Update tester files

packages/@office-iss/react-native-win32/.flowconfig

@@ -109,17 +109,11 @@
 ../../../node_modules/
 
 [libs]
-<<<<<<< Upstream
-flow-typed/
-packages/react-native/interface.js
-packages/react-native/flow/
-=======
 interface.js
 flow/
 ../../../node_modules/.flow/flow-typed/
 ../../../node_modules/react-native/src/types
 src/types/
->>>>>>> Override
 
 [options]
 enums=true

packages/@office-iss/react-native-win32/overrides.json

@@ -89,7 +89,7 @@
       "issue": 6240
     },
     {
-      "type": "patch",
+      "type": "copy",
       "file": "src-win/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.js",
       "baseFile": "packages/react-native/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.js",
       "baseHash": "85efdbe556a087175fb9328f8d6e8d1f2cf29447"
@@ -398,7 +398,7 @@
       "issue": 0
     },
     {
-      "type": "derived",
+      "type": "copy",
       "file": "src-win/Libraries/Settings/Settings.win32.js",
       "baseFile": "packages/react-native/Libraries/Settings/Settings.js",
       "baseHash": "e1d244ee581a1456d00af638fb9331d90c48c91e"

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

@@ -4,11 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
-<<<<<<< Upstream
  * @flow strict-local
-=======
- * @flow
->>>>>>> Override
  * @format
  */
 

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

@@ -8,7 +8,6 @@
  */
 
 import type * as React from 'react';
-<<<<<<< Upstream
 import {Insets} from '../../../types/public/Insets';
 import {GestureResponderHandlers} from '../../../types/public/ReactNativeRenderer';
 import {StyleProp} from '../../StyleSheet/StyleSheet';
@@ -18,21 +17,10 @@ import {
   FocusEvent,
   LayoutChangeEvent,
   PointerEvents,
-} from '../../Types/CoreEventTypes';
-import {Touchable} from '../Touchable/Touchable';
-=======
-import {Insets} from 'react-native/types/public/Insets';
-import {GestureResponderHandlers} from 'react-native/types/public/ReactNativeRenderer';
-import {StyleProp} from 'react-native/Libraries/StyleSheet/StyleSheet';
-import {ViewStyle} from 'react-native/Libraries/StyleSheet/StyleSheetTypes';
-import {
-  LayoutChangeEvent,
   MouseEvent, // Win32
   NativeSyntheticEvent, // Win32
-  PointerEvents,
-} from 'react-native/Libraries/Types/CoreEventTypes';
-import {Touchable} from 'react-native/Libraries/Components/Touchable/Touchable';
->>>>>>> Override
+} from '../../Types/CoreEventTypes';
+import {Touchable} from '../Touchable/Touchable';
 import {AccessibilityProps} from './ViewAccessibility';
 
 export interface TVViewPropsIOS {

packages/@office-iss/react-native-win32/src-win/index.win32.js

@@ -4,13 +4,8 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
-<<<<<<< Upstream
  * @flow strict-local
  * @format
-=======
- * @format
- * @flow
->>>>>>> Override
  */
 
 // flowlint unsafe-getters-setters:off

packages/@react-native-windows/tester/src/js/examples/Image/ImageExample.windows.js

@@ -631,9 +631,6 @@ const VectorDrawableExample = () => {
   );
 };
 
-<<<<<<< Upstream
-function CacheControlExample(): React.Node {
-=======
 const AccessibilityActions = () => {
   const [accessibilityLabel, setAccessibilityLabel] =
     React.useState('Initial Label');
@@ -735,8 +732,7 @@ const ImageFunctionsExample = () => {
   );
 };
 
-function CacheControlAndroidExample(): React.Node {
->>>>>>> Override
+  function CacheControlExample(): React.Node {
   const [reload, setReload] = useState(0);
 
   const onReload = () => {
@@ -1311,39 +1307,6 @@ exports.examples = [
   },
   {
     title: 'Cache Policy',
-<<<<<<< Upstream
-=======
-    description:
-      ('First image has never been loaded before and is instructed not to load unless in cache.' +
-        'Placeholder image from above will stay. Second image is the same but forced to load regardless of' +
-        ' local cache state.': string),
-    render: function (): React.Node {
-      return (
-        <View style={styles.horizontal} testID="image-cache" accessible>
-          <Image
-            defaultSource={require('../../assets/bunny.png')}
-            source={{
-              uri: smallImage.uri + '?cacheBust=notinCache' + Date.now(),
-              cache: 'only-if-cached',
-            }}
-            style={styles.base}
-          />
-          <Image
-            defaultSource={require('../../assets/bunny.png')}
-            source={{
-              uri: smallImage.uri + '?cacheBust=notinCache' + Date.now(),
-              cache: 'reload',
-            }}
-            style={styles.base}
-          />
-        </View>
-      );
-    },
-    platform: 'ios',
-  },
-  {
-    title: 'Cache Policy',
->>>>>>> Override
     description: `- First image will be loaded and cached.
 - Second image is the same but will be reloaded if re-rendered as the cache policy is set to reload.
 - Third image will try to load from the cache first and only use the network if the cached version is unavailable.

packages/@react-native-windows/tester/src/js/examples/Text/TextExample.windows.js

@@ -1156,19 +1156,12 @@ function TextBaseLineLayoutExample(props: {}): React.Node {
         {texts}
         {marker}
       </View>
-<<<<<<< Upstream
 
       {/* $FlowFixMe[incompatible-type] Natural Inference rollout. See
        * https://fburl.com/workplace/6291gfvu */}
       <RNTesterText style={subtitleStyle}>
         {'Interleaving <View> and <Text>:'}
       </RNTesterText>
-=======
-    </View>
-  ) : (
-    <View>
-      <RNTesterText style={subtitleStyle}>{'Nested <Text/>s:'}</RNTesterText>
->>>>>>> Override
       <View style={{flexDirection: 'row', alignItems: 'baseline'}}>
         {marker}
         <RNTesterText>{texts}</RNTesterText>
@@ -1185,20 +1178,6 @@ function TextBaseLineLayoutExample(props: {}): React.Node {
         {texts}
         {marker}
       </View>
-<<<<<<< Upstream
-
-      {/* $FlowFixMe[incompatible-type] Natural Inference rollout. See
-       * https://fburl.com/workplace/6291gfvu */}
-      <RNTesterText style={subtitleStyle}>
-        {'Multi-line <Text> alignment'}
-      </RNTesterText>
-      <View style={{flexDirection: 'row', alignItems: 'baseline'}}>
-        <View style={{width: 50, height: 50, backgroundColor: 'gray'}} />
-        <View style={{width: 125, backgroundColor: '#eee'}}>
-          <RNTesterText style={{fontSize: 15}}>
-            Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-            eiusmod tempor incididunt ut labore et dolore magna aliqua.
-=======
       <View>
         <RNTesterText style={subtitleStyle}>
           {'Interleaving <View> and <Text>:'}
@@ -1217,7 +1196,6 @@ function TextBaseLineLayoutExample(props: {}): React.Node {
               <RNTesterText>Text inside View.</RNTesterText>
               {marker}
             </View>
->>>>>>> Override
           </RNTesterText>
           {marker}
         </View>
@@ -1239,28 +1217,6 @@ function TextBaseLineLayoutExample(props: {}): React.Node {
           </RNTesterText>
         </View>
 
-<<<<<<< Upstream
-      {/* $FlowFixMe[incompatible-type] Natural Inference rollout. See
-       * https://fburl.com/workplace/6291gfvu */}
-      <RNTesterText style={subtitleStyle}>{'<TextInput/>:'}</RNTesterText>
-      <View style={{flexDirection: 'row', alignItems: 'baseline'}}>
-        {marker}
-        <TextInput style={{margin: 0, padding: 0}}>{texts}</TextInput>
-        {marker}
-      </View>
-
-      {/* $FlowFixMe[incompatible-type] Natural Inference rollout. See
-       * https://fburl.com/workplace/6291gfvu */}
-      <RNTesterText style={subtitleStyle}>
-        {'<TextInput multiline/>:'}
-      </RNTesterText>
-      <View style={{flexDirection: 'row', alignItems: 'baseline'}}>
-        {marker}
-        <TextInput multiline={true} style={{margin: 0, padding: 0}}>
-          {texts}
-        </TextInput>
-        {marker}
-=======
         <RNTesterText style={subtitleStyle}>
           {'Multi-line <Text> alignment'}
         </RNTesterText>
@@ -1297,7 +1253,6 @@ function TextBaseLineLayoutExample(props: {}): React.Node {
           </TextInput>
           {marker}
         </View>
->>>>>>> Override
       </View>
     </View>
   );

packages/@react-native-windows/tester/src/js/examples/Text/TextSharedExamples.windows.js

@@ -73,7 +73,6 @@ function EmptyTextExample(): React.Node {
   );
 }
 
-<<<<<<< Upstream
 function TextAndLayoutLinesJSON({
   testID,
   ellipsizeMode,
@@ -111,24 +110,12 @@ function NumberOfLinesTextLayoutExample(): React.Node {
   );
 }
 
-export default [
-=======
 const examples = [
->>>>>>> Override
   {
     title: 'Empty Text',
     name: 'emptyText',
     render: EmptyTextExample,
   },
-<<<<<<< Upstream
-  {
-    title: 'TextInlineViewsExample',
-    name: 'inlineViews',
-    description:
-      'Shows how inline views are rendered when text is subject to alignment.',
-    expect: 'The red box should align correctly with the rest of the text.',
-    render: TextInlineViewsExample,
-  },
   {
     title: 'numberOfLines with onTextLayout',
     name: 'numberOfLinesLayout',
@@ -137,9 +124,7 @@ const examples = [
     scrollable: true,
     render: NumberOfLinesTextLayoutExample,
   },
-] as $ReadOnlyArray<RNTesterModuleExample>;
-=======
-  // Windows: Only include TextInlineViewsExample in Fabric mode (bridgeless)
+   // Windows: Only include TextInlineViewsExample in Fabric mode (bridgeless)
   // Paper mode doesn't support Views nested in Text
   ...(global.RN$Bridgeless === true
     ? [
@@ -154,7 +139,6 @@ const examples = [
         },
       ]
     : []),
-];
+] ;
 
 export default examples;
->>>>>>> Override

packages/@react-native-windows/tester/src/js/examples/View/ViewExample.windows.js

@@ -1426,13 +1426,11 @@ export default ({
       name: 'box-sizing',
       render: BoxSizingExample,
     },
-<<<<<<< Upstream
     {
       title: 'Focus/Blur',
       name: 'focus-blur',
       render: FocusBlurExample,
     },
-=======
     // [Windows
     {
       title: 'NativeID',
@@ -1507,6 +1505,5 @@ export default ({
       },
     }, // ]TODO(macOS ISS#2323203)
     // Windows]
->>>>>>> Override
   ],
 }: RNTesterModule);

packages/@react-native-windows/tester/src/js/utils/RNTesterList.windows.js

@@ -1,15 +1,9 @@
 /**
-<<<<<<< Upstream
  * 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.
  *
-=======
- * Copyright (c) Microsoft Corporation.
- * Licensed under the MIT License.
- * @format
->>>>>>> Override
  * @flow
  * @format
  */

packages/@react-native/monorepo/package.json

@@ -46,14 +46,8 @@
     "@babel/preset-env": "^7.25.3",
     "@babel/preset-flow": "^7.24.7",
     "@jest/create-cache-key-function": "^29.7.0",
-<<<<<<< Upstream
-    "@microsoft/api-extractor": "^7.52.2",
-    "@react-native/metro-babel-transformer": "0.80.0-main",
-    "@react-native/metro-config": "0.80.0-main",
-=======
     "@react-native/metro-babel-transformer": "0.81.0-nightly-20250521-3cb70bb6a",
     "@react-native/metro-config": "0.81.0-nightly-20250521-3cb70bb6a",
->>>>>>> Override
     "@tsconfig/node18": "1.0.1",
     "@types/react": "^19.0.0",
     "@typescript-eslint/parser": "^7.1.1",

packages/@react-native/tester/js/components/ListExampleShared.js

@@ -4,8 +4,8 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @format
  * @flow
+ * @format
  */
 
 'use strict';

packages/@react-native/tester/js/components/RNTConfigurationBlock.js

@@ -4,8 +4,8 @@
  * 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
+ * @format
  */
 
 'use strict';

packages/@react-native/tester/js/components/RNTOption.js

@@ -4,8 +4,8 @@
  * 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
+ * @format
  */
 
 'use strict';

packages/@react-native/tester/js/components/RNTPressableRow.js

@@ -4,8 +4,8 @@
  * 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
+ * @format
  */
 
 import RNTesterComponentTitle from './RNTesterComponentTitle';

packages/@react-native/tester/js/components/RNTTitleBar.js

@@ -4,8 +4,8 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @format
  * @flow
+ * @format
  */
 
 import RNTesterDocumentationURL from './RNTesterDocumentationURL';