react-native-windows 0.75.4 → 0.76.0-preview.2

package/Microsoft.ReactNative/ReactNativeWin32App.cpp

@@ -0,0 +1,82 @@
+#include "pch.h"
+#include "ReactNativeWin32App.h"
+#include "ReactNativeWin32App.g.cpp"
+#include "ReactNativeHost.h"
+#include "winrt/Microsoft.UI.Composition.h"
+#include "winrt/Microsoft.UI.Content.h"
+#include "winrt/Microsoft.UI.Interop.h"
+#include "winrt/Microsoft.UI.Windowing.h"
+
+namespace winrt::Microsoft::ReactNative::implementation {
+ReactNativeWin32App::ReactNativeWin32App() {}
+
+ReactNativeWin32App::~ReactNativeWin32App() {
+  m_desktopChildSiteBridge = nullptr;
+
+  // Destroy all Composition objects
+  m_compositor.Close();
+  m_compositor = nullptr;
+}
+
+void ReactNativeWin32App::AppWindow(winrt::Microsoft::UI::Windowing::AppWindow const &appWindow) {
+  m_appWindow = appWindow;
+}
+
+winrt::Microsoft::UI::Windowing::AppWindow ReactNativeWin32App::AppWindow() {
+  return m_appWindow;
+}
+
+void ReactNativeWin32App::Compositor(winrt::Microsoft::UI::Composition::Compositor const &compositor) {
+  m_compositor = compositor;
+}
+
+winrt::Microsoft::UI::Composition::Compositor ReactNativeWin32App::Compositor() {
+  return m_compositor;
+}
+
+winrt::Microsoft::ReactNative::ReactNativeIsland ReactNativeWin32App::ReactNativeIsland() {
+  return m_reactNativeIsland;
+}
+
+void ReactNativeWin32App::ReactNativeIsland(winrt::Microsoft::ReactNative::ReactNativeIsland const &reactNativeIsland) {
+  m_reactNativeIsland = reactNativeIsland;
+}
+
+winrt::Microsoft::UI::Content::DesktopChildSiteBridge ReactNativeWin32App::DesktopChildSiteBridge() {
+  return m_desktopChildSiteBridge;
+}
+
+void ReactNativeWin32App::DesktopChildSiteBridge(
+    winrt::Microsoft::UI::Content::DesktopChildSiteBridge const &desktopChildSiteBridge) {
+  m_desktopChildSiteBridge = desktopChildSiteBridge;
+}
+
+winrt::Microsoft::ReactNative::ReactNativeHost ReactNativeWin32App::ReactNativeHost() {
+  if (m_host == nullptr) {
+    m_host = winrt::make<winrt::Microsoft::ReactNative::implementation::ReactNativeHost>();
+  }
+  return m_host;
+}
+
+void ReactNativeWin32App::ReactNativeHost(winrt::Microsoft::ReactNative::ReactNativeHost const &host) {
+  m_host = host;
+}
+
+void ReactNativeWin32App::DispatchQueueController(
+    winrt::Microsoft::UI::Dispatching::DispatcherQueueController const &dispatcherQueueController) {
+  m_dispatcherQueueController = dispatcherQueueController;
+}
+
+void ReactNativeWin32App::Start() {
+  m_desktopChildSiteBridge.Show();
+
+  // Run the main application event loop
+  m_dispatcherQueueController.DispatcherQueue().RunEventLoop();
+
+  // Rundown the DispatcherQueue. This drains the queue and raises events to let components
+  // know the message loop has finished.
+  m_dispatcherQueueController.ShutdownQueue();
+
+  m_desktopChildSiteBridge.Close();
+}
+} // namespace winrt::Microsoft::ReactNative::implementation

package/Microsoft.ReactNative/ReactNativeWin32App.h

