react-native-windows 0.81.1 → 0.82.0-preview.1

package/Microsoft.ReactNative/Modules/LogBoxModule.cpp

@@ -9,32 +9,24 @@
 #include "ReactNativeHost.h"
 #include "Utils/Helpers.h"
 
-#ifdef USE_FABRIC
 #include <Fabric/Composition/CompositionContextHelper.h>
 #include <Fabric/Composition/CompositionUIService.h>
 #include <winrt/Windows.UI.Composition.h>
-#else
-#include <UI.Xaml.Controls.Primitives.h>
-#include "XamlUtils.h"
-#endif
 
 namespace Microsoft::ReactNative {
 
 LogBox::~LogBox() {
-#ifdef USE_FABRIC
   if (m_hwnd) {
     m_context.UIDispatcher().Post([hwnd = m_hwnd]() { DestroyWindow(hwnd); });
     m_hwnd = nullptr;
   }
-#endif
 }
 
-#ifdef USE_FABRIC
 constexpr PCWSTR c_logBoxWindowClassName = L"MS_REACTNATIVE_LOGBOX";
 constexpr auto CompHostProperty = L"CompHost";
 const int LOGBOX_DEFAULT_WIDTH = 700;
 const int LOGBOX_DEFAULT_HEIGHT = 1000;
-#endif // USE_FABRIC
+
 void LogBox::Show() noexcept {
   if (!Mso::React::ReactOptions::UseDeveloperSupport(m_context.Properties().Handle())) {
     return;
@@ -55,7 +47,6 @@ void LogBox::Hide() noexcept {
   });
 }
 
-#ifdef USE_FABRIC
 LRESULT CALLBACK LogBoxWndProc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) noexcept {
   auto data = reinterpret_cast<::IUnknown *>(GetProp(hwnd, CompHostProperty));
   winrt::com_ptr<winrt::IUnknown> spunk;
@@ -116,112 +107,49 @@ void LogBox::RegisterWndClass() noexcept {
 
   registered = true;
 }
-#endif // USE_FABRIC
 
 void LogBox::ShowOnUIThread() noexcept {
   auto host = React::implementation::ReactNativeHost::GetReactNativeHost(m_context.Properties());
   if (!host)
     return;
-#ifndef USE_FABRIC
-  if (!IsFabricEnabled(m_context.Properties().Handle())) {
-    m_logBoxContent = React::ReactRootView();
-    m_logBoxContent.ComponentName(L"LogBox");
-    m_logBoxContent.ReactNativeHost(host);
-
-    m_popup = xaml::Controls::Primitives::Popup{};
-    xaml::FrameworkElement root{nullptr};
-
-    if (Is19H1OrHigher()) {
-      // XamlRoot added in 19H1 - is required to be set for XamlIsland scenarios
-      if (auto xamlRoot = React::XamlUIService::GetXamlRoot(m_context.Properties().Handle())) {
-        m_popup.XamlRoot(xamlRoot);
-        root = xamlRoot.Content().as<xaml::FrameworkElement>();
-      }
-    }
-
-    if (!root) {
-      auto window = xaml::Window::Current();
-      root = window.Content().as<xaml::FrameworkElement>();
-    }
 
-    m_logBoxContent.MaxHeight(root.ActualHeight());
-    m_logBoxContent.Height(root.ActualHeight());
-    m_logBoxContent.MaxWidth(root.ActualWidth());
-    m_logBoxContent.Width(root.ActualWidth());
-    m_logBoxContent.UpdateLayout();
-
-    m_sizeChangedRevoker = root.SizeChanged(
-        winrt::auto_revoke,
-        [wkThis = weak_from_this()](auto const & /*sender*/, xaml::SizeChangedEventArgs const &args) {
-          if (auto strongThis = wkThis.lock()) {
-            strongThis->m_logBoxContent.MaxHeight(args.NewSize().Height);
-            strongThis->m_logBoxContent.Height(args.NewSize().Height);
-            strongThis->m_logBoxContent.MaxWidth(args.NewSize().Width);
-            strongThis->m_logBoxContent.Width(args.NewSize().Width);
-          }
-        });
-
-    m_tokenClosed = m_popup.Closed(
-        [wkThis = weak_from_this()](auto const & /*sender*/, winrt::IInspectable const & /*args*/) noexcept {
-          if (auto strongThis = wkThis.lock()) {
-            strongThis->HideOnUIThread();
-          }
-        });
-
-    m_popup.Child(m_logBoxContent);
-    m_popup.IsOpen(true);
+  RegisterWndClass();
+
+  if (!m_hwnd) {
+    auto CompositionHwndHost = React::CompositionHwndHost();
+    winrt::Microsoft::ReactNative::ReactViewOptions viewOptions;
+    viewOptions.ComponentName(L"LogBox");
+    CompositionHwndHost.ReactViewHost(
+        winrt::Microsoft::ReactNative::ReactCoreInjection::MakeViewHost(host, viewOptions));
+    HINSTANCE hInstance = GetModuleHandle(NULL);
+    winrt::impl::abi<winrt::Microsoft::ReactNative::ICompositionHwndHost>::type *pHost{nullptr};
+    winrt::com_ptr<::IUnknown> spunk;
+    CompositionHwndHost.as(spunk);
+    spunk->AddRef(); // Will be stored in windowData
+
+    m_hwnd = CreateWindow(
+        c_logBoxWindowClassName,
+        L"React-Native LogBox",
+        WS_OVERLAPPEDWINDOW,
+        CW_USEDEFAULT,
+        CW_USEDEFAULT,
+        LOGBOX_DEFAULT_WIDTH,
+        LOGBOX_DEFAULT_HEIGHT,
+        nullptr,
+        nullptr,
+        hInstance,
+        spunk.get());
   }
-#else
-  else {
-    RegisterWndClass();
-
-    if (!m_hwnd) {
-      auto CompositionHwndHost = React::CompositionHwndHost();
-      winrt::Microsoft::ReactNative::ReactViewOptions viewOptions;
-      viewOptions.ComponentName(L"LogBox");
-      CompositionHwndHost.ReactViewHost(
-          winrt::Microsoft::ReactNative::ReactCoreInjection::MakeViewHost(host, viewOptions));
-      HINSTANCE hInstance = GetModuleHandle(NULL);
-      winrt::impl::abi<winrt::Microsoft::ReactNative::ICompositionHwndHost>::type *pHost{nullptr};
-      winrt::com_ptr<::IUnknown> spunk;
-      CompositionHwndHost.as(spunk);
-      spunk->AddRef(); // Will be stored in windowData
-
-      m_hwnd = CreateWindow(
-          c_logBoxWindowClassName,
-          L"React-Native LogBox",
-          WS_OVERLAPPEDWINDOW,
-          CW_USEDEFAULT,
-          CW_USEDEFAULT,
-          LOGBOX_DEFAULT_WIDTH,
-          LOGBOX_DEFAULT_HEIGHT,
-          nullptr,
-          nullptr,
-          hInstance,
-          spunk.get());
-    }
 
-    ShowWindow(m_hwnd, SW_NORMAL);
-    BringWindowToTop(m_hwnd);
-    SetFocus(m_hwnd);
-  }
-#endif // USE_FABRIC
+  ShowWindow(m_hwnd, SW_NORMAL);
+  BringWindowToTop(m_hwnd);
+  SetFocus(m_hwnd);
 }
 
 void LogBox::HideOnUIThread() noexcept {
-#ifdef USE_FABRIC
   if (m_hwnd) {
     ::ShowWindow(m_hwnd, SW_HIDE);
   }
-#else // USE_FABRIC
-  if (m_popup) {
-    m_popup.Closed(m_tokenClosed);
-    m_sizeChangedRevoker.revoke();
-    m_popup.IsOpen(false);
-    m_popup = nullptr;
-    m_logBoxContent = nullptr;
-  }
-#endif // USE_FABRIC
 }
 
 void LogBox::Initialize(React::ReactContext const &reactContext) noexcept {

package/Microsoft.ReactNative/Modules/LogBoxModule.h

@@ -23,19 +23,12 @@ struct LogBox : public std::enable_shared_from_this<LogBox> {
   REACT_METHOD(Hide, L"hide") void Hide() noexcept;
 
  private:
-#ifdef USE_FABRIC
   static void RegisterWndClass() noexcept;
-#endif // USE_FABRIC
   void ShowOnUIThread() noexcept;
   void HideOnUIThread() noexcept;
 
   winrt::Microsoft::ReactNative::ReactContext m_context;
-#ifdef USE_FABRIC
   HWND m_hwnd{nullptr};
-#else
-  xaml::Controls::Primitives::Popup m_popup{nullptr};
-  winrt::Microsoft::ReactNative::ReactRootView m_logBoxContent{nullptr};
-#endif // USE_FABRIC
   xaml::FrameworkElement::SizeChanged_revoker m_sizeChangedRevoker;
   winrt::event_token m_tokenClosed;
 };

package/Microsoft.ReactNative/Modules/Timing.cpp

@@ -7,13 +7,11 @@
 #include "Timing.h"
 
 #include <InstanceManager.h>
-#include <UI.Xaml.Media.h>
 #include <Utils/ValueUtils.h>
 #include <XamlUtils.h>
 
 #include <unknwnbase.h>
 
-using namespace facebook::xplat;
 using namespace folly;
 namespace winrt {
 using namespace Windows::Foundation;
@@ -101,20 +99,16 @@ void TimerRegistry::createRecurringTimer(uint32_t timerID, double delayMS) {
 }
 
 void TimerRegistry::callTimers(const vector<uint32_t> &ids) noexcept {
-#ifdef USE_FABRIC
   if (auto timerManager = m_timerManager.lock()) {
     for (auto id : ids) {
       timerManager->callTimer(id);
     }
   }
-#endif
 }
 
 // When running bridgeless mode timers are managed by TimerManager
 void TimerRegistry::setTimerManager(std::weak_ptr<facebook::react::TimerManager> timerManager) {
-#ifdef USE_FABRIC
   m_timerManager = timerManager;
-#endif
 }
 
 //
@@ -124,7 +118,7 @@ void TimerRegistry::setTimerManager(std::weak_ptr<facebook::react::TimerManager>
 void Timing::Initialize(winrt::Microsoft::ReactNative::ReactContext const &reactContext) noexcept {
   m_context = reactContext;
   m_properties = reactContext.Properties().Handle();
-  m_usePostForRendering = !xaml::TryGetCurrentUwpXamlApplication();
+  m_usePostForRendering = true;
   m_uiDispatcher = m_context.UIDispatcher().Handle();
 }
 
@@ -133,7 +127,7 @@ void Timing::InitializeBridgeless(
     const winrt::Microsoft::ReactNative::IReactPropertyBag &properties) noexcept {
   m_timerRegistry = timerRegistry;
   m_properties = properties;
-  m_usePostForRendering = !xaml::TryGetCurrentUwpXamlApplication();
+  m_usePostForRendering = true;
   m_uiDispatcher = {properties.Get(winrt::Microsoft::ReactNative::ReactDispatcherHelper::UIDispatcherProperty())
                         .try_as<winrt::Microsoft::ReactNative::IReactDispatcher>()};
 }
@@ -220,16 +214,20 @@ void Timing::StartRendering() {
     PostRenderFrame();
     return;
   }
+
+  // TODO use composition rendering callback here
+  /*
   m_rendering.revoke();
   m_usingRendering = true;
   m_rendering = xaml::Media::CompositionTarget::Rendering(
       winrt::auto_revoke,
       [wkThis = std::weak_ptr(this->shared_from_this())](
-          const winrt::IInspectable &, const winrt::IInspectable & /*args*/) {
+          const winrt::IInspectable &, const winrt::IInspectable & args) {
         if (auto pThis = wkThis.lock()) {
           pThis->OnTick();
         }
       });
+      */
 }
 
 void Timing::StartDispatcherTimer() {

package/Microsoft.ReactNative/Pch/pch.h

@@ -22,34 +22,6 @@
 // When WINAPI_FAMILY is DESKTOP_APP, windows.h creates a macro for GetCurrentTime, which conflicts with other headers
 #undef GetCurrentTime
 
-// Define environment variable RNW_FASTBUILD=true to improve compilation speed on your PC.
-#ifdef RNW_FASTBUILD
-#include <UI.Composition.h>
-#include <UI.Xaml.Automation.Peers.h>
-#include <UI.Xaml.Automation.h>
-#include <UI.Xaml.Controls.h>
-#include <UI.Xaml.Input.h>
-#include <UI.Xaml.Media.h>
-#include <UI.Xaml.Shapes.h>
-
-#include <Utils/CppWinrtLessExceptions.h>
-
-#include <winrt/Windows.ApplicationModel.Activation.h>
-#include <winrt/Windows.Devices.Input.h>
-#include <winrt/Windows.Foundation.Metadata.h>
-#include <winrt/Windows.Graphics.Display.h>
-#include <winrt/Windows.Networking.Sockets.h>
-#include <winrt/Windows.Security.Cryptography.h>
-#include <winrt/Windows.Storage.Streams.h>
-#include <winrt/Windows.UI.ViewManagement.Core.h>
-#include <winrt/Windows.UI.ViewManagement.h>
-#include <winrt/Windows.Web.Http.Headers.h>
-
-#include "Base/CxxReactIncludes.h"
-
-#include <boost/algorithm/string.hpp>
-#endif // RNW_FASTBUILD
-
 #include "CppWinRTIncludes.h"
 #include "HResult.h"
 

package/Microsoft.ReactNative/ReactCoreInjection.h

@@ -6,7 +6,6 @@
 #include "ReactCoreInjection.g.h"
 #include "ReactViewOptions.g.h"
 
-#include "INativeUIManager.h"
 #include "React.h"
 #include "ReactHost/React.h"
 #include "ReactPropertyBag.h"

package/Microsoft.ReactNative/ReactHost/IReactInstance.h

@@ -7,10 +7,6 @@
 #include <DevSettings.h>
 #include <folly/dynamic.h>
 
-#if !defined(CORE_ABI) && !defined(USE_FABRIC)
-#include "XamlView.h"
-#endif
-
 #include <functional>
 #include <string>
 
@@ -18,12 +14,8 @@ namespace Microsoft::ReactNative {
 
 struct INativeUIManager;
 class ExpressionAnimationStore;
-#if !defined(CORE_ABI) && !defined(USE_FABRIC)
-struct IXamlRootView;
-#endif
 
 typedef unsigned int LiveReloadCallbackCookie;
 typedef unsigned int ErrorCallbackCookie;
-typedef unsigned int DebuggerAttachCallbackCookie;
 
 } // namespace Microsoft::ReactNative

package/Microsoft.ReactNative/ReactHost/MsoReactContext.cpp

@@ -16,13 +16,6 @@ namespace Mso::React {
 ReactSettingsSnapshot::ReactSettingsSnapshot(Mso::WeakPtr<ReactInstanceWin> &&reactInstance) noexcept
     : m_reactInstance{std::move(reactInstance)} {}
 
-bool ReactSettingsSnapshot::UseWebDebugger() const noexcept {
-  if (auto instance = m_reactInstance.GetStrongPtr()) {
-    return instance->UseWebDebugger();
-  }
-  return false;
-}
-
 bool ReactSettingsSnapshot::UseFastRefresh() const noexcept {
   if (auto instance = m_reactInstance.GetStrongPtr()) {
     return instance->UseFastRefresh();
@@ -216,14 +209,6 @@ bool ReactContext::IsLoaded() const noexcept {
   return false;
 }
 
-std::shared_ptr<facebook::react::Instance> ReactContext::GetInnerInstance() const noexcept {
-  if (auto instance = m_reactInstance.GetStrongPtr()) {
-    return instance->GetInnerInstance();
-  }
-
-  return nullptr;
-}
-
 IReactSettingsSnapshot const &ReactContext::SettingsSnapshot() const noexcept {
   return *m_settings;
 }

package/Microsoft.ReactNative/ReactHost/MsoReactContext.h

@@ -18,7 +18,6 @@ class ReactSettingsSnapshot final : public Mso::UnknownObject<IReactSettingsSnap
   ReactSettingsSnapshot(Mso::WeakPtr<ReactInstanceWin> &&reactInstance) noexcept;
 
  public: // IReactSettingsSnapshot
-  bool UseWebDebugger() const noexcept override;
   bool UseFastRefresh() const noexcept override;
   bool UseDirectDebugger() const noexcept override;
   bool DebuggerBreakOnNextLine() const noexcept override;
@@ -53,7 +52,6 @@ class ReactContext final : public Mso::UnknownObject<IReactContext> {
   winrt::Microsoft::ReactNative::JsiRuntime JsiRuntime() const noexcept override;
   ReactInstanceState State() const noexcept override;
   bool IsLoaded() const noexcept override;
-  std::shared_ptr<facebook::react::Instance> GetInnerInstance() const noexcept override;
   IReactSettingsSnapshot const &SettingsSnapshot() const noexcept override;
 
  private:

package/Microsoft.ReactNative/ReactHost/React.h

@@ -14,7 +14,6 @@
 #include "errorCode/errorCode.h"
 #include "future/future.h"
 
-#include <NativeModuleProvider.h>
 #include <TurboModulesProvider.h>
 
 #ifdef CORE_ABI
@@ -26,12 +25,9 @@
 
 #include <Shared/IReactRootView.h>
 
-#include <ViewManagerProvider.h>
 #include <winrt/Microsoft.ReactNative.h>
 
-#ifdef USE_FABRIC
 #include <Fabric/Composition/UriImageManager.h>
-#endif
 
 namespace facebook::react::jsinspector_modern {
 class HostTarget;
@@ -54,7 +50,6 @@ enum class LogLevel : int32_t {
 };
 
 enum class JSIEngine : int32_t {
-  Chakra = 0, // Use the JSIExecutorFactory with ChakraRuntime
   Hermes = 1, // Use the JSIExecutorFactory with Hermes
   V8 = 2, // Use the JSIExecutorFactory with V8
 };
@@ -88,17 +83,10 @@ struct IReactInstance : IUnknown {
   virtual ReactInstanceState State() const noexcept = 0;
 
   virtual Mso::React::IReactContext &GetReactContext() const noexcept = 0;
-
-  virtual void AttachMeasuredRootView(
-      facebook::react::IReactRootView *rootView,
-      const winrt::Microsoft::ReactNative::JSValueArgWriter &initialProps,
-      bool useFabric) noexcept = 0;
-  virtual void DetachRootView(facebook::react::IReactRootView *rootView, bool useFabric) noexcept = 0;
 };
 
 MSO_GUID(IReactSettingsSnapshot, "6652bb2e-4c5e-49f7-b642-e817b0fef4de")
 struct IReactSettingsSnapshot : IUnknown {
-  virtual bool UseWebDebugger() const noexcept = 0;
   virtual bool UseFastRefresh() const noexcept = 0;
   virtual bool UseDirectDebugger() const noexcept = 0;
   virtual bool DebuggerBreakOnNextLine() const noexcept = 0;
@@ -124,7 +112,6 @@ struct IReactContext : IUnknown {
   virtual winrt::Microsoft::ReactNative::JsiRuntime JsiRuntime() const noexcept = 0;
   virtual ReactInstanceState State() const noexcept = 0;
   virtual bool IsLoaded() const noexcept = 0;
-  virtual std::shared_ptr<facebook::react::Instance> GetInnerInstance() const noexcept = 0;
   virtual IReactSettingsSnapshot const &SettingsSnapshot() const noexcept = 0;
 };
 
@@ -166,17 +153,6 @@ struct ReactDevOptions {
   std::string SourceBundleModuleName;
 };
 
-struct NativeModuleProvider2 {
-  virtual std::vector<facebook::react::NativeModuleDescription> GetModules(
-      Mso::CntPtr<IReactContext> const &reactContext,
-      std::shared_ptr<facebook::react::MessageQueueThread> const &defaultQueueThread) = 0;
-};
-
-struct ViewManagerProvider2 {
-  virtual std::vector<std::unique_ptr<::Microsoft::ReactNative::IViewManager>> GetViewManagers(
-      Mso::CntPtr<IReactContext> const &reactContext) = 0;
-};
-
 //! A simple struct that describes the basic properties/needs of an SDX. Whenever a new SDX is
 //! getting hosted in React, properties here will be used to construct the SDX.
 struct ReactOptions {
@@ -184,12 +160,8 @@ struct ReactOptions {
 
   winrt::Microsoft::ReactNative::IReactNotificationService Notifications;
 
-  std::shared_ptr<NativeModuleProvider2> ModuleProvider;
-  std::shared_ptr<ViewManagerProvider2> ViewManagerProvider;
   std::shared_ptr<winrt::Microsoft::ReactNative::TurboModulesProvider> TurboModuleProvider;
-#ifdef USE_FABRIC
   std::shared_ptr<winrt::Microsoft::ReactNative::Composition::implementation::UriImageManager> UriImageManager;
-#endif
 
   //! Identity of the SDX. Must uniquely describe the SDX across the installed product.
   std::string Identity;
@@ -229,7 +201,6 @@ struct ReactOptions {
   //! ReactNative Infrastructure Error
   //! Error types include:
   //! * Any call to Javascript function after Global Exception has been raised
-  //! * Any WebServer error when DeveloperSettings.UseWebDebugger is true
   //! Note: Default callback generates ShipAssert.
   OnErrorCallback OnError{GetDefaultOnErrorHandler()};
 
@@ -250,11 +221,6 @@ struct ReactOptions {
   std::string ByteCodeFileUri;
   bool EnableByteCodeCaching{true};
 
-  //! Enable function nativePerformanceNow.
-  //! Method nativePerformanceNow() returns high resolution time info.
-  //! It is not safe to expose to Custom Function. Add this flag so we can turn it off for Custom Function.
-  bool EnableNativePerformanceNow{true};
-
   ReactDevOptions DeveloperSettings = {};
 
   //! This controls the availability of various developer support functionality including
@@ -293,16 +259,6 @@ struct ReactOptions {
   static void SetUseLiveReload(winrt::Microsoft::ReactNative::IReactPropertyBag const &properties, bool value) noexcept;
   static bool UseLiveReload(winrt::Microsoft::ReactNative::IReactPropertyBag const &properties) noexcept;
 
-  //! Should the instance run in a remote environment such as within a browser
-  //! By default, this is using a browser navigated to  http://localhost:8081/debugger-ui served
-  //! by Metro/Haul. Debugging will start as soon as the React Native instance is loaded.
-  void SetUseWebDebugger(bool enabled) noexcept;
-  bool UseWebDebugger() const noexcept;
-  static void SetUseWebDebugger(
-      winrt::Microsoft::ReactNative::IReactPropertyBag const &properties,
-      bool value) noexcept;
-  static bool UseWebDebugger(winrt::Microsoft::ReactNative::IReactPropertyBag const &properties) noexcept;
-
   //! For direct debugging, whether to break on the next line of JavaScript that is executed.
   void SetDebuggerBreakOnNextLine(bool enable) noexcept;
   bool DebuggerBreakOnNextLine() const noexcept;

package/Microsoft.ReactNative/ReactHost/ReactHost.cpp

@@ -62,14 +62,6 @@ winrt::Microsoft::ReactNative::IReactPropertyName LiveReloadEnabledProperty() no
   return propName;
 }
 
-winrt::Microsoft::ReactNative::IReactPropertyName UseWebDebuggerProperty() noexcept {
-  static winrt::Microsoft::ReactNative::IReactPropertyName propName =
-      winrt::Microsoft::ReactNative::ReactPropertyBagHelper::GetName(
-          winrt::Microsoft::ReactNative::ReactPropertyBagHelper::GetNamespace(L"ReactNative.ReactOptions"),
-          L"UseWebDebugger");
-  return propName;
-}
-
 winrt::Microsoft::ReactNative::IReactPropertyName DebuggerBreakOnNextLineProperty() noexcept {
   static winrt::Microsoft::ReactNative::IReactPropertyName propName =
       winrt::Microsoft::ReactNative::ReactPropertyBagHelper::GetName(
@@ -199,30 +191,6 @@ void ReactOptions::SetUseLiveReload(bool enabled) noexcept {
   return winrt::unbox_value_or<bool>(properties.Get(LiveReloadEnabledProperty()), false);
 }
 
-void ReactOptions::SetUseWebDebugger(bool enabled) noexcept {
-  SetUseWebDebugger(Properties, enabled);
-}
-
-bool ReactOptions::UseWebDebugger() const noexcept {
-  return UseWebDebugger(Properties);
-}
-
-/*static*/ void ReactOptions::SetUseWebDebugger(
-    winrt::Microsoft::ReactNative::IReactPropertyBag const &properties,
-    bool value) noexcept {
-  properties.Set(UseWebDebuggerProperty(), winrt::box_value(value));
-
-  if (value) {
-    // Remote debugging is incompatible with direct debugging
-    SetUseDirectDebugger(properties, false);
-  }
-}
-
-/*static*/ bool ReactOptions::UseWebDebugger(
-    winrt::Microsoft::ReactNative::IReactPropertyBag const &properties) noexcept {
-  return winrt::unbox_value_or<bool>(properties.Get(UseWebDebuggerProperty()), false);
-}
-
 bool ReactOptions::UseLiveReload() const noexcept {
   return UseLiveReload(Properties);
 }
@@ -258,11 +226,6 @@ bool ReactOptions::UseDirectDebugger() const noexcept {
     winrt::Microsoft::ReactNative::IReactPropertyBag const &properties,
     bool value) noexcept {
   properties.Set(UseDirectDebuggerProperty(), winrt::box_value(value));
-
-  if (value) {
-    // Remote debugging is incompatible with direct debugging
-    SetUseWebDebugger(properties, false);
-  }
 }
 
 /*static*/ bool ReactOptions::UseDirectDebugger(
@@ -296,11 +259,7 @@ bool ReactOptions::EnableDefaultCrashHandler() const noexcept {
 class ReactNativeWindowsFeatureFlags : public facebook::react::ReactNativeFeatureFlagsDefaults {
  public:
   bool enableBridgelessArchitecture() override {
-#ifdef USE_FABRIC
     return true;
-#else
-    return false;
-#endif
   }
 
   bool enableCppPropsIteratorSetter() override {
@@ -385,16 +344,20 @@ ReactHost::ReactHost(Mso::DispatchQueue const &queue) noexcept
     : Super{EnsureSerialQueue(queue)},
       m_options{Queue(), m_mutex},
       m_notifyWhenClosed{ReactHostRegistry::Register(*this), Queue(), m_mutex},
-      m_inspectorHostTargetDelegate{std::make_shared<ReactInspectorHostTargetDelegate>(this)},
-      m_inspectorHostTarget{
-          jsinspector_modern::HostTarget::create(*m_inspectorHostTargetDelegate, [](std::function<void()> &&callback) {
-            ::Microsoft::ReactNative::ReactInspectorThread::Instance().Post(
-                [callback = std::move(callback)]() { callback(); });
-          })} {
+      m_inspectorHostTargetDelegate{std::make_shared<ReactInspectorHostTargetDelegate>(this)} {
+  // Feature flags must be overridden before HostTarget::create() is called,
+  // because HostTarget::create() accesses InspectorFlags which reads feature flags.
   static std::once_flag initFeatureFlagsOnce;
   std::call_once(initFeatureFlagsOnce, []() noexcept {
     ReactNativeFeatureFlags::override(std::make_unique<ReactNativeWindowsFeatureFlags>());
   });
+
+  // Create HostTarget after feature flags are set up
+  m_inspectorHostTarget =
+      jsinspector_modern::HostTarget::create(*m_inspectorHostTargetDelegate, [](std::function<void()> &&callback) {
+        ::Microsoft::ReactNative::ReactInspectorThread::Instance().Post(
+            [callback = std::move(callback)]() { callback(); });
+      });
 }
 
 ReactHost::~ReactHost() noexcept {}

package/Microsoft.ReactNative/ReactHost/ReactHost.h

@@ -108,7 +108,7 @@ class ReactHost final : public Mso::ActiveObject<IReactHost> {
   const Mso::ActiveField<bool> m_isInstanceUnloading{false, Queue()};
 
   const std::shared_ptr<facebook::react::jsinspector_modern::HostTargetDelegate> m_inspectorHostTargetDelegate;
-  const std::shared_ptr<facebook::react::jsinspector_modern::HostTarget> m_inspectorHostTarget;
+  std::shared_ptr<facebook::react::jsinspector_modern::HostTarget> m_inspectorHostTarget;
   const Mso::ActiveField<std::optional<int32_t>> m_inspectorPageId{Queue()};
 };