react-native-windows 0.81.4 → 0.81.5

package/Microsoft.ReactNative/ReactNativeWin32App.cpp

@@ -15,34 +15,10 @@
 #include "winrt/Microsoft.UI.Interop.h"
 #include "winrt/Microsoft.UI.Windowing.h"
 
-// Scaling factor for the window's content based on the DPI of the display where the window is located.
-float ScaleFactor(HWND hwnd) noexcept {
-  return GetDpiForWindow(hwnd) / static_cast<float>(USER_DEFAULT_SCREEN_DPI);
-}
-
-void UpdateRootViewSizeToAppWindow(
-    winrt::Microsoft::ReactNative::ReactNativeIsland const &rootView,
-    winrt::Microsoft::UI::Windowing::AppWindow const &window) {
-  auto hwnd = winrt::Microsoft::UI::GetWindowFromWindowId(window.Id());
-  auto scaleFactor = ScaleFactor(hwnd);
-  winrt::Windows::Foundation::Size size{
-      window.ClientSize().Width / scaleFactor, window.ClientSize().Height / scaleFactor};
-  // Do not relayout when minimized
-  if (window.Presenter().as<winrt::Microsoft::UI::Windowing::OverlappedPresenter>().State() !=
-      winrt::Microsoft::UI::Windowing::OverlappedPresenterState::Minimized) {
-    winrt::Microsoft::ReactNative::LayoutConstraints constraints;
-    constraints.LayoutDirection = winrt::Microsoft::ReactNative::LayoutDirection::Undefined;
-    constraints.MaximumSize = constraints.MinimumSize = size;
-    rootView.Arrange(constraints, {0, 0});
-  }
-}
-
 namespace winrt::Microsoft::ReactNative::implementation {
 ReactNativeWin32App::ReactNativeWin32App() {}
 
 ReactNativeWin32App::~ReactNativeWin32App() {
-  m_desktopChildSiteBridge = nullptr;
-
   // Destroy all Composition objects
   if (m_compositor != nullptr) {
     m_compositor.Close();
@@ -51,7 +27,7 @@ ReactNativeWin32App::~ReactNativeWin32App() {
 }
 
 winrt::Microsoft::UI::Windowing::AppWindow ReactNativeWin32App::AppWindow() {
-  return m_appWindow;
+  return ReactNativeWindow().AppWindow();
 }
 
 void ReactNativeWin32App::AppWindow(winrt::Microsoft::UI::Windowing::AppWindow const &appWindow) {
@@ -59,29 +35,19 @@ void ReactNativeWin32App::AppWindow(winrt::Microsoft::UI::Windowing::AppWindow c
 }
 
 winrt::Microsoft::UI::Composition::Compositor ReactNativeWin32App::Compositor() {
-  return m_compositor;
-}
-
-void ReactNativeWin32App::Compositor(winrt::Microsoft::UI::Composition::Compositor const &compositor) {
-  m_compositor = compositor;
-}
-
-void ReactNativeWin32App::DesktopChildSiteBridge(
-    winrt::Microsoft::UI::Content::DesktopChildSiteBridge const &desktopChildSiteBridge) {
-  m_desktopChildSiteBridge = desktopChildSiteBridge;
-}
-
-winrt::Microsoft::UI::Content::DesktopChildSiteBridge ReactNativeWin32App::DesktopChildSiteBridge() {
-  return m_desktopChildSiteBridge;
-}
+  if (m_compositor == nullptr) {
+    // Create a DispatcherQueue for this thread. This is needed for Composition, Content, and Input APIs.
+    m_dispatcherQueueController = winrt::Microsoft::UI::Dispatching::DispatcherQueueController::CreateOnCurrentThread();
 
-winrt::Microsoft::UI::Dispatching::DispatcherQueueController ReactNativeWin32App::DispatcherQueueController() {
-  return m_dispatcherQueueController;
-}
+    // Currently set the property to use current thread dispatcher as a default UI dispatcher.
+    ReactNativeHost().InstanceSettings().Properties().Set(
+        ReactDispatcherHelper::UIDispatcherProperty(), ReactDispatcherHelper::UIThreadDispatcher());
 
-void ReactNativeWin32App::DispatcherQueueController(
-    winrt::Microsoft::UI::Dispatching::DispatcherQueueController const &dispatcherQueueController) {
-  m_dispatcherQueueController = dispatcherQueueController;
+    m_compositor = winrt::Microsoft::UI::Composition::Compositor();
+    winrt::Microsoft::ReactNative::Composition::CompositionUIService::SetCompositor(
+        ReactNativeHost().InstanceSettings(), m_compositor);
+  }
+  return m_compositor;
 }
 
 winrt::Microsoft::ReactNative::ReactNativeHost ReactNativeWin32App::ReactNativeHost() {
@@ -91,18 +57,6 @@ winrt::Microsoft::ReactNative::ReactNativeHost ReactNativeWin32App::ReactNativeH
   return m_host;
 }
 
-void ReactNativeWin32App::ReactNativeHost(winrt::Microsoft::ReactNative::ReactNativeHost const &host) {
-  m_host = host;
-}
-
-winrt::Microsoft::ReactNative::ReactNativeIsland ReactNativeWin32App::ReactNativeIsland() {
-  return m_reactNativeIsland;
-}
-
-void ReactNativeWin32App::ReactNativeIsland(winrt::Microsoft::ReactNative::ReactNativeIsland const &reactNativeIsland) {
-  m_reactNativeIsland = reactNativeIsland;
-}
-
 winrt::Microsoft::ReactNative::ReactViewOptions ReactNativeWin32App::ReactViewOptions() {
   if (m_reactViewOptions == nullptr) {
     m_reactViewOptions = winrt::make<winrt::Microsoft::ReactNative::implementation::ReactViewOptions>();
@@ -114,45 +68,36 @@ void ReactNativeWin32App::ReactViewOptions(winrt::Microsoft::ReactNative::ReactV
   m_reactViewOptions = viewOptions;
 }
 
+winrt::Microsoft::ReactNative::ReactNativeWindow ReactNativeWin32App::ReactNativeWindow() noexcept {
+  if (!m_rnWindow) {
+    if (m_appWindow) {
+      m_rnWindow = winrt::Microsoft::ReactNative::ReactNativeWindow::CreateFromWindow(m_appWindow, Compositor());
+    } else {
+      m_rnWindow = winrt::Microsoft::ReactNative::ReactNativeWindow::CreateFromCompositor(Compositor());
+      m_appWindow = m_rnWindow.AppWindow();
+      m_appWindow.Title(L"ReactNativeWin32App");
+      m_appWindow.Resize({1000, 1000});
+    }
+  }
+
+  return m_rnWindow;
+}
+
 void ReactNativeWin32App::Start() {
   // Show the hosting AppWindow
-  m_appWindow.Show();
-
-  // Currently set the property to use current thread dispatcher as a default UI dispatcher.
-  // TODO: Use the correct dispatcher from a developer-provided DispatcherQueueController
-  ReactNativeHost().InstanceSettings().Properties().Set(
-      ReactDispatcherHelper::UIDispatcherProperty(), ReactDispatcherHelper::UIThreadDispatcher());
+  AppWindow().Show();
 
   auto hwnd{winrt::Microsoft::UI::GetWindowFromWindowId(m_appWindow.Id())};
 
   winrt::Microsoft::ReactNative::ReactCoreInjection::SetTopLevelWindowId(
       ReactNativeHost().InstanceSettings().Properties(), reinterpret_cast<uint64_t>(hwnd));
 
-  winrt::Microsoft::ReactNative::Composition::CompositionUIService::SetCompositor(
-      ReactNativeHost().InstanceSettings(), m_compositor);
-
   // Start the react-native instance, which will create a JavaScript runtime and load the applications bundle.
   ReactNativeHost().ReloadInstance();
 
-  // Create a RootView which will present a react-native component
-  if (m_reactNativeIsland == nullptr) {
-    m_reactNativeIsland = winrt::Microsoft::ReactNative::ReactNativeIsland(m_compositor);
-  }
-
-  m_reactNativeIsland.ReactViewHost(
+  m_rnWindow.ReactNativeIsland().ReactViewHost(
       winrt::Microsoft::ReactNative::ReactCoreInjection::MakeViewHost(ReactNativeHost(), ReactViewOptions()));
 
-  // Update the size of the RootView when the AppWindow changes size
-  m_appWindow.Changed([wkRootView = winrt::make_weak(m_reactNativeIsland)](
-                          winrt::Microsoft::UI::Windowing::AppWindow const &window,
-                          winrt::Microsoft::UI::Windowing::AppWindowChangedEventArgs const &args) {
-    if (args.DidSizeChange() || args.DidVisibilityChange()) {
-      if (auto rootView = wkRootView.get()) {
-        UpdateRootViewSizeToAppWindow(rootView, window);
-      }
-    }
-  });
-
   // Quit application when main window is closed
   m_appWindow.Destroying([this](
                              winrt::Microsoft::UI::Windowing::AppWindow const &window,
@@ -166,28 +111,13 @@ void ReactNativeWin32App::Start() {
     });
   });
 
-  // DesktopChildSiteBridge create a ContentSite that can host the RootView ContentIsland
-  m_desktopChildSiteBridge =
-      winrt::Microsoft::UI::Content::DesktopChildSiteBridge::Create(m_compositor, m_appWindow.Id());
-
-  m_desktopChildSiteBridge.Connect(m_reactNativeIsland.Island());
-
-  m_desktopChildSiteBridge.ResizePolicy(winrt::Microsoft::UI::Content::ContentSizePolicy::ResizeContentToParentWindow);
-
-  auto scaleFactor = ScaleFactor(hwnd);
-  m_reactNativeIsland.ScaleFactor(scaleFactor);
-
-  UpdateRootViewSizeToAppWindow(m_reactNativeIsland, m_appWindow);
-
-  m_desktopChildSiteBridge.Show();
-
   // Run the main application event loop
   m_dispatcherQueueController.DispatcherQueue().RunEventLoop();
 
+  m_appWindow.Destroy();
+
   // Rundown the DispatcherQueue. This drains the queue and raises events to let components
   // know the message loop has finished.
   m_dispatcherQueueController.ShutdownQueue();
-
-  m_desktopChildSiteBridge.Close();
 }
 } // namespace winrt::Microsoft::ReactNative::implementation

package/Microsoft.ReactNative/ReactNativeWin32App.h

@@ -15,20 +15,10 @@ struct ReactNativeWin32App : ReactNativeWin32AppT<ReactNativeWin32App> {
   winrt::Microsoft::UI::Windowing::AppWindow AppWindow();
 
   winrt::Microsoft::UI::Composition::Compositor Compositor();
-  void Compositor(winrt::Microsoft::UI::Composition::Compositor const &compositor);
-
-  winrt::Microsoft::UI::Content::DesktopChildSiteBridge DesktopChildSiteBridge();
-  void DesktopChildSiteBridge(winrt::Microsoft::UI::Content::DesktopChildSiteBridge const &desktopChildSiteBridge);
-
-  winrt::Microsoft::UI::Dispatching::DispatcherQueueController DispatcherQueueController();
-  void DispatcherQueueController(
-      winrt::Microsoft::UI::Dispatching::DispatcherQueueController const &dispatcherQueueController);
 
   winrt::Microsoft::ReactNative::ReactNativeHost ReactNativeHost();
-  void ReactNativeHost(winrt::Microsoft::ReactNative::ReactNativeHost const &host);
 
-  winrt::Microsoft::ReactNative::ReactNativeIsland ReactNativeIsland();
-  void ReactNativeIsland(winrt::Microsoft::ReactNative::ReactNativeIsland const &reactNativeIsland);
+  winrt::Microsoft::ReactNative::ReactNativeWindow ReactNativeWindow() noexcept;
 
   winrt::Microsoft::ReactNative::ReactViewOptions ReactViewOptions();
   void ReactViewOptions(winrt::Microsoft::ReactNative::ReactViewOptions const &reactViewOptions);
@@ -36,12 +26,11 @@ struct ReactNativeWin32App : ReactNativeWin32AppT<ReactNativeWin32App> {
   void Start();
 
  private:
+  winrt::Microsoft::ReactNative::ReactNativeWindow m_rnWindow{nullptr};
   winrt::Microsoft::UI::Windowing::AppWindow m_appWindow{nullptr};
   winrt::Microsoft::UI::Composition::Compositor m_compositor{nullptr};
-  winrt::Microsoft::UI::Content::DesktopChildSiteBridge m_desktopChildSiteBridge{nullptr};
   winrt::Microsoft::UI::Dispatching::DispatcherQueueController m_dispatcherQueueController{nullptr};
   winrt::Microsoft::ReactNative::ReactNativeHost m_host{nullptr};
-  winrt::Microsoft::ReactNative::ReactNativeIsland m_reactNativeIsland{nullptr};
   winrt::Microsoft::ReactNative::ReactViewOptions m_reactViewOptions{nullptr};
 };
 } // namespace winrt::Microsoft::ReactNative::implementation

package/Microsoft.ReactNative/ReactNativeWindow.idl

@@ -0,0 +1,44 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+import "ReactNativeIsland.idl";
+
+#include "NamespaceRedirect.h"
+#include "DocString.h"
+
+namespace Microsoft.ReactNative
+{
+
+  [experimental]
+  enum ContentSizePolicy
+  {
+    None,
+    ResizeContentToParentWindow,
+    ResizeParentWindowToContent,
+  };
+
+  [default_interface]
+  [webhosthidden]
+  [experimental]
+  DOC_STRING("Simplifies hosting a ReactNativeIsland inside a Window.")
+  runtimeclass ReactNativeWindow : Windows.Foundation.IClosable
+  {
+    static ReactNativeWindow CreateFromCompositor(Microsoft.UI.Composition.Compositor compositor);
+    static ReactNativeWindow CreateFromWindow(Microsoft.UI.Windowing.AppWindow appWindow, Microsoft.UI.Composition.Compositor compositor);
+    static ReactNativeWindow CreateFromContentSiteBridgeAndIsland(Microsoft.UI.Content.IContentSiteBridge bridge, Microsoft.ReactNative.ReactNativeIsland island);
+    static ReactNativeWindow CreateFromWindowAndIsland(Microsoft.UI.Windowing.AppWindow appWindow, Microsoft.ReactNative.ReactNativeIsland island);
+
+    ReactNativeIsland ReactNativeIsland { get; };
+
+    Microsoft.UI.Windowing.AppWindow AppWindow { get; };
+
+    Microsoft.UI.Content.IContentSiteBridge ContentSiteBridge { get; };
+    ContentSizePolicy ResizePolicy { get; set; };
+
+    DOC_STRING("When the ResizePolicy is set to ResizeParentWindowToContent, these LayoutConstraints will control the layout of the content."
+     " When ResizePolicy is set to ResizeContentToParentWindow, these constraints will be ignored. Instead the window can be constrained using"
+     " OverlappedPresenter.PreferredMaximumHeight etc.")
+    LayoutConstraints LayoutConstraints { get; set; };
+  }
+
+} // namespace Microsoft.ReactNative

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,11 +10,11 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.81.4</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.81.5</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>81</ReactNativeWindowsMinor>
-    <ReactNativeWindowsPatch>4</ReactNativeWindowsPatch>
+    <ReactNativeWindowsPatch>5</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>6cfb66be9b4dbbdff53e896e215230cdeddc38a6</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>ff246e07a1fca3e9925f60981d8a9b9d75ceb87d</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>

package/Shared/Shared.vcxitems

@@ -85,6 +85,11 @@
       <DependentUpon>$(ReactNativeWindowsDir)Microsoft.ReactNative\ReactNativeIsland.idl</DependentUpon>
       <SubType>Code</SubType>
     </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\ReactNativeWindow.cpp">
+      <ExcludedFromBuild Condition="'$(UseFabric)' != 'true'">true</ExcludedFromBuild>
+      <DependentUpon>$(ReactNativeWindowsDir)Microsoft.ReactNative\ReactNativeWindow.idl</DependentUpon>
+      <SubType>Code</SubType>
+    </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\CompositionUIService.cpp">
       <ExcludedFromBuild Condition="'$(UseFabric)' != 'true'">true</ExcludedFromBuild>
       <DependentUpon>$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionUIService.idl</DependentUpon>
@@ -315,6 +320,7 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\CompositionRootAutomationProvider.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\CompositionDynamicAutomationProvider.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\ReactNativeIsland.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\ReactNativeWindow.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\CompositionUIService.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\CompositionViewComponentView.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\ImageComponentView.h" />
@@ -710,6 +716,7 @@
     <Midl Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionContext.idl" />
     <Midl Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionHwndHost.idl" />
     <Midl Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\ReactNativeIsland.idl" />
+    <Midl Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\ReactNativeWindow.idl" />
     <Midl Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionSwitcher.idl" />
     <Midl Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionUIService.idl" />
     <Midl Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\IReactCompositionViewComponentBuilder.idl" />

package/Shared/Shared.vcxitems.filters

@@ -204,6 +204,9 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\ReactNativeIsland.cpp">
       <Filter>Source Files\Fabric\Composition</Filter>
     </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\ReactNativeWindow.cpp">
+      <Filter>Source Files\Fabric\Composition</Filter>
+    </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\CompositionUIService.cpp">
       <Filter>Source Files\Fabric\Composition</Filter>
     </ClCompile>
@@ -754,6 +757,9 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\ReactNativeIsland.h">
       <Filter>Header Files\Fabric\Composition</Filter>
     </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\ReactNativeWindow.h">
+      <Filter>Header Files\Fabric\Composition</Filter>
+    </ClInclude>
     <ClInclude Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\CompositionUIService.h">
       <Filter>Header Files\Fabric\Composition</Filter>
     </ClInclude>

package/codegen/react/components/rnwcore/ActivityIndicatorView.g.h

@@ -28,7 +28,8 @@ struct ActivityIndicatorViewProps : winrt::implements<ActivityIndicatorViewProps
        hidesWhenStopped = cloneFromProps->hidesWhenStopped;
        animating = cloneFromProps->animating;
        color = cloneFromProps->color;
-       size = cloneFromProps->size;  
+       size = cloneFromProps->size;
+  
      }
   }
 

package/codegen/react/components/rnwcore/AndroidDrawerLayout.g.h

@@ -30,7 +30,11 @@ struct AndroidDrawerLayoutProps : winrt::implements<AndroidDrawerLayoutProps, wi
        drawerPosition = cloneFromProps->drawerPosition;
        drawerWidth = cloneFromProps->drawerWidth;
        drawerLockMode = cloneFromProps->drawerLockMode;
-       statusBarBackgroundColor = cloneFromProps->statusBarBackgroundColor;  
+       statusBarBackgroundColor = cloneFromProps->statusBarBackgroundColor;
+       onDrawerSlide = cloneFromProps->onDrawerSlide;
+       onDrawerStateChanged = cloneFromProps->onDrawerStateChanged;
+       onDrawerOpen = cloneFromProps->onDrawerOpen;
+       onDrawerClose = cloneFromProps->onDrawerClose;  
      }
   }
 
@@ -56,6 +60,19 @@ struct AndroidDrawerLayoutProps : winrt::implements<AndroidDrawerLayoutProps, wi
   REACT_FIELD(statusBarBackgroundColor)
   winrt::Microsoft::ReactNative::Color statusBarBackgroundColor{nullptr};
 
+   // These fields can be used to determine if JS has registered for this event
+  REACT_FIELD(onDrawerSlide)
+  bool onDrawerSlide{false};
+
+  REACT_FIELD(onDrawerStateChanged)
+  bool onDrawerStateChanged{false};
+
+  REACT_FIELD(onDrawerOpen)
+  bool onDrawerOpen{false};
+
+  REACT_FIELD(onDrawerClose)
+  bool onDrawerClose{false};
+
   const winrt::Microsoft::ReactNative::ViewProps ViewProps;
 };
 