@@ -0,0 +1,38 @@
+#pragma once
+#include "ReactNativeWin32App.g.h"
+#include "winrt/Microsoft.UI.Dispatching.h"
+
+namespace winrt::Microsoft::ReactNative::implementation {
+struct ReactNativeWin32App : ReactNativeWin32AppT<ReactNativeWin32App> {
+  ReactNativeWin32App();
+  ~ReactNativeWin32App();
+
+  void AppWindow(winrt::Microsoft::UI::Windowing::AppWindow const &appWindow);
+  winrt::Microsoft::UI::Windowing::AppWindow AppWindow();
+
+  winrt::Microsoft::UI::Composition::Compositor Compositor();
+  void Compositor(winrt::Microsoft::UI::Composition::Compositor const &compositor);
+
+  winrt::Microsoft::ReactNative::ReactNativeIsland ReactNativeIsland();
+  void ReactNativeIsland(winrt::Microsoft::ReactNative::ReactNativeIsland const &reactNativeIsland);
+
+  winrt::Microsoft::UI::Content::DesktopChildSiteBridge DesktopChildSiteBridge();
+  void DesktopChildSiteBridge(winrt::Microsoft::UI::Content::DesktopChildSiteBridge const &desktopChildSiteBridge);
+
+  void DispatchQueueController(
+      winrt::Microsoft::UI::Dispatching::DispatcherQueueController const &dispatcherQueueController);
+
+  winrt::Microsoft::ReactNative::ReactNativeHost ReactNativeHost();
+  void ReactNativeHost(winrt::Microsoft::ReactNative::ReactNativeHost const &host);
+
+  void Start();
+
+ private:
+  winrt::Microsoft::UI::Windowing::AppWindow m_appWindow{nullptr};
+  winrt::Microsoft::UI::Composition::Compositor m_compositor{nullptr};
+  winrt::Microsoft::UI::Dispatching::DispatcherQueueController m_dispatcherQueueController{nullptr};
+  winrt::Microsoft::ReactNative::ReactNativeHost m_host{nullptr};
+  winrt::Microsoft::ReactNative::ReactNativeIsland m_reactNativeIsland{nullptr};
+  winrt::Microsoft::UI::Content::DesktopChildSiteBridge m_desktopChildSiteBridge{nullptr};
+};
+} // namespace winrt::Microsoft::ReactNative::implementation

package/Microsoft.ReactNative/TurboModulesProvider.cpp

@@ -8,7 +8,9 @@
 #include "pch.h"
 #include "TurboModulesProvider.h"
 #include <ReactCommon/TurboModuleUtils.h>
+#include <react/bridging/EventEmitter.h>
 #include "JSDispatcherWriter.h"
+#include "JSValueWriter.h"
 #include "JsiApi.h"
 #include "JsiReader.h"
 #include "JsiWriter.h"
@@ -51,6 +53,12 @@ struct TurboModuleBuilder : winrt::implements<TurboModuleBuilder, IReactModuleBu
     m_methods.insert({key, {returnType, method}});
   }
 
+  void AddEventEmitter(hstring const &name, EventEmitterInitializerDelegate const &emitter) noexcept {
+    auto key = to_string(name);
+    EnsureMemberNotSet(key, true);
+    m_eventEmitters.insert({key, emitter});
+  }
+
   void AddSyncMethod(hstring const &name, SyncMethodDelegate const &method) noexcept {
     auto key = to_string(name);
     EnsureMemberNotSet(key, true);
@@ -70,10 +78,15 @@ struct TurboModuleBuilder : winrt::implements<TurboModuleBuilder, IReactModuleBu
     return m_constantProviders;
   }
 
+  const std::unordered_map<std::string, EventEmitterInitializerDelegate> &EventEmitters() const noexcept {
+    return m_eventEmitters;
+  }
+
  private:
   void EnsureMemberNotSet(const std::string &key, bool checkingMethod) noexcept {
     VerifyElseCrash(m_methods.find(key) == m_methods.end());
     VerifyElseCrash(m_syncMethods.find(key) == m_syncMethods.end());
+    VerifyElseCrash(m_eventEmitters.find(key) == m_eventEmitters.end());
     if (checkingMethod && key == "getConstants") {
       VerifyElseCrash(m_constantProviders.size() == 0);
     }
@@ -81,6 +94,7 @@ struct TurboModuleBuilder : winrt::implements<TurboModuleBuilder, IReactModuleBu
 
  private:
   IReactContext m_reactContext;
+  std::unordered_map<std::string, EventEmitterInitializerDelegate> m_eventEmitters;
   std::unordered_map<std::string, TurboModuleMethodInfo> m_methods;
   std::unordered_map<std::string, SyncMethodDelegate> m_syncMethods;
   std::vector<ConstantProviderDelegate> m_constantProviders;
@@ -373,6 +387,36 @@ class TurboModuleImpl : public facebook::react::TurboModule {
       }
     }
 
