Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
ab397d0
updating @react-native-community/template
Nov 12, 2025
ff4a509
adding changes with conflicts
Nov 12, 2025
9c69bd6
resolving conficlts in monorepo
Nov 12, 2025
d6f2273
resolving confincts
Nov 12, 2025
bde8aa0
adding lint fix
Nov 12, 2025
52f9026
Change files
Nov 12, 2025
68cb23b
adding header changes
Nov 12, 2025
3cec31d
changing vcxprof file
Nov 12, 2025
9769f2f
Revert "changing vcxprof file"
Nov 12, 2025
17229bc
adding vcxprof files
Nov 13, 2025
557a7e1
Merge branch 'main' into user/protikbiswas100/integrate-nighlty-20250819
protikbiswas100 Nov 13, 2025
362fe0d
adding vcxprof files again
Nov 13, 2025
155caf3
Merge branch 'main' into user/protikbiswas100/integrate-nighlty-20250819
protikbiswas100 Nov 13, 2025
167f5c2
adding final changes
Nov 13, 2025
b150ffa
Merge branch 'user/protikbiswas100/integrate-nighlty-20250819' of htt…
Nov 13, 2025
65f66f8
Merge branch 'main' into user/protikbiswas100/integrate-nighlty-20250819
protikbiswas100 Nov 13, 2025
a1191be
Merge branch 'main' into user/protikbiswas100/integrate-nighlty-20250819
protikbiswas100 Nov 14, 2025
c08baa9
reevert AcessibilityPrimitives.h
Nov 14, 2025
dc2f156
adding vcxproj changes to suppress C220 warning
Nov 14, 2025
f65919f
Merge branch 'user/protikbiswas100/integrate-nighlty-20250819' of htt…
Nov 14, 2025
f8e368b
adding accessiblityPrimitives.h changes
Nov 14, 2025
fb4337d
updating flowconfig
Nov 14, 2025
0012574
updating flowconfig to fix linting error
Nov 14, 2025
36b7d32
adding tester file changes
Nov 14, 2025
30f88d1
adding lint fixes
Nov 14, 2025
a9b18b5
Merge branch 'main' into user/protikbiswas100/integrate-nighlty-20250819
protikbiswas100 Nov 17, 2025
416f7a0
adding windows comments and specifying issue number in overrides file
Nov 17, 2025
d50cee3
Merge branch 'user/protikbiswas100/integrate-nighlty-20250819' of htt…
Nov 17, 2025
75d40e4
Merge branch 'main' into user/protikbiswas100/integrate-nighlty-20250819
protikbiswas100 Nov 17, 2025
b81412f
adding testr overrides
Nov 17, 2025
d76cbaf
Merge branch 'user/protikbiswas100/integrate-nighlty-20250819' of htt…
Nov 17, 2025
c5107ac
adding vnext overrides
Nov 17, 2025
decca5d
Downgrade flow-bin version in package.json
protikbiswas100 Nov 17, 2025
2bf2354
updating package.lock.json
Nov 18, 2025
5864846
Merge branch 'user/protikbiswas100/integrate-nighlty-20250819' of htt…
Nov 18, 2025
d15c428
updating yarn.lock
Nov 18, 2025
5ab3f8e
adding lint fixes
Nov 18, 2025
ae59c58
Merge branch 'main' into user/protikbiswas100/integrate-nighlty-20250819
protikbiswas100 Nov 18, 2025
6a8b672
Change files
Nov 18, 2025
ce8fa22
Merge branch 'main' into user/protikbiswas100/integrate-nighlty-20250819
protikbiswas100 Nov 18, 2025
e0d7d6b
adding lock file changes
Nov 18, 2025
3f7acd7
Merge branch 'user/protikbiswas100/integrate-nighlty-20250819' of htt…
Nov 18, 2025
ea59e74
deleting package.lock.json
Nov 18, 2025
a5042c9
Remove lock files from gitignore
Nov 18, 2025
e2ec6b1
Revert "Remove lock files from gitignore"
Nov 18, 2025
625438f
changing package.lock.json
Nov 19, 2025
8877a19
Update WinAppSdk to 1.8 (#15381)
acoates-ms Nov 18, 2025
5266259
Tooltip positioned incorrectly on non 100% scale factor (#15382)
acoates-ms Nov 18, 2025
4e8ec62
Merge branch 'main' into user/protikbiswas100/integrate-nighlty-20250819
protikbiswas100 Nov 19, 2025
be4333e
Merge branch 'main' into user/protikbiswas100/integrate-nighlty-20250819
protikbiswas100 Nov 19, 2025
9dd8bee
Merge branch 'main' into user/protikbiswas100/integrate-nighlty-20250819
protikbiswas100 Nov 20, 2025
3d8d96f
adding reactnativeislnad changes
Nov 20, 2025
6c13749
adding ReactNativeIsland,cpp chnages
Nov 20, 2025
386a403
adding extra lines
Nov 20, 2025
4815fac
Merge branch 'user/protikbiswas100/integrate-nighlty-20250819' of htt…
Nov 20, 2025
6c704be
Fix formatting in ReactNativeIsland.cpp
Nov 20, 2025
cf6ebff
fix header files
Nov 20, 2025
365dc58
adding cpp changes
Nov 20, 2025
be69843
Merge branch 'main' into user/protikbiswas100/integrate-nighlty-20250819
protikbiswas100 Nov 20, 2025
60d6ad6
Revert deletion of fmt/packages.lock.json
Nov 20, 2025
a73493c
Update yarn.lock
Nov 20, 2025
821506e
adding lock.json files
Nov 20, 2025
40bacc2
removing deprecated APIs
Nov 20, 2025
81a9c04
Add missing NuGet lock files
Nov 20, 2025
138df9f
adding package.lock.json changes
Nov 20, 2025
e2f7aee
Update ADO pipeline to use latest VS 2022 version
Nov 21, 2025
957fc6a
Updating msbuild version
Nov 21, 2025
9119c0a
adding package.lock.json
Nov 21, 2025
ec51cac
Revert deletion of Microsoft.ReactNative.Cxx.UnitTests packages.lock.…
Nov 21, 2025
3e10b12
Merge branch 'main' into user/protikbiswas100/integrate-nighlty-20250819
protikbiswas100 Nov 21, 2025
4ec13d4
Run NuGetRestoreForceEvaluateAllSolutions.ps1 on VS2022
vineethkuttan Nov 21, 2025
5e39196
Merge branch 'main' into user/protikbiswas100/integrate-nighlty-20250819
vineethkuttan Nov 21, 2025
ad1df4a
update sample package json
vineethkuttan Nov 21, 2025
2946bd4
update yarn.lock
vineethkuttan Nov 21, 2025
0024783
update sample package.lock.json
vineethkuttan Nov 21, 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
2 changes: 1 addition & 1 deletion .ado/templates/msbuild-sln.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ parameters:
# NuGet & MSBuild
solutionDir:
solutionName:
msbuildVersion: 17.0
msbuildVersion: 17.14.21
msBuildArchitecture: x64
preferredToolArchitecture: x64
platformToolset: v143
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"comment": "integrate react native",
"type": "prerelease",
"packageName": "@office-iss/react-native-win32",
"email": "protikbiswas100@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Merge branch 'main' into user/protikbiswas100/integrate-nighlty-20250819",
"packageName": "@react-native-windows/automation",
"email": "protikbiswas100@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"comment": "integrate automation channel",
"type": "prerelease",
"packageName": "@react-native-windows/automation-channel",
"email": "protikbiswas100@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Merge branch 'main' into user/protikbiswas100/integrate-nighlty-20250819",
"packageName": "@react-native-windows/automation-commands",
"email": "protikbiswas100@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Merge branch 'main' into user/protikbiswas100/integrate-nighlty-20250819",
"packageName": "@react-native-windows/cli",
"email": "protikbiswas100@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Merge branch 'main' into user/protikbiswas100/integrate-nighlty-20250819",
"packageName": "@react-native-windows/codegen",
"email": "protikbiswas100@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Merge branch 'main' into user/protikbiswas100/integrate-nighlty-20250819",
"packageName": "@react-native-windows/find-repo-root",
"email": "protikbiswas100@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Merge branch 'main' into user/protikbiswas100/integrate-nighlty-20250819",
"packageName": "@react-native-windows/fs",
"email": "protikbiswas100@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Merge branch 'main' into user/protikbiswas100/integrate-nighlty-20250819",
"packageName": "@react-native-windows/package-utils",
"email": "protikbiswas100@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Merge branch 'main' into user/protikbiswas100/integrate-nighlty-20250819",
"packageName": "@react-native-windows/telemetry",
"email": "protikbiswas100@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Merge branch 'main' into user/protikbiswas100/integrate-nighlty-20250819",
"packageName": "@rnw-scripts/create-github-releases",
"email": "protikbiswas100@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Merge branch 'main' into user/protikbiswas100/integrate-nighlty-20250819",
"packageName": "@rnw-scripts/doxysaurus",
"email": "protikbiswas100@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Merge branch 'main' into user/protikbiswas100/integrate-nighlty-20250819",
"packageName": "@rnw-scripts/format-files",
"email": "protikbiswas100@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"comment": "adding changes with conflicts",
"type": "prerelease",
"packageName": "@rnw-scripts/integrate-rn",
"email": "protikbiswas100@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Merge branch 'main' into user/protikbiswas100/integrate-nighlty-20250819",
"packageName": "@rnw-scripts/just-task",
"email": "protikbiswas100@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Merge branch 'main' into user/protikbiswas100/integrate-nighlty-20250819",
"packageName": "@rnw-scripts/promote-release",
"email": "protikbiswas100@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Merge branch 'main' into user/protikbiswas100/integrate-nighlty-20250819",
"packageName": "@rnw-scripts/take-screenshot",
"email": "protikbiswas100@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"comment": "resolving confincts",
"type": "prerelease",
"packageName": "react-native-platform-override",
"email": "protikbiswas100@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"comment": "adding lint fix",
"type": "prerelease",
"packageName": "react-native-windows",
"email": "protikbiswas100@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Merge branch 'main' into user/protikbiswas100/integrate-nighlty-20250819",
"packageName": "react-native-windows-init",
"email": "protikbiswas100@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"excludePatterns": [
"src/js/examples-win32/**"
],
"baseVersion": "0.82.0-nightly-20250806-5936f29d6",
"baseVersion": "0.82.0-nightly-20250819-25104de5c",
"overrides": [
{
"type": "patch",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"@types/node": "^22.14.0",
"eslint": "^8.19.0",
"just-scripts": "^1.3.3",
"react-native": "0.82.0-nightly-20250806-5936f29d6",
"react-native": "0.82.0-nightly-20250819-25104de5c",
"react-native-platform-override": "^1.9.61",
"typescript": "5.0.4"
},
Expand Down
3 changes: 2 additions & 1 deletion packages/@office-iss/react-native-win32/.flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ module.system.haste.module_ref_prefix=m#

react.runtime=automatic

experimental.error_code_migration=new
suppress_type=$FlowFixMe

ban_spread_key_props=true
Expand Down Expand Up @@ -177,4 +178,4 @@ untyped-import
untyped-type-import

[version]
^0.278.0
^0.279.0
28 changes: 14 additions & 14 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.82.0-nightly-20250806-5936f29d6",
"baseVersion": "0.82.0-nightly-20250819-25104de5c",
"overrides": [
{
"type": "derived",
"file": ".flowconfig",
"baseFile": ".flowconfig",
"baseHash": "373bd1b0dfbd85e02605d9526e7b08b41a67435f"
"baseHash": "85187f6c2ae01185505e2dc8d14587e9e887e519"
},
{
"type": "derived",
"file": "src-win/index.win32.js",
"baseFile": "packages/react-native/index.js",
"baseHash": "e4e8dc864521ce28adf8cfa2fb29059484206a05"
"baseHash": "88aa62f2d86a810631bcbc871f45c28c53fceec7"
},
{
"type": "platform",
Expand All @@ -41,7 +41,7 @@
"type": "derived",
"file": "src-win/Libraries/Components/AccessibilityInfo/AccessibilityInfo.win32.js",
"baseFile": "packages/react-native/Libraries/Components/AccessibilityInfo/AccessibilityInfo.js",
"baseHash": "692b825d9db6a6da9c3ae9595e4dfb5c202b879d"
"baseHash": "b77b87e32a86265a3c8c29ebbbee46558596aec8"
},
{
"type": "copy",
Expand All @@ -60,7 +60,7 @@
"type": "derived",
"file": "src-win/Libraries/Components/Button.win32.js",
"baseFile": "packages/react-native/Libraries/Components/Button.js",
"baseHash": "5b293a6dbfdf16309c7cbfe71d61f143fa9fa2a2"
"baseHash": "26d3afc77f82939021f848eb8185b3b441fb3c7d"
},
{
"type": "platform",
Expand Down Expand Up @@ -114,7 +114,7 @@
"type": "derived",
"file": "src-win/Libraries/Components/TextInput/TextInput.win32.js",
"baseFile": "packages/react-native/Libraries/Components/TextInput/TextInput.js",
"baseHash": "d6f92b47afedf2e31f4066e50c2900477c4d6c31"
"baseHash": "ed5d48ce62056182bf81dfa2d22d511d611d5201"
},
{
"type": "patch",
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": "ac08c96a4bebd677597a40ea1525a2d5d1ee8742",
"baseHash": "5177ecc736e9bebd4e798dcc2c6dd19c38b0a937",
"issue": 12704
},
{
Expand Down Expand Up @@ -309,7 +309,7 @@
"type": "derived",
"file": "src-win/Libraries/LogBox/UI/LogBoxInspectorSourceMapStatus.win32.js",
"baseFile": "packages/react-native/Libraries/LogBox/UI/LogBoxInspectorSourceMapStatus.js",
"baseHash": "987653809d7838bb80d3a975abc9f0fd3bc13d93"
"baseHash": "ccbfc8413dc7bd26eb7bc9726b273f1cf23b1c70"
},
{
"type": "derived",
Expand All @@ -335,7 +335,7 @@
"type": "copy",
"file": "src-win/Libraries/Network/RCTNetworking.win32.js",
"baseFile": "packages/react-native/Libraries/Network/RCTNetworking.ios.js",
"baseHash": "975cb78ed40d162be73144bafcaee9bcd057bd44",
"baseHash": "1c7dcc3e3cf7339c3450e7722b7b0a355266a001",
"issue": 4318
},
{
Expand Down Expand Up @@ -425,13 +425,13 @@
"type": "derived",
"file": "src-win/Libraries/Text/Text.win32.js",
"baseFile": "packages/react-native/Libraries/Text/Text.js",
"baseHash": "fb6f5390b49eb22085ac1618becde3a5208ba167"
"baseHash": "14367e55fca8889783f7dea94ec2c09205960c3c"
},
{
"type": "derived",
"file": "src-win/Libraries/Text/TextNativeComponent.win32.js",
"baseFile": "packages/react-native/Libraries/Text/TextNativeComponent.js",
"baseHash": "4af82705ca22b281344c1e7f0c7b06b6fc3264c5",
"baseHash": "259a625b5f7cf3a70ecd4af6388d82d47f446e50",
"issue": 7074
},
{
Expand Down Expand Up @@ -478,13 +478,13 @@
"type": "derived",
"file": "src-win/Libraries/Utilities/Platform.win32.js",
"baseFile": "packages/react-native/Libraries/Utilities/Platform.android.js",
"baseHash": "d3c78d9d5e43a65ec67505b84a1f25f1647530c8"
"baseHash": "6497ec623691b34885e226e4d05bc55ba582a135"
},
{
"type": "patch",
"file": "src-win/Libraries/Utilities/PlatformTypes.js",
"baseFile": "packages/react-native/Libraries/Utilities/PlatformTypes.js",
"baseHash": "c2f607691db07cf1d43c42d048e8513b5515757b",
"baseHash": "f4859039e2bf991ff60d38308c25456ec752191f",
"issue": 14686
},
{
Expand All @@ -497,7 +497,7 @@
"type": "patch",
"file": "src-win/src/private/animated/NativeAnimatedHelper.win32.js",
"baseFile": "packages/react-native/src/private/animated/NativeAnimatedHelper.js",
"baseHash": "ecb4418a11a56257962be8ca273d3dbfb7d9862c",
"baseHash": "c3fdc3d1e9879c6fe03a1a5caad7b02b386ddcde",
"issue": 11041
},
{
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.82.0-nightly-20250806-5936f29d6",
"react-native": "0.82.0-nightly-20250819-25104de5c",
"react-native-platform-override": "^1.9.61",
"typescript": "5.0.4"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ const AccessibilityInfo = {
const deviceEventName = EventNames.get(eventName);
return deviceEventName == null
? {remove(): void {}}
: // $FlowFixMe[incompatible-call]
: // $FlowFixMe[incompatible-type]
RCTDeviceEventEmitter.addListener(deviceEventName, handler);
},

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ const Button: component(
touchSoundDisabled={touchSoundDisabled}
// $FlowFixMe[incompatible-exact]
// $FlowFixMe[prop-missing]
// $FlowFixMe[incompatible-type-arg]
// $FlowFixMe[incompatible-type]
ref={ref}>
<View style={buttonStyles}>
<Text style={textStyles} disabled={disabled}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@ function InternalTextInput(props: TextInputProps): React.Node {
[mostRecentEventCount, viewCommands],
);

// $FlowExpectedError[incompatible-call]
// $FlowExpectedError[incompatible-type]
const ref = useMergeRefs<HostInstance>(setLocalRef, props.forwardedRef);

const _onChange = (event: TextInputChangeEvent) => {
Expand Down Expand Up @@ -721,6 +721,9 @@ function InternalTextInput(props: TextInputProps): React.Node {
props.onKeyUpCapture && props.onKeyUpCapture(event);
};

const _accessibilityLabel =
props?.['aria-label'] ?? props?.accessibilityLabel;

let _accessibilityState;
if (
accessibilityState != null ||
Expand Down Expand Up @@ -752,7 +755,7 @@ function InternalTextInput(props: TextInputProps): React.Node {
if (typeof flattenedStyle?.fontWeight === 'number') {
overrides = overrides || ({}: {...TextStyleInternal});
overrides.fontWeight =
// $FlowFixMe[incompatible-cast]
// $FlowFixMe[incompatible-type]
(flattenedStyle.fontWeight.toString(): TextStyleInternal['fontWeight']);
}

Expand Down Expand Up @@ -789,6 +792,7 @@ function InternalTextInput(props: TextInputProps): React.Node {
{...otherProps}
{...eventHandlers}
acceptDragAndDropTypes={props.experimental_acceptDragAndDropTypes}
accessibilityLabel={_accessibilityLabel}
accessibilityErrorMessage={accessibilityErrorMessage}
accessibilityState={_accessibilityState}
accessible={accessible}
Expand Down Expand Up @@ -853,6 +857,7 @@ function InternalTextInput(props: TextInputProps): React.Node {
{...otherProps}
{...colorProps}
{...eventHandlers}
accessibilityLabel={_accessibilityLabel}
accessibilityErrorMessage={accessibilityErrorMessage}
accessibilityState={_accessibilityState}
accessibilityLabelledBy={_accessibilityLabelledBy}
Expand All @@ -873,7 +878,7 @@ function InternalTextInput(props: TextInputProps): React.Node {
/* $FlowFixMe[prop-missing] the types for AndroidTextInput don't match
* up exactly with the props for TextInput. This will need to get fixed
*/
/* $FlowFixMe[incompatible-type-arg] the types for AndroidTextInput
/* $FlowFixMe[incompatible-type] the types for AndroidTextInput
* don't match up exactly with the props for TextInput. This will need
* to get fixed */
onScroll={_onScroll}
Expand Down
Loading
Loading