[Fabric] Enable concurrentRoot (#12367)

acoates-ms · web-flow · commit 17b7d16f97e2 · 2023-11-13T11:30:25.000-08:00
* [Fabric] Enable concurrentRoot

* feedback

* fix

* format
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -17,7 +17,90 @@
     "utility": "cpp",
     "ratio": "cpp",
     "memory": "cpp",
-    "array": "cpp"
+    "array": "cpp",
+    "algorithm": "cpp",
+    "any": "cpp",
+    "atomic": "cpp",
+    "bit": "cpp",
+    "bitset": "cpp",
+    "cctype": "cpp",
+    "charconv": "cpp",
+    "chrono": "cpp",
+    "cinttypes": "cpp",
+    "clocale": "cpp",
+    "cmath": "cpp",
+    "compare": "cpp",
+    "complex": "cpp",
+    "concepts": "cpp",
+    "condition_variable": "cpp",
+    "coroutine": "cpp",
+    "csignal": "cpp",
+    "cstdarg": "cpp",
+    "cstddef": "cpp",
+    "cstdint": "cpp",
+    "cstdio": "cpp",
+    "cstdlib": "cpp",
+    "cstring": "cpp",
+    "ctime": "cpp",
+    "cwchar": "cpp",
+    "exception": "cpp",
+    "forward_list": "cpp",
+    "fstream": "cpp",
+    "functional": "cpp",
+    "future": "cpp",
+    "initializer_list": "cpp",
+    "iomanip": "cpp",
+    "ios": "cpp",
+    "iosfwd": "cpp",
+    "iostream": "cpp",
+    "istream": "cpp",
+    "iterator": "cpp",
+    "limits": "cpp",
+    "map": "cpp",
+    "memory_resource": "cpp",
+    "mutex": "cpp",
+    "new": "cpp",
+    "numeric": "cpp",
+    "optional": "cpp",
+    "ostream": "cpp",
+    "queue": "cpp",
+    "random": "cpp",
+    "ranges": "cpp",
+    "scoped_allocator": "cpp",
+    "set": "cpp",
+    "shared_mutex": "cpp",
+    "source_location": "cpp",
+    "span": "cpp",
+    "sstream": "cpp",
+    "stack": "cpp",
+    "stdexcept": "cpp",
+    "stop_token": "cpp",
+    "streambuf": "cpp",
+    "string": "cpp",
+    "strstream": "cpp",
+    "system_error": "cpp",
+    "thread": "cpp",
+    "tuple": "cpp",
+    "type_traits": "cpp",
+    "typeindex": "cpp",
+    "typeinfo": "cpp",
+    "unordered_map": "cpp",
+    "unordered_set": "cpp",
+    "variant": "cpp",
+    "xfacet": "cpp",
+    "xhash": "cpp",
+    "xiosbase": "cpp",
+    "xlocale": "cpp",
+    "xlocbuf": "cpp",
+    "xlocinfo": "cpp",
+    "xlocmes": "cpp",
+    "xlocmon": "cpp",
+    "xlocnum": "cpp",
+    "xloctime": "cpp",
+    "xmemory": "cpp",
+    "xtr1common": "cpp",
+    "xtree": "cpp",
+    "xutility": "cpp"
   },
   "search.exclude": {
     "**/dist/**/*.js": true,
diff --git a/change/react-native-windows-8b686cb5-40c7-4c75-a48c-885541f2714c.json b/change/react-native-windows-8b686cb5-40c7-4c75-a48c-885541f2714c.json
@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "[Fabric] Enable concurrentRoot",
+  "packageName": "react-native-windows",
+  "email": "erozell@outlook.com",
+  "dependentChangeType": "patch"
+}
diff --git a/vnext/Microsoft.ReactNative/Fabric/Composition/CompositionRootView.cpp b/vnext/Microsoft.ReactNative/Fabric/Composition/CompositionRootView.cpp
@@ -288,8 +288,12 @@ void CompositionRootView::ShowInstanceLoaded() noexcept {
 
     auto rootTag = ::Microsoft::ReactNative::getNextRootViewTag();
     SetTag(rootTag);
-    uiManager->startSurface(
-        *this, rootTag, JSComponentName(), DynamicWriter::ToDynamic(Mso::Copy(m_reactViewOptions.InitialProps())));
+    auto initProps = DynamicWriter::ToDynamic(Mso::Copy(m_reactViewOptions.InitialProps()));
+    if (initProps.isNull()) {
+      initProps = folly::dynamic::object();
+    }
+    initProps["concurrentRoot"] = true;
+    uiManager->startSurface(*this, rootTag, JSComponentName(), initProps);
 
     m_isJSViewAttached = true;
   }
