Skip to content

Integrate RN 0.85.0-nightly-20260128-36f07a1b2#16245

Open
anuagragith wants to merge 6 commits into
mainfrom
integrate-0.85.0-nightly-20260128-36f07a1b2-v3
Open

Integrate RN 0.85.0-nightly-20260128-36f07a1b2#16245
anuagragith wants to merge 6 commits into
mainfrom
integrate-0.85.0-nightly-20260128-36f07a1b2-v3

Conversation

@anuagragith

@anuagragith anuagragith commented Jun 10, 2026

Copy link
Copy Markdown
Contributor

Description

Integrate RN Nightly Build 0.85.0-nightly-20260128-36f07a1b2 - This PR integrates React Native Windows with a newer upstream React Native nightly build (Jan 28, 2026), advancing from the previous checkpoint of Jan 14, 2026. RNW is currently several months behind the latest RN nightly, so we are catching up in +14 day increments. This is the first PR in a series of catch-up integrations to bring RNW back to parity with the latest RN nightlies.

Please note:

This is my first attempt at RN → RNW integration. I used the integration script as a starting point and leveraged AI to help resolve merge conflicts, build issues, and linker errors, while reviewing and validating the resulting changes throughout the process.

In addition to ensuring the solution builds successfully, I validated the Playground app, including most controls and scenarios. Paid particular attention to the Text page, which had significant merge conflicts, and everything appears to be functioning correctly based on my testing.

Given the scope of the changes and the amount of conflict resolution involved, I'd appreciate a thorough review - especially for packages/@office-iss/react-native-win32/src-win/Libraries/Text/Text.win32.js to help catch anything that may have been inadvertently missed. Adding multiple reviewers to provide broader coverage across the different areas impacted by this integration. Thank you for taking a look.

Integration Details:

  • Previous version: 0.85.0-nightly-20260114-f15985f4f
  • New version: 0.85.0-nightly-20260128-36f07a1b2
  • Date range: 2026-01-14 → 2026-01-28

Commit range: react/react-native@f15985f...36f07a1

Type of Change

  • New feature (non-breaking change which adds functionality)

Why

Staying current with upstream ensures we pick up bug fixes, API changes, and performance improvements from core React Native, and reduces the risk of large, painful integrations later.

What

Integrate RN Nightly Build 0.85.0-nightly-20260128-36f07a1b2

Screenshots

N/A

Testing

Javascript validation:
yarn build (lage monorepo) — All packages pass
yarn lint (ESLint) — 0 errors (21 pre-existing warnings)
node --check on all resolved files — No syntax errors
No conflict markers in repo — Confirmed via grep
Metro bundle loads successfully — JS bundle served at localhost:8081
⚠️ Flow — Version mismatch (pre-existing): config requires ^0.298.0, installed version is 0.296.1

Native Build Validation:
✅ NuGet restore — Passed
✅ ReactCommon.vcxproj compile — Passed
Included MapBuffer C4267 suppression
Included AnimationBackend source files
✅ Microsoft.ReactNative.vcxproj compile — Passed
✅ Microsoft.ReactNative.vcxproj link — Passed
AnimationBackend symbols resolved successfully
✅ Playground-Composition.vcxproj compile — Passed
✅ Full solution build — Build succeeded

Playground App Validation:
✅ App launch (playground-composition) — Successful
✅ Metro bundler — Serving JavaScript correctly
✅ File → Open JavaScript File → RNTester samples — Loads successfully

Changelog

Should this change be included in the release notes: no

Microsoft Reviewers: Open in CodeFlow
Microsoft Reviewers: Open in CodeFlow

Includes:
- Full nightly integration with conflict resolution
- Fix C++ compile errors from nightly integration
- Fix AnimationBackend linker errors from nightly integration
- Fix X86 build (suppress C4018 signed/unsigned mismatch in MapBuffer.cpp)
- Sync stale copy overrides in @react-native/tester
- Update yarn.lock and add change files

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Anukrati Agrawal and others added 3 commits June 10, 2026 15:34
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
- snapshotPages Text 33: Add new FiraCode font variant examples
- TextComponentTest borders: Adjust visual tree sizes (138→139, 20→19)
- TouchableComponentTest: Add PositionInSet/SizeofSet accessibility props

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…tly pinning