@@ -88,26 +105,26 @@ struct AndroidDrawerLayoutEventEmitter {
   using OnDrawerOpen = AndroidDrawerLayoutSpec_onDrawerOpen;
   using OnDrawerClose = AndroidDrawerLayoutSpec_onDrawerClose;
 
-  void onDrawerSlide(OnDrawerSlide &value) const {
-    m_eventEmitter.DispatchEvent(L"drawerSlide", [&value](const winrt::Microsoft::ReactNative::IJSValueWriter writer) {
+  void onDrawerSlide(OnDrawerSlide &&value) const {
+    m_eventEmitter.DispatchEvent(L"drawerSlide", [value = std::move(value)](const winrt::Microsoft::ReactNative::IJSValueWriter writer) {
       winrt::Microsoft::ReactNative::WriteValue(writer, value);
     });
   }
 
-  void onDrawerStateChanged(OnDrawerStateChanged &value) const {
-    m_eventEmitter.DispatchEvent(L"drawerStateChanged", [&value](const winrt::Microsoft::ReactNative::IJSValueWriter writer) {
+  void onDrawerStateChanged(OnDrawerStateChanged &&value) const {
+    m_eventEmitter.DispatchEvent(L"drawerStateChanged", [value = std::move(value)](const winrt::Microsoft::ReactNative::IJSValueWriter writer) {
       winrt::Microsoft::ReactNative::WriteValue(writer, value);
     });
   }
 
-  void onDrawerOpen(OnDrawerOpen &value) const {
-    m_eventEmitter.DispatchEvent(L"drawerOpen", [&value](const winrt::Microsoft::ReactNative::IJSValueWriter writer) {
+  void onDrawerOpen(OnDrawerOpen &&value) const {
+    m_eventEmitter.DispatchEvent(L"drawerOpen", [value = std::move(value)](const winrt::Microsoft::ReactNative::IJSValueWriter writer) {
       winrt::Microsoft::ReactNative::WriteValue(writer, value);
     });
   }
 
-  void onDrawerClose(OnDrawerClose &value) const {
-    m_eventEmitter.DispatchEvent(L"drawerClose", [&value](const winrt::Microsoft::ReactNative::IJSValueWriter writer) {
+  void onDrawerClose(OnDrawerClose &&value) const {
+    m_eventEmitter.DispatchEvent(L"drawerClose", [value = std::move(value)](const winrt::Microsoft::ReactNative::IJSValueWriter writer) {
       winrt::Microsoft::ReactNative::WriteValue(writer, value);
     });
   }

package/codegen/react/components/rnwcore/AndroidHorizontalScrollContentView.g.h

@@ -25,7 +25,8 @@ struct AndroidHorizontalScrollContentViewProps : winrt::implements<AndroidHorizo
   {
      if (cloneFrom) {
        auto cloneFromProps = cloneFrom.as<AndroidHorizontalScrollContentViewProps>();
-       removeClippedSubviews = cloneFromProps->removeClippedSubviews;  
+       removeClippedSubviews = cloneFromProps->removeClippedSubviews;
+  
      }
   }
 

package/codegen/react/components/rnwcore/AndroidProgressBar.g.h

@@ -31,7 +31,8 @@ struct AndroidProgressBarProps : winrt::implements<AndroidProgressBarProps, winr
        progress = cloneFromProps->progress;
        animating = cloneFromProps->animating;
        color = cloneFromProps->color;
-       testID = cloneFromProps->testID;  
+       testID = cloneFromProps->testID;
+  
      }
   }
 

package/codegen/react/components/rnwcore/AndroidSwipeRefreshLayout.g.h

@@ -30,7 +30,8 @@ struct AndroidSwipeRefreshLayoutProps : winrt::implements<AndroidSwipeRefreshLay
        progressBackgroundColor = cloneFromProps->progressBackgroundColor;
        size = cloneFromProps->size;
        progressViewOffset = cloneFromProps->progressViewOffset;
-       refreshing = cloneFromProps->refreshing;  
+       refreshing = cloneFromProps->refreshing;
+       onRefresh = cloneFromProps->onRefresh;  
      }
   }
 
@@ -56,6 +57,10 @@ struct AndroidSwipeRefreshLayoutProps : winrt::implements<AndroidSwipeRefreshLay
   REACT_FIELD(refreshing)
   bool refreshing{};
 
+   // These fields can be used to determine if JS has registered for this event
+  REACT_FIELD(onRefresh)
+  bool onRefresh{false};
+
   const winrt::Microsoft::ReactNative::ViewProps ViewProps;
 };
 
@@ -69,8 +74,8 @@ struct AndroidSwipeRefreshLayoutEventEmitter {
 
   using OnRefresh = AndroidSwipeRefreshLayoutSpec_onRefresh;
 
-  void onRefresh(OnRefresh &value) const {
-    m_eventEmitter.DispatchEvent(L"refresh", [&value](const winrt::Microsoft::ReactNative::IJSValueWriter writer) {
+  void onRefresh(OnRefresh &&value) const {
+    m_eventEmitter.DispatchEvent(L"refresh", [value = std::move(value)](const winrt::Microsoft::ReactNative::IJSValueWriter writer) {
       winrt::Microsoft::ReactNative::WriteValue(writer, value);
     });
   }

package/codegen/react/components/rnwcore/AndroidSwitch.g.h

@@ -33,7 +33,8 @@ struct AndroidSwitchProps : winrt::implements<AndroidSwitchProps, winrt::Microso
        value = cloneFromProps->value;
        on = cloneFromProps->on;
        thumbTintColor = cloneFromProps->thumbTintColor;
-       trackTintColor = cloneFromProps->trackTintColor;  
+       trackTintColor = cloneFromProps->trackTintColor;
+       onChange = cloneFromProps->onChange;  
      }
   }
 
@@ -68,6 +69,10 @@ struct AndroidSwitchProps : winrt::implements<AndroidSwitchProps, winrt::Microso
   REACT_FIELD(trackTintColor)
   winrt::Microsoft::ReactNative::Color trackTintColor{nullptr};
 
+   // These fields can be used to determine if JS has registered for this event
+  REACT_FIELD(onChange)
+  bool onChange{false};
+
   const winrt::Microsoft::ReactNative::ViewProps ViewProps;
 };
 
@@ -86,8 +91,8 @@ struct AndroidSwitchEventEmitter {
 
   using OnChange = AndroidSwitchSpec_onChange;
 
-  void onChange(OnChange &value) const {
-    m_eventEmitter.DispatchEvent(L"change", [&value](const winrt::Microsoft::ReactNative::IJSValueWriter writer) {
+  void onChange(OnChange &&value) const {
+    m_eventEmitter.DispatchEvent(L"change", [value = std::move(value)](const winrt::Microsoft::ReactNative::IJSValueWriter writer) {
       winrt::Microsoft::ReactNative::WriteValue(writer, value);
     });
   }

package/codegen/react/components/rnwcore/DebuggingOverlay.g.h

@@ -25,6 +25,7 @@ struct DebuggingOverlayProps : winrt::implements<DebuggingOverlayProps, winrt::M
   {
      if (cloneFrom) {
        auto cloneFromProps = cloneFrom.as<DebuggingOverlayProps>();
+
   
      }
   }

package/codegen/react/components/rnwcore/InputAccessory.g.h

@@ -25,7 +25,8 @@ struct InputAccessoryProps : winrt::implements<InputAccessoryProps, winrt::Micro
   {
      if (cloneFrom) {
        auto cloneFromProps = cloneFrom.as<InputAccessoryProps>();
-       backgroundColor = cloneFromProps->backgroundColor;  
+       backgroundColor = cloneFromProps->backgroundColor;
+  
      }
   }
 

package/codegen/react/components/rnwcore/ModalHostView.g.h

@@ -36,7 +36,11 @@ struct ModalHostViewProps : winrt::implements<ModalHostViewProps, winrt::Microso
        allowSwipeDismissal = cloneFromProps->allowSwipeDismissal;
        supportedOrientations = cloneFromProps->supportedOrientations;
        identifier = cloneFromProps->identifier;
-       title = cloneFromProps->title;  
+       title = cloneFromProps->title;
+       onRequestClose = cloneFromProps->onRequestClose;
+       onShow = cloneFromProps->onShow;
+       onDismiss = cloneFromProps->onDismiss;
+       onOrientationChange = cloneFromProps->onOrientationChange;  
      }
   }
 
@@ -80,6 +84,19 @@ struct ModalHostViewProps : winrt::implements<ModalHostViewProps, winrt::Microso
   REACT_FIELD(title)
   std::optional<std::string> title;
 
+   // These fields can be used to determine if JS has registered for this event
+  REACT_FIELD(onRequestClose)
+  bool onRequestClose{false};
+
+  REACT_FIELD(onShow)
+  bool onShow{false};
+
+  REACT_FIELD(onDismiss)
+  bool onDismiss{false};
+
+  REACT_FIELD(onOrientationChange)
+  bool onOrientationChange{false};
+
   const winrt::Microsoft::ReactNative::ViewProps ViewProps;
 };
 
@@ -110,26 +127,26 @@ struct ModalHostViewEventEmitter {
   using OnDismiss = ModalHostViewSpec_onDismiss;
   using OnOrientationChange = ModalHostViewSpec_onOrientationChange;
 
-  void onRequestClose(OnRequestClose &value) const {
-    m_eventEmitter.DispatchEvent(L"requestClose", [&value](const winrt::Microsoft::ReactNative::IJSValueWriter writer) {
+  void onRequestClose(OnRequestClose &&value) const {
+    m_eventEmitter.DispatchEvent(L"requestClose", [value = std::move(value)](const winrt::Microsoft::ReactNative::IJSValueWriter writer) {
       winrt::Microsoft::ReactNative::WriteValue(writer, value);
     });
   }
 
-  void onShow(OnShow &value) const {
-    m_eventEmitter.DispatchEvent(L"show", [&value](const winrt::Microsoft::ReactNative::IJSValueWriter writer) {
+  void onShow(OnShow &&value) const {
+    m_eventEmitter.DispatchEvent(L"show", [value = std::move(value)](const winrt::Microsoft::ReactNative::IJSValueWriter writer) {
       winrt::Microsoft::ReactNative::WriteValue(writer, value);
     });
   }
 
-  void onDismiss(OnDismiss &value) const {
-    m_eventEmitter.DispatchEvent(L"dismiss", [&value](const winrt::Microsoft::ReactNative::IJSValueWriter writer) {
+  void onDismiss(OnDismiss &&value) const {
+    m_eventEmitter.DispatchEvent(L"dismiss", [value = std::move(value)](const winrt::Microsoft::ReactNative::IJSValueWriter writer) {
       winrt::Microsoft::ReactNative::WriteValue(writer, value);
     });
   }
 
-  void onOrientationChange(OnOrientationChange &value) const {
-    m_eventEmitter.DispatchEvent(L"orientationChange", [&value](const winrt::Microsoft::ReactNative::IJSValueWriter writer) {
+  void onOrientationChange(OnOrientationChange &&value) const {
+    m_eventEmitter.DispatchEvent(L"orientationChange", [value = std::move(value)](const winrt::Microsoft::ReactNative::IJSValueWriter writer) {
       winrt::Microsoft::ReactNative::WriteValue(writer, value);
     });
   }

package/codegen/react/components/rnwcore/PullToRefreshView.g.h

@@ -29,7 +29,8 @@ struct PullToRefreshViewProps : winrt::implements<PullToRefreshViewProps, winrt:
        titleColor = cloneFromProps->titleColor;
        title = cloneFromProps->title;
        progressViewOffset = cloneFromProps->progressViewOffset;
-       refreshing = cloneFromProps->refreshing;  
+       refreshing = cloneFromProps->refreshing;
+       onRefresh = cloneFromProps->onRefresh;  
      }
   }
 
@@ -52,6 +53,10 @@ struct PullToRefreshViewProps : winrt::implements<PullToRefreshViewProps, winrt:
   REACT_FIELD(refreshing)
   bool refreshing{};
 
+   // These fields can be used to determine if JS has registered for this event
+  REACT_FIELD(onRefresh)
+  bool onRefresh{false};
+
   const winrt::Microsoft::ReactNative::ViewProps ViewProps;
 };
 
@@ -65,8 +70,8 @@ struct PullToRefreshViewEventEmitter {
 
   using OnRefresh = PullToRefreshViewSpec_onRefresh;
 
-  void onRefresh(OnRefresh &value) const {
-    m_eventEmitter.DispatchEvent(L"refresh", [&value](const winrt::Microsoft::ReactNative::IJSValueWriter writer) {
+  void onRefresh(OnRefresh &&value) const {
+    m_eventEmitter.DispatchEvent(L"refresh", [value = std::move(value)](const winrt::Microsoft::ReactNative::IJSValueWriter writer) {
       winrt::Microsoft::ReactNative::WriteValue(writer, value);
     });
   }

package/codegen/react/components/rnwcore/SafeAreaView.g.h

@@ -25,6 +25,7 @@ struct SafeAreaViewProps : winrt::implements<SafeAreaViewProps, winrt::Microsoft
   {
      if (cloneFrom) {
        auto cloneFromProps = cloneFrom.as<SafeAreaViewProps>();
+
   
      }
   }