+    {
+      // try to find an event
+      auto it = m_moduleBuilder->EventEmitters().find(key);
+      if (it != m_moduleBuilder->EventEmitters().end()) {
+        // See if we have an existing eventEmitter
+        auto itEmitter = m_eventEmitters.find(key);
+        if (itEmitter == m_eventEmitters.end()) {
+          m_eventEmitters[key] = std::make_shared<facebook::react::AsyncEventEmitter<facebook::jsi::Value>>();
+
+          itEmitter = m_eventEmitters.find(key);
+
+          it->second([emitter = std::static_pointer_cast<facebook::react::AsyncEventEmitter<facebook::jsi::Value>>(
+                          itEmitter->second),
+                      jsInvoker = jsInvoker_](const JSValueArgWriter &eventDelegate) {
+            auto argWriter = MakeJSValueTreeWriter();
+            eventDelegate(argWriter);
+            emitter->emit(
+                [jsInvoker, eventDelegate, jsValue = std::make_shared<JSValue>(TakeJSValue(argWriter))](
+                    facebook::jsi::Runtime &rt) -> facebook::jsi::Value {
+                  auto argWriter = winrt::make<JsiWriter>(rt);
+                  WriteValue(argWriter, *jsValue);
+                  return argWriter.as<JsiWriter>()->MoveResult();
+                });
+          });
+        }
+
+        return itEmitter->second->get(runtime, jsInvoker_);
+      }
+    }
+
     // returns undefined if the expected member is not found
     return facebook::jsi::Value::undefined();
   }
@@ -408,6 +452,7 @@ class TurboModuleImpl : public facebook::react::TurboModule {
   IReactContext m_reactContext;
   winrt::com_ptr<TurboModuleBuilder> m_moduleBuilder;
   IInspectable m_providedModule;
+  std::unordered_map<std::string, std::shared_ptr<facebook::react::IAsyncEventEmitter>> m_eventEmitters;
   std::shared_ptr<implementation::HostObjectWrapper> m_hostObjectWrapper;
   std::weak_ptr<facebook::react::LongLivedObjectCollection> m_longLivedObjectCollection;
 };

package/Microsoft.ReactNative/Views/DynamicAutomationPeer.cpp

@@ -257,7 +257,8 @@ winrt::IInspectable DynamicAutomationPeer::GetPatternCore(winrt::PatternInterfac
   if (patternInterface == winrt::PatternInterface::Invoke &&
       (accessibilityRole == winrt::Microsoft::ReactNative::AccessibilityRoles::Button ||
        accessibilityRole == winrt::Microsoft::ReactNative::AccessibilityRoles::ImageButton ||
-       accessibilityRole == winrt::Microsoft::ReactNative::AccessibilityRoles::Radio)) {
+       accessibilityRole == winrt::Microsoft::ReactNative::AccessibilityRoles::Radio ||
+       accessibilityRole == winrt::Microsoft::ReactNative::AccessibilityRoles::Link)) {
     return *this;
   } else if (
       (patternInterface == winrt::PatternInterface::Selection ||

package/Microsoft.ReactNative/Views/FlyoutViewManager.cpp

@@ -200,7 +200,10 @@ void FlyoutShadowNode::createView(const winrt::Microsoft::ReactNative::JSValueOb
       }
 
       OnFlyoutClosed(GetViewManager()->GetReactContext(), m_tag, false);
-      m_xamlRootChangedRevoker.revoke();
+
+      if (Is19H1OrHigher()) {
+        m_xamlRootChangedRevoker.revoke();
+      }
     }
   });
 
