react-native-windows 0.73.10 → 0.74.0-preview.1

package/Microsoft.ReactNative/Fabric/FabricUIManagerModule.cpp

@@ -2,11 +2,13 @@
 // Licensed under the MIT License.
 
 #include "pch.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/RootComponentView.h>
 #include <Fabric/FabricUIManagerModule.h>
 #include <Fabric/ReactNativeConfigProperties.h>
 #include <Fabric/WindowsComponentDescriptorRegistry.h>
@@ -14,19 +16,22 @@
 #include <IReactContext.h>
 #include <IReactRootView.h>
 #include <JSI/jsi.h>
+#include <ReactCommon/RuntimeExecutor.h>
 #include <SchedulerSettings.h>
+#include <SynchronousEventBeat.h>
 #include <UI.Xaml.Controls.h>
 #include <react/components/rnwcore/ComponentDescriptors.h>
 #include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 #include <react/renderer/core/DynamicPropsUtilities.h>
 #include <react/renderer/core/EventBeat.h>
+#include <react/renderer/runtimescheduler/RuntimeScheduler.h>
 #include <react/renderer/scheduler/Scheduler.h>
 #include <react/renderer/scheduler/SchedulerToolbox.h>
 #include <react/utils/ContextContainer.h>
 #include <react/utils/CoreFeatures.h>
-#include <runtimeexecutor/ReactCommon/RuntimeExecutor.h>
 #include <winrt/Windows.Graphics.Display.h>
 #include <winrt/Windows.UI.Composition.Desktop.h>
