react-native-windows 0.84.0 → 0.85.0-preview.1

package/ReactCommon/TEMP_UntilReactCommonUpdate/react/renderer/uimanager/UIManager.cpp

@@ -112,7 +112,8 @@ std::shared_ptr<ShadowNode> UIManager::createNode(
 
 std::shared_ptr<ShadowNode> UIManager::cloneNode(
     const ShadowNode& shadowNode,
-    const ShadowNode::SharedListOfShared& children,
+    const std::shared_ptr<const std::vector<std::shared_ptr<const ShadowNode>>>&
+        children,
     RawProps rawProps) const {
   TraceSection s(
       "UIManager::cloneNode", "componentName", shadowNode.getComponentName());
@@ -189,12 +190,15 @@ void UIManager::appendChild(
 
 void UIManager::completeSurface(
     SurfaceId surfaceId,
-    const ShadowNode::UnsharedListOfShared& rootChildren,
+    const std::shared_ptr<std::vector<std::shared_ptr<const ShadowNode>>>&
+        rootChildren,
     ShadowTree::CommitOptions commitOptions) {
   TraceSection s("UIManager::completeSurface", "surfaceId", surfaceId);
 
+  ShadowTree::CommitStatus result;
+
   shadowTreeRegistry_.visit(surfaceId, [&](const ShadowTree& shadowTree) {
-    auto result = shadowTree.commit(
+    result = shadowTree.commit(
         [&](const RootShadowNode& oldRootShadowNode) {
           return std::make_shared<RootShadowNode>(
               oldRootShadowNode,
@@ -204,20 +208,17 @@ void UIManager::completeSurface(
               });
         },
         commitOptions);
+  });
 
-    if (result == ShadowTree::CommitStatus::Succeeded) {
-      // It's safe to update the visible revision of the shadow tree immediately
-      // after we commit a specific one.
-      lazyShadowTreeRevisionConsistencyManager_->updateCurrentRevision(
-          surfaceId, shadowTree.getCurrentRevision().rootShadowNode);
-        
-      if (ReactNativeFeatureFlags::useSharedAnimatedBackend()) {
-        if (auto animationBackend = animationBackend_.lock()) {
-          animationBackend->clearRegistry(surfaceId);
-        }
-      }
+  if (result == ShadowTree::CommitStatus::Succeeded) {
+    // It's safe to update the visible revision of the shadow tree immediately
+    // after we commit a specific one.
+    lazyShadowTreeRevisionConsistencyManager_->updateCurrentRevision(surfaceId);
+
+    if (ReactNativeFeatureFlags::useSharedAnimatedBackend()) {
+      animationBackend_->clearRegistry(surfaceId);
     }
-  });
+  }
 }
 
 void UIManager::setIsJSResponder(
@@ -442,8 +443,8 @@ void UIManager::setNativeProps_DEPRECATED(
   if (family.nativeProps_DEPRECATED) {
     // Values in `rawProps` patch (take precedence over)
     // `nativeProps_DEPRECATED`. For example, if both `nativeProps_DEPRECATED`
-    // and `rawProps` contain key 'A'. Value from `rawProps` overrides what was
-    // previously in `nativeProps_DEPRECATED`.
+    // and `rawProps` contain key 'A'. Value from `rawProps` overrides what
+    // was previously in `nativeProps_DEPRECATED`.
     family.nativeProps_DEPRECATED =
         std::make_unique<folly::dynamic>(mergeDynamicProps(
             *family.nativeProps_DEPRECATED,
@@ -475,7 +476,7 @@ void UIManager::setNativeProps_DEPRECATED(
                             ->getProps(),
                         RawProps(rawProps));
 
-                    return oldShadowNode.clone({/* .props = */ .props = props});
+                    return oldShadowNode.clone({.props = props});
                   });
 
               return std::static_pointer_cast<RootShadowNode>(rootNode);
@@ -499,15 +500,12 @@ void UIManager::configureNextLayoutAnimation(
     const jsi::Value& failureCallback) const {
   if (animationDelegate_ != nullptr) {
     animationDelegate_->uiManagerDidConfigureNextLayoutAnimation(
-        runtime,
-        config,
-        std::move(successCallback),
-        std::move(failureCallback));
+        runtime, config, successCallback, failureCallback);
   }
 }
 
 static std::shared_ptr<const ShadowNode> findShadowNodeByTagRecursively(
-    std::shared_ptr<const ShadowNode> parentShadowNode,
+    const std::shared_ptr<const ShadowNode>& parentShadowNode,
     Tag tag) {
   if (parentShadowNode->getTag() == tag) {
     return parentShadowNode;
@@ -529,20 +527,30 @@ std::shared_ptr<const ShadowNode> UIManager::findShadowNodeByTag_DEPRECATED(
   auto shadowNode = std::shared_ptr<const ShadowNode>{};
 
   shadowTreeRegistry_.enumerate([&](const ShadowTree& shadowTree, bool& stop) {
+    // Obtain a pointer to the root node. The flag-gated path uses
+    // getCurrentRevision() which keeps the root alive via shared_ptr for
+    // the entire traversal, fixing a use-after-free race condition.
+    RootShadowNode::Shared rootShadowNodeHolder;
     const RootShadowNode* rootShadowNode = nullptr;
-    // The public interface of `ShadowTree` discourages accessing a stored
-    // pointer to a root node because of the possible data race.
-    // To work around this, we ask for a commit and immediately cancel it
-    // returning `nullptr` instead of a new shadow tree.
-    // We don't want to add a way to access a stored pointer to a root node
-    // because this `findShadowNodeByTag` is deprecated. It is only added
-    // to make migration to the new architecture easier.
-    shadowTree.tryCommit(
-        [&](const RootShadowNode& oldRootShadowNode) {
-          rootShadowNode = &oldRootShadowNode;
-          return nullptr;
-        },
-        {/* default commit options */});
+    if (ReactNativeFeatureFlags::fixFindShadowNodeByTagRaceCondition()) {
+      rootShadowNodeHolder = shadowTree.getCurrentRevision().rootShadowNode;
+      rootShadowNode = rootShadowNodeHolder.get();
+    } else {
+      // TODO(T257154369): Remove after flag rollout.
+      // The public interface of `ShadowTree` discourages accessing a stored
+      // pointer to a root node because of the possible data race.
+      // To work around this, we ask for a commit and immediately cancel it
+      // returning `nullptr` instead of a new shadow tree.
+      // We don't want to add a way to access a stored pointer to a root
+      // node because this `findShadowNodeByTag` is deprecated. It is only
+      // added to make migration to the new architecture easier.
+      shadowTree.tryCommit(
+          [&](const RootShadowNode& oldRootShadowNode) {
+            rootShadowNode = &oldRootShadowNode;
+            return nullptr;
+          },
+          {/* default commit options */});
+    }
 
     if (rootShadowNode != nullptr) {
       const auto& children = rootShadowNode->getChildren();
@@ -650,6 +658,20 @@ void UIManager::shadowTreeDidFinishTransaction(
   }
 }
 
+void UIManager::shadowTreeDidFinishReactCommit(
+    const ShadowTree& shadowTree) const {
+  if (delegate_ != nullptr) {
+    delegate_->uiManagerDidFinishReactCommit(shadowTree);
+  }
+}
+
+void UIManager::shadowTreeDidPromoteReactRevision(
+    const ShadowTree& shadowTree) const {
+  if (delegate_ != nullptr) {
+    delegate_->uiManagerDidPromoteReactRevision(shadowTree);
+  }
+}
+
 void UIManager::reportMount(SurfaceId surfaceId) const {
   TraceSection s("UIManager::reportMount");
 
@@ -692,7 +714,7 @@ void UIManager::setNativeAnimatedDelegate(
 }
 
 void UIManager::unstable_setAnimationBackend(
-    std::weak_ptr<UIManagerAnimationBackend> animationBackend) {
+    std::shared_ptr<UIManagerAnimationBackend> animationBackend) {
   animationBackend_ = animationBackend;
 }
 
@@ -709,8 +731,10 @@ void UIManager::animationTick() const {
     });
   }
 
-  if (auto nativeAnimatedDelegate = nativeAnimatedDelegate_.lock()) {
-    nativeAnimatedDelegate->runAnimationFrame();
+  if (!ReactNativeFeatureFlags::useSharedAnimatedBackend()) {
+    if (auto nativeAnimatedDelegate = nativeAnimatedDelegate_.lock()) {
+      nativeAnimatedDelegate->runAnimationFrame();
+    }
   }
 }
 
@@ -722,6 +746,12 @@ void UIManager::synchronouslyUpdateViewOnUIThread(
   }
 }
 
+#pragma mark ContextContainer
+
+std::shared_ptr<const ContextContainer> UIManager::getContextContainer() const {
+  return contextContainer_;
+}
+
 #pragma mark - Add & Remove event listener
 
 void UIManager::addEventListener(

package/Scripts/OfficeReact.Win32.nuspec

@@ -56,7 +56,6 @@
 
     <!-- Required for win32 -->
     <file src="$nugetroot$\inc\Shared\DevServerHelper.h" target="inc"/>
-    <file src="$nugetroot$\inc\ReactWin32\JSBigStringResourceDll.h" target="inc"/>
     <file src="$nugetroot$\inc\react-native-win32.x64.def" target="inc"/>
     <file src="$nugetroot$\inc\react-native-win32.x86.def" target="inc"/>
 

package/Scripts/Tfs/Layout-Desktop-Headers.ps1

@@ -9,37 +9,9 @@ param(
 	[string[]] $Extensions = ('h', 'hpp', 'def')
 )
 
-[xml]$props = gc $PSScriptRoot\..\..\Directory.Build.props
-[string] $FollyVersion = $props.Project.PropertyGroup.FollyVersion;
-$FollyVersion = $FollyVersion.Trim() # The extracted FollyVersion contains a space at the end that isn't actually present, issue #6216
-$FollyRoot = "$SourceRoot\node_modules\.folly";
-$FollyOverrideRoot = "$ReactWindowsRoot\Folly\TEMP_UntilFollyUpdate";
-
-[string] $FmtVersion = $props.Project.PropertyGroup.FmtVersion;
-$FmtVersion = $FmtVersion.Trim() # The extracted FmtVersion contains a space at the end that isn't actually present, issue #6216
-$FmtRoot = "$SourceRoot\node_modules\.fmt\fmt-${FmtVersion}";
-
-# Download Folly if running on a machine which hasn't run native build logic to acquire it
-if (!(Test-Path $FollyRoot)) {
-	Write-Host "Downloading Folly $FollyVersion"
-	$FollyZip = "$SourceRoot\node_modules\.folly\folly-${FollyVersion}.zip"
-	$FollyDest = "$SourceRoot\node_modules\.folly"
-
-	New-Item $FollyRoot -ItemType Directory
-	Invoke-RestMethod -Uri "https://github.com/facebook/folly/archive/v$FollyVersion.zip" -OutFile $FollyZip
-	Expand-Archive -LiteralPath $FollyZip -DestinationPath $FollyRoot
-}
-
-# Download Fmt if running on a machine which hasn't run native build logic to acquire it
-if (!(Test-Path $FmtRoot)) {
-	Write-Host "Downloading Fmt $FmtVersion"
-	$FmtZip = "$SourceRoot\node_modules\.fmt\fmt-${FmtVersion}.zip"
-	$FmtDest = "$SourceRoot\node_modules\.fmt"
-
-	New-Item $FmtRoot -ItemType Directory
-	Invoke-RestMethod -Uri "https://github.com/fmtlib/fmt/archive/refs/tags/$FmtVersion.zip" -OutFile $FmtZip
-	Expand-Archive -LiteralPath $FmtZip -DestinationPath $FmtDest
-}
+# Folly and fmt source are committed in vnext/external/ — no download needed
+$FollyRoot = "$ReactWindowsRoot\external\folly";
+$FmtRoot = "$ReactWindowsRoot\external\fmt";
 
 Write-Host "Source root: [$SourceRoot]"
 Write-Host "Destination root: [$TargetRoot]"
@@ -70,13 +42,6 @@ Get-ChildItem -Path $FollyRoot -Name -Recurse -Include $patterns | ForEach-Objec
 	-Force
 }
 
-# Folly overrides
-Get-ChildItem -Path $FollyOverrideRoot -Name -Recurse -Include $patterns | ForEach-Object { Copy-Item `
-	-Path        $FollyOverrideRoot\$_ `
-	-Destination (New-Item -ItemType Directory $TargetRoot\inc\folly\folly-$FollyVersion\folly\$(Split-Path $_) -Force) `
-	-Force
-}
-
 # Fmt headers
 Get-ChildItem -Path $FmtRoot\include -Name -Recurse -Include $patterns | ForEach-Object { Copy-Item `
 	-Path        $FmtRoot\include\$_ `
@@ -115,4 +80,4 @@ Get-ChildItem -Path $ReactWindowsRoot\Desktop.DLL -Recurse -Include '*.def' | Fo
 Copy-Item -Force -Recurse -Path $ReactWindowsRoot\include -Destination $TargetRoot\inc
 
 # Natvis files
-Copy-Item -Force -Path $ReactWindowsRoot\Folly\Folly.natvis -Destination (New-Item -ItemType Directory $TargetRoot\natvis -Force)
+Copy-Item -Force -Path $ReactWindowsRoot\external\folly\Folly.natvis -Destination (New-Item -ItemType Directory $TargetRoot\natvis -Force)

package/Scripts/creaternwapp.cmd

@@ -120,13 +120,6 @@ if not "x%RN_VERSION:nightly=%"=="x%RN_VERSION%" (
   set RNCLI_TEMPLATE=--template "@react-native-community/template@0.84.1"
 )
 
-if not "x%RN_VERSION:-rc=%"=="x%RN_VERSION%" (
-  @echo creaternwapp.cmd Override @react-native-community/template version for RC
-  REM RC versions may not have a corresponding template published to npm
-  REM Windows we need to manually update this with every integration #15124
-  set RNCLI_TEMPLATE=--template "@react-native-community/template@0.84.1"
-)
-
 @echo creaternwapp.cmd: Creating base RN app project with: npx --yes @react-native-community/cli@%RNCLI_VERSION% init %APP_NAME% --version %RN_VERSION% %RNCLI_TEMPLATE% --verbose --skip-install --install-pods false --skip-git-init true
 call npx --yes @react-native-community/cli@%RNCLI_VERSION% init %APP_NAME% --version %RN_VERSION% %RNCLI_TEMPLATE% --verbose --skip-install --install-pods false --skip-git-init true
 
@@ -140,7 +133,7 @@ pushd "%APP_NAME%"
 if not "x%RN_VERSION:nightly=%"=="x%RN_VERSION%" (
   @echo creaternwapp.cmd Fixing react-native nightly issues
   pwsh.exe -Command "(gc package.json) -replace '""react-native"": ""[^\*]*""', '""react-native"": ""%RN_VERSION%""' | Out-File -encoding utf8NoBOM package.json"
-  pwsh.exe -Command "(gc package.json) -replace '""@react-native/(.+-(config|preset))"": "".*""', '""@react-native/$1"": ""%RN_VERSION%""' | Out-File -encoding utf8NoBOM package.json"
+  pwsh.exe -Command "(gc package.json) -replace '""@react-native/((?!jest-preset).+-(config|preset))"": "".*""', '""@react-native/$1"": ""%RN_VERSION%""' | Out-File -encoding utf8NoBOM package.json"
   pwsh.exe -Command "(gc package.json) -replace '""@react-native/new-app-screen"": "".*""', '""@react-native/new-app-screen"": ""%RN_VERSION%""' | Out-File -encoding utf8NoBOM package.json"
   pwsh.exe -Command "(gc package.json) -replace '""@react-native-community/cli((-platform-)?(ios|android))?"": "".*""', '""@react-native-community/cli$1"": ""%RNCLI_VERSION%""' | Out-File -encoding utf8NoBOM package.json"
 )
@@ -155,7 +148,6 @@ call git commit -m "npx --yes @react-native-community/cli@%RNCLI_VERSION% init %
 
 if %USE_VERDACCIO% equ 1 (
   @echo creaternwapp.cmd: Setting yarn to use verdaccio at http://localhost:4873
-  call yarn config set registry http://localhost:4873
   call yarn config set npmRegistryServer http://localhost:4873
   call yarn config set unsafeHttpWhitelist --json "[\"localhost\"]"
 )

package/Scripts/creaternwlib.cmd

@@ -116,15 +116,8 @@ for /f "delims=" %%a in ('npm show react@%R_VERSION% version') do @set R_VERSION
 
 @echo creaternwlib.cmd Creating RNW lib "%LIB_NAME%" with react@%R_VERSION%, react-native@%RN_VERSION%, and react-native-windows@%RNW_VERSION%
 
-set CRNL_RN_VERSION_ARG=--react-native-version %RN_VERSION%
-if not "x%RN_VERSION:-rc=%"=="x%RN_VERSION%" (
-  @echo creaternwlib.cmd Override --react-native-version for RC build, will fix up versions later
-  REM RC versions may not have a corresponding template published to npm, omit --react-native-version
-  set CRNL_RN_VERSION_ARG=
-)
-
-@echo creaternwlib.cmd Creating base RN library project with: npx --yes create-react-native-library@0.48.9 --slug %LIB_NAME% --description %LIB_NAME% --author-name "React-Native-Windows Bot" --author-email 53619745+rnbot@users.noreply.github.com --author-url http://example.com --repo-url http://example.com --languages kotlin-objc --local false --type %RN_TEMPLATE_TYPE% %CRNL_RN_VERSION_ARG% --example vanilla %LIB_NAME%
-call npx --yes create-react-native-library@0.48.9 --slug %LIB_NAME% --description %LIB_NAME% --author-name "React-Native-Windows Bot" --author-email 53619745+rnbot@users.noreply.github.com --author-url http://example.com --repo-url http://example.com --languages kotlin-objc --local false --type %RN_TEMPLATE_TYPE% %CRNL_RN_VERSION_ARG% --example vanilla %LIB_NAME%
+@echo creaternwlib.cmd Creating base RN library project with: npx --yes create-react-native-library@0.48.9 --slug %LIB_NAME% --description %LIB_NAME% --author-name "React-Native-Windows Bot" --author-email 53619745+rnbot@users.noreply.github.com --author-url http://example.com --repo-url http://example.com --languages kotlin-objc --local false --type %RN_TEMPLATE_TYPE% --react-native-version %RN_VERSION% --example vanilla %LIB_NAME%
+call npx --yes create-react-native-library@0.48.9 --slug %LIB_NAME% --description %LIB_NAME% --author-name "React-Native-Windows Bot" --author-email 53619745+rnbot@users.noreply.github.com --author-url http://example.com --repo-url http://example.com --languages kotlin-objc --local false --type %RN_TEMPLATE_TYPE% --react-native-version %RN_VERSION% --example vanilla %LIB_NAME%
 
 if %ERRORLEVEL% neq 0 (
   @echo creaternwlib.cmd: Unable to create base RN library project
@@ -136,23 +129,11 @@ pushd "%LIB_NAME%"
 if not "x%RN_VERSION:nightly=%"=="x%RN_VERSION%" (
   @echo creaternwlib.cmd Fixing react-native nightly issue
   pwsh.exe -Command "(gc package.json) -replace '""react-native"": ""[^\*]*""', '""react-native"": ""%RN_VERSION%""' | Out-File -encoding utf8NoBOM package.json"
-  pwsh.exe -Command "(gc package.json) -replace '""@react-native/(.+-(config|preset))"": "".*""', '""@react-native/$1"": ""%RN_VERSION%""' | Out-File -encoding utf8NoBOM package.json"
-  pwsh.exe -Command "(gc package.json) -replace '""@react-native-community/cli((-platform-)?(ios|android))?"": "".*""', '""@react-native-community/cli$1"": ""%RNCLI_VERSION%""' | Out-File -encoding utf8NoBOM package.json"
-  pushd example
-  pwsh.exe -Command "(gc package.json) -replace '""react-native"": ""[^\*]*""', '""react-native"": ""%RN_VERSION%""' | Out-File -encoding utf8NoBOM package.json"
-  pwsh.exe -Command "(gc package.json) -replace '""@react-native/(.+-(config|preset))"": "".*""', '""@react-native/$1"": ""%RN_VERSION%""' | Out-File -encoding utf8NoBOM package.json"
-  pwsh.exe -Command "(gc package.json) -replace '""@react-native-community/cli((-platform-)?(ios|android))?"": "".*""', '""@react-native-community/cli$1"": ""%RNCLI_VERSION%""' | Out-File -encoding utf8NoBOM package.json"
-  popd
-)
-
-if not "x%RN_VERSION:-rc=%"=="x%RN_VERSION%" (
-  @echo creaternwlib.cmd Fixing react-native RC version
-  pwsh.exe -Command "(gc package.json) -replace '""react-native"": ""[^\*]*""', '""react-native"": ""%RN_VERSION%""' | Out-File -encoding utf8NoBOM package.json"
-  pwsh.exe -Command "(gc package.json) -replace '""@react-native/(.+-(config|preset))"": "".*""', '""@react-native/$1"": ""%RN_VERSION%""' | Out-File -encoding utf8NoBOM package.json"
+  pwsh.exe -Command "(gc package.json) -replace '""@react-native/((?!jest-preset).+-(config|preset))"": "".*""', '""@react-native/$1"": ""%RN_VERSION%""' | Out-File -encoding utf8NoBOM package.json"
   pwsh.exe -Command "(gc package.json) -replace '""@react-native-community/cli((-platform-)?(ios|android))?"": "".*""', '""@react-native-community/cli$1"": ""%RNCLI_VERSION%""' | Out-File -encoding utf8NoBOM package.json"
   pushd example
   pwsh.exe -Command "(gc package.json) -replace '""react-native"": ""[^\*]*""', '""react-native"": ""%RN_VERSION%""' | Out-File -encoding utf8NoBOM package.json"
-  pwsh.exe -Command "(gc package.json) -replace '""@react-native/(.+-(config|preset))"": "".*""', '""@react-native/$1"": ""%RN_VERSION%""' | Out-File -encoding utf8NoBOM package.json"
+  pwsh.exe -Command "(gc package.json) -replace '""@react-native/((?!jest-preset).+-(config|preset))"": "".*""', '""@react-native/$1"": ""%RN_VERSION%""' | Out-File -encoding utf8NoBOM package.json"
   pwsh.exe -Command "(gc package.json) -replace '""@react-native-community/cli((-platform-)?(ios|android))?"": "".*""', '""@react-native-community/cli$1"": ""%RNCLI_VERSION%""' | Out-File -encoding utf8NoBOM package.json"
   popd
 )
@@ -162,7 +143,6 @@ call yarn install
 
 if %USE_VERDACCIO% equ 1 (
   @echo creaternwlib.cmd: Setting yarn to use verdaccio at http://localhost:4873
-  call yarn config set registry http://localhost:4873
   call yarn config set npmRegistryServer http://localhost:4873
   call yarn config set unsafeHttpWhitelist --json "[\"localhost\"]"
 )

package/Shared/DevSettings.h

@@ -86,9 +86,6 @@ struct DevSettings {
 
   bool enableDefaultCrashHandler{false};
 
-  // Enable concurrent mode by installing runtimeScheduler
-  bool useRuntimeScheduler{false};
-
   // The HostTarget instance for Fusebox
   facebook::react::jsinspector_modern::HostTarget *inspectorHostTarget;
 };