@@ -262,15 +265,17 @@ void FlyoutShadowNode::createView(const winrt::Microsoft::ReactNative::JSValueOb
       });
 
   // Set XamlRoot on the Flyout to handle XamlIsland/AppWindow scenarios.
-  if (auto flyoutBase6 = m_flyout.try_as<winrt::IFlyoutBase6>()) {
-    if (auto uiManager = GetNativeUIManager(GetViewManager()->GetReactContext()).lock()) {
-      if (auto xamlRoot = uiManager->tryGetXamlRoot(m_rootTag)) {
-        flyoutBase6.XamlRoot(xamlRoot);
-        m_xamlRootChangedRevoker = xamlRoot.Changed(winrt::auto_revoke, [this](auto &&, auto &&) {
-          if (m_isLightDismissEnabled) {
-            onDropViewInstance();
-          }
-        });
+  if (Is19H1OrHigher()) {
+    if (auto flyoutBase6 = m_flyout.try_as<winrt::IFlyoutBase6>()) {
+      if (auto uiManager = GetNativeUIManager(GetViewManager()->GetReactContext()).lock()) {
+        if (auto xamlRoot = uiManager->tryGetXamlRoot(m_rootTag)) {
+          flyoutBase6.XamlRoot(xamlRoot);
+          m_xamlRootChangedRevoker = xamlRoot.Changed(winrt::auto_revoke, [this](auto &&, auto &&) {
+            if (m_isLightDismissEnabled) {
+              onDropViewInstance();
+            }
+          });
+        }
       }
     }
   }
@@ -403,12 +408,16 @@ winrt::Flyout FlyoutShadowNode::GetFlyout() {
 void FlyoutShadowNode::OnShowFlyout() {
   AdjustDefaultFlyoutStyle(50000, 50000);
   if (m_isFlyoutShowOptionsSupported) {
-    if (!m_flyout.XamlRoot()) {
-      LogErrorAndClose("The target view window was closed before flyout could be shown.");
-    } else if (!m_targetElement && m_targetTag > 0) {
-      LogErrorAndClose("The target view unmounted before flyout could be shown.");
-    } else if (m_targetElement && m_flyout.XamlRoot() != m_targetElement.XamlRoot()) {
-      LogErrorAndClose("The target view window lost focus before flyout could be shown.");
+    if (Is19H1OrHigher()) {
+      if (!m_flyout.XamlRoot()) {
+        LogErrorAndClose("The target view window was closed before flyout could be shown.");
+      } else if (!m_targetElement && m_targetTag > 0) {
+        LogErrorAndClose("The target view unmounted before flyout could be shown.");
+      } else if (m_targetElement && m_flyout.XamlRoot() != m_targetElement.XamlRoot()) {
+        LogErrorAndClose("The target view window lost focus before flyout could be shown.");
+      } else {
+        m_flyout.ShowAt(m_targetElement, m_showOptions);
+      }
     } else {
       m_flyout.ShowAt(m_targetElement, m_showOptions);
     }

package/Microsoft.ReactNative.Cxx/Microsoft.ReactNative.Cxx.vcxitems

@@ -17,10 +17,6 @@
     <TurboModule_SourcePath Condition="'$(TurboModule_SourcePath)' == '' AND Exists('$(MSBuildThisFileDirectory)ReactCommon\TurboModule.h')">$(MSBuildThisFileDirectory)</TurboModule_SourcePath>
     <Bridging_SourcePath Condition="'$(Bridging_SourcePath)' == '' AND '$(ReactNativeDir)' != ''">$(ReactNativeDir)\ReactCommon\react\bridging</Bridging_SourcePath>
     <Bridging_SourcePath Condition="'$(Bridging_SourcePath)' == '' AND Exists('$(MSBuildThisFileDirectory)ReactCommon\CallbackWrapper.h')">$(MSBuildThisFileDirectory)ReactCommon</Bridging_SourcePath>
-    <Bridging_SourcePath Condition="'$(Bridging_SourcePath)' == '' AND Exists('$(MSBuildThisFileDirectory)ReactCommon\EventEmitter.h')">$(MSBuildThisFileDirectory)ReactCommon</Bridging_SourcePath>
-    <Bridging_SourcePath Condition="'$(Bridging_SourcePath)' == '' AND Exists('$(MSBuildThisFileDirectory)ReactCommon\Function.h')">$(MSBuildThisFileDirectory)ReactCommon</Bridging_SourcePath>
-    <Bridging_SourcePath Condition="'$(Bridging_SourcePath)' == '' AND Exists('$(MSBuildThisFileDirectory)ReactCommon\Base.h')">$(MSBuildThisFileDirectory)ReactCommon</Bridging_SourcePath>
-    <Bridging_SourcePath Condition="'$(Bridging_SourcePath)' == '' AND Exists('$(MSBuildThisFileDirectory)ReactCommon\Convert.h')">$(MSBuildThisFileDirectory)ReactCommon</Bridging_SourcePath>
 
     <NodeApiJsiCommitHash>83cfef428a97627c9185c73da097e42742de56eb</NodeApiJsiCommitHash>
     <NodeApiJsiLocal Condition="Exists('$(MSBuildThisFileDirectory)NodeApiJsiRuntime.cpp')">true</NodeApiJsiLocal>
@@ -65,6 +61,9 @@
     <ClInclude Include="$(TurboModule_SourcePath)\ReactCommon\LongLivedObject.h" />
     <ClInclude Include="$(Bridging_SourcePath)\CallbackWrapper.h" />
     <ClInclude Include="$(Bridging_SourcePath)\EventEmitter.h" />
+    <ClInclude Include="$(Bridging_SourcePath)\Function.h" />
+    <ClInclude Include="$(Bridging_SourcePath)\Base.h" />
+    <ClInclude Include="$(Bridging_SourcePath)\Convert.h" />
     <ClInclude Include="$(TurboModule_SourcePath)\ReactCommon\TurboModule.h" />
     <ClInclude Include="$(TurboModule_SourcePath)\ReactCommon\TurboModuleUtils.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)CppWinRTIncludes.h" />

package/Microsoft.ReactNative.Cxx/Microsoft.ReactNative.Cxx.vcxitems.filters

@@ -161,6 +161,9 @@
     </ClInclude>
     <ClInclude Include="$(Bridging_SourcePath)\CallbackWrapper.h" />
     <ClInclude Include="$(Bridging_SourcePath)\EventEmitter.h" />
+    <ClInclude Include="$(Bridging_SourcePath)\Function.h" />
+    <ClInclude Include="$(Bridging_SourcePath)\Base.h" />
+    <ClInclude Include="$(Bridging_SourcePath)\Convert.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)JSI\LongLivedJsiValue.h">
       <Filter>TurboModule</Filter>
     </ClInclude>

package/Microsoft.ReactNative.Cxx/ModuleRegistration.cpp

@@ -17,7 +17,7 @@ ModuleRegistration::ModuleRegistration(wchar_t const *moduleName) noexcept : m_m
 
 void AddAttributedModules(IReactPackageBuilder const &packageBuilder, bool useTurboModules) noexcept {
   for (auto const *reg = ModuleRegistration::Head(); reg != nullptr; reg = reg->Next()) {
-    if (useTurboModules)
+    if (useTurboModules || reg->ShouldRegisterAsTurboModule())
       packageBuilder.AddTurboModule(reg->ModuleName(), reg->MakeModuleProvider());
     else
       packageBuilder.AddModule(reg->ModuleName(), reg->MakeModuleProvider());
@@ -30,7 +30,7 @@ bool TryAddAttributedModule(
     bool useTurboModule) noexcept {
   for (auto const *reg = ModuleRegistration::Head(); reg != nullptr; reg = reg->Next()) {
     if (moduleName == reg->ModuleName()) {
-      if (useTurboModule) {
+      if (useTurboModule || reg->ShouldRegisterAsTurboModule()) {
         packageBuilder.AddTurboModule(moduleName, reg->MakeModuleProvider());
       } else {
         packageBuilder.AddModule(moduleName, reg->MakeModuleProvider());

package/Microsoft.ReactNative.Cxx/ModuleRegistration.h

@@ -17,10 +17,20 @@
 // The macros below are internal implementation details for macro defined in nativeModules.h
 //
 
-// Register struct as a ReactNative module.
-#define INTERNAL_REACT_MODULE_3_ARGS(moduleStruct, moduleName, eventEmitterName)                                    \
+template <typename T>
+struct IsReactTurboModule;
+
+// Default to false if no specific override
+template <typename T>
+struct IsReactTurboModule : std::false_type {};
+
+#define INTERNAL_REACT_MODULE_REGISTRATION_AND_PROVIDER(                                                            \
+    moduleStruct, moduleName, eventEmitterName, isReactTurboModule)                                                 \
   struct moduleStruct;                                                                                              \
                                                                                                                     \
+  template <>                                                                                                       \
+  struct IsReactTurboModule<moduleStruct> : std::isReactTurboModule##_type {};                                      \
+                                                                                                                    \
   template <class TDummy>                                                                                           \
   struct moduleStruct##_ModuleRegistration final : winrt::Microsoft::ReactNative::ModuleRegistration {              \
     moduleStruct##_ModuleRegistration() noexcept : winrt::Microsoft::ReactNative::ModuleRegistration{moduleName} {} \
@@ -29,6 +39,8 @@
       return winrt::Microsoft::ReactNative::MakeModuleProvider<moduleStruct>();                                     \
     }                                                                                                               \
                                                                                                                     \
+    bool ShouldRegisterAsTurboModule() const noexcept override { return isReactTurboModule; }                       \
+                                                                                                                    \
     static const moduleStruct##_ModuleRegistration Registration;                                                    \
   };                                                                                                                \
                                                                                                                     \
@@ -42,6 +54,9 @@
         moduleName, eventEmitterName, winrt::Microsoft::ReactNative::ReactAttributeId<__COUNTER__>{});              \
   }
 
+#define INTERNAL_REACT_MODULE_3_ARGS(moduleStruct, moduleName, eventEmitterName) \
+  INTERNAL_REACT_MODULE_REGISTRATION_AND_PROVIDER(moduleStruct, moduleName, eventEmitterName, false)
+
 #define INTERNAL_REACT_MODULE_2_ARGS(moduleStruct, moduleName) \
   INTERNAL_REACT_MODULE_3_ARGS(moduleStruct, moduleName, L"")
 
@@ -51,15 +66,23 @@
   INTERNAL_REACT_RECOMPOSER_4(     \
       (__VA_ARGS__, INTERNAL_REACT_MODULE_3_ARGS, INTERNAL_REACT_MODULE_2_ARGS, INTERNAL_REACT_MODULE_1_ARG, ))
 
-// Another version of REACT_MODULE but does not do auto registration
-#define INTERNAL_REACT_MODULE_NOREG_3_ARGS(moduleStruct, moduleName, eventEmitterName)                 \
+#define INTERNAL_REACT_MODULE_NO_REGISTRATION_AND_PROVIDER(                                            \
+    moduleStruct, moduleName, eventEmitterName, isReactTurboModule)                                    \
   struct moduleStruct;                                                                                 \
+                                                                                                       \
+  template <>                                                                                          \
+  struct IsReactTurboModule<moduleStruct> : std::isReactTurboModule##_type {};                         \
+                                                                                                       \
   template <class TRegistry>                                                                           \
   constexpr void GetReactModuleInfo(moduleStruct *, TRegistry &registry) noexcept {                    \
     registry.RegisterModule(                                                                           \
         moduleName, eventEmitterName, winrt::Microsoft::ReactNative::ReactAttributeId<__COUNTER__>{}); \
   }
 
+// Another version of REACT_MODULE but does not do auto registration
+#define INTERNAL_REACT_MODULE_NOREG_3_ARGS(moduleStruct, moduleName, eventEmitterName) \
+  INTERNAL_REACT_MODULE_NO_REGISTRATION_AND_PROVIDER(moduleStruct, moduleName, eventEmitterName, false)
+
 #define INTERNAL_REACT_MODULE_NOREG_2_ARGS(moduleStruct, moduleName) \
   INTERNAL_REACT_MODULE_NOREG_3_ARGS(moduleStruct, moduleName, L"")
 
@@ -73,6 +96,30 @@
        INTERNAL_REACT_MODULE_NOREG_2_ARGS, \
        INTERNAL_REACT_MODULE_NOREG_1_ARG, ))
 
+#define INTERNAL_REACT_GET_ARG_3(arg1, arg2, arg3, ...) arg3
+#define INTERNAL_REACT_RECOMPOSER_3(argsWithParentheses) INTERNAL_REACT_GET_ARG_3 argsWithParentheses
+
+// Register struct as a ReactNative module.
+#define INTERNAL_REACT_TURBO_MODULE_2_ARGS(moduleStruct, moduleName) \
+  INTERNAL_REACT_MODULE_REGISTRATION_AND_PROVIDER(moduleStruct, moduleName, L"", true)
+
+#define INTERNAL_REACT_TURBO_MODULE_1_ARG(moduleStruct) \
+  INTERNAL_REACT_TURBO_MODULE_2_ARGS(moduleStruct, L## #moduleStruct)
+
+#define INTERNAL_REACT_TURBO_MODULE(...) \
+  INTERNAL_REACT_RECOMPOSER_3((__VA_ARGS__, INTERNAL_REACT_TURBO_MODULE_2_ARGS, INTERNAL_REACT_TURBO_MODULE_1_ARG, ))
+
+// Another version of REACT_MODULE but does not do auto registration
+#define INTERNAL_REACT_TURBO_MODULE_NOREG_2_ARGS(moduleStruct, moduleName) \
+  INTERNAL_REACT_MODULE_NO_REGISTRATION_AND_PROVIDER(moduleStruct, moduleName, L"", true)
+
+#define INTERNAL_REACT_TURBO_MODULE_NOREG_1_ARG(moduleStruct) \
+  INTERNAL_REACT_TURBO_MODULE_NOREG_2_ARGS(moduleStruct, L## #moduleStruct)
+
+#define INTERNAL_REACT_TURBO_MODULE_NOREG(...) \
+  INTERNAL_REACT_RECOMPOSER_3(                 \
+      (__VA_ARGS__, INTERNAL_REACT_TURBO_MODULE_NOREG_2_ARGS, INTERNAL_REACT_TURBO_MODULE_NOREG_1_ARG, ))
+
 // Provide meta data information about struct member.
 // For each member with a 'custom attribute' macro we create a static method to provide meta data.
 // The member Id is generated as a ReactMemberId<__COUNTER__> type.
@@ -102,6 +149,7 @@ struct ModuleRegistration {
   ModuleRegistration(wchar_t const *moduleName) noexcept;
 
   virtual ReactModuleProvider MakeModuleProvider() const noexcept = 0;
+  virtual bool ShouldRegisterAsTurboModule() const noexcept = 0;
 
   static ModuleRegistration const *Head() noexcept {
     return s_head;
@@ -122,6 +170,16 @@ struct ModuleRegistration {
   static const ModuleRegistration *s_head;
 };
 
+// AddAttributedModules(IReactPackageBuilder const &packageBuilder, bool useTurboModules = false)
+// Arguments:
+// - packageBuilder (required).
+// - useTurboModules (optional) - If set to true, all modules will be registered as TurboModules.
+//                                Consider moving modules to use REACT_TURBO_MODULE instead.
+//
+// AddAttributedModules will add all modules attributed with REACT_MODULE or REACT_TURBO_MODULE into packageBuilder.
+// if useTurboModules is specified, then all modules will be registered using packageBuilder.AddTurboModules
+// Otherwise modules attributed with REACT_MODULE will use packageBuilder.AddModule, and modules attributed with
+// REACT_TURBO_MODULE will use packageBuilder.AddTurboModule.
 void AddAttributedModules(IReactPackageBuilder const &packageBuilder, bool useTurboModules = false) noexcept;
 
 bool TryAddAttributedModule(