+#include "DynamicReader.h"
 #include "Unicode.h"
 
 namespace Microsoft::ReactNative {
@@ -49,60 +54,16 @@ FabricUIManager::FabricUIManager() {
   facebook::react::CoreFeatures::enablePropIteratorSetter = true;
 }
 
-FabricUIManager::~FabricUIManager() {}
-
-class AsyncEventBeat final : public facebook::react::EventBeat {
- public:
-  AsyncEventBeat(
-      facebook::react::EventBeat::SharedOwnerBox const &ownerBox,
-      const winrt::Microsoft::ReactNative::ReactContext &context,
-      facebook::react::RuntimeExecutor runtimeExecutor)
-      : EventBeat(ownerBox), m_context(context), m_runtimeExecutor(runtimeExecutor) {}
-
-  void induce() const override {
-    if (!isRequested_ || m_isBeatCallbackScheduled) {
-      isRequested_ = false;
-      return;
-    }
-    isRequested_ = false;
-    m_isBeatCallbackScheduled = true;
-
-    m_runtimeExecutor([this, ownerBox = ownerBox_](facebook::jsi::Runtime &runtime) {
-      auto owner = ownerBox->owner.lock();
-      if (!owner) {
-        return;
-      }
-
-      m_isBeatCallbackScheduled = false;
-      if (beatCallback_) {
-        beatCallback_(runtime);
-      }
-    });
+FabricUIManager::~FabricUIManager() {
+  // Make sure that we destroy UI components on UI thread.
+  if (!m_context.UIDispatcher().HasThreadAccess()) {
+    m_context.UIDispatcher().Post([registry = std::move(m_registry)]() {});
   }
-
-  void request() const override {
-    bool alreadyRequested = isRequested_;
-    EventBeat::request();
-    if (!alreadyRequested) {
-      m_context.UIDispatcher().Post([this, ownerBox = ownerBox_]() {
-        auto owner = ownerBox->owner.lock();
-        if (!owner) {
-          return;
-        }
-        induce();
-      });
-    }
-  }
-
- private:
-  mutable std::atomic<bool> m_isBeatCallbackScheduled{false};
-  winrt::Microsoft::ReactNative::ReactContext m_context;
-  facebook::react::RuntimeExecutor m_runtimeExecutor;
-};
+}
 
 void FabricUIManager::installFabricUIManager() noexcept {
   std::shared_ptr<const facebook::react::ReactNativeConfig> config =
-      std::make_shared<const ReactNativeConfigProperties>(m_context);
+      std::make_shared<const ReactNativeConfigProperties>(m_context.Properties());
 
   std::lock_guard<std::mutex> schedulerLock(m_schedulerMutex);
 
@@ -111,21 +72,37 @@ void FabricUIManager::installFabricUIManager() noexcept {
   // This allows access to our ReactContext from the contextContainer thats passed around the fabric codebase
   contextContainer->insert("MSRN.ReactContext", m_context);
 
-  auto runtimeExecutor = SchedulerSettings::GetRuntimeExecutor(m_context.Properties());
+  facebook::react::RuntimeExecutor runtimeExecutor;
+  auto toolbox = facebook::react::SchedulerToolbox{};
 
-  facebook::react::EventBeat::Factory synchronousBeatFactory =
-      [runtimeExecutor, context = m_context](facebook::react::EventBeat::SharedOwnerBox const &ownerBox) {
-        return std::make_unique<AsyncEventBeat>(ownerBox, context, runtimeExecutor);
-      };
+  if (auto runtimeScheduler = SchedulerSettings::RuntimeSchedulerFromProperties(m_context.Properties())) {
+    contextContainer->insert("RuntimeScheduler", runtimeScheduler);
+    runtimeExecutor = [runtimeScheduler](std::function<void(facebook::jsi::Runtime & runtime)> &&callback) {
+      runtimeScheduler->scheduleWork(std::move(callback));
+    };
+    facebook::react::EventBeat::Factory synchronousBeatFactory =
+        [runtimeExecutor, context = m_context, runtimeScheduler](
+            facebook::react::EventBeat::SharedOwnerBox const &ownerBox) {
+          return std::make_unique<SynchronousEventBeat>(ownerBox, context, runtimeExecutor, runtimeScheduler);
+        };
+    toolbox.synchronousEventBeatFactory = synchronousBeatFactory;
+  } else {
+    runtimeExecutor = SchedulerSettings::GetRuntimeExecutor(m_context.Properties());
+
+    facebook::react::EventBeat::Factory synchronousBeatFactory =
+        [runtimeExecutor, context = m_context](facebook::react::EventBeat::SharedOwnerBox const &ownerBox) {
+          return std::make_unique<AsynchronousEventBeat>(ownerBox, context, runtimeExecutor);
+        };
+    toolbox.synchronousEventBeatFactory = synchronousBeatFactory;
+  }
 
   facebook::react::EventBeat::Factory asynchronousBeatFactory =
       [runtimeExecutor, context = m_context](facebook::react::EventBeat::SharedOwnerBox const &ownerBox) {
-        return std::make_unique<AsyncEventBeat>(ownerBox, context, runtimeExecutor);
+        return std::make_unique<AsynchronousEventBeat>(ownerBox, context, runtimeExecutor);
       };
 
   contextContainer->insert("ReactNativeConfig", config);
 
-  auto toolbox = facebook::react::SchedulerToolbox{};
   toolbox.contextContainer = contextContainer;
   toolbox.componentRegistryFactory = [](facebook::react::EventDispatcher::Weak const &eventDispatcher,
                                         facebook::react::ContextContainer::Shared const &contextContainer)
@@ -144,7 +121,6 @@ void FabricUIManager::installFabricUIManager() noexcept {
     return registry;
   };
   toolbox.runtimeExecutor = runtimeExecutor;
-  toolbox.synchronousEventBeatFactory = synchronousBeatFactory;
   toolbox.asynchronousEventBeatFactory = asynchronousBeatFactory;
   toolbox.backgroundExecutor = [context = m_context,
                                 dispatcher = Mso::DispatchQueue::MakeLooperQueue()](std::function<void()> &&callback) {
@@ -166,29 +142,30 @@ const IComponentViewRegistry &FabricUIManager::GetViewRegistry() const noexcept
 }
 
 void FabricUIManager::startSurface(
-    facebook::react::IReactRootView *rootview,
+    const winrt::Microsoft::ReactNative::CompositionRootView &rootView,
     facebook::react::SurfaceId surfaceId,
     const std::string &moduleName,
     const folly::dynamic &initialProps) noexcept {
-  auto CompositionRootView = static_cast<ICompositionRootView *>(rootview);
-  m_surfaceRegistry.insert({surfaceId, {CompositionRootView->GetVisual()}});
+  m_surfaceRegistry.insert({surfaceId, {rootView}});
 
-  m_context.UIDispatcher().Post([self = shared_from_this(), surfaceId]() {
+  m_context.UIDispatcher().Post([self = shared_from_this(), surfaceId, rootView]() {
     auto &rootComponentViewDescriptor = self->m_registry.dequeueComponentViewWithComponentHandle(
         facebook::react::RootShadowNode::Handle(), surfaceId, self->m_compContext);
 
-    self->m_surfaceRegistry.at(surfaceId).rootVisual.InsertAt(
-        static_cast<const CompositionBaseComponentView &>(*rootComponentViewDescriptor.view).OuterVisual(), 0);
+    auto root = rootComponentViewDescriptor.view
+                    .as<winrt::Microsoft::ReactNative::Composition::implementation::RootComponentView>();
+    root->theme(winrt::get_self<winrt::Microsoft::ReactNative::Composition::implementation::Theme>(rootView.Theme()));
+    root->start(rootView);
   });
 
   facebook::react::LayoutContext context;
   facebook::react::LayoutConstraints constraints;
-  context.pointScaleFactor = CompositionRootView->ScaleFactor();
-  context.fontSizeMultiplier = CompositionRootView->ScaleFactor();
-  constraints.minimumSize.height = static_cast<float>(CompositionRootView->GetActualHeight());
-  constraints.minimumSize.width = static_cast<float>(CompositionRootView->GetActualWidth());
-  constraints.maximumSize.height = static_cast<float>(CompositionRootView->GetActualHeight());
-  constraints.maximumSize.width = static_cast<float>(CompositionRootView->GetActualWidth());
+  context.pointScaleFactor = rootView.ScaleFactor();
+  context.fontSizeMultiplier = rootView.ScaleFactor();
+  constraints.minimumSize.height = rootView.Size().Height;
+  constraints.minimumSize.width = rootView.Size().Width;
+  constraints.maximumSize.height = rootView.Size().Height;
+  constraints.maximumSize.width = rootView.Size().Width;
   constraints.layoutDirection = facebook::react::LayoutDirection::LeftToRight;
 
   m_surfaceManager->startSurface(
@@ -204,6 +181,11 @@ void FabricUIManager::stopSurface(facebook::react::SurfaceId surfaceId) noexcept
   m_surfaceManager->stopSurface(surfaceId);
 }
 
+winrt::Microsoft::ReactNative::CompositionRootView FabricUIManager::GetCompositionRootView(
+    facebook::react::SurfaceId surfaceId) const noexcept {
+  return m_surfaceRegistry.at(surfaceId).wkRootView.get();
+}
+
 facebook::react::Size FabricUIManager::measureSurface(
     facebook::react::SurfaceId surfaceId,
     const facebook::react::LayoutConstraints &layoutConstraints,
@@ -249,17 +231,17 @@ void FabricUIManager::RCTPerformMountInstructions(
         auto &newChildShadowView = mutation.newChildShadowView;
         auto &parentShadowView = mutation.parentShadowView;
         auto &newChildViewDescriptor = m_registry.componentViewDescriptorWithTag(newChildShadowView.tag);
-        auto &parentViewDescriptor = m_registry.componentViewDescriptorWithTag(parentShadowView.tag);
-
-        auto &newChildComponentView = newChildViewDescriptor.view;
+        auto parentViewDescriptor = m_registry.componentViewDescriptorWithTag(parentShadowView.tag);
+        auto newChildComponentView =
+            winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(newChildViewDescriptor.view);
 
         newChildComponentView->updateProps(newChildShadowView.props, oldChildShadowView.props);
         newChildComponentView->updateEventEmitter(newChildShadowView.eventEmitter);
         newChildComponentView->updateState(newChildShadowView.state, oldChildShadowView.state);
         newChildComponentView->updateLayoutMetrics(newChildShadowView.layoutMetrics, oldChildShadowView.layoutMetrics);
-        newChildComponentView->finalizeUpdates(RNComponentViewUpdateMask::All);
+        newChildViewDescriptor.view.FinalizeUpdates(winrt::Microsoft::ReactNative::ComponentViewUpdateMask::All);
 
-        parentViewDescriptor.view->mountChildComponentView(*newChildComponentView, mutation.index);
+        parentViewDescriptor.view.MountChildComponentView(*newChildComponentView, mutation.index);
         break;
       }
 
@@ -268,7 +250,7 @@ void FabricUIManager::RCTPerformMountInstructions(
         auto &parentShadowView = mutation.parentShadowView;
         auto &oldChildViewDescriptor = m_registry.componentViewDescriptorWithTag(oldChildShadowView.tag);
         auto &parentViewDescriptor = m_registry.componentViewDescriptorWithTag(parentShadowView.tag);
-        parentViewDescriptor.view->unmountChildComponentView(*oldChildViewDescriptor.view, mutation.index);
+        parentViewDescriptor.view.UnmountChildComponentView(oldChildViewDescriptor.view, mutation.index);
         break;
       }
 
@@ -276,33 +258,33 @@ void FabricUIManager::RCTPerformMountInstructions(
         auto &oldChildShadowView = mutation.oldChildShadowView;
         auto &newChildShadowView = mutation.newChildShadowView;
         auto &newChildViewDescriptor = m_registry.componentViewDescriptorWithTag(newChildShadowView.tag);
-        auto &newChildComponentView = newChildViewDescriptor.view;
-
-        auto mask = RNComponentViewUpdateMask{};
+        auto newChildComponentView =
+            winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(newChildViewDescriptor.view);
+        auto mask = winrt::Microsoft::ReactNative::ComponentViewUpdateMask::None;
 
         if (oldChildShadowView.props != newChildShadowView.props) {
           newChildComponentView->updateProps(newChildShadowView.props, oldChildShadowView.props);
-          mask |= RNComponentViewUpdateMask::Props;
+          mask |= winrt::Microsoft::ReactNative::ComponentViewUpdateMask::Props;
         }
 
         if (oldChildShadowView.eventEmitter != newChildShadowView.eventEmitter) {
           newChildComponentView->updateEventEmitter(newChildShadowView.eventEmitter);
-          mask |= RNComponentViewUpdateMask::EventEmitter;
+          mask |= winrt::Microsoft::ReactNative::ComponentViewUpdateMask::EventEmitter;
         }
 
         if (oldChildShadowView.state != newChildShadowView.state) {
           newChildComponentView->updateState(newChildShadowView.state, oldChildShadowView.state);
-          mask |= RNComponentViewUpdateMask::State;
+          mask |= winrt::Microsoft::ReactNative::ComponentViewUpdateMask::State;
         }
 
         if (oldChildShadowView.layoutMetrics != newChildShadowView.layoutMetrics) {
           newChildComponentView->updateLayoutMetrics(
               newChildShadowView.layoutMetrics, oldChildShadowView.layoutMetrics);
-          mask |= RNComponentViewUpdateMask::LayoutMetrics;
+          mask |= winrt::Microsoft::ReactNative::ComponentViewUpdateMask::LayoutMetrics;
         }
 
-        if (mask != RNComponentViewUpdateMask::None) {
-          newChildComponentView->finalizeUpdates(mask);
+        if (mask != winrt::Microsoft::ReactNative::ComponentViewUpdateMask::None) {
+          newChildViewDescriptor.view.FinalizeUpdates(mask);
         }
 
         break;
@@ -384,14 +366,16 @@ void FabricUIManager::schedulerDidDispatchCommand(
     folly::dynamic const &arg) {
   if (m_context.UIDispatcher().HasThreadAccess()) {
     auto descriptor = m_registry.componentViewDescriptorWithTag(shadowView.tag);
-    descriptor.view->handleCommand(commandName, arg);
+    descriptor.view.HandleCommand(
+        winrt::to_hstring(commandName), winrt::make<winrt::Microsoft::ReactNative::DynamicReader>(arg));
   } else {
     m_context.UIDispatcher().Post(
         [wkThis = weak_from_this(), commandName, tag = shadowView.tag, args = folly::dynamic(arg)]() {
           if (auto pThis = wkThis.lock()) {
             auto view = pThis->m_registry.findComponentViewWithTag(tag);
             if (view) {
-              view->handleCommand(commandName, args);
+              view.HandleCommand(
+                  winrt::to_hstring(commandName), winrt::make<winrt::Microsoft::ReactNative::DynamicReader>(args));
             }
           }
         });

package/Microsoft.ReactNative/Fabric/FabricUIManagerModule.h

@@ -29,7 +29,7 @@ struct FabricUIManager final : public std::enable_shared_from_this<FabricUIManag
   void Initialize(winrt::Microsoft::ReactNative::ReactContext const &reactContext) noexcept;
 
   void startSurface(
-      facebook::react::IReactRootView *rootview,
+      const winrt::Microsoft::ReactNative::CompositionRootView &rootView,
       facebook::react::SurfaceId surfaceId,
       const std::string &moduleName,
       const folly::dynamic &initialProps) noexcept;
@@ -48,6 +48,9 @@ struct FabricUIManager final : public std::enable_shared_from_this<FabricUIManag
 
   const IComponentViewRegistry &GetViewRegistry() const noexcept;
 
+  winrt::Microsoft::ReactNative::CompositionRootView GetCompositionRootView(
+      facebook::react::SurfaceId surfaceId) const noexcept;
+
  private:
   void installFabricUIManager() noexcept;
   void initiateTransaction(facebook::react::MountingCoordinator::Shared mountingCoordinator);
@@ -69,7 +72,7 @@ struct FabricUIManager final : public std::enable_shared_from_this<FabricUIManag
 
   ComponentViewRegistry m_registry;
   struct SurfaceInfo {
-    winrt::Microsoft::ReactNative::Composition::IVisual rootVisual{nullptr};
+    winrt::weak_ref<winrt::Microsoft::ReactNative::CompositionRootView> wkRootView{nullptr};
   };
 
   std::unordered_map<facebook::react::SurfaceId, SurfaceInfo> m_surfaceRegistry;

package/Microsoft.ReactNative/Fabric/IComponentViewRegistry.h

@@ -12,7 +12,7 @@
 namespace Microsoft::ReactNative {
 
 struct ComponentViewDescriptor final {
-  std::shared_ptr<IComponentView> view{nullptr};
+  winrt::Microsoft::ReactNative::ComponentView view{nullptr};
 };
 
 struct IComponentViewRegistry {
@@ -24,7 +24,8 @@ struct IComponentViewRegistry {
       facebook::react::Tag tag,
       const winrt::Microsoft::ReactNative::Composition::ICompositionContext &compContext) noexcept = 0;
   virtual ComponentViewDescriptor const &componentViewDescriptorWithTag(facebook::react::Tag tag) const noexcept = 0;
-  virtual std::shared_ptr<IComponentView> findComponentViewWithTag(facebook::react::Tag tag) const noexcept = 0;
+  virtual winrt::Microsoft::ReactNative::ComponentView findComponentViewWithTag(
+      facebook::react::Tag tag) const noexcept = 0;
   virtual void enqueueComponentViewWithComponentHandle(
       facebook::react::ComponentHandle componentHandle,
       facebook::react::Tag tag,

package/Microsoft.ReactNative/Fabric/ReactNativeConfigProperties.cpp

@@ -9,13 +9,13 @@
 namespace Microsoft::ReactNative {
 
 ReactNativeConfigProperties::ReactNativeConfigProperties(
-    winrt::Microsoft::ReactNative::ReactContext const &reactContext)
-    : m_context(reactContext) {}
+    winrt::Microsoft::ReactNative::ReactPropertyBag const &properties)
+    : m_properties(properties) {}
 
 ReactNativeConfigProperties::~ReactNativeConfigProperties() {}
 
 bool ReactNativeConfigProperties::getBool(const std::string &param) const {
-  auto value = m_context.Properties().Handle().Get(winrt::Microsoft::ReactNative::ReactPropertyBagHelper::GetName(
+  auto value = m_properties.Handle().Get(winrt::Microsoft::ReactNative::ReactPropertyBagHelper::GetName(
       winrt::Microsoft::ReactNative::ReactPropertyBagHelper::GetNamespace(winrt::hstring(L"ReactNativeConfig")),
       winrt::hstring(Common::Unicode::Utf8ToUtf16(param))));
 
@@ -23,7 +23,7 @@ bool ReactNativeConfigProperties::getBool(const std::string &param) const {
 }
 
 std::string ReactNativeConfigProperties::getString(const std::string &param) const {
-  auto value = m_context.Properties().Handle().Get(winrt::Microsoft::ReactNative::ReactPropertyBagHelper::GetName(
+  auto value = m_properties.Handle().Get(winrt::Microsoft::ReactNative::ReactPropertyBagHelper::GetName(
       winrt::Microsoft::ReactNative::ReactPropertyBagHelper::GetNamespace(winrt::hstring(L"ReactNativeConfig")),
       winrt::hstring(Common::Unicode::Utf8ToUtf16(param))));
 
@@ -35,7 +35,7 @@ std::string ReactNativeConfigProperties::getString(const std::string &param) con
 }
 
 int64_t ReactNativeConfigProperties::getInt64(const std::string &param) const {
-  auto value = m_context.Properties().Handle().Get(winrt::Microsoft::ReactNative::ReactPropertyBagHelper::GetName(
+  auto value = m_properties.Handle().Get(winrt::Microsoft::ReactNative::ReactPropertyBagHelper::GetName(
       winrt::Microsoft::ReactNative::ReactPropertyBagHelper::GetNamespace(winrt::hstring(L"ReactNativeConfig")),
       winrt::hstring(Common::Unicode::Utf8ToUtf16(param))));
 
@@ -43,7 +43,7 @@ int64_t ReactNativeConfigProperties::getInt64(const std::string &param) const {
 }
 
 double ReactNativeConfigProperties::getDouble(const std::string &param) const {
-  auto value = m_context.Properties().Handle().Get(winrt::Microsoft::ReactNative::ReactPropertyBagHelper::GetName(
+  auto value = m_properties.Handle().Get(winrt::Microsoft::ReactNative::ReactPropertyBagHelper::GetName(
       winrt::Microsoft::ReactNative::ReactPropertyBagHelper::GetNamespace(winrt::hstring(L"ReactNativeConfig")),
       winrt::hstring(Common::Unicode::Utf8ToUtf16(param))));
 

package/Microsoft.ReactNative/Fabric/ReactNativeConfigProperties.h

@@ -11,7 +11,7 @@ namespace Microsoft::ReactNative {
 
 class ReactNativeConfigProperties final : public facebook::react::ReactNativeConfig {
  public:
-  ReactNativeConfigProperties(winrt::Microsoft::ReactNative::ReactContext const &reactContext);
+  ReactNativeConfigProperties(winrt::Microsoft::ReactNative::ReactPropertyBag const &properties);
   virtual ~ReactNativeConfigProperties();
 
   virtual bool getBool(const std::string &param) const override;
@@ -20,7 +20,7 @@ class ReactNativeConfigProperties final : public facebook::react::ReactNativeCon
   virtual double getDouble(const std::string &param) const override;
 
  private:
-  winrt::Microsoft::ReactNative::ReactContext m_context;
+  winrt::Microsoft::ReactNative::ReactPropertyBag m_properties;
 };
 
 } // namespace Microsoft::ReactNative

package/Microsoft.ReactNative/Fabric/ReactTaggedView.h

@@ -15,20 +15,25 @@ namespace Microsoft::ReactNative {
  * changed from the one provided at initialization time (i.e. recycled).
  */
 struct ReactTaggedView {
-  ReactTaggedView(const std::shared_ptr<IComponentView> &componentView)
-      : m_view(componentView), m_tag(componentView->tag()) {}
+  ReactTaggedView(const winrt::Microsoft::ReactNative::ComponentView &componentView)
+      : m_view(componentView), m_tag(componentView.Tag()) {}
 
-  std::shared_ptr<IComponentView> view() noexcept {
-    auto strongView = m_view.lock();
-    if (!m_view.expired() && strongView->tag() != m_tag) {
-      m_view.reset();
+  winrt::Microsoft::ReactNative::ComponentView view() noexcept {
+    if (!m_view) {
+      return nullptr;
     }
+
+    auto strongView = m_view.get();
+    if (!strongView || strongView.Tag() != m_tag) {
+      m_view = nullptr;
+    }
+
     return strongView;
   }
 
  private:
   facebook::react::Tag m_tag;
-  std::weak_ptr<IComponentView> m_view;
+  winrt::weak_ref<winrt::Microsoft::ReactNative::ComponentView> m_view;
 };
 
 } // namespace Microsoft::ReactNative

package/Microsoft.ReactNative/Fabric/WindowsComponentDescriptorRegistry.cpp

@@ -4,7 +4,9 @@
 
 #include "WindowsComponentDescriptorRegistry.h"
 
+#include <Fabric/AbiComponentDescriptor.h>
 #include <Fabric/AbiViewComponentDescriptor.h>
+#include <Fabric/Composition/Modal/WindowsModalHostViewComponentDescriptor.h>
 #include <Fabric/Composition/TextInput/WindowsTextInputComponentDescriptor.h>
 #include <react/components/rnwcore/ComponentDescriptors.h>
 #include <react/renderer/components/image/ImageComponentDescriptor.h>
@@ -31,25 +33,27 @@ WindowsComponentDescriptorRegistryProperty() noexcept {
 
 WindowsComponentDescriptorRegistry::WindowsComponentDescriptorRegistry()
     : m_componentDescriptorRegistry(std::make_shared<facebook::react::ComponentDescriptorProviderRegistry>()) {
-  m_componentDescriptorRegistry->add(facebook::react::concreteComponentDescriptorProvider<
-                                     facebook::react::ActivityIndicatorViewComponentDescriptor>());
+  add(facebook::react::concreteComponentDescriptorProvider<
+      facebook::react::ActivityIndicatorViewComponentDescriptor>());
+  add(facebook::react::concreteComponentDescriptorProvider<facebook::react::DebuggingOverlayComponentDescriptor>());
+  add(facebook::react::concreteComponentDescriptorProvider<facebook::react::ImageComponentDescriptor>());
+  add(facebook::react::concreteComponentDescriptorProvider<facebook::react::WindowsModalHostViewComponentDescriptor>());
+  add(facebook::react::concreteComponentDescriptorProvider<facebook::react::ParagraphComponentDescriptor>());
+  add(facebook::react::concreteComponentDescriptorProvider<facebook::react::RawTextComponentDescriptor>());
+  add(facebook::react::concreteComponentDescriptorProvider<facebook::react::ScrollViewComponentDescriptor>());
+  add(facebook::react::concreteComponentDescriptorProvider<facebook::react::SwitchComponentDescriptor>());
+  add(facebook::react::concreteComponentDescriptorProvider<facebook::react::TextComponentDescriptor>());
+  add(facebook::react::concreteComponentDescriptorProvider<facebook::react::ViewComponentDescriptor>());
+  add(facebook::react::concreteComponentDescriptorProvider<facebook::react::WindowsTextInputComponentDescriptor>());
+}
 
-  m_componentDescriptorRegistry->add(
-      facebook::react::concreteComponentDescriptorProvider<facebook::react::ImageComponentDescriptor>());
-  m_componentDescriptorRegistry->add(
-      facebook::react::concreteComponentDescriptorProvider<facebook::react::ParagraphComponentDescriptor>());
-  m_componentDescriptorRegistry->add(
-      facebook::react::concreteComponentDescriptorProvider<facebook::react::RawTextComponentDescriptor>());
-  m_componentDescriptorRegistry->add(
-      facebook::react::concreteComponentDescriptorProvider<facebook::react::ScrollViewComponentDescriptor>());
-  m_componentDescriptorRegistry->add(
-      facebook::react::concreteComponentDescriptorProvider<facebook::react::SwitchComponentDescriptor>());
-  m_componentDescriptorRegistry->add(
-      facebook::react::concreteComponentDescriptorProvider<facebook::react::TextComponentDescriptor>());
-  m_componentDescriptorRegistry->add(
-      facebook::react::concreteComponentDescriptorProvider<facebook::react::ViewComponentDescriptor>());
-  m_componentDescriptorRegistry->add(
-      facebook::react::concreteComponentDescriptorProvider<facebook::react::WindowsTextInputComponentDescriptor>());
+void WindowsComponentDescriptorRegistry::add(const facebook::react::ComponentDescriptorProvider &provider) noexcept {
+  m_componentNames.push_back(provider.name);
+  m_componentDescriptorRegistry->add(provider);
+}
+
+bool WindowsComponentDescriptorRegistry::hasComponentProvider(const std::string &name) noexcept {
+  return std::find(m_componentNames.begin(), m_componentNames.end(), name) != m_componentNames.end();
 }
 
 void WindowsComponentDescriptorRegistry::Add(
@@ -58,16 +62,21 @@ void WindowsComponentDescriptorRegistry::Add(
   auto builder = winrt::make<winrt::Microsoft::ReactNative::Composition::ReactCompositionViewComponentBuilder>();
   provider(builder);
 
+  m_componentNames.push_back(winrt::to_string(componentName));
   m_descriptorFlavors.emplace_back(std::make_shared<std::string>(winrt::to_string(componentName)));
   auto handle = reinterpret_cast<facebook::react::ComponentHandle>(
       facebook::react::ComponentName(m_descriptorFlavors.back()->c_str()));
   m_builderByName.emplace(m_descriptorFlavors.back(), builder);
   m_builderByHandle.emplace(handle, builder);
+
   m_componentDescriptorRegistry->add(
       {handle,
        m_descriptorFlavors.back()->c_str(),
        std::static_pointer_cast<void const>(m_descriptorFlavors.back()),
-       &facebook::react::concreteComponentDescriptorConstructor<AbiViewComponentDescriptor>});
+       winrt::get_self<winrt::Microsoft::ReactNative::Composition::ReactCompositionViewComponentBuilder>(builder)
+               ->IsViewComponent()
+           ? &facebook::react::concreteComponentDescriptorConstructor<AbiViewComponentDescriptor>
+           : &facebook::react::concreteComponentDescriptorConstructor<AbiComponentDescriptor>});
 }
 
 winrt::Microsoft::ReactNative::IReactViewComponentBuilder WindowsComponentDescriptorRegistry::GetDescriptor(

package/Microsoft.ReactNative/Fabric/WindowsComponentDescriptorRegistry.h

@@ -30,8 +30,13 @@ struct WindowsComponentDescriptorRegistry {
   static std::shared_ptr<WindowsComponentDescriptorRegistry> FromProperties(
       const winrt::Microsoft::ReactNative::ReactPropertyBag &props) noexcept;
 
+  bool hasComponentProvider(const std::string &name) noexcept;
+
  private:
+  void add(const facebook::react::ComponentDescriptorProvider &provider) noexcept;
+
   std::vector<std::shared_ptr<const std::string>> m_descriptorFlavors;
+  std::vector<std::string> m_componentNames;
   std::shared_ptr<facebook::react::ComponentDescriptorProviderRegistry> m_componentDescriptorRegistry;
 
   std::map<std::shared_ptr<const std::string>, winrt::Microsoft::ReactNative::IReactViewComponentBuilder const>

package/Microsoft.ReactNative/Fabric/platform/react/renderer/components/view/HostPlatformViewEventEmitter.cpp

@@ -55,5 +55,3 @@ void HostPlatformViewEventEmitter::onMouseLeave(PointerEvent const &pointerEvent
 }
 
 } // namespace facebook::react
-
-// @generated SignedSource<<a6f36c63efa0edf80beb29b0187deb77>>

package/Microsoft.ReactNative/Fabric/platform/react/renderer/components/view/HostPlatformViewTraitsInitializer.h

@@ -9,7 +9,11 @@
 namespace facebook::react::HostPlatformViewTraitsInitializer {
 
 inline bool formsStackingContext(ViewProps const &viewProps) {
-  return viewProps.windowsEvents.bits.any();
+  // onFocus/onBlur are often just used for listening to bubbled events.
+  // Only Views which are marked as focusable can actually trigger the events, which will already avoid being collapsed.
+  constexpr decltype(WindowsViewEvents::bits) focusEventsMask = {
+      (1 << (int)WindowsViewEvents::Offset::Focus) & (1 << (int)WindowsViewEvents::Offset::Blur)};
+  return (viewProps.windowsEvents.bits & focusEventsMask).any();
 }
 
 inline bool formsView(ViewProps const &viewProps) {

package/Microsoft.ReactNative/Fabric/platform/react/renderer/components/view/WindowsViewEvents.h

@@ -10,8 +10,7 @@
 #include <cmath>
 #include <optional>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 struct WindowsViewEvents {
   std::bitset<32> bits{};
@@ -71,5 +70,4 @@ static inline WindowsViewEvents convertRawProp(
   return result;
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react

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

@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <limits>
+
+namespace facebook::react {
+
+/*
+ * Exact type of float numbers which ideally should match a type behing
+ * platform- and chip-architecture-specific float type.
+ */
+using Float = float;
+
+} // namespace facebook::react