Skip to content

Commit d27755f

Browse files
authored
Integrate RN Nightly Build 0.80.0-nightly-20250506-3ac16dd6a (#14951)
1 parent d11142f commit d27755f

File tree

119 files changed

+866
-3066
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+866
-3066
lines changed
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "prerelease",
3+
"comment": "Integrate RN Nightly Build 0.80.0-nightly-20250506-3ac16dd6a",
4+
"packageName": "@office-iss/react-native-win32",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Integrate RN Nightly Build 0.80.0-nightly-20250506-3ac16dd6a",
4+
"packageName": "@react-native-windows/automation-channel",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "prerelease",
3+
"comment": "Integrate RN Nightly Build 0.80.0-nightly-20250506-3ac16dd6a",
4+
"packageName": "react-native-windows",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"excludePatterns": [
66
"src/js/examples-win32/**"
77
],
8-
"baseVersion": "0.80.0-nightly-20250428-9efcdc091",
8+
"baseVersion": "0.80.0-nightly-20250506-3ac16dd6a",
99
"overrides": [
1010
{
1111
"type": "patch",
@@ -42,7 +42,7 @@
4242
"type": "derived",
4343
"file": "src/js/utils/RNTesterList.win32.js",
4444
"baseFile": "packages/rn-tester/js/utils/RNTesterList.android.js",
45-
"baseHash": "3b5c8bcdee69293ddce0d515300504979e36f87a"
45+
"baseHash": "aded9dd37f3ac325aa1cc095f6d217114c45a8b9"
4646
}
4747
]
4848
}

packages/@office-iss/react-native-win32-tester/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"peerDependencies": {
2020
"@office-iss/react-native-win32": "^0.0.0-canary.293",
2121
"react": "19.1.0",
22-
"react-native": "0.80.0-nightly-20250428-9efcdc091"
22+
"react-native": "0.80.0-nightly-20250506-3ac16dd6a"
2323
},
2424
"devDependencies": {
2525
"@office-iss/react-native-win32": "^0.0.0-canary.293",
@@ -30,7 +30,7 @@
3030
"@types/node": "^18.0.0",
3131
"eslint": "^8.19.0",
3232
"just-scripts": "^1.3.3",
33-
"react-native": "0.80.0-nightly-20250428-9efcdc091",
33+
"react-native": "0.80.0-nightly-20250506-3ac16dd6a",
3434
"react-native-platform-override": "^1.9.56",
3535
"typescript": "5.0.4"
3636
},

packages/@office-iss/react-native-win32-tester/src/js/examples-win32/Theming/ThemingModuleAPI.tsx

