react-native-windows 0.0.0-canary.641 → 0.0.0-canary.642

package/Microsoft.ReactNative/Modules/PaperUIManagerModule.cpp

@@ -54,8 +54,11 @@ UIManagerSettingsProperty() noexcept {
 
 UIManagerSettings::UIManagerSettings(
     const std::shared_ptr<facebook::react::MessageQueueThread> batchingUIMessageQueue,
+    const std::shared_ptr<facebook::react::MessageQueueThread> uiMessageQueue,
     std::vector<std::unique_ptr<IViewManager>> &&viewManagers)
-    : batchingUIMessageQueue(std::move(batchingUIMessageQueue)), viewManagers(std::move(viewManagers)) {}
+    : batchingUIMessageQueue(std::move(batchingUIMessageQueue)),
+      uiMessageQueue(std::move(uiMessageQueue)),
+      viewManagers(std::move(viewManagers)) {}
 
 void UIManager::SetSettings(
     winrt::Microsoft::ReactNative::IReactPropertyBag const &properties,
@@ -534,6 +537,7 @@ void UIManager::Initialize(winrt::Microsoft::ReactNative::ReactContext const &re
 
   auto settings = m_context.Properties().Get(UIManagerSettingsProperty());
   m_batchingUIMessageQueue = std::move((*settings)->batchingUIMessageQueue);
+  m_uiMessageQueue = std::move((*settings)->uiMessageQueue);
 
   m_module->Initialize(reactContext);
 }
@@ -568,11 +572,11 @@ void UIManager::createView(
     std::string viewName,
     double rootTag,
     React::JSValueObject &&props) noexcept {
-  m_batchingUIMessageQueue->runOnQueue(Mso::VoidFunctor([m = std::weak_ptr<UIManagerModule>(m_module),
-                                                         reactTag,
-                                                         viewName = std::move(viewName),
-                                                         rootTag,
-                                                         props = std::move(props)]() mutable {
+  m_uiMessageQueue->runOnQueue(Mso::VoidFunctor([m = std::weak_ptr<UIManagerModule>(m_module),
+                                                 reactTag,
+                                                 viewName = std::move(viewName),
+                                                 rootTag,
+                                                 props = std::move(props)]() mutable {
     SystraceSection s("UIManager::createView");
     if (auto module = m.lock()) {
       module->createView(static_cast<int64_t>(reactTag), viewName, static_cast<int64_t>(rootTag), std::move(props));

package/Microsoft.ReactNative/Modules/PaperUIManagerModule.h

@@ -22,9 +22,11 @@ class NativeUIManager;
 struct UIManagerSettings {
   UIManagerSettings(
       const std::shared_ptr<facebook::react::MessageQueueThread> batchingUIMessageQueue,
+      const std::shared_ptr<facebook::react::MessageQueueThread> uiMessageQueue,
       std::vector<std::unique_ptr<IViewManager>> &&viewManagers);
   UIManagerSettings(UIManagerSettings const &) = delete;
   const std::shared_ptr<facebook::react::MessageQueueThread> batchingUIMessageQueue;
+  const std::shared_ptr<facebook::react::MessageQueueThread> uiMessageQueue;
   std::vector<std::unique_ptr<IViewManager>> viewManagers;
 };
 
@@ -175,6 +177,7 @@ struct UIManager final {
 
  private:
   std::shared_ptr<facebook::react::MessageQueueThread> m_batchingUIMessageQueue;
+  std::shared_ptr<facebook::react::MessageQueueThread> m_uiMessageQueue;
   std::shared_ptr<UIManagerModule> m_module;
   winrt::Microsoft::ReactNative::ReactContext m_context;
 };

package/Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp

@@ -794,8 +794,8 @@ void ReactInstanceWin::InitUIManager() noexcept {
 
   Microsoft::ReactNative::AddStandardViewManagers(viewManagers, *m_reactContext);
 
-  auto uiManagerSettings =
-      std::make_unique<Microsoft::ReactNative::UIManagerSettings>(m_batchingUIThread, std::move(viewManagers));
+  auto uiManagerSettings = std::make_unique<Microsoft::ReactNative::UIManagerSettings>(
+      m_batchingUIThread, m_uiMessageThread.Load(), std::move(viewManagers));
   Microsoft::ReactNative::UIManager::SetSettings(m_reactContext->Properties(), std::move(uiManagerSettings));
 
   m_reactContext->Properties().Set(

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,11 +10,11 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.0.0-canary.641</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.0.0-canary.642</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>0</ReactNativeWindowsMinor>
     <ReactNativeWindowsPatch>0</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>true</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>ca37eb7b34f8e40feb248ce35109ef82f09344d4</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>71ca215e58db4f6b9b79be31b1320ab4c05714f1</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.0.0-canary.641",
+  "version": "0.0.0-canary.642",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -26,7 +26,7 @@
     "@react-native-community/cli": "12.0.0-alpha.0",
     "@react-native-community/cli-platform-android": "12.0.0-alpha.0",
     "@react-native-community/cli-platform-ios": "12.0.0-alpha.0",
-    "@react-native-windows/cli": "0.0.0-canary.166",
+    "@react-native-windows/cli": "0.0.0-canary.167",
     "@react-native/assets": "1.0.0",
     "@react-native/assets-registry": "^0.73.0",
     "@react-native/codegen": "^0.73.0",
@@ -62,7 +62,7 @@
     "yargs": "^17.6.2"
   },
   "devDependencies": {
-    "@react-native-windows/codegen": "0.0.0-canary.54",
+    "@react-native-windows/codegen": "0.0.0-canary.55",
     "@rnw-scripts/babel-react-native-config": "0.0.0",
     "@rnw-scripts/eslint-config": "1.1.15",
     "@rnw-scripts/jest-out-of-tree-snapshot-resolver": "^1.1.1",