react-native-windows 0.72.13 → 0.73.0-preview.1

package/Microsoft.ReactNative/Modules/NativeUIManager.cpp

@@ -42,8 +42,8 @@ static inline bool YogaFloatEquals(float x, float y) {
 
 #if defined(_DEBUG)
 static int YogaLog(
-    const YGConfigRef /*config*/,
-    const YGNodeRef /*node*/,
+    const YGConfigConstRef /*config*/,
+    const YGNodeConstRef /*node*/,
     YGLogLevel /*level*/,
     const char *format,
     va_list args) {
@@ -153,9 +153,10 @@ NativeUIManager::NativeUIManager(winrt::Microsoft::ReactNative::ReactContext con
   m_yogaConfig = YGConfigNew();
   if (React::implementation::QuirkSettings::GetUseWebFlexBasisBehavior(m_context.Properties()))
     YGConfigSetExperimentalFeatureEnabled(m_yogaConfig, YGExperimentalFeatureWebFlexBasis, true);
-  if (React::implementation::QuirkSettings::GetMatchAndroidAndIOSStretchBehavior(m_context.Properties()))
-    YGConfigSetUseLegacyStretchBehaviour(m_yogaConfig, true);
-
+  auto errata = YGErrataAll;
+  if (!React::implementation::QuirkSettings::GetMatchAndroidAndIOSStretchBehavior(m_context.Properties()))
+    errata &= ~YGErrataStretchFlexBasis;
+  YGConfigSetErrata(m_yogaConfig, errata);
 #if defined(_DEBUG)
   YGConfigSetLogger(m_yogaConfig, &YogaLog);
 
@@ -217,8 +218,9 @@ void NativeUIManager::AddRootView(ShadowNode &shadowNode, facebook::react::IReac
   SystraceSection s("NativeUIManager::AddRootView");
   auto xamlRootView = static_cast<IXamlRootView *>(pReactRootView);
   XamlView view = xamlRootView->GetXamlView();
+  const auto rootTag = shadowNode.m_tag;
   m_tagsToXamlReactControl.emplace(
-      shadowNode.m_tag,
+      rootTag,
       winrt::weak_ref<winrt::Microsoft::ReactNative::ReactRootView>(
           view.as<winrt::Microsoft::ReactNative::ReactRootView>()));
 
@@ -226,14 +228,16 @@ void NativeUIManager::AddRootView(ShadowNode &shadowNode, facebook::react::IReac
   view.as<xaml::FrameworkElement>().FlowDirection(
       I18nManager::IsRTL(m_context.Properties()) ? xaml::FlowDirection::RightToLeft : xaml::FlowDirection::LeftToRight);
 
-  m_tagsToYogaNodes.emplace(shadowNode.m_tag, make_yoga_node(m_yogaConfig));
+  m_tagsToYogaNodes.emplace(rootTag, make_yoga_node(m_yogaConfig));
 
   auto element = view.as<xaml::FrameworkElement>();
-  Microsoft::ReactNative::SetTag(element, shadowNode.m_tag);
+  Microsoft::ReactNative::SetTag(element, rootTag);
 
   // Add listener to size change so we can redo the layout when that happens
-  m_sizeChangedVector.push_back(
-      view.as<xaml::FrameworkElement>().SizeChanged(winrt::auto_revoke, [this](auto &&, auto &&) { DoLayout(); }));
+  m_sizeChangedVector.push_back(view.as<xaml::FrameworkElement>().SizeChanged(
+      winrt::auto_revoke, [this, rootTag](auto &&, xaml::SizeChangedEventArgs const &args) {
+        ApplyLayout(rootTag, args.NewSize().Width, args.NewSize().Height);
+      }));
 }
 
 void NativeUIManager::removeRootView(Microsoft::ReactNative::ShadowNode &shadow) {
@@ -831,8 +835,8 @@ void NativeUIManager::RemoveView(ShadowNode &shadowNode, bool removeChildren /*=
 
     YGNodeRef yogaNode = pViewManager->RequiresYogaNode() ? GetYogaNode(node.m_tag) : nullptr;
     if (yogaNode != nullptr && !pViewManager->IsNativeControlWithSelfLayout()) {
-      uint32_t childCount = YGNodeGetChildCount(yogaNode);
-      for (uint32_t i = childCount; i > 0; --i) {
+      auto childCount = YGNodeGetChildCount(yogaNode);
+      for (auto i = childCount; i > 0; --i) {
         YGNodeRef yogaNodeToRemove = YGNodeGetChild(yogaNode, i - 1);
         YGNodeRemoveChild(yogaNode, yogaNodeToRemove);
       }
@@ -1069,9 +1073,9 @@ void NativeUIManager::measureLayout(
     const auto &target = static_cast<ShadowNodeBase &>(shadowNode);
     const auto &ancestor = static_cast<ShadowNodeBase &>(ancestorNode);
     const auto targetElement = target.GetView().as<xaml::FrameworkElement>();
-    const auto ancenstorElement = ancestor.GetView().as<xaml::FrameworkElement>();
+    const auto ancestorElement = ancestor.GetView().as<xaml::FrameworkElement>();
 
-    const auto ancestorTransform = targetElement.TransformToVisual(ancenstorElement);
+    const auto ancestorTransform = targetElement.TransformToVisual(ancestorElement);
     const auto width = static_cast<float>(targetElement.ActualWidth());
     const auto height = static_cast<float>(targetElement.ActualHeight());
     const auto transformedBounds = ancestorTransform.TransformBounds(winrt::Rect(0, 0, width, height));
@@ -1167,7 +1171,9 @@ void NativeUIManager::blur(int64_t reactTag) {
   if (auto shadowNode = static_cast<ShadowNodeBase *>(m_host->FindShadowNodeForTag(reactTag))) {
     // Only blur if current UI is focused to avoid problem described in PR #2687
     const auto xamlRoot = tryGetXamlRoot(shadowNode->m_rootTag);
-    if (shadowNode->GetView() == xaml::Input::FocusManager::GetFocusedElement(xamlRoot)) {
+    const auto focusedElement = xamlRoot ? xaml::Input::FocusManager::GetFocusedElement(xamlRoot)
+                                         : xaml::Input::FocusManager::GetFocusedElement();
+    if (shadowNode->GetView() == focusedElement) {
       if (auto reactControl = GetParentXamlReactControl(reactTag).get()) {
         reactControl.as<winrt::Microsoft::ReactNative::implementation::ReactRootView>()->blur(shadowNode->GetView());
       } else {

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;
 };
 
@@ -35,7 +37,7 @@ REACT_MODULE(UIManager)
 struct UIManager final {
   // TODO:
   // Spec incorrectly reports commandID as a number, but its actually a number | string..
-  // There is also other issues to catch up, so dont use the spec for now
+  // There is also other issues to catch up, so don't use the spec for now
   // using ModuleSpec = ReactNativeSpecs::UIManagerSpec;
 
   UIManager();
@@ -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/QuirkSettings.idl

@@ -33,7 +33,7 @@ namespace Microsoft.ReactNative
     DOC_STRING(
         "There is a chance that cached flex basis values can cause text truncation in some re-layout scenarios. "
         "Enabling [Yoga](https://github.com/facebook/yoga)'s experimental web flex basis behavior fixes this issue, "
-        "however using it may result in perfomance regressions due to additional layout passes.")
+        "however using it may result in performance regressions due to additional layout passes.")
     DOC_DEFAULT("false")
     static void SetUseWebFlexBasisBehavior(ReactInstanceSettings settings, Boolean value);
 

package/Microsoft.ReactNative/ReactApplication.cpp

@@ -105,9 +105,9 @@ void ReactApplication::BundleAppId(hstring const &value) noexcept {
   InstanceSettings().BundleAppId(value);
 }
 
-void ReactApplication::OnActivated(Windows::ApplicationModel::Activation::IActivatedEventArgs const &e) {
-  if (e.Kind() == Windows::ApplicationModel::Activation::ActivationKind::Protocol) {
-    auto protocolActivatedEventArgs{e.as<Windows::ApplicationModel::Activation::ProtocolActivatedEventArgs>()};
+void ReactApplication::OnActivated(winrt::Windows::ApplicationModel::Activation::IActivatedEventArgs const &e) {
+  if (e.Kind() == winrt::Windows::ApplicationModel::Activation::ActivationKind::Protocol) {
+    auto protocolActivatedEventArgs{e.as<winrt::Windows::ApplicationModel::Activation::ProtocolActivatedEventArgs>()};
     ::Microsoft::ReactNative::LinkingManager::OpenUri(protocolActivatedEventArgs.Uri());
   }
   this->OnCreate(e);
@@ -115,7 +115,7 @@ void ReactApplication::OnActivated(Windows::ApplicationModel::Activation::IActiv
 
 void ReactApplication::OnLaunched(activation::LaunchActivatedEventArgs const &e_) {
   base_type::OnLaunched(e_);
-  Windows::ApplicationModel::Activation::LaunchActivatedEventArgs e =
+  winrt::Windows::ApplicationModel::Activation::LaunchActivatedEventArgs e =
 #ifdef USE_WINUI3
       e_.UWPLaunchActivatedEventArgs();
 #else
@@ -165,15 +165,16 @@ void ApplyArguments(ReactNative::ReactNativeHost const &host, std::wstring const
 /// specific file.
 /// </summary>
 /// <param name="e">Details about the launch request and process.</param>
-void ReactApplication::OnCreate(Windows::ApplicationModel::Activation::IActivatedEventArgs const &e) {
+void ReactApplication::OnCreate(winrt::Windows::ApplicationModel::Activation::IActivatedEventArgs const &e) {
   bool isPrelaunchActivated = false;
-  if (auto prelauchActivatedArgs = e.try_as<Windows::ApplicationModel::Activation::IPrelaunchActivatedEventArgs>()) {
-    isPrelaunchActivated = prelauchActivatedArgs.PrelaunchActivated();
+  if (auto prelaunchActivatedArgs =
+          e.try_as<winrt::Windows::ApplicationModel::Activation::IPrelaunchActivatedEventArgs>()) {
+    isPrelaunchActivated = prelaunchActivatedArgs.PrelaunchActivated();
   }
 
   hstring args;
-  if (auto lauchActivatedArgs = e.try_as<activation::ILaunchActivatedEventArgs>()) {
-    args = lauchActivatedArgs.Arguments();
+  if (auto launchActivatedArgs = e.try_as<activation::ILaunchActivatedEventArgs>()) {
+    args = launchActivatedArgs.Arguments();
   }
 
   Frame rootFrame{nullptr};
@@ -192,7 +193,8 @@ void ReactApplication::OnCreate(Windows::ApplicationModel::Activation::IActivate
 
     rootFrame.NavigationFailed({this, &ReactApplication::OnNavigationFailed});
 
-    if (e.PreviousExecutionState() == Windows::ApplicationModel::Activation::ApplicationExecutionState::Terminated) {
+    if (e.PreviousExecutionState() ==
+        winrt::Windows::ApplicationModel::Activation::ApplicationExecutionState::Terminated) {
       // Restore the saved session state only when appropriate, scheduling the
       // final launch steps after the restore is complete
     }
@@ -222,7 +224,7 @@ void ReactApplication::OnCreate(Windows::ApplicationModel::Activation::IActivate
 /// <param name="e">Details about the suspend request.</param>
 void ReactApplication::OnSuspending(
     [[maybe_unused]] IInspectable const &sender,
-    [[maybe_unused]] Windows::ApplicationModel::SuspendingEventArgs const &e) {
+    [[maybe_unused]] winrt::Windows::ApplicationModel::SuspendingEventArgs const &e) {
   // Save application state and stop any background activity
 }
 

package/Microsoft.ReactNative/ReactApplication.h

@@ -81,7 +81,7 @@ struct ReactApplication : NoDefaultCtorReactApplication_base<ReactApplication, x
   ReactNative::ReactInstanceSettings InstanceSettings() noexcept;
   void InstanceSettings(ReactNative::ReactInstanceSettings const &value) noexcept;
 
-  Windows::Foundation::Collections::IVector<IReactPackageProvider> PackageProviders() noexcept;
+  winrt::Windows::Foundation::Collections::IVector<IReactPackageProvider> PackageProviders() noexcept;
 
   ReactNative::ReactNativeHost Host() noexcept;
 
@@ -94,9 +94,9 @@ struct ReactApplication : NoDefaultCtorReactApplication_base<ReactApplication, x
   hstring BundleAppId() noexcept;
   void BundleAppId(hstring const &value) noexcept;
 
-  void OnActivated(Windows::ApplicationModel::Activation::IActivatedEventArgs const &e);
+  void OnActivated(winrt::Windows::ApplicationModel::Activation::IActivatedEventArgs const &e);
   void OnLaunched(activation::LaunchActivatedEventArgs const &e);
-  void OnSuspending(IInspectable const &, Windows::ApplicationModel::SuspendingEventArgs const &);
+  void OnSuspending(IInspectable const &, winrt::Windows::ApplicationModel::SuspendingEventArgs const &);
   void OnNavigationFailed(IInspectable const &, xaml::Navigation::NavigationFailedEventArgs const &);
 
   using AppLaunchedDelegate = winrt::delegate<void(
@@ -129,7 +129,7 @@ struct ReactApplication : NoDefaultCtorReactApplication_base<ReactApplication, x
   winrt::Microsoft::ReactNative::ReactInstanceSettings m_instanceSettings{nullptr};
   winrt::Microsoft::ReactNative::ReactNativeHost m_host{nullptr};
 
-  void OnCreate(Windows::ApplicationModel::Activation::IActivatedEventArgs const &e);
+  void OnCreate(winrt::Windows::ApplicationModel::Activation::IActivatedEventArgs const &e);
 
   AppLaunchedDelegate m_launched;
   AppViewCreatedDelegate m_viewCreated;

package/Microsoft.ReactNative/ReactCoreInjection.h

@@ -60,11 +60,12 @@ struct ReactViewHost : public winrt::implements<ReactViewHost, IReactViewHost> {
       Mso::React::IReactViewHost &viewHost,
       const winrt::Microsoft::ReactNative::IReactDispatcher &uiDispatcher);
 
-  Windows::Foundation::IAsyncAction ReloadViewInstance() noexcept;
-  Windows::Foundation::IAsyncAction ReloadViewInstanceWithOptions(ReactNative::ReactViewOptions options) noexcept;
-  Windows::Foundation::IAsyncAction UnloadViewInstance() noexcept;
-  Windows::Foundation::IAsyncAction AttachViewInstance(IReactViewInstance viewInstance) noexcept;
-  Windows::Foundation::IAsyncAction DetachViewInstance() noexcept;
+  winrt::Windows::Foundation::IAsyncAction ReloadViewInstance() noexcept;
+  winrt::Windows::Foundation::IAsyncAction ReloadViewInstanceWithOptions(
+      ReactNative::ReactViewOptions options) noexcept;
+  winrt::Windows::Foundation::IAsyncAction UnloadViewInstance() noexcept;
+  winrt::Windows::Foundation::IAsyncAction AttachViewInstance(IReactViewInstance viewInstance) noexcept;
+  winrt::Windows::Foundation::IAsyncAction DetachViewInstance() noexcept;
   winrt::Microsoft::ReactNative::ReactNativeHost ReactNativeHost() noexcept;
 
  private:

package/Microsoft.ReactNative/ReactHost/JSCallInvokerScheduler.cpp

@@ -20,7 +20,7 @@ struct JSCallInvokerScheduler
 
  public:
   // IDispatchQueueScheduler
-  void IntializeScheduler(Mso::WeakPtr<IDispatchQueueService> &&queue) noexcept override;
+  void InitializeScheduler(Mso::WeakPtr<IDispatchQueueService> &&queue) noexcept override;
   bool HasThreadAccess() noexcept override;
   bool IsSerial() noexcept override;
   void Post() noexcept override;
@@ -59,7 +59,7 @@ JSCallInvokerScheduler::~JSCallInvokerScheduler() noexcept {
   AwaitTermination();
 }
 
-void JSCallInvokerScheduler::IntializeScheduler(Mso::WeakPtr<IDispatchQueueService> &&queue) noexcept {
+void JSCallInvokerScheduler::InitializeScheduler(Mso::WeakPtr<IDispatchQueueService> &&queue) noexcept {
   m_queue = std::move(queue);
 }
 

package/Microsoft.ReactNative/ReactHost/MsoUtils.cpp

@@ -35,7 +35,7 @@ struct WhenAllCompletedState : Mso::RefCountedObjectNoVTable<WhenAllCompletedSta
     resultSlot = std::move(result);
     if (--m_waitCount == 0) {
       // All tasks are completed.
-      // If we have an error, then propage only the first error in the list.
+      // If we have an error, then propagate only the first error in the list.
       for (auto &taskResult : m_taskResults) {
         if (taskResult.IsError()) {
           m_result.SetMaybe(std::move(taskResult));

package/Microsoft.ReactNative/ReactHost/React.h

@@ -186,7 +186,7 @@ struct ReactOptions {
   //! Identity of the SDX. Must uniquely describe the SDX across the installed product.
   std::string Identity;
 
-  //! List of names of Cxx modules that all ReactIntances hosting this SDX should be configured with.
+  //! List of names of Cxx modules that all ReactInstances hosting this SDX should be configured with.
   //!
   //! In addition to this list, there are following hardcoded modules.
   //!
@@ -200,7 +200,7 @@ struct ReactOptions {
   //! ExceptionsManager: Implemented by facebook::react::ExceptionsManagerModule
   std::vector<std::string> CxxModuleNames;
 
-  //! List of names of Java modules that all ReactIntances hosting this SDX should be configured with.
+  //! List of names of Java modules that all ReactInstances hosting this SDX should be configured with.
   std::vector<std::string> JavaModuleNames;
 
   //! (Optional) Name of the registered IDataServiceProvider to use when creating data services
@@ -275,9 +275,6 @@ struct ReactOptions {
       winrt::Microsoft::ReactNative::IReactPropertyBag const &properties,
       JSIEngine value) noexcept;
 
-  bool JsiEngineV8NodeApi() const noexcept;
-  static bool JsiEngineV8NodeApi(winrt::Microsoft::ReactNative::IReactPropertyBag const &properties) noexcept;
-
   //! Enable live reload to load the source bundle from the React Native packager.
   //! When the file is saved, the packager will trigger reloading.
   void SetUseLiveReload(bool enable) noexcept;
@@ -345,7 +342,7 @@ struct ReactOptions {
   OnReactInstanceDestroyedCallback OnInstanceDestroyed;
 };
 
-//! IReactHost manages a RactNative instance.
+//! IReactHost manages a ReactNative instance.
 MSO_GUID(IReactHost, "2a2474ff-264f-449a-9852-0463e6ac6bbf")
 struct DECLSPEC_NOVTABLE IReactHost : IUnknown {
   //! Returns a copy of react options.

package/Microsoft.ReactNative/ReactHost/ReactHost.cpp

@@ -3,7 +3,6 @@
 
 #include "ReactHost.h"
 #include <Future/FutureWait.h>
-#include <ReactPropertyBag.h>
 #include <winrt/Windows.Foundation.h>
 
 namespace Mso::React {
@@ -36,12 +35,6 @@ winrt::Microsoft::ReactNative::IReactPropertyName JSIEngineProperty() noexcept {
   return propName;
 }
 
-winrt::Microsoft::ReactNative::ReactPropertyId<bool> JSIEngineV8NodeApiProperty() noexcept {
-  static winrt::Microsoft::ReactNative::ReactPropertyId<bool> propId{
-      L"ReactNative.ReactOptions", L"JSIEngineV8NodeApi"};
-  return propId;
-}
-
 winrt::Microsoft::ReactNative::IReactPropertyName LiveReloadEnabledProperty() noexcept {
   static winrt::Microsoft::ReactNative::IReactPropertyName propName =
       winrt::Microsoft::ReactNative::ReactPropertyBagHelper::GetName(
@@ -144,15 +137,6 @@ void ReactOptions::SetJsiEngine(JSIEngine value) noexcept {
   properties.Set(JSIEngineProperty(), winrt::box_value(static_cast<uint32_t>(value)));
 }
 
-/*static*/ bool ReactOptions::JsiEngineV8NodeApi(
-    winrt::Microsoft::ReactNative::IReactPropertyBag const &properties) noexcept {
-  return winrt::Microsoft::ReactNative::ReactPropertyBag(properties).Get(JSIEngineV8NodeApiProperty()).value_or(false);
-}
-
-bool ReactOptions::JsiEngineV8NodeApi() const noexcept {
-  return JsiEngineV8NodeApi(Properties);
-}
-
 /*static*/ void ReactOptions::SetUseFastRefresh(
     winrt::Microsoft::ReactNative::IReactPropertyBag const &properties,
     bool value) noexcept {

package/Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp

@@ -76,9 +76,7 @@
 
 #if defined(USE_V8)
 #include <winrt/Windows.Storage.h>
-#include "BaseScriptStoreImpl.h"
 #include "JSI/V8RuntimeHolder.h"
-#include "V8JSIRuntimeHolder.h"
 #endif // USE_V8
 
 #include "RedBox.h"
@@ -493,6 +491,7 @@ void ReactInstanceWin::Initialize() noexcept {
 
           switch (m_options.JsiEngine()) {
             case JSIEngine::Hermes: {
+              // TODO: Should we use UwpPreparedScriptStore?
               if (Microsoft::ReactNative::HasPackageIdentity()) {
                 preparedScriptStore =
                     std::make_unique<facebook::react::BasePreparedScriptStoreImpl>(getApplicationTempFolder());
@@ -530,18 +529,8 @@ void ReactInstanceWin::Initialize() noexcept {
               enableMultiThreadSupport = Microsoft::ReactNative::IsFabricEnabled(m_reactContext->Properties());
 #endif // USE_FABRIC
 
-              if (m_options.JsiEngineV8NodeApi()) {
-                devSettings->jsiRuntimeHolder = std::make_shared<Microsoft::ReactNative::V8RuntimeHolder>(
-                    devSettings, m_jsMessageThread.Load(), std::move(preparedScriptStore), enableMultiThreadSupport);
-              } else {
-                devSettings->jsiRuntimeHolder = std::make_shared<facebook::react::V8JSIRuntimeHolder>(
-                    devSettings,
-                    m_jsMessageThread.Load(),
-                    std::move(scriptStore),
-                    std::move(preparedScriptStore),
-                    enableMultiThreadSupport);
-              }
-
+              devSettings->jsiRuntimeHolder = std::make_shared<Microsoft::ReactNative::V8RuntimeHolder>(
+                  devSettings, m_jsMessageThread.Load(), std::move(preparedScriptStore), enableMultiThreadSupport);
               break;
             }
 #endif // USE_V8
@@ -567,6 +556,9 @@ void ReactInstanceWin::Initialize() noexcept {
             auto omitNetCxxPropName = ReactPropertyBagHelper::GetName(nullptr, L"OmitNetworkingCxxModules");
             auto omitNetCxxPropValue = m_options.Properties.Get(omitNetCxxPropName);
             devSettings->omitNetworkingCxxModules = winrt::unbox_value_or(omitNetCxxPropValue, false);
+            auto useWebSocketTurboModulePropName = ReactPropertyBagHelper::GetName(nullptr, L"UseWebSocketTurboModule");
+            auto useWebSocketTurboModulePropValue = m_options.Properties.Get(useWebSocketTurboModulePropName);
+            devSettings->useWebSocketTurboModule = winrt::unbox_value_or(useWebSocketTurboModulePropValue, false);
             auto bundleRootPath = devSettings->bundleRootPath;
             auto instanceWrapper = facebook::react::CreateReactInstance(
                 std::shared_ptr<facebook::react::Instance>(strongThis->m_instance.Load()),
@@ -821,8 +813,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/Microsoft.ReactNative/ReactInstanceSettings.cpp

@@ -155,12 +155,12 @@ IReactPropertyName InstanceDestroyedEventName() noexcept {
 }
 
 // Subscribes to a notification from a ReactNotificationService, then returns the IReactNotificationSubscription as a
-// event_token This allows easy implementation of winrt events which are implemented using the ReactNotifictionService.
+// event_token This allows easy implementation of winrt events which are implemented using the ReactNotificationService.
 template <typename argsT>
 winrt::event_token subscribeToNotifications(
     IReactNotificationService const &notifications,
     IReactPropertyName const &property,
-    Windows::Foundation::EventHandler<argsT> const &handler) {
+    winrt::Windows::Foundation::EventHandler<argsT> const &handler) {
   auto subscription = notifications.Subscribe(
       property,
       nullptr,
@@ -185,7 +185,7 @@ void unsubscribeFromNotifications(winrt::event_token const &token) {
 }
 
 winrt::event_token ReactInstanceSettings::InstanceCreated(
-    Windows::Foundation::EventHandler<winrt::Microsoft::ReactNative::InstanceCreatedEventArgs> const
+    winrt::Windows::Foundation::EventHandler<winrt::Microsoft::ReactNative::InstanceCreatedEventArgs> const
         &handler) noexcept {
   return subscribeToNotifications(Notifications(), InstanceCreatedEventName(), handler);
 }
@@ -195,7 +195,8 @@ void ReactInstanceSettings::InstanceCreated(winrt::event_token const &token) noe
 }
 
 winrt::event_token ReactInstanceSettings::InstanceLoaded(
-    Windows::Foundation::EventHandler<winrt::Microsoft::ReactNative::InstanceLoadedEventArgs> const &handler) noexcept {
+    winrt::Windows::Foundation::EventHandler<winrt::Microsoft::ReactNative::InstanceLoadedEventArgs> const
+        &handler) noexcept {
   return subscribeToNotifications(Notifications(), InstanceLoadedEventName(), handler);
 }
 
@@ -204,7 +205,7 @@ void ReactInstanceSettings::InstanceLoaded(winrt::event_token const &token) noex
 }
 
 winrt::event_token ReactInstanceSettings::InstanceDestroyed(
-    Windows::Foundation::EventHandler<winrt::Microsoft::ReactNative::InstanceDestroyedEventArgs> const
+    winrt::Windows::Foundation::EventHandler<winrt::Microsoft::ReactNative::InstanceDestroyedEventArgs> const
         &handler) noexcept {
   return subscribeToNotifications(Notifications(), InstanceDestroyedEventName(), handler);
 }

package/Microsoft.ReactNative/ReactInstanceSettings.h

@@ -53,7 +53,7 @@ struct ReactInstanceSettings : ReactInstanceSettingsT<ReactInstanceSettings> {
 
   IReactNotificationService Notifications() noexcept;
 
-  Windows::Foundation::Collections::IVector<IReactPackageProvider> PackageProviders() noexcept;
+  winrt::Windows::Foundation::Collections::IVector<IReactPackageProvider> PackageProviders() noexcept;
 
   //! This controls the availability of various developer support functionality including
   //! RedBox, and the Developer Menu
@@ -83,7 +83,7 @@ struct ReactInstanceSettings : ReactInstanceSettingsT<ReactInstanceSettings> {
   void UseFastRefresh(bool value) noexcept;
 
   //! Should the instance monitor for changes to the JS and reload the instance when a change is
-  //! detected.  Generally its prefered to use FastFreshed instead of this.  But if there is some
+  //! detected.  Generally its preferred to use FastFreshed instead of this.  But if there is some
   //! issue with hot reloading in your app, then this can be used instead
   bool UseLiveReload() noexcept;
   void UseLiveReload(bool value) noexcept;
@@ -147,17 +147,17 @@ struct ReactInstanceSettings : ReactInstanceSettingsT<ReactInstanceSettings> {
   void JSIEngineOverride(JSIEngine value) noexcept;
 
   winrt::event_token InstanceCreated(
-      Windows::Foundation::EventHandler<winrt::Microsoft::ReactNative::InstanceCreatedEventArgs> const
+      winrt::Windows::Foundation::EventHandler<winrt::Microsoft::ReactNative::InstanceCreatedEventArgs> const
           &handler) noexcept;
   void InstanceCreated(winrt::event_token const &token) noexcept;
 
   winrt::event_token InstanceLoaded(
-      Windows::Foundation::EventHandler<winrt::Microsoft::ReactNative::InstanceLoadedEventArgs> const
+      winrt::Windows::Foundation::EventHandler<winrt::Microsoft::ReactNative::InstanceLoadedEventArgs> const
           &handler) noexcept;
   void InstanceLoaded(winrt::event_token const &token) noexcept;
 
   winrt::event_token InstanceDestroyed(
-      Windows::Foundation::EventHandler<winrt::Microsoft::ReactNative::InstanceDestroyedEventArgs> const
+      winrt::Windows::Foundation::EventHandler<winrt::Microsoft::ReactNative::InstanceDestroyedEventArgs> const
           &handler) noexcept;
   void InstanceDestroyed(winrt::event_token const &token) noexcept;
 
@@ -174,7 +174,7 @@ struct ReactInstanceSettings : ReactInstanceSettingsT<ReactInstanceSettings> {
  private:
   IReactPropertyBag m_properties{ReactPropertyBagHelper::CreatePropertyBag()};
   IReactNotificationService m_notifications{ReactNotificationServiceHelper::CreateNotificationService()};
-  Windows::Foundation::Collections::IVector<IReactPackageProvider> m_packageProviders{
+  ::winrt::Windows::Foundation::Collections::IVector<IReactPackageProvider> m_packageProviders{
       single_threaded_vector<IReactPackageProvider>()};
   hstring m_javaScriptBundleFile{};
   hstring m_bundleAppId{};
@@ -223,7 +223,7 @@ inline IReactNotificationService ReactInstanceSettings::Notifications() noexcept
   return m_notifications;
 }
 
-inline Windows::Foundation::Collections::IVector<IReactPackageProvider>
+inline winrt::Windows::Foundation::Collections::IVector<IReactPackageProvider>
 ReactInstanceSettings::PackageProviders() noexcept {
   return m_packageProviders;
 }

package/Microsoft.ReactNative/ReactNativeHost.h

@@ -20,15 +20,15 @@ struct ReactNativeHost : ReactNativeHostT<ReactNativeHost> {
   static ReactNative::ReactNativeHost FromContext(ReactNative::IReactContext const &reactContext) noexcept;
 
   // property PackageProviders
-  Windows::Foundation::Collections::IVector<IReactPackageProvider> PackageProviders() noexcept;
+  winrt::Windows::Foundation::Collections::IVector<IReactPackageProvider> PackageProviders() noexcept;
 
   // property InstanceSettings
   ReactNative::ReactInstanceSettings InstanceSettings() noexcept;
   void InstanceSettings(ReactNative::ReactInstanceSettings const &value) noexcept;
 
-  Windows::Foundation::IAsyncAction LoadInstance() noexcept;
-  Windows::Foundation::IAsyncAction ReloadInstance() noexcept;
-  Windows::Foundation::IAsyncAction UnloadInstance() noexcept;
+  winrt::Windows::Foundation::IAsyncAction LoadInstance() noexcept;
+  winrt::Windows::Foundation::IAsyncAction ReloadInstance() noexcept;
+  winrt::Windows::Foundation::IAsyncAction UnloadInstance() noexcept;
 
  public:
   Mso::React::IReactHost *ReactHost() noexcept;

package/Microsoft.ReactNative/ReactRootView.cpp

@@ -160,7 +160,7 @@ void ReactRootView::InitRootView(
 
   m_touchEventHandler->AddTouchHandlers(*this);
   m_previewKeyboardEventHandlerOnRoot->hook(*this);
-  m_SIPEventHandler->AttachView(*this, /*fireKeyboradEvents:*/ true);
+  m_SIPEventHandler->AttachView(*this, /*fireKeyboardEvents:*/ true);
 
   UpdateRootViewInternal();
   AttachBackHandlers();
@@ -430,8 +430,9 @@ void ReactRootView::ReactViewHost(Mso::React::IReactViewHost *viewHost) noexcept
   }
 }
 
-Windows::Foundation::Size ReactRootView::MeasureOverride(Windows::Foundation::Size const &availableSize) const {
-  Windows::Foundation::Size size{0.0f, 0.0f};
+winrt::Windows::Foundation::Size ReactRootView::MeasureOverride(
+    winrt::Windows::Foundation::Size const &availableSize) const {
+  winrt::Windows::Foundation::Size size{0.0f, 0.0f};
 
   for (xaml::UIElement child : Children()) {
     child.Measure(availableSize);
@@ -445,7 +446,7 @@ Windows::Foundation::Size ReactRootView::MeasureOverride(Windows::Foundation::Si
   return size;
 }
 
-Windows::Foundation::Size ReactRootView::ArrangeOverride(Windows::Foundation::Size finalSize) const {
+winrt::Windows::Foundation::Size ReactRootView::ArrangeOverride(winrt::Windows::Foundation::Size finalSize) const {
   for (xaml::UIElement child : Children()) {
     child.Arrange(winrt::Rect(0, 0, finalSize.Width, finalSize.Height));
   }

package/Microsoft.ReactNative/ReactRootView.h

@@ -60,8 +60,8 @@ struct ReactRootView : ReactRootViewT<ReactRootView>, ::Microsoft::ReactNative::
   void UpdateRootView() noexcept;
   void UninitRootView() noexcept;
 
-  Windows::Foundation::Size MeasureOverride(Windows::Foundation::Size const &availableSize) const;
-  Windows::Foundation::Size ArrangeOverride(Windows::Foundation::Size finalSize) const;
+  winrt::Windows::Foundation::Size MeasureOverride(winrt::Windows::Foundation::Size const &availableSize) const;
+  winrt::Windows::Foundation::Size ArrangeOverride(winrt::Windows::Foundation::Size finalSize) const;
 
   void blur(::Microsoft::ReactNative::XamlView const &xamlView) noexcept;
 

package/Microsoft.ReactNative/ReactSupport.h

@@ -8,6 +8,6 @@
 namespace winrt::Microsoft::ReactNative {
 
 // Convert a WinRT IInspectable into a folly::dynamic object
-folly::dynamic ConvertToDynamic(Windows::Foundation::IInspectable const &object);
+folly::dynamic ConvertToDynamic(winrt::Windows::Foundation::IInspectable const &object);
 
 } // namespace winrt::Microsoft::ReactNative

package/Microsoft.ReactNative/RedBox.cpp

@@ -487,7 +487,7 @@ struct DefaultRedBoxHandler final : public std::enable_shared_from_this<DefaultR
   }
 
   virtual void showNewError(ErrorInfo &&info, ErrorType /*exceptionType*/) override {
-    // Check if the rebox has been suppressed
+    // Check if the redbox has been suppressed
     if (!info.ExtraData.isNull()) {
       auto iterator = info.ExtraData.find("suppressRedBox");
       if (iterator != info.ExtraData.items().end()) {

package/Microsoft.ReactNative/RedBoxHandler.idl

@@ -103,7 +103,7 @@ class MyRedBoxHandler : IRedBoxHandler
     }
 
    public void ShowNewError(IRedBoxErrorInfo info, RedBoxErrorType type) {
-      /-/ Dont report non-fatal errors (optional)
+      /-/ Do not report non-fatal errors (optional)
       if (type != RedBoxErrorType.JavaScriptSoft)
         ReportErrorToMyErrorReportingSystem(info, type);