react-native-windows 0.75.3 → 0.76.0-preview.1

package/Microsoft.ReactNative/Fabric/Composition/UiaHelpers.cpp

@@ -72,9 +72,10 @@ HRESULT UiaNavigateHelper(
       auto parentCV = view.Parent().as<winrt::Microsoft::ReactNative::Composition::implementation::ComponentView>();
       if (parentCV != nullptr) {
         auto children = parentCV->Children();
-        for (auto it = children.end(); it != children.begin(); --it) {
-          if (*it == view) {
-            uiaProvider = (*it)
+        for (auto i = children.Size() - 1; i > 0; i--) {
+          auto child = children.GetAt(i);
+          if (child == view) {
+            uiaProvider = children.GetAt(i - 1)
                               .as<winrt::Microsoft::ReactNative::Composition::implementation::ComponentView>()
                               ->EnsureUiaProvider();
             break;
@@ -121,7 +122,9 @@ HRESULT UiaSetFocusHelper(::Microsoft::ReactNative::ReactTaggedView &view) noexc
   if (rootCV == nullptr)
     return UIA_E_ELEMENTNOTAVAILABLE;
 
-  return rootCV->TrySetFocusedComponent(strongView) ? S_OK : E_FAIL;
+  return rootCV->TrySetFocusedComponent(strongView, winrt::Microsoft::ReactNative::FocusNavigationDirection::None)
+      ? S_OK
+      : E_FAIL;
 }
 
 bool WasUiaPropertyAdvised(winrt::com_ptr<IRawElementProviderSimple> &providerSimple, PROPERTYID propId) noexcept {
@@ -181,4 +184,26 @@ std::string extractAccessibilityValue(const facebook::react::AccessibilityValue
   }
 }
 
+void DispatchAccessibilityAction(::Microsoft::ReactNative::ReactTaggedView &view, const std::string &action) noexcept {
+  auto strongView = view.view();
+
+  if (!strongView)
+    return;
+
+  auto baseView = strongView.try_as<winrt::Microsoft::ReactNative::Composition::implementation::ComponentView>();
+  if (baseView == nullptr)
+    return;
+
+  auto props = std::static_pointer_cast<const facebook::react::ViewProps>(baseView->props());
+  if (props == nullptr)
+    return;
+
+  auto accessibilityActions = props->accessibilityActions;
+  for (size_t i = 0; i < accessibilityActions.size(); i++) {
+    if (accessibilityActions[i].name == action) {
+      baseView->GetEventEmitter()->onAccessibilityAction(action);
+    }
+  }
+}
+
 } // namespace winrt::Microsoft::ReactNative::implementation

package/Microsoft.ReactNative/Fabric/Composition/UiaHelpers.h

@@ -33,4 +33,6 @@ long GetLiveSetting(const std::string &liveRegion) noexcept;
 
 std::string extractAccessibilityValue(const facebook::react::AccessibilityValue &value) noexcept;
 
+void DispatchAccessibilityAction(::Microsoft::ReactNative::ReactTaggedView &view, const std::string &action) noexcept;
+
 } // namespace winrt::Microsoft::ReactNative::implementation

package/Microsoft.ReactNative/Fabric/Composition/UnimplementedNativeViewComponentView.cpp

@@ -37,8 +37,7 @@ winrt::Microsoft::ReactNative::ComponentView UnimplementedNativeViewComponentVie
 }
 
 void UnimplementedNativeViewComponentView::HandleCommand(
-    winrt::hstring commandName,
-    const winrt::Microsoft::ReactNative::IJSValueReader &args) noexcept {
+    const winrt::Microsoft::ReactNative::HandleCommandArgs &args) noexcept {
   // Do not call base to avoid unknown command asserts
 }
 

package/Microsoft.ReactNative/Fabric/Composition/UnimplementedNativeViewComponentView.h

@@ -25,8 +25,7 @@ struct UnimplementedNativeViewComponentView
       facebook::react::LayoutMetrics const &layoutMetrics,
       facebook::react::LayoutMetrics const &oldLayoutMetrics) noexcept override;
 
-  void HandleCommand(winrt::hstring commandName, const winrt::Microsoft::ReactNative::IJSValueReader &args) noexcept
-      override;
+  void HandleCommand(const winrt::Microsoft::ReactNative::HandleCommandArgs &args) noexcept override;
 
   UnimplementedNativeViewComponentView(
       const winrt::Microsoft::ReactNative::Composition::Experimental::ICompositionContext &compContext,

package/Microsoft.ReactNative/Fabric/FabricUIManagerModule.cpp

@@ -2,12 +2,15 @@
 // Licensed under the MIT License.
 
 #include "pch.h"
+#include "HandleCommandArgs.g.cpp"
+#include "HandleCommandArgs.g.h"
 #include <AsynchronousEventBeat.h>
 #include <DynamicReader.h>
 #include <DynamicWriter.h>
 #include <Fabric/ComponentView.h>
 #include <Fabric/Composition/CompositionUIService.h>
 #include <Fabric/Composition/CompositionViewComponentView.h>
+#include <Fabric/Composition/ReactNativeIsland.h>
 #include <Fabric/Composition/RootComponentView.h>
 #include <Fabric/FabricUIManagerModule.h>
 #include <Fabric/ReactNativeConfigProperties.h>
@@ -109,15 +112,6 @@ void FabricUIManager::installFabricUIManager() noexcept {
   };
   toolbox.runtimeExecutor = runtimeExecutor;
   toolbox.asynchronousEventBeatFactory = asynchronousBeatFactory;
-  toolbox.backgroundExecutor = [context = m_context,
-                                dispatcher = Mso::DispatchQueue::MakeLooperQueue()](std::function<void()> &&callback) {
-    if (context.UIDispatcher().HasThreadAccess()) {
-      callback();
-      return;
-    }
-
-    dispatcher.Post(std::move(callback));
-  };
 
   m_scheduler = std::make_shared<facebook::react::Scheduler>(
       toolbox, (/*animationDriver_ ? animationDriver_.get() :*/ nullptr), this);
@@ -148,7 +142,7 @@ void FabricUIManager::startSurface(
 
   facebook::react::LayoutContext layoutContext;
   layoutContext.pointScaleFactor = rootView.ScaleFactor();
-  layoutContext.fontSizeMultiplier = rootView.ScaleFactor();
+  layoutContext.fontSizeMultiplier = rootView.FontSizeMultiplier();
 
   m_surfaceManager->startSurface(
       surfaceId,
@@ -377,6 +371,28 @@ void FabricUIManager::schedulerDidRequestPreliminaryViewAllocation(const faceboo
   */
 }
 
+struct HandleCommandArgs : public winrt::Microsoft::ReactNative::implementation::HandleCommandArgsT<HandleCommandArgs> {
+  HandleCommandArgs(winrt::hstring commandName, folly::dynamic const &arg) : m_commandName(commandName), m_args(arg) {}
+
+  winrt::hstring CommandName() const noexcept {
+    return m_commandName;
+  }
+  winrt::Microsoft::ReactNative::IJSValueReader CommandArgs() const noexcept {
+    return winrt::make<winrt::Microsoft::ReactNative::DynamicReader>(m_args);
+  }
+  bool Handled() const noexcept {
+    return m_handled;
+  }
+  void Handled(bool value) noexcept {
+    m_handled = value;
+  }
+
+ private:
+  folly::dynamic const &m_args;
+  const winrt::hstring m_commandName;
+  bool m_handled{false};
+};
+
 void FabricUIManager::schedulerDidDispatchCommand(
     facebook::react::ShadowView const &shadowView,
     std::string const &commandName,
@@ -384,7 +400,7 @@ void FabricUIManager::schedulerDidDispatchCommand(
   if (m_context.UIDispatcher().HasThreadAccess()) {
     auto descriptor = m_registry.componentViewDescriptorWithTag(shadowView.tag);
     winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(descriptor.view)
-        ->HandleCommand(winrt::to_hstring(commandName), winrt::make<winrt::Microsoft::ReactNative::DynamicReader>(arg));
+        ->HandleCommand(winrt::make<HandleCommandArgs>(winrt::to_hstring(commandName), arg));
   } else {
     m_context.UIDispatcher().Post(
         [wkThis = weak_from_this(), commandName, tag = shadowView.tag, args = folly::dynamic(arg)]() {
@@ -392,7 +408,7 @@ void FabricUIManager::schedulerDidDispatchCommand(
             auto view = pThis->m_registry.findComponentViewWithTag(tag);
             if (view) {
               winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(view)->HandleCommand(
-                  winrt::to_hstring(commandName), winrt::make<winrt::Microsoft::ReactNative::DynamicReader>(args));
+                  winrt::make<HandleCommandArgs>(winrt::to_hstring(commandName), args));
             }
           }
         });

package/Microsoft.ReactNative/Fabric/platform/react/renderer/graphics/HostPlatformColor.h

@@ -58,6 +58,39 @@ inline Color hostPlatformColorFromComponents(ColorComponents components) {
       /* .m_platformColor = */ {}};
 }
 
+inline Color hostPlatformColorFromRGBA(uint8_t r, uint8_t g, uint8_t b, uint8_t a) {
+  // Create ColorComponents from RGBA values normalized to the range [0.0f, 1.0f]
+  float ratio = 255.0f;
+  const auto colorComponents = ColorComponents{
+      .red = static_cast<float>(r) / ratio,
+      .green = static_cast<float>(g) / ratio,
+      .blue = static_cast<float>(b) / ratio,
+      .alpha = static_cast<float>(a) / ratio,
+  };
+
+  return hostPlatformColorFromComponents(colorComponents);
+}
+
+inline float alphaFromHostPlatformColor(Color color) {
+  float ratio = 255.0f;
+  return static_cast<float>(color.m_color.A) / ratio;
+}
+
+inline float redFromHostPlatformColor(Color color) {
+  float ratio = 255.0f;
+  return static_cast<float>(color.m_color.R) / ratio;
+}
+
+inline float greenFromHostPlatformColor(Color color) {
+  float ratio = 255.0f;
+  return static_cast<float>(color.m_color.G) / ratio;
+}
+
+inline float blueFromHostPlatformColor(Color color) {
+  float ratio = 255.0f;
+  return static_cast<float>(color.m_color.B) / ratio;
+}
+
 inline ColorComponents colorComponentsFromHostPlatformColor(Color color) {
   float ratio = 255;
   const auto windowsColor = color.AsWindowsColor();

package/Microsoft.ReactNative/Fabric/platform/react/renderer/textlayoutmanager/TextLayoutManager.cpp

@@ -17,10 +17,11 @@
 namespace facebook::react {
 
 void TextLayoutManager::GetTextLayout(
-    const AttributedString &attributedString,
+    const AttributedStringBox &attributedStringBox,
     const ParagraphAttributes &paragraphAttributes,
     Size size,
     winrt::com_ptr<IDWriteTextLayout> &spTextLayout) noexcept {
+  const auto &attributedString = attributedStringBox.getValue();
   auto fragments = attributedString.getFragments();
   auto outerFragment = fragments[0];
 
@@ -40,7 +41,10 @@ void TextLayoutManager::GetTextLayout(
           static_cast<facebook::react::FontWeight>(DWRITE_FONT_WEIGHT_REGULAR))),
       style,
       DWRITE_FONT_STRETCH_NORMAL,
-      outerFragment.textAttributes.fontSize,
+      (outerFragment.textAttributes.allowFontScaling.value_or(true) &&
+       !std::isnan(outerFragment.textAttributes.fontSizeMultiplier))
+          ? (outerFragment.textAttributes.fontSizeMultiplier * outerFragment.textAttributes.fontSize)
+          : outerFragment.textAttributes.fontSize,
       L"",
       spTextFormat.put()));
 
@@ -83,7 +87,7 @@ void TextLayoutManager::GetTextLayout(
   }
   winrt::check_hresult(spTextFormat->SetTextAlignment(alignment));
 
-  auto str = GetTransformedText(attributedString);
+  auto str = GetTransformedText(attributedStringBox);
 
   winrt::check_hresult(Microsoft::ReactNative::DWriteFactory()->CreateTextLayout(
       str.c_str(), // The string to be laid out and formatted.
@@ -115,7 +119,11 @@ void TextLayoutManager::GetTextLayout(
             attributes.fontWeight.value_or(static_cast<facebook::react::FontWeight>(DWRITE_FONT_WEIGHT_REGULAR))),
         range));
     winrt::check_hresult(spTextLayout->SetFontStyle(fragmentStyle, range));
-    winrt::check_hresult(spTextLayout->SetFontSize(attributes.fontSize, range));
+    winrt::check_hresult(spTextLayout->SetFontSize(
+        (attributes.allowFontScaling.value_or(true) && !std::isnan(attributes.fontSizeMultiplier))
+            ? (attributes.fontSizeMultiplier * attributes.fontSize)
+            : attributes.fontSize,
+        range));
 
     if (!isnan(attributes.letterSpacing)) {
       winrt::check_hresult(
@@ -134,7 +142,7 @@ void TextLayoutManager::GetTextLayout(
   if (attributedStringBox.getValue().isEmpty())
     return;
 
-  GetTextLayout(attributedStringBox.getValue(), paragraphAttributes, layoutConstraints.maximumSize, spTextLayout);
+  GetTextLayout(attributedStringBox, paragraphAttributes, layoutConstraints.maximumSize, spTextLayout);
 }
 
 TextMeasurement TextLayoutManager::measure(
@@ -218,14 +226,14 @@ Microsoft::ReactNative::TextTransform ConvertTextTransform(std::optional<TextTra
 }
 
 LinesMeasurements TextLayoutManager::measureLines(
-    const AttributedString &attributedString,
+    const AttributedStringBox &attributedStringBox,
     const ParagraphAttributes &paragraphAttributes,
     Size size) const {
   LinesMeasurements lineMeasurements{};
 
   winrt::com_ptr<IDWriteTextLayout> spTextLayout;
 
-  GetTextLayout(attributedString, paragraphAttributes, size, spTextLayout);
+  GetTextLayout(attributedStringBox, paragraphAttributes, size, spTextLayout);
 
   if (spTextLayout) {
     std::vector<DWRITE_LINE_METRICS> lineMetrics;
@@ -265,6 +273,7 @@ LinesMeasurements TextLayoutManager::measureLines(
       }
 
       std::string str;
+      const auto &attributedString = attributedStringBox.getValue();
       for (const auto &fragment : attributedString.getFragments()) {
         str = str +
             winrt::to_string(Microsoft::ReactNative::TransformableText::TransformText(
@@ -290,7 +299,7 @@ LinesMeasurements TextLayoutManager::measureLines(
 }
 
 std::shared_ptr<void> TextLayoutManager::getHostTextStorage(
-    const AttributedString &attributedString,
+    const AttributedStringBox &attributedStringBox,
     const ParagraphAttributes &paragraphAttributes,
     LayoutConstraints layoutConstraints) const {
   return nullptr;
@@ -300,8 +309,16 @@ void *TextLayoutManager::getNativeTextLayoutManager() const {
   return (void *)this;
 }
 
-winrt::hstring TextLayoutManager::GetTransformedText(const AttributedString &attributedString) {
+Float TextLayoutManager::baseline(
+    AttributedStringBox attributedStringBox,
+    ParagraphAttributes paragraphAttributes,
+    Size size) const {
+  return 0;
+}
+
+winrt::hstring TextLayoutManager::GetTransformedText(const AttributedStringBox &attributedStringBox) {
   winrt::hstring result{};
+  const auto &attributedString = attributedStringBox.getValue();
   for (const auto &fragment : attributedString.getFragments()) {
     result = result +
         Microsoft::ReactNative::TransformableText::TransformText(

package/Microsoft.ReactNative/Fabric/platform/react/renderer/textlayoutmanager/TextLayoutManager.h

@@ -45,12 +45,12 @@ class TextLayoutManager {
    * infrastructure.
    */
   LinesMeasurements measureLines(
-      const AttributedString &attributedString,
+      const AttributedStringBox &attributedStringBox,
       const ParagraphAttributes &paragraphAttributes,
       Size size) const;
 
   std::shared_ptr<void> getHostTextStorage(
-      const AttributedString &attributedString,
+      const AttributedStringBox &attributedStringBox,
       const ParagraphAttributes &paragraphAttributes,
       LayoutConstraints layoutConstraints) const;
 
@@ -63,6 +63,12 @@ class TextLayoutManager {
       const ParagraphAttributes &paragraphAttributes,
       LayoutConstraints layoutConstraints) const;
 
+  /*
+   * Calculates baseline of `attributedString` using native text rendering
+   * infrastructure.
+   */
+  Float baseline(AttributedStringBox attributedStringBox, ParagraphAttributes paragraphAttributes, Size size) const;
+
   /*
    * Returns an opaque pointer to platform-specific TextLayoutManager.
    * Is used on a native views layer to delegate text rendering to the manager.
@@ -78,9 +84,9 @@ class TextLayoutManager {
 #pragma endregion
 
  private:
-  static winrt::hstring GetTransformedText(const AttributedString &attributedString);
+  static winrt::hstring GetTransformedText(const AttributedStringBox &attributedStringBox);
   static void GetTextLayout(
-      const AttributedString &attributedString,
+      const AttributedStringBox &attributedStringBox,
       const ParagraphAttributes &paragraphAttributes,
       Size size,
       winrt::com_ptr<IDWriteTextLayout> &spTextLayout) noexcept;

package/Microsoft.ReactNative/IReactModuleBuilder.cpp

@@ -129,6 +129,11 @@ void ReactModuleBuilder::AddSyncMethod(hstring const &name, SyncMethodDelegate c
   m_methods.push_back(std::move(cxxMethod));
 }
 
+void ReactModuleBuilder::AddEventEmitter(hstring const &, EventEmitterInitializerDelegate const &) {
+  throw std::runtime_error(
+      "This module requires that it is registered as a TurboModule. If the module is being manually registered ensure you are using packageBuilder.AddTurboModule instead of packageBuilder.AddModule.");
+}
+
 /*static*/ MethodResultCallback ReactModuleBuilder::MakeMethodResultCallback(CxxModule::Callback &&callback) noexcept {
   if (callback) {
     return [callback = std::move(callback)](const IJSValueWriter &outputWriter) noexcept {

package/Microsoft.ReactNative/IReactModuleBuilder.h

@@ -15,6 +15,7 @@ struct ReactModuleBuilder : winrt::implements<ReactModuleBuilder, IReactModuleBu
   void AddConstantProvider(ConstantProviderDelegate const &constantProvider) noexcept;
   void AddMethod(hstring const &name, MethodReturnType returnType, MethodDelegate const &method) noexcept;
   void AddSyncMethod(hstring const &name, SyncMethodDelegate const &method) noexcept;
+  void AddEventEmitter(hstring const &name, EventEmitterInitializerDelegate const &emitter);
 
  public:
   std::unique_ptr<facebook::xplat::module::CxxModule> MakeCxxModule(

package/Microsoft.ReactNative/IReactModuleBuilder.idl

@@ -34,6 +34,12 @@ namespace Microsoft.ReactNative
       MethodResultCallback resolve,
       MethodResultCallback reject);
 
+  DOC_STRING("A delegate gets the arguments for an event emit on a EventEmitter.")
+  delegate void EmitEventSetterDelegate(JSValueArgWriter argWriter);
+
+  DOC_STRING("A delegate to call a turbo module EventEmitter.")
+  delegate void EventEmitterInitializerDelegate(EmitEventSetterDelegate emitter);
+
   DOC_STRING("A delegate to call native synchronous method.")
   delegate void SyncMethodDelegate(IJSValueReader inputReader, IJSValueWriter outputWriter);
 
@@ -62,5 +68,8 @@ namespace Microsoft.ReactNative
 
     DOC_STRING("Adds a synchronous method to the native module. See @SyncMethodDelegate.")
     void AddSyncMethod(String name, SyncMethodDelegate method);
+
+    DOC_STRING("Adds an EventEmitter to the turbo module. See @EventEmitterInitializerDelegate.")
+    void AddEventEmitter(String name, EventEmitterInitializerDelegate emitter);
   };
 } // namespace Microsoft.ReactNative

package/Microsoft.ReactNative/IReactViewComponentBuilder.idl

@@ -47,6 +47,13 @@ namespace Microsoft.ReactNative
     UInt32 Index { get; };
   };
 
+  [experimental]
+  runtimeclass HandleCommandArgs {
+    String CommandName { get; };
+    IJSValueReader CommandArgs { get; };
+    Boolean Handled;
+  };
+
   [experimental]
   DOC_STRING("A delegate that creates a @IComponentProps object for an instance of @ViewProps. See @IReactViewComponentBuilder.SetCreateProps")
   delegate IComponentProps ViewPropsFactory(ViewProps props);
@@ -71,7 +78,7 @@ namespace Microsoft.ReactNative
   delegate void ComponentViewInitializer(ComponentView view);
 
   [experimental]
-  delegate void HandleCommandDelegate(ComponentView source, String commandName, IJSValueReader args);
+  delegate void HandleCommandDelegate(ComponentView source, HandleCommandArgs args);
 
   [experimental]
   delegate void UpdateFinalizerDelegate(ComponentView source, ComponentViewUpdateMask updateMask);

package/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj

@@ -78,6 +78,8 @@
   <ImportGroup Label="PropertySheets">
     <Import Project="PropertySheet.props" />
     <Import Project="..\PropertySheets\WinUI.props" />
+    <!-- Added since we build this project with Paper/Fabric. -->
+    <Import Project="$(ReactNativeWindowsDir)\PropertySheets\NuGet.LockFile.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

package/Microsoft.ReactNative/Modules/AlertModule.cpp

@@ -117,7 +117,9 @@ void Alert::ProcessPendingAlertRequestsXaml() noexcept {
   // https://github.com/microsoft/microsoft-ui-xaml/issues/2331
   dialog.Opened([useXamlRootForThemeBugWorkaround](winrt::IInspectable const &sender, auto &&) {
     auto contentDialog = sender.as<xaml::Controls::ContentDialog>();
-    auto popups = xaml::Media::VisualTreeHelper::GetOpenPopupsForXamlRoot(contentDialog.XamlRoot());
+    auto popups = useXamlRootForThemeBugWorkaround
+        ? xaml::Media::VisualTreeHelper::GetOpenPopupsForXamlRoot(contentDialog.XamlRoot())
+        : xaml::Media::VisualTreeHelper::GetOpenPopups(xaml::Window::Current());
 
     auto contentAsFrameworkElement = useXamlRootForThemeBugWorkaround
         ? contentDialog.XamlRoot().Content().try_as<xaml::FrameworkElement>()

package/Microsoft.ReactNative/Modules/AppearanceModule.cpp

@@ -68,7 +68,7 @@ void Appearance::RequeryTheme() noexcept {
   auto oldTheme = winrt::unbox_value_or<ApplicationTheme>(oldThemeBoxed, ApplicationTheme::Light);
 
   if (oldTheme != theme) {
-    appearanceChanged(ToString(theme));
+    appearanceChanged({ToString(theme)});
   }
 }
 

package/Microsoft.ReactNative/Modules/AppearanceModule.h

@@ -9,6 +9,12 @@
 
 namespace Microsoft::ReactNative {
 
+REACT_STRUCT(AppearanceChangeArgs)
+struct AppearanceChangeArgs {
+  REACT_FIELD(colorScheme)
+  std::string colorScheme;
+};
+
 REACT_MODULE(Appearance)
 struct Appearance : std::enable_shared_from_this<Appearance> {
   using ApplicationTheme = xaml::ApplicationTheme;
@@ -31,7 +37,7 @@ struct Appearance : std::enable_shared_from_this<Appearance> {
   void removeListeners(double count) noexcept;
 
   REACT_EVENT(appearanceChanged);
-  std::function<void(std::string const &)> appearanceChanged;
+  std::function<void(AppearanceChangeArgs const &)> appearanceChanged;
 
   // This function allows the module to get the current theme on the UI thread before it is requested by any JS thread
   static void InitOnUIThread(const Mso::React::IReactContext &context) noexcept;

package/Microsoft.ReactNative/Modules/DevSettingsModule.cpp

@@ -50,12 +50,12 @@ void DevSettings::toggleElementInspector() noexcept {
       "RCTDeviceEventEmitter", "emit", folly::dynamic::array("toggleElementInspector", nullptr));
 }
 
-void DevSettings::openDebugger() noexcept {
+void DevSettings::addMenuItem(std::string title) noexcept {
   assert(false);
 }
 
-void DevSettings::addMenuItem(std::string title) noexcept {
-  assert(false);
+void DevSettings::openDebugger() noexcept {
+  // TODO: implement openDebugger() #13437
 }
 
 void DevSettings::setIsShakeToShowDevMenuEnabled(bool enabled) noexcept {

package/Microsoft.ReactNative/Modules/DevSettingsModule.h

@@ -24,8 +24,8 @@ struct DevSettings {
   REACT_METHOD(setIsDebuggingRemotely) void setIsDebuggingRemotely(bool isDebuggingRemotelyEnabled) noexcept;
   REACT_METHOD(setProfilingEnabled) void setProfilingEnabled(bool isProfilingEnabled) noexcept;
   REACT_METHOD(toggleElementInspector) void toggleElementInspector() noexcept;
-  REACT_METHOD(openDebugger) void openDebugger() noexcept;
   REACT_METHOD(addMenuItem) void addMenuItem(std::string title) noexcept;
+  REACT_METHOD(openDebugger) void openDebugger() noexcept;
   REACT_METHOD(setIsShakeToShowDevMenuEnabled) void setIsShakeToShowDevMenuEnabled(bool enabled) noexcept;
 
   REACT_METHOD(addListener)

package/Microsoft.ReactNative/Modules/LinkingManagerModule.cpp

@@ -109,11 +109,11 @@ void LinkingManager::HandleOpenUri(winrt::hstring const &uri) noexcept {
   // no-op
 }
 
-/*static*/ void LinkingManager::getInitialURL(::React::ReactPromise<std::string> &&result) noexcept {
+/*static*/ void LinkingManager::getInitialURL(::React::ReactPromise<std::optional<std::string>> &&result) noexcept {
   if (s_initialUri) {
     result.Resolve(to_string(s_initialUri.AbsoluteUri()));
   } else {
-    result.Resolve("");
+    result.Resolve(std::nullopt);
   }
 }
 

package/Microsoft.ReactNative/Modules/LinkingManagerModule.h

@@ -39,7 +39,7 @@ struct LinkingManager {
   static void removeListeners(double count) noexcept;
 
   REACT_METHOD(getInitialURL)
-  static void getInitialURL(winrt::Microsoft::ReactNative::ReactPromise<std::string> &&result) noexcept;
+  static void getInitialURL(winrt::Microsoft::ReactNative::ReactPromise<std::optional<std::string>> &&result) noexcept;
 
   static void OpenUri(winrt::Windows::Foundation::Uri const &uri) noexcept;
 

package/Microsoft.ReactNative/Modules/LogBoxModule.cpp

@@ -19,6 +19,15 @@
 
 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";

package/Microsoft.ReactNative/Modules/LogBoxModule.h

@@ -14,6 +14,8 @@ REACT_MODULE(LogBox)
 struct LogBox : public std::enable_shared_from_this<LogBox> {
   using ModuleSpec = ReactNativeSpecs::LogBoxSpec;
 
+  ~LogBox();
+
   REACT_INIT(Initialize)
   void Initialize(winrt::Microsoft::ReactNative::ReactContext const &reactContext) noexcept;