react-native-windows 0.84.0-preview.2 → 0.84.0-preview.4

package/Common/Common.vcxproj

@@ -94,7 +94,7 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ItemGroup>
-    <PackageReference Include="boost" Version="1.83.0.0" />
+    <PackageReference Include="boost" Version="1.84.0.0" />
     <PackageReference Include="Microsoft.Windows.CppWinRT" Version="$(CppWinRTVersion)" PrivateAssets="all" />
   </ItemGroup>
   <ImportGroup Label="ExtensionTargets">

package/Folly/Folly.vcxproj

@@ -364,7 +364,7 @@
     <TemporaryFollyPatchFiles Include="$(MSBuildThisFileDirectory)\TEMP_UntilFollyUpdate\**\*.*" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="boost" Version="1.83.0.0" />
+    <PackageReference Include="boost" Version="1.84.0.0" />
   </ItemGroup>
   <Target Name="Deploy" />
   <!-- Reenable this task if we need to temporarily replace any folly files for fixes, while we wait for PRs to land in folly -->

package/Microsoft.ReactNative/Fabric/Composition/ScrollViewComponentView.cpp

@@ -1023,16 +1023,16 @@ void ScrollViewComponentView::OnKeyDown(
       args.Handled(pageUp(true));
       break;
     case winrt::Windows::System::VirtualKey::Up:
-      args.Handled(lineUp(true));
+      args.Handled(lineUp(false));
       break;
     case winrt::Windows::System::VirtualKey::Down:
-      args.Handled(lineDown(true));
+      args.Handled(lineDown(false));
       break;
     case winrt::Windows::System::VirtualKey::Left:
-      args.Handled(lineLeft(true));
+      args.Handled(lineLeft(false));
       break;
     case winrt::Windows::System::VirtualKey::Right:
-      args.Handled(lineRight(true));
+      args.Handled(lineRight(false));
       break;
   }
 

package/Microsoft.ReactNative/Fabric/Composition/TextInput/WindowsTextInputComponentView.cpp

@@ -1780,7 +1780,10 @@ void WindowsTextInputComponentView::DrawText() noexcept {
       }
 
       // TODO keep track of proper invalid rect
+      // Prevent reentrancy: TxDrawD2D may call TxViewChange -> DrawText
+      m_cDrawBlock++;
       auto hrDraw = m_textServices->TxDrawD2D(d2dDeviceContext, &rc, nullptr, TXTVIEW_ACTIVE);
+      m_cDrawBlock--;
       winrt::check_hresult(hrDraw);
 
       // draw placeholder text if needed

package/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj

@@ -426,7 +426,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="boost" Version="1.83.0.0" />
+    <PackageReference Include="boost" Version="1.84.0.0" />
     <PackageReference Include="Microsoft.Windows.CppWinRT" Version="$(CppWinRTVersion)" PrivateAssets="all" />
     <PackageReference Include="Microsoft.JavaScript.Hermes" Version="$(HermesVersion)" />
     <PackageReference Include="$(WinUIPackageName)" Version="$(WinUIPackageVersion)" Condition="'$(OverrideWinUIPackage)'!='true'" />

package/PropertySheets/External/Microsoft.ReactNative.Composition.CppApp.targets

@@ -21,8 +21,8 @@
   <Import Project="$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Uwp.CppApp.targets" />
 
   <ItemGroup>
-    <PackageReference Include="boost" Version="1.83.0.0" />
+    <PackageReference Include="boost" Version="1.84.0.0" />
     <PackageReference Include="Microsoft.VCRTForwarders.140" Version="1.0.2-rc" />
   </ItemGroup>
 
-</Project>
+</Project>

package/PropertySheets/External/Microsoft.ReactNative.Composition.CppLib.targets

@@ -23,8 +23,8 @@
   <Import Project="$(ReactNativeWindowsDir)\PropertySheets\Codegen.targets" />
 
   <ItemGroup>
-    <PackageReference Include="boost" Version="1.83.0.0" />
+    <PackageReference Include="boost" Version="1.84.0.0" />
     <PackageReference Include="Microsoft.VCRTForwarders.140" Version="1.0.2-rc" />
   </ItemGroup>
 
-</Project>
+</Project>

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,11 +10,11 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.84.0-preview.2</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.84.0-preview.4</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>84</ReactNativeWindowsMinor>
     <ReactNativeWindowsPatch>0</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>eec445b81f53fa5dbd9fa27b2f5f3aa26d452c50</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>c72727372283e8a8b3a82c21d817ad737c27f5ae</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>

package/ReactCommon/ReactCommon.vcxproj

@@ -245,7 +245,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="boost" Version="1.83.0.0" />
+    <PackageReference Include="boost" Version="1.84.0.0" />
     <PackageReference Include="Microsoft.Windows.CppWinRT" Version="$(CppWinRTVersion)" PrivateAssets="all" />
   </ItemGroup>
   <PropertyGroup>

package/Scripts/perf/compare-results.js

@@ -10,7 +10,7 @@
  *   node vnext/Scripts/perf/compare-results.js [options]
  *
  * Options:
- *   --results <path>    Path to CI results JSON (default: .perf-results/results.json)
+ *   --results <path>    Path to CI results JSON (repeatable, default: .perf-results/results.json)
  *   --baselines <dir>   Path to base branch perf snapshots directory
  *   --output <path>     Path to write markdown report (default: .perf-results/report.md)
  *   --fail-on-regression  Exit 1 if regressions found (default: true in CI)
