react-native-windows 0.74.6 → 0.74.8

package/Libraries/ReactNative/AppContainer-dev.js

@@ -92,6 +92,7 @@ const AppContainer = ({
   rootTag,
   showArchitectureIndicator,
   WrapperComponent,
+  rootViewStyle,
 }: Props): React.Node => {
   const appContainerRootViewRef: AppContainerRootViewRef = React.useRef(null);
   const innerViewRef: InspectedViewRef = React.useRef(null);
@@ -141,7 +142,7 @@ const AppContainer = ({
       collapsable={reactDevToolsAgent == null && !shouldRenderInspector}
       pointerEvents="box-none"
       key={key}
-      style={styles.container}
+      style={rootViewStyle || styles.container}
       ref={innerViewRef}>
       {children}
     </View>
@@ -167,7 +168,7 @@ const AppContainer = ({
     <RootTagContext.Provider value={createRootTag(rootTag)}>
       <View
         ref={appContainerRootViewRef}
-        style={styles.container}
+        style={rootViewStyle || styles.container}
         pointerEvents="box-none">
         {innerView}
 

package/Libraries/ReactNative/AppContainer-prod.js

@@ -23,6 +23,7 @@ const AppContainer = ({
   rootTag,
   showArchitectureIndicator,
   WrapperComponent,
+  rootViewStyle,
 }: Props): React.Node => {
   let innerView = children;
 
@@ -39,7 +40,7 @@ const AppContainer = ({
 
   return (
     <RootTagContext.Provider value={createRootTag(rootTag)}>
-      <View style={styles.root} pointerEvents="box-none">
+      <View style={rootViewStyle || styles.root} pointerEvents="box-none">
         {innerView}
       </View>
     </RootTagContext.Provider>

package/Libraries/ReactNative/AppContainer.js

@@ -9,6 +9,7 @@
  */
 
 import type {RootTag} from './RootTag';
+import type {ViewStyleProp} from '../StyleSheet/StyleSheet';
 
 import * as React from 'react';
 
@@ -19,6 +20,7 @@ export type Props = $ReadOnly<{|
   initialProps?: {...},
   showArchitectureIndicator?: boolean,
   WrapperComponent?: ?React.ComponentType<any>,
+  rootViewStyle?: ?ViewStyleProp,
   internal_excludeLogBox?: boolean,
   internal_excludeInspector?: boolean,
 |}>;

package/Libraries/ReactNative/AppRegistry.d.ts

@@ -9,6 +9,7 @@
 
 import type * as React from 'react';
 import type {IPerformanceLogger} from '../Utilities/IPerformanceLogger';
+import type {ViewStyle} from '../StyleSheet/StyleSheetTypes';
 
 type Task = (taskData: any) => Promise<void>;
 type TaskProvider = () => Task;
@@ -34,6 +35,8 @@ export type WrapperComponentProvider = (
   appParameters: any,
 ) => React.ComponentType<any>;
 
+export type RootViewStyleProvider = (appParameters: any) => ViewStyle;
+
 /**
  * `AppRegistry` is the JS entry point to running all React Native apps.  App
  * root components should register themselves with
@@ -56,6 +59,10 @@ export namespace AppRegistry {
 
   export function registerConfig(config: AppConfig[]): void;
 
+  export function setRootViewStyleProvider(
+    provider: RootViewStyleProvider,
+  ): void;
+
   export function registerComponent(
     appKey: string,
     getComponentFunc: ComponentProvider,

package/Libraries/ReactNative/AppRegistry.js

@@ -11,6 +11,7 @@
 import type {RootTag} from '../Types/RootTagTypes';
 import type {IPerformanceLogger} from '../Utilities/createPerformanceLogger';
 import type {DisplayModeType} from './DisplayMode';
+import type {ViewStyleProp} from '../StyleSheet/StyleSheet';
 
 import BatchedBridge from '../BatchedBridge/BatchedBridge';
 import BugReporting from '../BugReporting/BugReporting';
@@ -60,6 +61,7 @@ export type Registry = {
 export type WrapperComponentProvider = (
   appParameters: Object,
 ) => React$ComponentType<any>;
+export type RootViewStyleProvider = (appParameters: Object) => ViewStyleProp;
 
 const runnables: Runnables = {};
 let runCount = 1;
@@ -70,6 +72,7 @@ let componentProviderInstrumentationHook: ComponentProviderInstrumentationHook =
   (component: ComponentProvider) => component();
 
 let wrapperComponentProvider: ?WrapperComponentProvider;
+let rootViewStyleProvider: ?RootViewStyleProvider;
 let showArchitectureIndicator = false;
 
 /**
@@ -82,6 +85,10 @@ const AppRegistry = {
     wrapperComponentProvider = provider;
   },
 
+  setRootViewStyleProvider(provider: RootViewStyleProvider) {
+    rootViewStyleProvider = provider;
+  },
+
   enableArchitectureIndicator(enabled: boolean): void {
     showArchitectureIndicator = enabled;
   },
@@ -130,6 +137,7 @@ const AppRegistry = {
         appParameters.initialProps,
         appParameters.rootTag,
         wrapperComponentProvider && wrapperComponentProvider(appParameters),
+        rootViewStyleProvider && rootViewStyleProvider(appParameters),
         appParameters.fabric,
         showArchitectureIndicator,
         scopedPerformanceLogger,

package/Libraries/ReactNative/renderApplication.js

@@ -9,6 +9,7 @@
  */
 
 import type {IPerformanceLogger} from '../Utilities/createPerformanceLogger';
+import type {ViewStyleProp} from '../StyleSheet/StyleSheet';
 
 import GlobalPerformanceLogger from '../Utilities/GlobalPerformanceLogger';
 import PerformanceLoggerContext from '../Utilities/PerformanceLoggerContext';
@@ -32,6 +33,7 @@ export default function renderApplication<Props: Object>(
   initialProps: Props,
   rootTag: any,
   WrapperComponent?: ?React.ComponentType<any>,
+  rootViewStyle?: ?ViewStyleProp,
   fabric?: boolean,
   showArchitectureIndicator?: boolean,
   scopedPerformanceLogger?: IPerformanceLogger,
@@ -52,6 +54,7 @@ export default function renderApplication<Props: Object>(
         fabric={fabric}
         showArchitectureIndicator={showArchitectureIndicator}
         WrapperComponent={WrapperComponent}
+        rootViewStyle={rootViewStyle}
         initialProps={initialProps ?? Object.freeze({})}
         internal_excludeLogBox={isLogBox}>
         <RootComponent {...initialProps} rootTag={rootTag} />

package/Microsoft.ReactNative/AsynchronousEventBeat.cpp

@@ -30,8 +30,7 @@ void AsynchronousEventBeat::induce() const {
 }
 
 void AsynchronousEventBeat::request() const {
-  bool alreadyRequested = isRequested_;
-  EventBeat::request();
+  bool alreadyRequested = isRequested_.exchange(true);
   if (!alreadyRequested) {
     if (m_context.UIDispatcher().HasThreadAccess()) {
       induce();

package/Microsoft.ReactNative/CompositionHwndHost.idl

@@ -4,7 +4,7 @@
 import "IJSValueWriter.idl";
 import "ReactCoreInjection.idl";
 import "ReactNativeHost.idl";
-import "CompositionRootView.idl";
+import "ReactNativeIsland.idl";
 #include "NamespaceRedirect.h"
 #include "DocString.h"
 

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

@@ -14,8 +14,8 @@
 #include <windowsx.h>
 #include <winrt/Windows.UI.Input.h>
 #include "Composition.Input.h"
-#include "CompositionRootView.h"
 #include "CompositionViewComponentView.h"
+#include "ReactNativeIsland.h"
 #include "RootComponentView.h"
 
 #ifdef USE_WINUI3
@@ -151,10 +151,10 @@ struct CompositionInputKeyboardSource : winrt::implements<
 
 CompositionEventHandler::CompositionEventHandler(
     const winrt::Microsoft::ReactNative::ReactContext &context,
-    const winrt::Microsoft::ReactNative::CompositionRootView &CompositionRootView)
-    : m_context(context), m_wkRootView(CompositionRootView) {
+    const winrt::Microsoft::ReactNative::ReactNativeIsland &reactNativeIsland)
+    : m_context(context), m_wkRootView(reactNativeIsland) {
 #ifdef USE_WINUI3
-  if (auto island = CompositionRootView.Island()) {
+  if (auto island = reactNativeIsland.Island()) {
     auto pointerSource = winrt::Microsoft::UI::Input::InputPointerSource::GetForIsland(island);
 
     m_pointerPressedToken =
@@ -241,9 +241,9 @@ CompositionEventHandler::CompositionEventHandler(
                 focusedComponent
                     ? focusedComponent.Tag()
                     : static_cast<facebook::react::Tag>(
-                          winrt::get_self<winrt::Microsoft::ReactNative::implementation::CompositionRootView>(
+                          winrt::get_self<winrt::Microsoft::ReactNative::implementation::ReactNativeIsland>(
                               strongRootView)
-                              ->GetTag()),
+                              ->RootTag()),
                 args);
         auto keyboardSource = winrt::make<CompositionInputKeyboardSource>(source);
         onKeyDown(keyboardSource, keyArgs);
@@ -264,9 +264,9 @@ CompositionEventHandler::CompositionEventHandler(
                 focusedComponent
                     ? focusedComponent.Tag()
                     : static_cast<facebook::react::Tag>(
-                          winrt::get_self<winrt::Microsoft::ReactNative::implementation::CompositionRootView>(
+                          winrt::get_self<winrt::Microsoft::ReactNative::implementation::ReactNativeIsland>(
                               strongRootView)
-                              ->GetTag()),
+                              ->RootTag()),
                 args);
         auto keyboardSource = winrt::make<CompositionInputKeyboardSource>(source);
         onKeyUp(keyboardSource, keyArgs);
@@ -288,9 +288,9 @@ CompositionEventHandler::CompositionEventHandler(
                 focusedComponent
                     ? focusedComponent.Tag()
                     : static_cast<facebook::react::Tag>(
-                          winrt::get_self<winrt::Microsoft::ReactNative::implementation::CompositionRootView>(
+                          winrt::get_self<winrt::Microsoft::ReactNative::implementation::ReactNativeIsland>(
                               strongRootView)
-                              ->GetTag()),
+                              ->RootTag()),
                 args);
             auto keyboardSource = winrt::make<CompositionInputKeyboardSource>(source);
             onCharacterReceived(keyboardSource, charArgs);
@@ -323,7 +323,7 @@ CompositionEventHandler::~CompositionEventHandler() {
 facebook::react::SurfaceId CompositionEventHandler::SurfaceId() const noexcept {
   if (auto strongRootView = m_wkRootView.get()) {
     return static_cast<facebook::react::SurfaceId>(
-        winrt::get_self<winrt::Microsoft::ReactNative::implementation::CompositionRootView>(strongRootView)->GetTag());
+        winrt::get_self<winrt::Microsoft::ReactNative::implementation::ReactNativeIsland>(strongRootView)->RootTag());
   }
   return -1;
 }
@@ -456,11 +456,11 @@ int64_t CompositionEventHandler::SendMessage(HWND hwnd, uint32_t msg, uint64_t w
         auto focusedComponent = RootComponentView().GetFocusedComponent();
         auto args = winrt::make<
             winrt::Microsoft::ReactNative::Composition::Input::implementation::CharacterReceivedRoutedEventArgs>(
-            focusedComponent ? focusedComponent.Tag()
-                             : static_cast<facebook::react::Tag>(
-                                   winrt::get_self<winrt::Microsoft::ReactNative::implementation::CompositionRootView>(
-                                       strongRootView)
-                                       ->GetTag()),
+            focusedComponent
+                ? focusedComponent.Tag()
+                : static_cast<facebook::react::Tag>(
+                      winrt::get_self<winrt::Microsoft::ReactNative::implementation::ReactNativeIsland>(strongRootView)
+                          ->RootTag()),
             msg,
             wParam,
             lParam);
@@ -477,11 +477,11 @@ int64_t CompositionEventHandler::SendMessage(HWND hwnd, uint32_t msg, uint64_t w
       if (auto strongRootView = m_wkRootView.get()) {
         auto focusedComponent = RootComponentView().GetFocusedComponent();
         auto args = winrt::make<winrt::Microsoft::ReactNative::Composition::Input::implementation::KeyRoutedEventArgs>(
-            focusedComponent ? focusedComponent.Tag()
-                             : static_cast<facebook::react::Tag>(
-                                   winrt::get_self<winrt::Microsoft::ReactNative::implementation::CompositionRootView>(
-                                       strongRootView)
-                                       ->GetTag()),
+            focusedComponent
+                ? focusedComponent.Tag()
+                : static_cast<facebook::react::Tag>(
+                      winrt::get_self<winrt::Microsoft::ReactNative::implementation::ReactNativeIsland>(strongRootView)
+                          ->RootTag()),
             msg,
             wParam,
             lParam);

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

@@ -31,7 +31,7 @@ class CompositionEventHandler {
  public:
   CompositionEventHandler(
       const winrt::Microsoft::ReactNative::ReactContext &context,
-      const winrt::Microsoft::ReactNative::CompositionRootView &CompositionRootView);
+      const winrt::Microsoft::ReactNative::ReactNativeIsland &ReactNativeIsland);
   virtual ~CompositionEventHandler();
 
   int64_t SendMessage(HWND hwnd, uint32_t msg, uint64_t wParam, int64_t lParam) noexcept;
@@ -154,7 +154,7 @@ class CompositionEventHandler {
   PointerId m_touchId = 0;
 
   std::map<PointerId, std::vector<ReactTaggedView>> m_currentlyHoveredViewsPerPointer;
-  winrt::weak_ref<winrt::Microsoft::ReactNative::CompositionRootView> m_wkRootView;
+  winrt::weak_ref<winrt::Microsoft::ReactNative::ReactNativeIsland> m_wkRootView;
   winrt::Microsoft::ReactNative::ReactContext m_context;
 
   facebook::react::Tag m_pointerCapturingComponentTag{-1}; // Component that has captured input

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

@@ -16,7 +16,7 @@
 
 #include <winrt/Microsoft.ReactNative.Composition.Experimental.h>
 #include "CompositionRootAutomationProvider.h"
-#include "CompositionRootView.h"
+#include "ReactNativeIsland.h"
 
 #if USE_WINUI3
 #include <winrt/Microsoft.UI.Content.h>
@@ -39,7 +39,7 @@ void CompositionHwndHost::Initialize(uint64_t hwnd) noexcept {
   if (auto liftedCompositor =
           winrt::Microsoft::ReactNative::Composition::Experimental::MicrosoftCompositionContextHelper::InnerCompositor(
               compositionContext)) {
-    m_compRootView = winrt::Microsoft::ReactNative::CompositionRootView(liftedCompositor);
+    m_compRootView = winrt::Microsoft::ReactNative::ReactNativeIsland(liftedCompositor);
 
     auto bridge = winrt::Microsoft::UI::Content::DesktopChildSiteBridge::Create(
         liftedCompositor, winrt::Microsoft::UI::GetWindowIdFromWindow(m_hwnd));
@@ -52,7 +52,7 @@ void CompositionHwndHost::Initialize(uint64_t hwnd) noexcept {
     m_compRootView.ScaleFactor(ScaleFactor());
     bridge.ResizePolicy(winrt::Microsoft::UI::Content::ContentSizePolicy::ResizeContentToParentWindow);
   } else {
-    m_compRootView = winrt::Microsoft::ReactNative::CompositionRootView();
+    m_compRootView = winrt::Microsoft::ReactNative::ReactNativeIsland();
     m_compRootView.as<winrt::Microsoft::ReactNative::Composition::Experimental::IInternalCompositionRootView>()
         .SetWindow(reinterpret_cast<uint64_t>(m_hwnd));
 
@@ -101,8 +101,9 @@ void CompositionHwndHost::UpdateSize() noexcept {
           static_cast<float>(m_width / ScaleFactor()), static_cast<float>(m_height / ScaleFactor())};
       // Do not relayout when minimized
       if (!IsIconic(m_hwnd)) {
-        m_compRootView.Size(size);
-        m_compRootView.Arrange(size);
+        winrt::Microsoft::ReactNative::LayoutConstraints constraints;
+        constraints.MinimumSize = constraints.MaximumSize = size;
+        m_compRootView.Arrange(constraints, {0, 0});
       }
     }
   }
@@ -148,7 +149,7 @@ void CompositionHwndHost::ReactViewHost(ReactNative::IReactViewHost const &value
 }
 
 IInspectable CompositionHwndHost::UiaProvider() noexcept {
-  auto compRootView = winrt::get_self<implementation::CompositionRootView>(m_compRootView);
+  auto compRootView = winrt::get_self<implementation::ReactNativeIsland>(m_compRootView);
   auto provider = compRootView->GetUiaProvider();
   auto pRootProvider = static_cast<CompositionRootAutomationProvider *>(provider.as<IRawElementProviderSimple>().get());
   if (pRootProvider != nullptr) {

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

@@ -33,7 +33,7 @@ struct CompositionHwndHost : CompositionHwndHostT<CompositionHwndHost> {
   float ScaleFactor() noexcept;
 
   HWND m_hwnd;
-  winrt::Microsoft::ReactNative::CompositionRootView m_compRootView{nullptr};
+  winrt::Microsoft::ReactNative::ReactNativeIsland m_compRootView{nullptr};
   LONG m_height{0};
   LONG m_width{0};
 

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

@@ -8,12 +8,12 @@
 #include <winrt/Microsoft.UI.Input.h>
 #endif
 
-#include <Fabric/Composition/CompositionRootView.h>
+#include <Fabric/Composition/ReactNativeIsland.h>
 
 namespace winrt::Microsoft::ReactNative::implementation {
 
 CompositionRootAutomationProvider::CompositionRootAutomationProvider(
-    const winrt::Microsoft::ReactNative::CompositionRootView &rootView) noexcept
+    const winrt::Microsoft::ReactNative::ReactNativeIsland &rootView) noexcept
     : m_wkRootView{rootView} {}
 
 // Implementations should return NULL for a top-level element that is hosted in a window. Other elements should return
@@ -170,7 +170,7 @@ HRESULT __stdcall CompositionRootAutomationProvider::get_ProviderOptions(Provide
 winrt::Microsoft::ReactNative::Composition::implementation::RootComponentView *
 CompositionRootAutomationProvider::rootComponentView() noexcept {
   if (auto rootView = m_wkRootView.get()) {
-    auto innerRootView = winrt::get_self<winrt::Microsoft::ReactNative::implementation::CompositionRootView>(rootView);
+    auto innerRootView = winrt::get_self<winrt::Microsoft::ReactNative::implementation::ReactNativeIsland>(rootView);
     if (auto view = innerRootView->GetComponentView()) {
       return view;
     }

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

@@ -6,7 +6,7 @@
 #include <inspectable.h>
 
 namespace winrt::Microsoft::ReactNative::implementation {
-struct CompositionRootView;
+struct ReactNativeIsland;
 
 class CompositionRootAutomationProvider : public winrt::implements<
                                               CompositionRootAutomationProvider,
@@ -39,7 +39,7 @@ class CompositionRootAutomationProvider : public winrt::implements<
   virtual HRESULT __stdcall AdviseEventAdded(EVENTID idEvent, SAFEARRAY *psaProperties) override;
   virtual HRESULT __stdcall AdviseEventRemoved(EVENTID idEvent, SAFEARRAY *psaProperties) override;
 
-  CompositionRootAutomationProvider(const winrt::Microsoft::ReactNative::CompositionRootView &rootView) noexcept;
+  CompositionRootAutomationProvider(const winrt::Microsoft::ReactNative::ReactNativeIsland &rootView) noexcept;
 
   void SetHwnd(HWND hwnd) noexcept;
 #ifdef USE_WINUI3
@@ -72,7 +72,7 @@ class CompositionRootAutomationProvider : public winrt::implements<
   // practice ATs tend to only listen to a dozen or so props and events, so std::vector is likely better than maps.
   std::vector<AdvisedEvent> m_advisedEvents{};
   std::vector<AdvisedEvent> m_advisedProperties{};
-  winrt::weak_ref<winrt::Microsoft::ReactNative::CompositionRootView> m_wkRootView;
+  winrt::weak_ref<winrt::Microsoft::ReactNative::ReactNativeIsland> m_wkRootView;
   HWND m_hwnd{nullptr};
 #ifdef USE_WINUI3
   winrt::Microsoft::UI::Content::ContentIsland m_island{nullptr};

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

@@ -9,7 +9,7 @@
 #include <AutoDraw.h>
 #include <Fabric/AbiState.h>
 #include <Fabric/AbiViewProps.h>
-#include <Fabric/Composition/CompositionRootView.h>
+#include <Fabric/Composition/ReactNativeIsland.h>
 #include <Fabric/FabricUIManagerModule.h>
 #include <UI.Xaml.Controls.h>
 #include <Utils/KeyboardUtils.h>
@@ -175,6 +175,10 @@ void ComponentView::updateLayoutMetrics(
   base_type::updateLayoutMetrics(layoutMetrics, oldLayoutMetrics);
 }
 
+const facebook::react::LayoutMetrics &ComponentView::layoutMetrics() const noexcept {
+  return m_layoutMetrics;
+}
+
 void ComponentView::FinalizeUpdates(winrt::Microsoft::ReactNative::ComponentViewUpdateMask updateMask) noexcept {
   if ((m_flags & ComponentViewFeatures::NativeBorder) == ComponentViewFeatures::NativeBorder) {
     finalizeBorderUpdates(m_layoutMetrics, *viewProps());
@@ -266,12 +270,12 @@ bool ComponentView::CapturePointer(const winrt::Microsoft::ReactNative::Composit
   if (!root)
     return false;
 
-  auto rootView = uiManager->GetCompositionRootView(root->Tag());
+  auto rootView{uiManager->GetReactNativeIsland(root->Tag())};
   if (!rootView) {
     return false;
   }
 
-  return winrt::get_self<winrt::Microsoft::ReactNative::implementation::CompositionRootView>(rootView)->CapturePointer(
+  return winrt::get_self<winrt::Microsoft::ReactNative::implementation::ReactNativeIsland>(rootView)->CapturePointer(
       pointer, static_cast<facebook::react::Tag>(Tag()));
 }
 
@@ -285,12 +289,12 @@ void ComponentView::ReleasePointerCapture(
   if (!root)
     return;
 
-  auto rootView = uiManager->GetCompositionRootView(root->Tag());
+  auto rootView{uiManager->GetReactNativeIsland(root->Tag())};
   if (!rootView) {
     return;
   }
 
-  return winrt::get_self<winrt::Microsoft::ReactNative::implementation::CompositionRootView>(rootView)
+  return winrt::get_self<winrt::Microsoft::ReactNative::implementation::ReactNativeIsland>(rootView)
       ->ReleasePointerCapture(pointer, static_cast<facebook::react::Tag>(Tag()));
 }
 

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

@@ -120,6 +120,8 @@ struct ComponentView
   bool getAcccessiblityIsReadOnly() noexcept override;
   virtual winrt::Microsoft::ReactNative::implementation::ClipState getClipState() noexcept;
 
+  const facebook::react::LayoutMetrics &layoutMetrics() const noexcept;
+
   virtual std::string DefaultControlType() const noexcept;
   virtual std::string DefaultAccessibleName() const noexcept;
   virtual std::string DefaultHelpText() const noexcept;