diff --git a/vnext/Microsoft.ReactNative/Fabric/FabricUIManagerModule.cpp b/vnext/Microsoft.ReactNative/Fabric/FabricUIManagerModule.cpp
@@ -76,6 +76,9 @@ void FabricUIManager::installFabricUIManager() noexcept {
           return std::make_unique<SynchronousEventBeat>(ownerBox, context, runtimeExecutor, runtimeScheduler);
         };
     toolbox.synchronousEventBeatFactory = synchronousBeatFactory;
+    runtimeExecutor = [runtimeScheduler](std::function<void(facebook::jsi::Runtime & runtime)> &&callback) {
+      runtimeScheduler->scheduleWork(std::move(callback));
+    };
   } else {
     facebook::react::EventBeat::Factory synchronousBeatFactory =
         [runtimeExecutor, context = m_context](facebook::react::EventBeat::SharedOwnerBox const &ownerBox) {
diff --git a/vnext/Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp b/vnext/Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp
@@ -26,7 +26,6 @@
 #endif
 #include <JSCallInvokerScheduler.h>
 #include <QuirkSettings.h>
-#include <SchedulerSettings.h>
 #include <Shared/DevServerHelper.h>
 #include <Views/ViewManager.h>
 #include <dispatchQueue/dispatchQueue.h>
@@ -88,10 +87,11 @@
 #include "ChakraRuntimeHolder.h"
 
 #include <CppRuntimeOptions.h>
+#include <CreateInstance.h>
 #include <CreateModules.h>
 #include <Utils/Helpers.h>
 #include <react/renderer/runtimescheduler/RuntimeScheduler.h>
-#include <react/renderer/runtimescheduler/RuntimeSchedulerBinding.h>
+#include <react/renderer/runtimescheduler/RuntimeSchedulerCallInvoker.h>
 #include "CrashManager.h"
 #include "JsiApi.h"
 #include "ReactCoreInjection.h"
@@ -569,6 +569,12 @@ void ReactInstanceWin::Initialize() noexcept {
 
           m_jsiRuntimeHolder = devSettings->jsiRuntimeHolder;
 
+          bool useRuntimeScheduler =
+              winrt::Microsoft::ReactNative::implementation::QuirkSettings::GetUseRuntimeScheduler(
+                  winrt::Microsoft::ReactNative::ReactPropertyBag(m_reactContext->Properties()));
+
+          devSettings->useRuntimeScheduler = useRuntimeScheduler;
+
           try {
             // We need to keep the instance wrapper alive as its destruction shuts down the native queue.
             m_options.TurboModuleProvider->SetReactContext(
@@ -587,6 +593,7 @@ void ReactInstanceWin::Initialize() noexcept {
                 std::move(cxxModules),
                 m_options.TurboModuleProvider,
                 m_options.TurboModuleProvider->LongLivedObjectCollection(),
+                m_reactContext->Properties(),
                 std::make_unique<BridgeUIBatchInstanceCallback>(weakThis),
                 m_jsMessageThread.Load(),
                 m_nativeMessageThread.Load(),
@@ -604,33 +611,6 @@ void ReactInstanceWin::Initialize() noexcept {
                                                   instance = m_instance.Load(),
                                                   turboModuleProvider = m_options.TurboModuleProvider,
                                                   useWebDebugger = m_options.UseWebDebugger()]() noexcept {
-              if (!useWebDebugger) {
-#ifdef USE_FABRIC
-                Microsoft::ReactNative::SchedulerSettings::SetRuntimeExecutor(
-                    winrt::Microsoft::ReactNative::ReactPropertyBag(reactContext->Properties()),
-                    instanceWrapper->GetInstance()->getRuntimeExecutor());
-#endif
-
-                if (winrt::Microsoft::ReactNative::implementation::QuirkSettings::GetUseRuntimeScheduler(
-                        winrt::Microsoft::ReactNative::ReactPropertyBag(reactContext->Properties()))) {
-                  std::shared_ptr<facebook::react::RuntimeScheduler> runtimeScheduler =
-                      std::make_shared<facebook::react::RuntimeScheduler>(
-                          instanceWrapper->GetInstance()->getRuntimeExecutor());
-
-                  facebook::react::RuntimeSchedulerBinding::createAndInstallIfNeeded(
-                      *jsiRuntimeHolder->getRuntime().get(), runtimeScheduler);
-                  Microsoft::ReactNative::SchedulerSettings::SetRuntimeScheduler(
-                      ReactPropertyBag(reactContext->Properties()), runtimeScheduler);
-                }
-              }
-
-#ifdef USE_FABRIC
-              // Eagerly init the FabricUI binding
-              if (!useWebDebugger) {
-                turboModuleProvider->getModule("FabricUIManagerBinding", instance->getJSCallInvoker());
-              }
-#endif
-
               if (onCreated) {
                 onCreated.Get()->Invoke(reactContext);
               }
diff --git a/vnext/Microsoft.ReactNative/TurboModulesProvider.cpp b/vnext/Microsoft.ReactNative/TurboModulesProvider.cpp
@@ -384,6 +384,10 @@ std::vector<std::string> TurboModulesProvider::getEagerInitModuleNames() noexcep
   if (it != m_moduleProviders.end()) {
     eagerModules.push_back("UIManager");
   }
+  it = m_moduleProviders.find("FabricUIManagerBinding");
+  if (it != m_moduleProviders.end()) {
+    eagerModules.push_back("FabricUIManagerBinding");
+  }
   return eagerModules;
 }
 
diff --git a/vnext/Shared/CreateInstance.h b/vnext/Shared/CreateInstance.h
@@ -0,0 +1,25 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#pragma once
+
+#include <InstanceManager.h>
+#include <winrt/Microsoft.ReactNative.h>
+
+namespace facebook::react {
+
+std::shared_ptr<InstanceWrapper> CreateReactInstance(
+    std::shared_ptr<Instance> &&instance,
+    std::string &&jsBundleRelativePath,
+    std::vector<
+        std::tuple<std::string, facebook::xplat::module::CxxModule::Provider, std::shared_ptr<MessageQueueThread>>>
+        &&cxxModules,
+    std::shared_ptr<TurboModuleRegistry> turboModuleRegistry,
+    std::shared_ptr<facebook::react::LongLivedObjectCollection> longLivedObjectCollection,
+    const winrt::Microsoft::ReactNative::IReactPropertyBag &propertyBag,
+    std::unique_ptr<InstanceCallback> &&callback,
+    std::shared_ptr<MessageQueueThread> jsQueue,
+    std::shared_ptr<MessageQueueThread> nativeQueue,
+    std::shared_ptr<DevSettings> devSettings) noexcept;
+
+} // namespace facebook::react
diff --git a/vnext/Shared/DevSettings.h b/vnext/Shared/DevSettings.h
@@ -105,6 +105,9 @@ struct DevSettings {
 
   // OC:8368383 - Memory leak under investigation.
   bool useWebSocketTurboModule{false};
+
+  // Enable concurrent mode by installing runtimeScheduler
+  bool useRuntimeScheduler{false};
 };
 
 } // namespace react
diff --git a/vnext/Shared/InstanceManager.cpp b/vnext/Shared/InstanceManager.cpp
@@ -41,7 +41,8 @@ std::shared_ptr<InstanceWrapper> CreateReactInstance(
       std::move(jsBundleBasePath),
       std::move(cxxModules),
       std::move(turboModuleRegistry),
-      nullptr,
+      nullptr, // longLivedObjectCollection
+      nullptr, // PropertyBag
       std::move(callback),
       std::move(jsQueue),
       std::move(nativeQueue),
@@ -59,6 +60,7 @@ std::shared_ptr<InstanceWrapper> CreateReactInstance(
         &&cxxModules,
     std::shared_ptr<TurboModuleRegistry> turboModuleRegistry,
     std::shared_ptr<facebook::react::LongLivedObjectCollection> longLivedObjectCollection,
+    const winrt::Microsoft::ReactNative::IReactPropertyBag &propertyBag,
     std::unique_ptr<InstanceCallback> &&callback,
     std::shared_ptr<MessageQueueThread> jsQueue,
     std::shared_ptr<MessageQueueThread> nativeQueue,
@@ -70,6 +72,7 @@ std::shared_ptr<InstanceWrapper> CreateReactInstance(
       std::move(cxxModules),
       std::move(turboModuleRegistry),
       std::move(longLivedObjectCollection),
+      propertyBag,
       std::move(callback),
       std::move(jsQueue),
       std::move(nativeQueue),
diff --git a/vnext/Shared/InstanceManager.h b/vnext/Shared/InstanceManager.h
@@ -18,16 +18,15 @@ namespace folly {
 struct dynamic;
 }
 
-namespace facebook {
-
-namespace react {
+namespace facebook::react {
 
 class Instance;
 struct InstanceCallback;
 class MessageQueueThread;
 class ModuleRegistry;
 class IUIManager;
 class TurboModuleRegistry;
+class RuntimeScheduler;
 
 struct InstanceWrapper {
   virtual const std::shared_ptr<Instance> &GetInstance() const noexcept = 0;
@@ -52,19 +51,6 @@ std::shared_ptr<InstanceWrapper> CreateReactInstance(
     std::shared_ptr<MessageQueueThread> nativeQueue,
     std::shared_ptr<DevSettings> devSettings) noexcept;
 
-std::shared_ptr<InstanceWrapper> CreateReactInstance(
-    std::shared_ptr<Instance> &&instance,
-    std::string &&jsBundleRelativePath,
-    std::vector<
-        std::tuple<std::string, facebook::xplat::module::CxxModule::Provider, std::shared_ptr<MessageQueueThread>>>
-        &&cxxModules,
-    std::shared_ptr<TurboModuleRegistry> turboModuleRegistry,
-    std::shared_ptr<facebook::react::LongLivedObjectCollection> longLivedObjectCollection,
-    std::unique_ptr<InstanceCallback> &&callback,
-    std::shared_ptr<MessageQueueThread> jsQueue,
-    std::shared_ptr<MessageQueueThread> nativeQueue,
-    std::shared_ptr<DevSettings> devSettings) noexcept;
-
 std::shared_ptr<InstanceWrapper> CreateReactInstance(
     std::shared_ptr<Instance> &&instance,
     std::string &&jsBundleBasePath,
@@ -78,5 +64,4 @@ std::shared_ptr<InstanceWrapper> CreateReactInstance(
     std::shared_ptr<MessageQueueThread> nativeQueue,
     std::shared_ptr<DevSettings> devSettings) noexcept;
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/vnext/Shared/OInstance.cpp b/vnext/Shared/OInstance.cpp
diff --git a/vnext/Shared/OInstance.h b/vnext/Shared/OInstance.h
diff --git a/vnext/Shared/Shared.vcxitems b/vnext/Shared/Shared.vcxitems
diff --git a/vnext/Shared/Shared.vcxitems.filters b/vnext/Shared/Shared.vcxitems.filters

Original file line number	Diff line number	Diff line change
`@@ -384,6 +384,10 @@ std::vector<std::string> TurboModulesProvider::getEagerInitModuleNames() noexcep`
`384`	`384`	`if (it != m_moduleProviders.end()) {`
`385`	`385`	`eagerModules.push_back("UIManager");`
`386`	`386`	`}`
	`387`	`+ it = m_moduleProviders.find("FabricUIManagerBinding");`
	`388`	`+ if (it != m_moduleProviders.end()) {`
	`389`	`+ eagerModules.push_back("FabricUIManagerBinding");`
	`390`	`+ }`
`387`	`391`	`return eagerModules;`
`388`	`392`	`}`
`389`	`393`