Skip to content

Integrate nightly 0.81.0-nightly-20250521-3cb70bb6a #14991

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 25 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
b911317
solved merge conflicts and resolved unresolved overrides
iamAbhi-916 Jul 30, 2025
1da60bb
yarn change , format , lint:fix
iamAbhi-916 Jul 31, 2025
19c359c
Merge branch 'main' into integrate-nightly
iamAbhi-916 Jul 31, 2025
704b48b
fix
iamAbhi-916 Jul 31, 2025
5ba5947
Change files
iamAbhi-916 Jul 31, 2025
65d9df4
fix build issues , creates override
iamAbhi-916 Aug 6, 2025
2e7cc84
Merge branch 'main' into integrate-nightly
iamAbhi-916 Aug 6, 2025
2d673d7
update e2e package-lock.json
iamAbhi-916 Aug 6, 2025
ac807c5
update yarn.lock
iamAbhi-916 Aug 6, 2025
f1f843c
added override of paragraphState.h
iamAbhi-916 Aug 7, 2025
14d21a6
yarn format
iamAbhi-916 Aug 7, 2025
b83e513
Merge branch 'main' into integrate-nightly
iamAbhi-916 Aug 7, 2025
2da925c
fix package.json
iamAbhi-916 Aug 7, 2025
c45898c
update vcxproj and commented conversions.h depends in WindowsTextInpu…
iamAbhi-916 Aug 7, 2025
81edec6
revert GenerateWindowsMetadata
iamAbhi-916 Aug 7, 2025
c2bb704
removed getMapBuffer from windowsTextInputState.cpp
iamAbhi-916 Aug 11, 2025
1175544
Merge branch 'main' into integrate-nightly
iamAbhi-916 Aug 11, 2025
75b1264
update NativeDOM .h/.cpp removing backticks
iamAbhi-916 Aug 11, 2025
5057cb7
Merge branch 'integrate-nightly' of https://github.com/iamAbhi-916/re…
iamAbhi-916 Aug 11, 2025
809669f
udpated yarn.lock
iamAbhi-916 Aug 11, 2025
2855180
fix yarn:test
iamAbhi-916 Aug 11, 2025
ebbeeed
fix yarn validate-overrides
iamAbhi-916 Aug 11, 2025
576ee84
supress 5028 warning WindowsTextInputState.cpp
iamAbhi-916 Aug 11, 2025
57a6985
fix C4715 in \AccessibilityPrimitives.h for windows
iamAbhi-916 Aug 11, 2025
f71d8dc
comment testcases to suppress JSI failures
iamAbhi-916 Aug 11, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "integraye nightly",
"packageName": "@office-iss/react-native-win32",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix",
"packageName": "@react-native-windows/automation-channel",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix",
"packageName": "react-native-platform-override",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "fix",
"packageName": "react-native-windows",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
"excludePatterns": [
"src/js/examples-win32/**"
],
"baseVersion": "0.80.0-nightly-20250506-3ac16dd6a",
"baseVersion": "0.81.0-nightly-20250521-3cb70bb6a",
"overrides": [
{
"type": "patch",
"file": "src/js/components/ListExampleShared.win32.js",
"baseFile": "packages/rn-tester/js/components/ListExampleShared.js",
"baseHash": "d39ad505e22d525b00b8f63165ce2c2bbcc86152"
"baseHash": "eb604f3c06468e8aaa2671985a772b26f666e5de"
},
{
"type": "patch",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"@types/node": "^18.0.0",
"eslint": "^8.19.0",
"just-scripts": "^1.3.3",
"react-native": "0.80.0-nightly-20250506-3ac16dd6a",
"react-native": "0.81.0-nightly-20250521-3cb70bb6a",
"react-native-platform-override": "^1.9.56",
"typescript": "5.0.4"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

import RNTesterText from './RNTesterText';
import React from 'react';
import {memo} from 'react';
import {
ActivityIndicator,
Animated,
Expand Down Expand Up @@ -164,7 +165,7 @@ class SeparatorComponent extends React.PureComponent<{...}> {
}
}

const LoadingComponent: React.ComponentType<{}> = React.memo(() => (
const LoadingComponent: React.ComponentType<{}> = memo(() => (
<View style={styles.loadingContainer}>
<ActivityIndicator />
</View>
Expand Down
2 changes: 1 addition & 1 deletion packages/@office-iss/react-native-win32/.flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -174,4 +174,4 @@ untyped-import
untyped-type-import

[version]
^0.269.1
^0.271.0
40 changes: 20 additions & 20 deletions packages/@office-iss/react-native-win32/overrides.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@
"**/__snapshots__/**",
"src-win/rntypes/**"
],
"baseVersion": "0.80.0-nightly-20250506-3ac16dd6a",
"baseVersion": "0.81.0-nightly-20250521-3cb70bb6a",
"overrides": [
{
"type": "derived",
"file": ".flowconfig",
"baseFile": ".flowconfig",
"baseHash": "70ed729d5f52c241530e8459cc40263d4e9fa9c0"
"baseHash": "dbea35126905a8314fa0a64ed2912896bc6d307b"
},
{
"type": "derived",
"file": "src-win/index.win32.js",
"baseFile": "packages/react-native/index.js",
"baseHash": "96361b83bfc122f1d78cc7d87ea0d7c3bfac138f"
"baseHash": "b447e699186ab3e95da9dc4520b9c2517776e723"
},
{
"type": "platform",
Expand Down Expand Up @@ -60,7 +60,7 @@
"type": "derived",
"file": "src-win/Libraries/Components/Button.win32.js",
"baseFile": "packages/react-native/Libraries/Components/Button.js",
"baseHash": "4e77e13aa5774e813fbd874a13a920ea12e3ed91"
"baseHash": "6063d726e6255d1c55e07587f9ce09f1b7284301"
},
{
"type": "platform",
Expand All @@ -85,14 +85,14 @@
"type": "patch",
"file": "src-win/Libraries/Components/Pressable/Pressable.win32.js",
"baseFile": "packages/react-native/Libraries/Components/Pressable/Pressable.js",
"baseHash": "96bdd4aebf4133fd2fe6d1b448f9d7b4cd3e8982",
"baseHash": "eff51d201199c68c6f7ca268e315e538dcc01ab9",
"issue": 6240
},
{
"type": "patch",
"file": "src-win/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.js",
"baseFile": "packages/react-native/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.js",
"baseHash": "c96925930d9664306a8aef8b4102c43055ea03be"
"baseHash": "d1cc663442d184b62799b748c475a5a2c5c558c7"
},
{
"type": "copy",
Expand All @@ -108,13 +108,13 @@
"type": "derived",
"file": "src-win/Libraries/Components/TextInput/TextInput.flow.win32.js",
"baseFile": "packages/react-native/Libraries/Components/TextInput/TextInput.flow.js",
"baseHash": "f407548782cade71af32a52ecb440f72a403f06e"
"baseHash": "b611f4e98e9c7818dfac087e4f14384d3cc16b6a"
},
{
"type": "derived",
"file": "src-win/Libraries/Components/TextInput/TextInput.win32.js",
"baseFile": "packages/react-native/Libraries/Components/TextInput/TextInput.js",
"baseHash": "9965c0079652083ab549bc2799eb9528b56a1b2d"
"baseHash": "2a5835c5cbdb36bd110e26f9be737aaaeb1fd97c"
},
{
"type": "patch",
Expand Down Expand Up @@ -153,7 +153,7 @@
"type": "derived",
"file": "src-win/Libraries/Components/Touchable/TouchableNativeFeedback.win32.js",
"baseFile": "packages/react-native/Libraries/Components/Touchable/TouchableNativeFeedback.js",
"baseHash": "8706705c1f8d3dd5390ea631ce5ae60e300ae50d"
"baseHash": "1cad0522ba348d657e7857bf84628d88e776170b"
},
{
"type": "platform",
Expand All @@ -177,7 +177,7 @@
"type": "patch",
"file": "src-win/Libraries/Components/View/View.win32.js",
"baseFile": "packages/react-native/Libraries/Components/View/View.js",
"baseHash": "2dd3e58cf6c4bc0882550eedd8150435972365eb"
"baseHash": "121c2126d26c94c8e508e3fb19ffe33f7be814b1"
},
{
"type": "derived",
Expand Down Expand Up @@ -218,7 +218,7 @@
"type": "patch",
"file": "src-win/Libraries/Core/Devtools/loadBundleFromServer.win32.js",
"baseFile": "packages/react-native/Libraries/Core/Devtools/loadBundleFromServer.js",
"baseHash": "e0158fd16d4a787e5a94d69e2b7a721e81b7c3da",
"baseHash": "ac08c96a4bebd677597a40ea1525a2d5d1ee8742",
"issue": 12704
},
{
Expand All @@ -236,7 +236,7 @@
"type": "derived",
"file": "src-win/Libraries/Image/Image.win32.js",
"baseFile": "packages/react-native/Libraries/Image/Image.ios.js",
"baseHash": "c0bc913aa95b6d1309ba44ef7968ba58fc488427",
"baseHash": "5d62f4a6c4edfe3007eb3b80704a1dfb68e5ff8a",
"issue": 4320
},
{
Expand Down Expand Up @@ -303,13 +303,13 @@
"type": "derived",
"file": "src-win/Libraries/LogBox/UI/LogBoxInspectorReactFrames.win32.js",
"baseFile": "packages/react-native/Libraries/LogBox/UI/LogBoxInspectorReactFrames.js",
"baseHash": "3a3d7da499937cce35c9bd17a11f10b2eeac04cc"
"baseHash": "cdf958aebabbe9067d34a2df3e6f2fe7ce09f51e"
},
{
"type": "derived",
"file": "src-win/Libraries/LogBox/UI/LogBoxInspectorSourceMapStatus.win32.js",
"baseFile": "packages/react-native/Libraries/LogBox/UI/LogBoxInspectorSourceMapStatus.js",
"baseHash": "b355418205aa52cf33fb7e4d521b26083eada49d"
"baseHash": "987653809d7838bb80d3a975abc9f0fd3bc13d93"
},
{
"type": "derived",
Expand Down Expand Up @@ -412,13 +412,13 @@
"type": "derived",
"file": "src-win/Libraries/Text/Text.d.ts",
"baseFile": "packages/react-native/Libraries/Text/Text.d.ts",
"baseHash": "b5f44957bc61497fcb7203934bdbc6ca9725cf42"
"baseHash": "d3807571f477ef8ba4bb20c1ee899b1a5814941d"
},
{
"type": "derived",
"file": "src-win/Libraries/Text/Text.win32.js",
"baseFile": "packages/react-native/Libraries/Text/Text.js",
"baseHash": "1f802db19830e468b84640fc5c7740a11e154250"
"baseHash": "108e59816ed3b3c8183d0687a66088755580c00d"
},
{
"type": "derived",
Expand All @@ -431,7 +431,7 @@
"type": "derived",
"file": "src-win/Libraries/Text/TextProps.win32.js",
"baseFile": "packages/react-native/Libraries/Text/TextProps.js",
"baseHash": "d31f973c14140792d9d28d208fca15d092a8a4e2"
"baseHash": "6ee62a1b3a4384c2b5bd1dd10a13664c72e5dc88"
},
{
"type": "patch",
Expand Down Expand Up @@ -477,7 +477,7 @@
"type": "patch",
"file": "src-win/Libraries/Utilities/PlatformTypes.js",
"baseFile": "packages/react-native/Libraries/Utilities/PlatformTypes.js",
"baseHash": "0bd36210528f74f9081d858c9ab64ead92c54950",
"baseHash": "8beb4d8d786f33f9eeb6edcff939c38765e19055",
"issue": 14686
},
{
Expand All @@ -490,14 +490,14 @@
"type": "patch",
"file": "src-win/src/private/animated/NativeAnimatedHelper.win32.js",
"baseFile": "packages/react-native/src/private/animated/NativeAnimatedHelper.js",
"baseHash": "3247a8e436a7beeda45ce7d77343229b5204cbfc",
"baseHash": "e897f1bd33ed982044b97a01d9f606b9ebcd4505",
"issue": 11041
},
{
"type": "copy",
"file": "src-win/src/private/devsupport/rndevtools/ReactDevToolsSettingsManager.win32.js",
"baseFile": "packages/react-native/src/private/devsupport/rndevtools/ReactDevToolsSettingsManager.android.js",
"baseHash": "2d33789b0c7a45996dc23f26c4b09fb2026a9285"
"baseHash": "f2cc01b07b779b75002daec9c2761616ad01f4ca"
},
{
"type": "derived",
Expand Down
2 changes: 1 addition & 1 deletion packages/@office-iss/react-native-win32/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
"just-scripts": "^1.3.3",
"prettier": "2.8.8",
"react": "19.1.0",
"react-native": "0.80.0-nightly-20250506-3ac16dd6a",
"react-native": "0.81.0-nightly-20250521-3cb70bb6a",
"react-native-platform-override": "^1.9.56",
"typescript": "5.0.4"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -288,10 +288,10 @@ const Touchable: typeof TouchableNativeFeedback | typeof TouchableOpacity =

type ButtonRef = React.ElementRef<typeof Touchable>;

const Button: component(
ref?: React.RefSetter<ButtonRef>,
...props: ButtonProps
) = React.forwardRef((props: ButtonProps, ref: React.RefSetter<ButtonRef>) => {
const Button = React.forwardRef(function Button(
props: ButtonProps,
ref: React.RefSetter<ButtonRef>,
) {
// Win32
const {
accessibilityLabel,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import useAndroidRippleForView, {
type PressableAndroidRippleConfig,
} from './useAndroidRippleForView';
import * as React from 'react';
import {useMemo, useRef, useState} from 'react';
import {memo, useMemo, useRef, useState} from 'react';
import type {HandledKeyboardEvent} from '../../Components/View/ViewPropTypes';
import View from '../View/View';

Expand Down Expand Up @@ -211,10 +211,13 @@ type Instance = React.ElementRef<typeof View>;
* Component used to build display components that should respond to whether the
* component is currently pressed or not.
*/
function Pressable(
props: PressableProps,
forwardedRef: React.RefSetter<Instance>,
): React.Node {
function Pressable({
ref: forwardedRef,
...props
}: {
ref?: React.RefSetter<Instance>,
...PressableProps,
}): React.Node {
const {
accessible,
accessibilityState,
Expand Down Expand Up @@ -398,7 +401,7 @@ function usePressState(forcePressed: boolean): [boolean, (boolean) => void] {
return [pressed || forcePressed, setPressed];
}

const MemoedPressable = React.memo(React.forwardRef(Pressable));
const MemoedPressable = memo(Pressable);
MemoedPressable.displayName = 'Pressable';

export default (MemoedPressable: component(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,23 @@ import Platform from '../../Utilities/Platform';

export type {ProgressBarAndroidProps};

// A utility type to preserve the semantics of the union uses in the definition
// 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;

/**
* ProgressBarAndroid has been extracted from react-native core and will be removed in a future release.
* It can now be installed and imported from `@react-native-community/progress-bar-android` instead of 'react-native'.
* @see https://github.com/react-native-community/progress-bar-android
* @deprecated
*/
let ProgressBarAndroid: component(
ref?: React.RefSetter<
React.ElementRef<ProgressBarAndroidNativeComponentType>,
>,
...props: ProgressBarAndroidProps
...props: Omit<ProgressBarAndroidProps, empty>
);

if (Platform.OS === 'android') {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,7 @@ import type {
} from '../../Types/CoreEventTypes';
import type {ViewProps} from '../View/ViewPropTypes';

import {
type ColorValue,
type TextStyleProp,
type ViewStyleProp,
} from '../../StyleSheet/StyleSheet';
import {type ColorValue, type TextStyleProp} from '../../StyleSheet/StyleSheet';
import * as React from 'react';

/**
Expand Down
Loading
Loading