@@ -25,17 +25,29 @@ const path = require('path');
 
 function parseArgs() {
   const args = process.argv.slice(2);
+
+  // Auto-discover results files: JS perf + native perf
+  const defaultResults = [
+    '.perf-results/results.json',
+    '.native-perf-results/results.json',
+  ].filter(p => fs.existsSync(p));
+
   const opts = {
-    results: '.perf-results/results.json',
+    results: defaultResults,
     baselines: null, // auto-detect from test file paths
     output: '.perf-results/report.md',
     failOnRegression: !!process.env.CI,
   };
 
+  let explicitResults = false;
   for (let i = 0; i < args.length; i++) {
     switch (args[i]) {
       case '--results':
-        opts.results = args[++i];
+        if (!explicitResults) {
+          opts.results = [];
+          explicitResults = true;
+        }
+        opts.results.push(args[++i]);
         break;
       case '--baselines':
         opts.baselines = args[++i];
@@ -98,6 +110,7 @@ function compareEntry(head, base, threshold) {
         : 0;
 
   const errors = [];
+  const isTrackMode = threshold.mode === 'track';
 
   const absoluteDelta = head.medianDuration - base.medianDuration;
   const minAbsoluteDelta =
@@ -126,8 +139,9 @@ function compareEntry(head, base, threshold) {
     head,
     base,
     percentChange,
-    passed: errors.length === 0,
+    passed: isTrackMode || errors.length === 0,
     errors,
+    isTrackMode,
   };
 }
 
@@ -207,6 +221,24 @@ function generateMarkdown(suiteComparisons, ciResults) {
     }
   }
 
+  // Track-mode warnings (not blocking)
+  const trackedWarnings = suiteComparisons.flatMap(s =>
+    s.results.filter(r => r.isTrackMode && r.errors.length > 0),
+  );
+  if (trackedWarnings.length > 0) {
+    md += '### ⚠️ Tracked (not blocking)\n\n';
+    md += '| Scenario | Baseline | Current | Change |\n';
+    md += '|----------|----------|---------|--------|\n';
+    for (const r of trackedWarnings) {
+      const baseline = r.base ? `${r.base.meanDuration.toFixed(2)}ms` : 'N/A';
+      const current = r.head ? `${r.head.meanDuration.toFixed(2)}ms` : 'N/A';
+      const change =
+        r.percentChange != null ? `+${r.percentChange.toFixed(1)}%` : 'N/A';
+      md += `| ${r.name} | ${baseline} | ${current} | ${change} |\n`;
+    }
+    md += '\n';
+  }
+
   // Passed suites
   const passedSuites = suiteComparisons.filter(s => !s.hasRegressions);
   if (passedSuites.length > 0) {
@@ -257,17 +289,41 @@ function generateMarkdown(suiteComparisons, ciResults) {
 function main() {
   const opts = parseArgs();
 
-  // 1. Load CI results JSON
-  if (!fs.existsSync(opts.results)) {
-    console.error(`❌ Results file not found: ${opts.results}`);
+  // 1. Load CI results JSON (supports multiple --results paths)
+  const ciResults = {
+    suites: [],
+    branch: '',
+    commitSha: '',
+    timestamp: '',
+    summary: {
+      totalSuites: 0,
+      totalTests: 0,
+      passed: 0,
+      failed: 0,
+      durationMs: 0,
+    },
+  };
+  const resultsPaths = opts.results.filter(p => fs.existsSync(p));
+  if (resultsPaths.length === 0) {
+    console.error(`❌ No results files found: ${opts.results.join(', ')}`);
     console.error('Run perf tests with CI=true first: CI=true yarn perf:ci');
     process.exit(1);
   }
-
-  const ciResults = JSON.parse(fs.readFileSync(opts.results, 'utf-8'));
-  console.log(
-    `📊 Loaded ${ciResults.suites.length} suite(s) from ${opts.results}`,
-  );
+  for (const resultsPath of resultsPaths) {
+    const partial = JSON.parse(fs.readFileSync(resultsPath, 'utf-8'));
+    ciResults.suites.push(...(partial.suites || []));
+    ciResults.branch = ciResults.branch || partial.branch;
+    ciResults.commitSha = ciResults.commitSha || partial.commitSha;
+    ciResults.timestamp = ciResults.timestamp || partial.timestamp;
+    ciResults.summary.totalSuites += partial.summary?.totalSuites || 0;
+    ciResults.summary.totalTests += partial.summary?.totalTests || 0;
+    ciResults.summary.passed += partial.summary?.passed || 0;
+    ciResults.summary.failed += partial.summary?.failed || 0;
+    ciResults.summary.durationMs += partial.summary?.durationMs || 0;
+    console.log(
+      `📊 Loaded ${partial.suites.length} suite(s) from ${resultsPath}`,
+    );
+  }
 
   // 2. Compare each suite against its committed baseline
   const suiteComparisons = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.84.0-preview.2",
+  "version": "0.84.0-preview.4",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -26,7 +26,7 @@
     "@react-native-community/cli": "20.0.0",
     "@react-native-community/cli-platform-android": "20.0.0",
     "@react-native-community/cli-platform-ios": "20.0.0",
-    "@react-native-windows/cli": "0.84.0-preview.1",
+    "@react-native-windows/cli": "0.84.0-preview.2",
     "@react-native/assets": "1.0.0",
     "@react-native/assets-registry": "0.84.1",
     "@react-native/codegen": "0.84.1",
@@ -70,7 +70,7 @@
     "yargs": "^17.6.2"
   },
   "devDependencies": {
-    "@react-native-windows/codegen": "0.84.0-preview.1",
+    "@react-native-windows/codegen": "0.84.0-preview.2",
     "@react-native/metro-config": "0.84.1",
     "@rnw-scripts/babel-react-native-config": "0.0.0",
     "@rnw-scripts/eslint-config": "1.2.38",