The nightly fixup regex in creaternwlib.cmd and creaternwapp.cmd was replacing
all @react-native/*-config and *-preset package versions with the exact nightly
version. However, @react-native/jest-preset was not published until Feb 2026
(earliest: 0.85.0-nightly-20260219), while our target nightly is from Jan 2026
(0.85.0-nightly-20260128-36f07a1b2). This caused yarn install to fail with
'No candidates found'.

Fix: Add a negative lookahead (?!jest-preset) to skip this package. It will
remain at the 'nightly' dist-tag which resolves to a valid version.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@anuagragith anuagragith requested a review from a team as a code owner June 11, 2026 19:28
@anuagragith

anuagragith commented Jun 11, 2026

Copy link
Copy Markdown
Contributor Author

/azp run #Resolved

@azure-pipelines

azure-pipelines Bot commented Jun 11, 2026

Copy link
Copy Markdown
Contributor
Azure Pipelines successfully started running 1 pipeline(s).

#Resolved

Comment thread vnext/ReactCommon/ReactCommon.vcxproj Outdated
Comment thread vnext/src-win/Libraries/Text/Text.windows.js

@JunielKatarn JunielKatarn Jun 12, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please provide context about changes in this file. #Resolved

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as Text.windows.js - just syncing with the upstream feature flag removal and new component syntax, while keeping the Win32-specific accessibility props intact, to the best of my understanding

Instead of suppressing SDL-mandatory warnings (which could break BinSkim),
create a local patched copy in TEMP_UntilReactCommonUpdate with proper
static_casts to fix signed/unsigned comparison warnings in upstream code.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

@vineethkuttan vineethkuttan left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add the issue number for the changes added to the fork file

networkAgentId_ = std::nullopt;
}
}

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Create a issue describing why these changes have been added and add the issue id here in the code
refer https://github.com/microsoft/react-native-windows/wiki/Integration-Process#overriding-files--errors-in-reactcommon

*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Create issue for this file also

@azure-pipelines

Copy link
Copy Markdown
Contributor
No pipelines are associated with this pull request.

- MapBuffer.cpp: #16261 (C4018/C4267 signed/unsigned fixes)
- AnimatedPropSerializer.cpp: #16262 (Windows Color struct conversion)
- NetworkIOAgent.cpp: #16263 (destructor and enableAgent/disableAgent API)

Added // [Windows #issue] comments and registered overrides in overrides.json
per integration process guidelines.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@github-actions

Copy link
Copy Markdown

Performance Test Results

Branch: integrate-0.85.0-nightly-20260128-36f07a1b2-v3
Commit: 9c8c8810
Time: 2026-06-16T19:45:33.455Z
Tests: 161/161 passed

✅ Passed

161 scenario(s) across 28 suite(s) — no regressions

SectionList

Scenario Mean Median StdDev Renders vs Baseline
SectionList mount 4.80ms 5.00ms ±0.63ms 1 +0.0%
SectionList unmount 0.20ms 0.00ms ±0.42ms 0 +0.0%
SectionList rerender 13.50ms 13.50ms ±1.58ms 2 +28.6%
SectionList with-3-sections-15-items 7.80ms 7.50ms ±2.15ms 1 +36.4%
SectionList with-5-sections-50-items 6.30ms 6.50ms ±1.34ms 1 +8.3%
SectionList with-10-sections-200-items 6.10ms 6.00ms ±1.20ms 1 +9.1%
SectionList with-20-sections-200-items 4.90ms 5.00ms ±1.29ms 1 +0.0%
SectionList with-section-separator 2.60ms 2.00ms ±1.65ms 1 +0.0%
SectionList with-item-separator 2.40ms 2.00ms ±0.70ms 1 +0.0%
SectionList with-header-footer 2.40ms 2.00ms ±1.65ms 1 +0.0%
SectionList with-section-footer 1.70ms 2.00ms ±0.48ms 1 +0.0%
SectionList with-sticky-section-headers 2.00ms 2.00ms ±0.47ms 1 +0.0%
SectionList with-empty-list 0.60ms 1.00ms ±0.52ms 1 +0.0%
SectionList with-50-sections-1000-items 1.60ms 2.00ms ±0.52ms 1 +0.0%

FlatList

Scenario Mean Median StdDev Renders vs Baseline
FlatList mount 4.30ms 4.00ms ±0.48ms 1 +0.0%
FlatList unmount 0.10ms 0.00ms ±0.32ms 0 +0.0%
FlatList rerender 10.50ms 10.00ms ±1.27ms 2 +11.1%
FlatList with-10-items 4.80ms 4.50ms ±1.62ms 1 +12.5%
FlatList with-100-items 5.30ms 5.00ms ±0.95ms 1 +0.0%
FlatList with-500-items 5.40ms 4.50ms ±1.84ms 1 +12.5%
FlatList with-1000-items 4.20ms 4.00ms ±0.92ms 1 +0.0%
FlatList horizontal 4.60ms 4.00ms ±2.01ms 1 -20.0%
FlatList with-separator 2.20ms 2.00ms ±0.42ms 1 +0.0%
FlatList with-header-footer 1.90ms 1.50ms ±1.52ms 1 -25.0%
FlatList with-empty-list 0.50ms 0.50ms ±0.53ms 1 +0.0%
FlatList with-get-item-layout 1.60ms 2.00ms ±0.52ms 1 +100.0%
FlatList inverted 1.40ms 1.00ms ±0.52ms 1 -33.3%
FlatList with-num-columns 3.30ms 3.00ms ±1.34ms 1 +0.0%

TouchableOpacity

Scenario Mean Median StdDev Renders vs Baseline
TouchableOpacity mount 0.80ms 1.00ms ±0.42ms 1 +0.0%
TouchableOpacity unmount 0.00ms 0.00ms ±0.00ms 0 +0.0%
TouchableOpacity rerender 1.20ms 1.00ms ±0.63ms 2 +0.0%
TouchableOpacity custom-active-opacity 0.80ms 1.00ms ±0.42ms 1 +0.0%
TouchableOpacity disabled 0.80ms 1.00ms ±0.42ms 1 +0.0%
TouchableOpacity with-all-handlers 0.50ms 0.50ms ±0.53ms 1 -50.0%
TouchableOpacity with-hit-slop 0.80ms 1.00ms ±0.42ms 1 +0.0%
TouchableOpacity with-delay 1.00ms 1.00ms ±1.15ms 1 +0.0%
TouchableOpacity nested 1.40ms 1.00ms ±0.52ms 1 +0.0%
TouchableOpacity multiple-10 6.40ms 6.00ms ±1.64ms 1 +0.0%
TouchableOpacity multiple-50 27.33ms 26.00ms ±3.74ms 1 -10.3%
TouchableOpacity multiple-100 39.20ms 43.00ms ±11.80ms 1 -14.0%

ScrollView

Scenario Mean Median StdDev Renders vs Baseline
ScrollView mount 0.40ms 0.00ms ±0.52ms 1 +0.0%
ScrollView unmount 0.00ms 0.00ms ±0.00ms 0 +0.0%
ScrollView rerender 0.60ms 1.00ms ±0.52ms 2 +0.0%
ScrollView children-20 3.60ms 3.00ms ±1.40ms 1 -25.0%
ScrollView children-100 17.07ms 16.00ms ±2.43ms 1 +0.0%
ScrollView horizontal 3.30ms 3.00ms ±0.67ms 1 -25.0%
ScrollView sticky-headers 3.10ms 3.00ms ±0.99ms 1 +0.0%
ScrollView scroll-indicators 1.10ms 1.00ms ±1.45ms 1 +0.0%
ScrollView nested 1.30ms 1.00ms ±0.48ms 1 +0.0%
ScrollView content-container-style 0.80ms 1.00ms ±0.42ms 1 +0.0%
ScrollView children-500 20.80ms 19.00ms ±3.08ms 1 +0.0%

TouchableHighlight

Scenario Mean Median StdDev Renders vs Baseline
TouchableHighlight mount 0.50ms 0.50ms ±0.53ms 1 +0.0%
TouchableHighlight unmount 0.00ms 0.00ms ±0.00ms 0 +0.0%
TouchableHighlight rerender 0.50ms 0.50ms ±0.53ms 2 -50.0%
TouchableHighlight custom-underlay-color 0.50ms 0.50ms ±0.53ms 1 +Infinity%
TouchableHighlight custom-active-opacity 0.40ms 0.00ms ±0.52ms 1 +0.0%
TouchableHighlight disabled 0.40ms 0.00ms ±0.52ms 1 +0.0%
TouchableHighlight with-all-handlers 0.40ms 0.00ms ±0.52ms 1 +0.0%
TouchableHighlight with-hit-slop 0.80ms 0.50ms ±1.23ms 1 +Infinity%
TouchableHighlight nested-touchables 0.80ms 1.00ms ±0.42ms 1 +0.0%
TouchableHighlight multiple-touchables-10 2.30ms 2.00ms ±0.82ms 1 -33.3%
TouchableHighlight multiple-touchables-50 14.40ms 13.50ms ±2.67ms 1 +8.0%
TouchableHighlight multiple-touchables-100 25.40ms 25.50ms ±4.20ms 1 +13.3%

Pressable

Scenario Mean Median StdDev Renders vs Baseline
Pressable mount 0.50ms 0.50ms ±0.53ms 1 +Infinity%
Pressable unmount 0.00ms 0.00ms ±0.00ms 0 +0.0%
Pressable rerender 0.60ms 1.00ms ±0.52ms 2 +100.0%
Pressable with-all-handlers 0.50ms 0.50ms ±0.53ms 1 +Infinity%
Pressable with-style-function 0.30ms 0.00ms ±0.48ms 1 +0.0%
Pressable disabled 0.30ms 0.00ms ±0.48ms 1 +0.0%
Pressable with-hit-slop 0.40ms 0.00ms ±0.52ms 1 +0.0%
Pressable nested 0.60ms 1.00ms ±0.52ms 1 +0.0%
Pressable multiple-10 3.53ms 3.00ms ±1.55ms 1 +0.0%
Pressable multiple-50 16.87ms 16.00ms ±1.73ms 1 +14.3%
Pressable multiple-100 17.47ms 13.00ms ±10.38ms 1 +8.3%

Modal

Scenario Mean Median StdDev Renders vs Baseline
Modal mount 0.30ms 0.00ms ±0.48ms 1 +0.0%
Modal unmount 0.00ms 0.00ms ±0.00ms 0 +0.0%
Modal rerender 0.20ms 0.00ms ±0.42ms 2 +0.0%
Modal slide-animation 0.30ms 0.00ms ±0.48ms 1 +0.0%
Modal fade-animation 0.30ms 0.00ms ±0.48ms 1 +0.0%
Modal transparent 0.40ms 0.00ms ±0.52ms 1 +0.0%
Modal with-callbacks 0.20ms 0.00ms ±0.42ms 1 +0.0%
Modal rich-content 1.90ms 2.00ms ±1.20ms 1 +0.0%
Modal with-accessibility 0.30ms 0.00ms ±0.48ms 1 +0.0%

Image

Scenario Mean Median StdDev Renders vs Baseline
Image mount 0.20ms 0.00ms ±0.42ms 1 +0.0%
Image unmount 0.00ms 0.00ms ±0.00ms 0 +0.0%
Image rerender 0.30ms 0.00ms ±0.48ms 2 +0.0%
Image with-resize-mode 0.30ms 0.00ms ±0.48ms 1 +0.0%
Image with-border-radius 0.20ms 0.00ms ±0.42ms 1 +0.0%
Image with-tint-color 0.20ms 0.00ms ±0.42ms 1 +0.0%
Image with-blur-radius 0.10ms 0.00ms ±0.32ms 1 +0.0%
Image with-accessibility 0.10ms 0.00ms ±0.32ms 1 +0.0%
Image multiple-10 1.00ms 1.00ms ±0.00ms 1 +0.0%
Image multiple-50 3.93ms 4.00ms ±1.22ms 1 +33.3%
Image multiple-100 8.67ms 8.00ms ±1.11ms 1 +0.0%

ActivityIndicator

Scenario Mean Median StdDev Renders vs Baseline
ActivityIndicator mount 0.20ms 0.00ms ±0.42ms 1 +0.0%
ActivityIndicator unmount 0.00ms 0.00ms ±0.00ms 0 +0.0%
ActivityIndicator rerender 0.10ms 0.00ms ±0.32ms 2 +0.0%
ActivityIndicator size-large 0.10ms 0.00ms ±0.32ms 1 +0.0%
ActivityIndicator size-small 0.20ms 0.00ms ±0.42ms 1 +0.0%
ActivityIndicator with-color 0.20ms 0.00ms ±0.42ms 1 +0.0%
ActivityIndicator not-animating 0.20ms 0.00ms ±0.42ms 1 +0.0%
ActivityIndicator with-accessibility 0.20ms 0.00ms ±0.42ms 1 +0.0%
ActivityIndicator multiple-10 0.93ms 1.00ms ±0.26ms 1 +0.0%
ActivityIndicator multiple-50 4.20ms 4.00ms ±1.26ms 1 +0.0%
ActivityIndicator multiple-100 9.07ms 8.00ms ±2.05ms 1 +14.3%

Switch

Scenario Mean Median StdDev Renders vs Baseline
Switch mount 0.30ms 0.00ms ±0.48ms 1 +0.0%
Switch unmount 0.20ms 0.00ms ±0.42ms 0 +0.0%
Switch rerender 0.40ms 0.00ms ±0.52ms 2 -100.0%
Switch value-true 0.40ms 0.00ms ±0.52ms 1 +0.0%
Switch disabled 0.20ms 0.00ms ±0.42ms 1 +0.0%
Switch custom-colors 0.70ms 0.00ms ±1.25ms 1 +0.0%
Switch on-value-change 0.20ms 0.00ms ±0.42ms 1 +0.0%
Switch with-accessibility 0.30ms 0.00ms ±0.48ms 1 +0.0%
Switch multiple-10 1.73ms 2.00ms ±0.46ms 1 +0.0%
Switch multiple-50 9.93ms 9.00ms ±2.49ms 1 +0.0%
Switch multiple-100 19.53ms 18.00ms ±3.44ms 1 +12.5%

Button

Scenario Mean Median StdDev Renders vs Baseline
Button mount 0.50ms 0.50ms ±0.53ms 1 -50.0%
Button unmount 0.00ms 0.00ms ±0.00ms 0 +0.0%
Button rerender 0.80ms 1.00ms ±0.42ms 2 +0.0%
Button disabled 0.60ms 1.00ms ±0.52ms 1 +0.0%
Button with-color 0.60ms 1.00ms ±0.52ms 1 +100.0%
Button with-accessibility 0.50ms 0.50ms ±0.53ms 1 -50.0%
Button multiple-10 6.00ms 6.00ms ±1.46ms 1 +0.0%
Button multiple-50 22.60ms 25.00ms ±8.04ms 1 -7.4%
Button multiple-100 16.87ms 16.00ms ±2.77ms 1 -15.8%

TextInput

Scenario Mean Median StdDev Renders vs Baseline
TextInput mount 0.00ms 0.00ms ±0.00ms 1 +0.0%
TextInput unmount 0.00ms 0.00ms ±0.00ms 0 +0.0%
TextInput rerender 0.30ms 0.00ms ±0.48ms 2 +0.0%
TextInput multiline 0.20ms 0.00ms ±0.42ms 1 +0.0%
TextInput with-value 0.20ms 0.00ms ±0.42ms 1 +0.0%
TextInput styled 0.10ms 0.00ms ±0.32ms 1 +0.0%
TextInput multiple-100 8.53ms 8.00ms ±1.46ms 1 +14.3%

View

Scenario Mean Median StdDev Renders vs Baseline
View mount 0.10ms 0.00ms ±0.32ms 1 +0.0%
View unmount 0.00ms 0.00ms ±0.00ms 0 +0.0%
View rerender 0.20ms 0.00ms ±0.42ms 2 +0.0%
View nested-50 3.87ms 4.00ms ±1.55ms 1 +33.3%
View nested-100 8.80ms 9.00ms ±1.26ms 1 +28.6%
View shadow 0.20ms 0.00ms ±0.42ms 1 +0.0%
View border-radius 0.20ms 0.00ms ±0.42ms 1 +0.0%
View nested-500 18.07ms 11.00ms ±13.28ms 1 +10.0%

Text

Scenario Mean Median StdDev Renders vs Baseline
Text mount 0.10ms 0.00ms ±0.32ms 1 +0.0%
Text unmount 0.00ms 0.00ms ±0.00ms 0 +0.0%
Text rerender 0.30ms 0.00ms ±0.48ms 2 +0.0%
Text long-1000 0.30ms 0.00ms ±0.48ms 1 +0.0%
Text nested 0.20ms 0.00ms ±0.42ms 1 +0.0%
Text styled 0.20ms 0.00ms ±0.42ms 1 +0.0%
Text multiple-100 8.87ms 8.00ms ±1.46ms 1 +14.3%

SectionList.native-perf-test.ts

Scenario Mean Median StdDev Renders vs Baseline
SectionList native mount 4.61ms 4.53ms ±0.59ms 1 -30.4%

FlatList.native-perf-test.ts

Scenario Mean Median StdDev Renders vs Baseline
FlatList native mount 4.49ms 4.44ms ±0.73ms 1 -51.9%

TouchableHighlight.native-perf-test.ts

Scenario Mean Median StdDev Renders vs Baseline
TouchableHighlight native mount 1.29ms 1.23ms ±0.21ms 1 -41.1%

TouchableOpacity.native-perf-test.ts

Scenario Mean Median StdDev Renders vs Baseline
TouchableOpacity native mount 1.44ms 1.42ms ±0.04ms 1 -54.6%

Pressable.native-perf-test.ts

Scenario Mean Median StdDev Renders vs Baseline
Pressable native mount 1.70ms 1.66ms ±0.42ms 1 -33.9%

ScrollView.native-perf-test.ts

Scenario Mean Median StdDev Renders vs Baseline
ScrollView native mount 3.73ms 3.71ms ±0.38ms 1 -8.4%

ActivityIndicator.native-perf-test.ts

Scenario Mean Median StdDev Renders vs Baseline
ActivityIndicator native mount 1.44ms 1.24ms ±0.62ms 1 -49.9%

TextInput.native-perf-test.ts

Scenario Mean Median StdDev Renders vs Baseline
TextInput native mount 2.08ms 1.85ms ±0.53ms 1 -54.7%

Switch.native-perf-test.ts

Scenario Mean Median StdDev Renders vs Baseline
Switch native mount 1.37ms 1.14ms ±0.68ms 1 -34.3%

Button.native-perf-test.ts

Scenario Mean Median StdDev Renders vs Baseline
Button native mount 1.63ms 1.55ms ±0.26ms 1 -40.4%

Modal.native-perf-test.ts

Scenario Mean Median StdDev Renders vs Baseline
Modal native mount 0.85ms 0.83ms ±0.08ms 1 -32.2%

Image.native-perf-test.ts

Scenario Mean Median StdDev Renders vs Baseline
Image native mount 1.84ms 1.75ms ±0.40ms 1 -22.5%

View.native-perf-test.ts

Scenario Mean Median StdDev Renders vs Baseline
View native mount 1.03ms 0.92ms ±0.33ms 1 -35.6%

Text.native-perf-test.ts

Scenario Mean Median StdDev Renders vs Baseline
Text native mount 1.30ms 1.17ms ±0.42ms 1 -32.7%

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants