react-native-windows 0.81.3 → 0.81.5

package/Mso/src/dispatchQueue/uiScheduler_winrt.cpp

@@ -271,7 +271,8 @@ bool UISchedulerWinRT<TDispatcherTraits>::TryTakeTask(
     --m_taskCount;
   }
 
-  if (queue = m_queue.GetStrongPtr()) {
+  queue = m_queue.GetStrongPtr();
+  if (queue) {
     return queue->TryDequeTask(task);
   }
 

package/PropertySheets/Generated/PackageVersion.g.props

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

package/Shared/Networking/OriginPolicyHttpFilter.cpp

@@ -758,7 +758,8 @@ ResponseOperation OriginPolicyHttpFilter::SendRequestAsync(HttpRequestMessage co
     if (originPolicy == OriginPolicy::CrossOriginResourceSharing) {
       // If inner filter can AllowRedirect, disable for preflight.
       winrt::impl::com_ref<IHttpBaseProtocolFilter> baseFilter;
-      if (baseFilter = m_innerFilter.try_as<IHttpBaseProtocolFilter>()) {
+      baseFilter = m_innerFilter.try_as<IHttpBaseProtocolFilter>();
+      if (baseFilter) {
         baseFilter.AllowAutoRedirect(false);
       }
 

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,58 +60,71 @@ 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;
 };
 
-REACT_STRUCT(AndroidDrawerLayout_OnDrawerSlide)
-struct AndroidDrawerLayout_OnDrawerSlide {
-  REACT_FIELD(offset)
-  float offset{};
+REACT_STRUCT(AndroidDrawerLayoutSpec_onDrawerClose)
+struct AndroidDrawerLayoutSpec_onDrawerClose {
 };
 
-REACT_STRUCT(AndroidDrawerLayout_OnDrawerStateChanged)
-struct AndroidDrawerLayout_OnDrawerStateChanged {
-  REACT_FIELD(drawerState)
-  int32_t drawerState{};
+REACT_STRUCT(AndroidDrawerLayoutSpec_onDrawerOpen)
+struct AndroidDrawerLayoutSpec_onDrawerOpen {
 };
 
-REACT_STRUCT(AndroidDrawerLayout_OnDrawerOpen)
-struct AndroidDrawerLayout_OnDrawerOpen {
+REACT_STRUCT(AndroidDrawerLayoutSpec_onDrawerStateChanged)
+struct AndroidDrawerLayoutSpec_onDrawerStateChanged {
+  REACT_FIELD(drawerState)
+  int32_t drawerState{};
 };
 
-REACT_STRUCT(AndroidDrawerLayout_OnDrawerClose)
-struct AndroidDrawerLayout_OnDrawerClose {
+REACT_STRUCT(AndroidDrawerLayoutSpec_onDrawerSlide)
+struct AndroidDrawerLayoutSpec_onDrawerSlide {
+  REACT_FIELD(offset)
+  float offset{};
 };
 
 struct AndroidDrawerLayoutEventEmitter {
   AndroidDrawerLayoutEventEmitter(const winrt::Microsoft::ReactNative::EventEmitter &eventEmitter)
       : m_eventEmitter(eventEmitter) {}
 
-  using OnDrawerSlide = AndroidDrawerLayout_OnDrawerSlide;
-  using OnDrawerStateChanged = AndroidDrawerLayout_OnDrawerStateChanged;
-  using OnDrawerOpen = AndroidDrawerLayout_OnDrawerOpen;
-  using OnDrawerClose = AndroidDrawerLayout_OnDrawerClose;
+  using OnDrawerSlide = AndroidDrawerLayoutSpec_onDrawerSlide;
+  using OnDrawerStateChanged = AndroidDrawerLayoutSpec_onDrawerStateChanged;
+  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,21 +57,25 @@ 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;
 };
 
-REACT_STRUCT(AndroidSwipeRefreshLayout_OnRefresh)
-struct AndroidSwipeRefreshLayout_OnRefresh {
+REACT_STRUCT(AndroidSwipeRefreshLayoutSpec_onRefresh)
+struct AndroidSwipeRefreshLayoutSpec_onRefresh {
 };
 
 struct AndroidSwipeRefreshLayoutEventEmitter {
   AndroidSwipeRefreshLayoutEventEmitter(const winrt::Microsoft::ReactNative::EventEmitter &eventEmitter)
       : m_eventEmitter(eventEmitter) {}
 
-  using OnRefresh = AndroidSwipeRefreshLayout_OnRefresh;
+  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,11 +69,15 @@ 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;
 };
 
-REACT_STRUCT(AndroidSwitch_OnChange)
-struct AndroidSwitch_OnChange {
+REACT_STRUCT(AndroidSwitchSpec_onChange)
+struct AndroidSwitchSpec_onChange {
   REACT_FIELD(value)
   bool value{};
 
@@ -84,10 +89,10 @@ struct AndroidSwitchEventEmitter {
   AndroidSwitchEventEmitter(const winrt::Microsoft::ReactNative::EventEmitter &eventEmitter)
       : m_eventEmitter(eventEmitter) {}
 
-  using OnChange = AndroidSwitch_OnChange;
+  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,56 +84,69 @@ 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;
 };
 
-REACT_STRUCT(ModalHostView_OnRequestClose)
-struct ModalHostView_OnRequestClose {
+REACT_STRUCT(ModalHostViewSpec_onOrientationChange)
+struct ModalHostViewSpec_onOrientationChange {
+  REACT_FIELD(orientation)
+  std::string orientation;
 };
 
-REACT_STRUCT(ModalHostView_OnShow)
-struct ModalHostView_OnShow {
+REACT_STRUCT(ModalHostViewSpec_onDismiss)
+struct ModalHostViewSpec_onDismiss {
 };
 
-REACT_STRUCT(ModalHostView_OnDismiss)
-struct ModalHostView_OnDismiss {
+REACT_STRUCT(ModalHostViewSpec_onShow)
+struct ModalHostViewSpec_onShow {
 };
 
-REACT_STRUCT(ModalHostView_OnOrientationChange)
-struct ModalHostView_OnOrientationChange {
-  REACT_FIELD(orientation)
-  std::string orientation;
+REACT_STRUCT(ModalHostViewSpec_onRequestClose)
+struct ModalHostViewSpec_onRequestClose {
 };
 
 struct ModalHostViewEventEmitter {
   ModalHostViewEventEmitter(const winrt::Microsoft::ReactNative::EventEmitter &eventEmitter)
       : m_eventEmitter(eventEmitter) {}
 
-  using OnRequestClose = ModalHostView_OnRequestClose;
-  using OnShow = ModalHostView_OnShow;
-  using OnDismiss = ModalHostView_OnDismiss;
-  using OnOrientationChange = ModalHostView_OnOrientationChange;
+  using OnRequestClose = ModalHostViewSpec_onRequestClose;
+  using OnShow = ModalHostViewSpec_onShow;
+  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,21 +53,25 @@ 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;
 };
 
-REACT_STRUCT(PullToRefreshView_OnRefresh)
-struct PullToRefreshView_OnRefresh {
+REACT_STRUCT(PullToRefreshViewSpec_onRefresh)
+struct PullToRefreshViewSpec_onRefresh {
 };
 
 struct PullToRefreshViewEventEmitter {
   PullToRefreshViewEventEmitter(const winrt::Microsoft::ReactNative::EventEmitter &eventEmitter)
       : m_eventEmitter(eventEmitter) {}
 
-  using OnRefresh = PullToRefreshView_OnRefresh;
+  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>();
+
   
      }
   }

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

@@ -32,7 +32,8 @@ struct SwitchProps : winrt::implements<SwitchProps, winrt::Microsoft::ReactNativ
        thumbTintColor = cloneFromProps->thumbTintColor;
        thumbColor = cloneFromProps->thumbColor;
        trackColorForFalse = cloneFromProps->trackColorForFalse;
-       trackColorForTrue = cloneFromProps->trackColorForTrue;  
+       trackColorForTrue = cloneFromProps->trackColorForTrue;
+       onChange = cloneFromProps->onChange;  
      }
   }
 
@@ -64,11 +65,15 @@ struct SwitchProps : winrt::implements<SwitchProps, winrt::Microsoft::ReactNativ
   REACT_FIELD(trackColorForTrue)
   winrt::Microsoft::ReactNative::Color trackColorForTrue{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;
 };
 
-REACT_STRUCT(Switch_OnChange)
-struct Switch_OnChange {
+REACT_STRUCT(SwitchSpec_onChange)
+struct SwitchSpec_onChange {
   REACT_FIELD(value)
   bool value{};
 
@@ -80,10 +85,10 @@ struct SwitchEventEmitter {
   SwitchEventEmitter(const winrt::Microsoft::ReactNative::EventEmitter &eventEmitter)
       : m_eventEmitter(eventEmitter) {}
 
-  using OnChange = Switch_OnChange;
+  using OnChange = SwitchSpec_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/UnimplementedNativeView.g.h

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

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

@@ -26,7 +26,8 @@ struct VirtualViewProps : winrt::implements<VirtualViewProps, winrt::Microsoft::
      if (cloneFrom) {
        auto cloneFromProps = cloneFrom.as<VirtualViewProps>();
        initialHidden = cloneFromProps->initialHidden;
-       renderState = cloneFromProps->renderState;  
+       renderState = cloneFromProps->renderState;
+       onModeChange = cloneFromProps->onModeChange;  
      }
   }
 
@@ -40,11 +41,45 @@ struct VirtualViewProps : winrt::implements<VirtualViewProps, winrt::Microsoft::
   REACT_FIELD(renderState)
   int32_t renderState{};
 
+   // These fields can be used to determine if JS has registered for this event
+  REACT_FIELD(onModeChange)
+  bool onModeChange{false};
+
   const winrt::Microsoft::ReactNative::ViewProps ViewProps;
 };
 
-REACT_STRUCT(VirtualView_OnModeChange)
-struct VirtualView_OnModeChange {
+REACT_STRUCT(VirtualViewSpec_onModeChange3)
+struct VirtualViewSpec_onModeChange3 {
+  REACT_FIELD(x)
+  double x{};
+
+  REACT_FIELD(y)
+  double y{};
+
+  REACT_FIELD(width)
+  double width{};
+
+  REACT_FIELD(height)
+  double height{};
+};
+
+REACT_STRUCT(VirtualViewSpec_onModeChange2)
+struct VirtualViewSpec_onModeChange2 {
+  REACT_FIELD(x)
+  double x{};
+
+  REACT_FIELD(y)
+  double y{};
+
+  REACT_FIELD(width)
+  double width{};
+
+  REACT_FIELD(height)
+  double height{};
+};
+
+REACT_STRUCT(VirtualViewSpec_onModeChange)
+struct VirtualViewSpec_onModeChange {
   REACT_FIELD(mode)
   int32_t mode{};
 
@@ -59,12 +94,10 @@ struct VirtualViewEventEmitter {
   VirtualViewEventEmitter(const winrt::Microsoft::ReactNative::EventEmitter &eventEmitter)
       : m_eventEmitter(eventEmitter) {}
 
-  using OnModeChange = VirtualView_OnModeChange;
-  using OnModeChange2 = VirtualView_OnModeChange2;
-  using OnModeChange3 = VirtualView_OnModeChange3;
+  using OnModeChange = VirtualViewSpec_onModeChange;
 
-  void onModeChange(OnModeChange &value) const {
-    m_eventEmitter.DispatchEvent(L"modeChange", [value](const winrt::Microsoft::ReactNative::IJSValueWriter writer) {
+  void onModeChange(OnModeChange &&value) const {
+    m_eventEmitter.DispatchEvent(L"modeChange", [value = std::move(value)](const winrt::Microsoft::ReactNative::IJSValueWriter writer) {
       winrt::Microsoft::ReactNative::WriteValue(writer, value);
     });
   }