Lines changed: 54 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ const styles = StyleSheet.create({
2424

2525
const Theming = NativeModules.Theming;
2626

27-
const ifModuleAvailable = (wrappedComponent: React.JSX.Element) => {
27+
const ifModuleAvailable = (wrappedComponent: React.ReactElement): React.ReactElement => {
2828
return Theming ? wrappedComponent : <Text>Theming Native Module not available</Text>;
2929
};
3030

31-
const RenderThemeFunction = () => {
31+
const RenderThemeFunction = (): React.ReactElement => {
3232
const [, setText] = React.useState('');
33-
const onChangeText = React.useCallback(t => setText(t), [setText]);
33+
const onChangeText = React.useCallback((t: string) => setText(t), [setText]);
3434
return (
3535
<View style={styles.nestedContainer}>
3636
<Text>Arguments: </Text>
@@ -39,68 +39,85 @@ const RenderThemeFunction = () => {
3939
);
4040
};
4141

42-
const ThemingMethods: React.FunctionComponent<{}> = () => {
42+
const withBox = (
43+
key: string,
44+
component: React.ReactElement | React.ReactElement[]
45+
): React.ReactElement => (
46+
<View style={styles.box} key={key}>
47+
<Text style={styles.header}>{key}</Text>
48+
<>{component}</>
49+
</View>
50+
);
51+
52+
const ThemingMethods: React.FunctionComponent = () => {
4353
return (
4454
<View>
45-
{Object.keys(Theming).map((val: string) => {
46-
return typeof Theming[val] === 'function' ? withBox(val, RenderThemeFunction()) : undefined;
47-
})}
55+
<>
56+
{Object.keys(Theming).map((val: string) =>
57+
typeof Theming[val] === 'function' ? withBox(val, <RenderThemeFunction />) : null
58+
)}
59+
</>
4860
</View>
4961
);
5062
};
5163

52-
const renderNestedObject = (obj: Record<string, any>) => {
64+
const renderNestedObject = (obj: Record<string, any>): React.ReactElement => {
5365
return (
5466
<View style={styles.nestedContainer}>
5567
<ScrollView>
56-
{Object.keys(obj).map((val: string) => {
57-
return <Text key={val}>{val + ': ' + JSON.stringify(obj[val])}</Text>;
58-
})}
68+
{Object.keys(obj).map((val: string) => (
69+
<Text key={val}>{val + ': ' + JSON.stringify(obj[val])}</Text>
70+
))}
5971
</ScrollView>
6072
</View>
6173
);
6274
};
6375

64-
const renderObject = (obj: Record<string, any>) => {
76+
const renderObject = (obj: Record<string, any>): React.ReactElement => {
6577
const firstKey = Object.keys(obj)[0];
6678
const formattedOutput = JSON.stringify(obj)
6779
.replace(/],/g, '],\n\n')
6880
.replace(/:/g, ': ')
6981
.replace(/,/g, ', ');
70-
return obj[firstKey] instanceof Array ? <Text style={styles.nestedContainer}>{formattedOutput}</Text> : renderNestedObject(obj);
71-
};
7282

73-
const renderThemeObject = (key: string): React.ReactElement => withBox(key, renderObject(Theming[key]));
83+
return obj[firstKey] instanceof Array ? (
84+
<Text style={styles.nestedContainer}>{formattedOutput}</Text>
85+
) : (
86+
renderNestedObject(obj)
87+
);
88+
};
7489

75-
const withBox = (key: string, component: React.ReactNode) => (
76-
<View style={styles.box} key={key}>
77-
<Text style={styles.header}>{key}</Text>
78-
{component}
79-
</View>
80-
);
90+
const renderThemeObject = (key: string): React.ReactElement =>
91+
withBox(key, renderObject(Theming[key]));
8192

82-
const ThemingConstants: React.FunctionComponent<{}> = () => {
93+
const ThemingConstants: React.FunctionComponent = () => {
8394
return (
8495
<View>
85-
{Object.keys(Theming).map((val: string) => {
86-
return typeof Theming[val] === 'object' ? renderThemeObject(val) : undefined;
87-
})}
96+
<>
97+
{Object.keys(Theming).map((val: string) =>
98+
typeof Theming[val] === 'object' ? renderThemeObject(val) : null
99+
)}
100+
</>
88101
</View>
89102
);
90103
};
91104

92105
export const title = 'Theming Module APIs';
93106
export const displayName = 'Theming Module APIs';
94107
export const description = 'Tests shape of Theming Native Module';
95-
export const examples = [
96-
{
97-
title: 'Theming Module Constants',
98-
description: 'All constants',
99-
render: () => ifModuleAvailable(<ThemingConstants />),
100-
},
101-
{
102-
title: 'Theming Module Methods',
103-
description: 'Method invoker',
104-
render: () => ifModuleAvailable(<ThemingMethods />),
105-
},
106-
];
108+
export const examples: {
109+
title: string;
110+
description: string;
111+
render: () => React.ReactElement;
112+
}[] = [
113+
{
114+
title: 'Theming Module Constants',
115+
description: 'All constants',
116+
render: (): React.ReactElement => ifModuleAvailable(<ThemingConstants />),
117+
},
118+
{
119+
title: 'Theming Module Methods',
120+
description: 'Method invoker',
121+
render: (): React.ReactElement => ifModuleAvailable(<ThemingMethods />),
122+
},
123+
];

packages/@office-iss/react-native-win32-tester/src/js/utils/RNTesterList.win32.js

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
import type {RNTesterModule, RNTesterModuleInfo} from '../types/RNTesterTypes';
1414

15+
import * as RNTesterListFbInternal from './RNTesterListFbInternal';
1516
import ReactNativeFeatureFlags from 'react-native/Libraries/ReactNative/ReactNativeFeatureFlags';
1617

1718
const Components: Array<RNTesterModuleInfo> = [
@@ -159,6 +160,7 @@ const Components: Array<RNTesterModuleInfo> = [
159160
module: require('../examples/OSSLibraryExample/OSSLibraryExample'),
160161
},
161162
*/
163+
...RNTesterListFbInternal.Components,
162164
];
163165

164166
const APIs: Array<RNTesterModuleInfo> = ([
@@ -233,14 +235,6 @@ const APIs: Array<RNTesterModuleInfo> = ([
233235
.default,
234236
},
235237
// Only show the link for the example if the API is available.
236-
// $FlowExpectedError[cannot-resolve-name]
237-
typeof IntersectionObserver === 'function'
238-
? {
239-
key: 'IntersectionObserver',
240-
category: 'UI',
241-
module: require('../examples/IntersectionObserver/IntersectionObserverIndex'),
242-
}
243-
: null,
244238
{
245239
key: 'InvalidPropsExample',
246240
module: require('../examples/InvalidProps/InvalidPropsExample'),
@@ -265,14 +259,6 @@ const APIs: Array<RNTesterModuleInfo> = ([
265259
category: 'UI',
266260
module: require('../examples/Layout/LayoutExample'),
267261
},
268-
// $FlowExpectedError[cannot-resolve-name]
269-
typeof MutationObserver === 'function'
270-
? {
271-
key: 'MutationObserver',
272-
category: 'UI',
273-
module: require('../examples/MutationObserver/MutationObserverIndex'),
274-
}
275-
: null,
276262
{
277263
key: 'NativeAnimationsExample',
278264
category: 'UI',
@@ -380,11 +366,7 @@ const APIs: Array<RNTesterModuleInfo> = ([
380366
category: 'Basic',
381367
module: require('../examples/TurboModule/TurboCxxModuleExample'),
382368
},
383-
{
384-
key: 'PerformanceApiExample',
385-
category: 'Basic',
386-
module: require('../examples/Performance/PerformanceApiExample'),
387-
},
369+
...RNTesterListFbInternal.APIs,
388370
]: Array<?RNTesterModuleInfo>).filter(Boolean);
389371

390372
if (ReactNativeFeatureFlags.shouldEmitW3CPointerEvents()) {

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
.*/*[.]macos.js
66
.*/*[.]windesktop.js
77

8+
; Ignore fb_internal modules
9+
<PROJECT_ROOT>/packages/react-native/src/fb_internal/.*
10+
811
; These modules have base components and win32 versions.
912
; Ideally we'd delete the base versions of files that had .win32 overrides as part of the
1013
; initRNLibraries build step
@@ -39,6 +42,10 @@
3942
<PROJECT_ROOT>/Libraries/LogBox/UI/LogBoxInspectorReactFrames.js
4043
<PROJECT_ROOT>/Libraries/LogBox/UI/LogBoxStyle.js
4144

45+
<PROJECT_ROOT>/IntegrationTests/ImageCachePolicyTest.js
46+
<PROJECT_ROOT>/IntegrationTests/LayoutEventsTest.js
47+
<PROJECT_ROOT>/IntegrationTests/IntegrationTestsApp.js
48+
4249
; Ignore react-native files in node_modules since they are copied into project root
4350
.*/node_modules/react-native/.*
4451

@@ -167,4 +174,4 @@ untyped-import
167174
untyped-type-import
168175

169176
[version]
170-
^0.268.0
177+
^0.269.1

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
"**/__snapshots__/**",
88
"src-win/rntypes/**"
99
],
10-
"baseVersion": "0.80.0-nightly-20250428-9efcdc091",
10+
"baseVersion": "0.80.0-nightly-20250506-3ac16dd6a",
1111
"overrides": [
1212
{
1313
"type": "derived",
1414
"file": ".flowconfig",
1515
"baseFile": ".flowconfig",
16-
"baseHash": "d274ca7bb384b334c5b2ee0827726e7a3d6c98c9"
16+
"baseHash": "70ed729d5f52c241530e8459cc40263d4e9fa9c0"
1717
},
1818
{
1919
"type": "derived",
@@ -114,7 +114,7 @@
114114
"type": "derived",
115115
"file": "src-win/Libraries/Components/TextInput/TextInput.win32.js",
116116
"baseFile": "packages/react-native/Libraries/Components/TextInput/TextInput.js",
117-
"baseHash": "4b3128471dd0d362e9828df8937f708d53694e12"
117+
"baseHash": "9965c0079652083ab549bc2799eb9528b56a1b2d"
118118
},
119119
{
120120
"type": "patch",
@@ -183,13 +183,13 @@
183183
"type": "derived",
184184
"file": "src-win/Libraries/Components/View/ViewAccessibility.d.ts",
185185
"baseFile": "packages/react-native/Libraries/Components/View/ViewAccessibility.d.ts",
186-
"baseHash": "d97e29f01e57cc2b0de209a03f8584b984cfe190"
186+
"baseHash": "1e4e3a89397960e8f08b86be62496473829c0ac3"
187187
},
188188
{
189189
"type": "derived",
190190
"file": "src-win/Libraries/Components/View/ViewAccessibility.win32.js",
191191
"baseFile": "packages/react-native/Libraries/Components/View/ViewAccessibility.js",
192-
"baseHash": "c30dab3926869e84edafebd485e78637d69ccd61"
192+
"baseHash": "04981261b2ed61b31bfbb396478bb6b103d99253"
193193
},
194194
{
195195
"type": "derived",
@@ -329,7 +329,7 @@
329329
"type": "derived",
330330
"file": "src-win/Libraries/NativeComponent/BaseViewConfig.win32.js",
331331
"baseFile": "packages/react-native/Libraries/NativeComponent/BaseViewConfig.ios.js",
332-
"baseHash": "3ba8fe1a60d744e057e856bc43e2df28f4fd7f66"
332+
"baseHash": "b520e2bdb2be31bdb6ad7e3769dbe69168870c8c"
333333
},
334334
{
335335
"type": "copy",

0 commit comments

Comments
 (0)