react-native-windows 0.74.19 → 0.74.21

package/Microsoft.ReactNative/Fabric/Composition/TextInput/WindowsTextInputComponentView.h

@@ -62,16 +62,10 @@ struct WindowsTextInputComponentView
   void OnPointerMoved(
       const winrt::Microsoft::ReactNative::Composition::Input::PointerRoutedEventArgs &args) noexcept override;
 
-  void OnKeyDown(
-      const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source,
-      const winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs &args) noexcept override;
-  void OnKeyUp(
-      const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source,
-      const winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs &args) noexcept override;
-  void OnCharacterReceived(
-      const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source,
-      const winrt::Microsoft::ReactNative::Composition::Input::CharacterReceivedRoutedEventArgs &args) noexcept
-      override;
+  void OnKeyDown(const winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs &args) noexcept override;
+  void OnKeyUp(const winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs &args) noexcept override;
+  void OnCharacterReceived(const winrt::Microsoft::ReactNative::Composition::Input::CharacterReceivedRoutedEventArgs
+                               &args) noexcept override;
 
   std::optional<std::string> getAcccessiblityValue() noexcept override;
   void setAcccessiblityValue(std::string &&value) noexcept override;
@@ -106,7 +100,6 @@ struct WindowsTextInputComponentView
       const facebook::react::SharedColor &cursorColor,
       const facebook::react::SharedColor &foregroundColor) noexcept;
   bool ShouldSubmit(
-      const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source,
       const winrt::Microsoft::ReactNative::Composition::Input::CharacterReceivedRoutedEventArgs &args) noexcept;
 
   winrt::Windows::UI::Composition::CompositionSurfaceBrush m_brush{nullptr};

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

@@ -162,4 +162,23 @@ void UpdateUiaProperty(
       spProviderSimple.get(), propId, CComVariant(oldValue.c_str()), CComVariant(newValue.c_str()));
 }
 
+long GetLiveSetting(const std::string &liveRegion) noexcept {
+  if (liveRegion == "polite") {
+    return LiveSetting::Polite;
+  } else if (liveRegion == "assertive") {
+    return LiveSetting::Assertive;
+  }
+  return LiveSetting::Off;
+}
+
+std::string extractAccessibilityValue(const facebook::react::AccessibilityValue &value) noexcept {
+  if (value.now.has_value()) {
+    return std::to_string(value.now.value());
+  } else if (value.text.has_value()) {
+    return value.text.value();
+  } else {
+    return "";
+  }
+}
+
 } // namespace winrt::Microsoft::ReactNative::implementation

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

@@ -29,4 +29,8 @@ void UpdateUiaProperty(
     const std::string &oldValue,
     const std::string &newValue) noexcept;
 
+long GetLiveSetting(const std::string &liveRegion) noexcept;
+
+std::string extractAccessibilityValue(const facebook::react::AccessibilityValue &value) noexcept;
+
 } // namespace winrt::Microsoft::ReactNative::implementation

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

@@ -24,8 +24,7 @@ UnimplementedNativeViewComponentView::UnimplementedNativeViewComponentView(
           reactContext,
           ComponentViewFeatures::Default &
               ~(ComponentViewFeatures::Background | ComponentViewFeatures::ShadowProps |
-                ComponentViewFeatures::NativeBorder),
-          false) {
+                ComponentViewFeatures::NativeBorder)) {
   m_labelVisual = compContext.CreateSpriteVisual();
   OuterVisual().InsertAt(m_labelVisual, 1);
 }

package/Microsoft.ReactNative/Fabric/FabricUIManagerModule.cpp

@@ -257,9 +257,10 @@ void FabricUIManager::RCTPerformMountInstructions(
         newChildComponentView->updateEventEmitter(newChildShadowView.eventEmitter);
         newChildComponentView->updateState(newChildShadowView.state, oldChildShadowView.state);
         newChildComponentView->updateLayoutMetrics(newChildShadowView.layoutMetrics, oldChildShadowView.layoutMetrics);
-        newChildViewDescriptor.view.FinalizeUpdates(winrt::Microsoft::ReactNative::ComponentViewUpdateMask::All);
+        newChildComponentView->FinalizeUpdates(winrt::Microsoft::ReactNative::ComponentViewUpdateMask::All);
 
-        parentViewDescriptor.view.MountChildComponentView(*newChildComponentView, mutation.index);
+        winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(parentViewDescriptor.view)
+            ->MountChildComponentView(*newChildComponentView, mutation.index);
         break;
       }
 
@@ -268,7 +269,8 @@ 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);
+        winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(parentViewDescriptor.view)
+            ->UnmountChildComponentView(oldChildViewDescriptor.view, mutation.index);
         break;
       }
 
@@ -302,7 +304,8 @@ void FabricUIManager::RCTPerformMountInstructions(
         }
 
         if (mask != winrt::Microsoft::ReactNative::ComponentViewUpdateMask::None) {
-          newChildViewDescriptor.view.FinalizeUpdates(mask);
+          winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(newChildViewDescriptor.view)
+              ->FinalizeUpdates(mask);
         }
 
         break;
@@ -387,15 +390,15 @@ void FabricUIManager::schedulerDidDispatchCommand(
     folly::dynamic const &arg) {
   if (m_context.UIDispatcher().HasThreadAccess()) {
     auto descriptor = m_registry.componentViewDescriptorWithTag(shadowView.tag);
-    descriptor.view.HandleCommand(
-        winrt::to_hstring(commandName), winrt::make<winrt::Microsoft::ReactNative::DynamicReader>(arg));
+    winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(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(
+              winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(view)->HandleCommand(
                   winrt::to_hstring(commandName), winrt::make<winrt::Microsoft::ReactNative::DynamicReader>(args));
             }
           }

package/Microsoft.ReactNative/Fabric/WindowsComponentDescriptorRegistry.cpp

@@ -74,9 +74,7 @@ void WindowsComponentDescriptorRegistry::Add(
        m_descriptorFlavors.back()->c_str(),
        std::static_pointer_cast<void const>(m_descriptorFlavors.back()),
        winrt::get_self<winrt::Microsoft::ReactNative::Composition::ReactCompositionViewComponentBuilder>(builder)
-               ->IsViewComponent()
-           ? &facebook::react::concreteComponentDescriptorConstructor<AbiViewComponentDescriptor>
-           : &facebook::react::concreteComponentDescriptorConstructor<AbiComponentDescriptor>});
+           ->GetComponentDescriptorProvider()});
 }
 
 winrt::Microsoft::ReactNative::IReactViewComponentBuilder WindowsComponentDescriptorRegistry::GetDescriptor(

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

@@ -26,7 +26,23 @@ HostPlatformViewProps::HostPlatformViewProps(
       focusable(
           CoreFeatures::enablePropIteratorSetter
               ? sourceProps.focusable
-              : convertRawProp(context, rawProps, "focusable", sourceProps.focusable, {})) {}
+              : convertRawProp(context, rawProps, "focusable", sourceProps.focusable, {})),
+      accessibilityPosInSet(
+          CoreFeatures::enablePropIteratorSetter
+              ? sourceProps.accessibilityPosInSet
+              : convertRawProp(context, rawProps, "accessibilityPosInSet", sourceProps.accessibilityPosInSet, 0)),
+      accessibilitySetSize(
+          CoreFeatures::enablePropIteratorSetter
+              ? sourceProps.accessibilitySetSize
+              : convertRawProp(context, rawProps, "accessibilitySetSize", sourceProps.accessibilitySetSize, 0)),
+      accessibilityLiveRegion(
+          CoreFeatures::enablePropIteratorSetter ? sourceProps.accessibilityLiveRegion
+                                                 : convertRawProp(
+                                                       context,
+                                                       rawProps,
+                                                       "accessibilityLiveRegion",
+                                                       sourceProps.accessibilityLiveRegion,
+                                                       "none")) {}
 
 #define WINDOWS_VIEW_EVENT_CASE(eventType)                    \
   case CONSTEXPR_RAW_PROPS_KEY_HASH("on" #eventType): {       \
@@ -61,6 +77,9 @@ void HostPlatformViewProps::setProp(
     WINDOWS_VIEW_EVENT_CASE(MouseLeave);
     RAW_SET_PROP_SWITCH_CASE_BASIC(enableFocusRing);
     RAW_SET_PROP_SWITCH_CASE_BASIC(focusable);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityPosInSet);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilitySetSize);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityLiveRegion);
     RAW_SET_PROP_SWITCH_CASE_BASIC(keyDownEvents);
     RAW_SET_PROP_SWITCH_CASE_BASIC(keyUpEvents);
   }

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

@@ -24,6 +24,9 @@ class HostPlatformViewProps : public BaseViewProps {
   WindowsViewEvents windowsEvents{};
   bool enableFocusRing{true};
   bool focusable{false};
+  int accessibilityPosInSet{0};
+  int accessibilitySetSize{0};
+  std::string accessibilityLiveRegion{"none"};
 
   // std::optional<std::string> overflowAnchor{};
   // std::optional<std::string> tooltip{};

package/Microsoft.ReactNative/IReactCompositionViewComponentBuilder.idl

@@ -13,16 +13,26 @@ import "CompositionComponentView.idl";
 
 namespace Microsoft.ReactNative.Composition
 {
+  [webhosthidden]
+  [experimental]
+  delegate void ViewComponentViewInitializer(ViewComponentView view);
+
+  [webhosthidden]
   [experimental]
-  DOC_STRING("Provides a factory method to create an instance of a ViewComponentView. See @IReactCompositionViewComponentBuilder.SetCreateViewComponentView")
-  delegate Microsoft.ReactNative.Composition.ViewComponentView CompositionViewComponentViewFactory(CreateCompositionComponentViewArgs args);
+  delegate void ComponentIslandComponentViewInitializer(ContentIslandComponentView view);
+
+  [experimental]
+  [webhosthidden]
+  delegate Microsoft.UI.Composition.Visual CreateVisualDelegate(Microsoft.ReactNative.ComponentView view);
 
   [webhosthidden]
   [experimental]
   DOC_STRING(".")
   interface IReactCompositionViewComponentBuilder
   {
-    void SetCreateViewComponentView(CompositionViewComponentViewFactory impl);
+    void SetViewComponentViewInitializer(ViewComponentViewInitializer initializer);
+    void SetContentIslandComponentViewInitializer(ComponentIslandComponentViewInitializer initializer);
+    void SetCreateVisualHandler(CreateVisualDelegate impl);
   };
 
 } // namespace Microsoft.ReactNative

package/Microsoft.ReactNative/IReactViewComponentBuilder.idl

@@ -3,6 +3,7 @@
 
 import "ViewProps.idl";
 import "ComponentView.idl";
+import "IJSValueWriter.idl";
 
 #include "DocString.h"
 
@@ -34,6 +35,18 @@ namespace Microsoft.ReactNative
     LayoutDirection LayoutDirection;
   };
 
+  [experimental]
+  runtimeclass MountChildComponentViewArgs {
+    ComponentView Child { get; };
+    UInt32 Index { get; };
+  };
+
+  [experimental]
+  runtimeclass UnmountChildComponentViewArgs {
+    ComponentView Child { get; };
+    UInt32 Index { get; };
+  };
+
   [experimental]
   DOC_STRING("A delegate that creates a @IComponentProps object for an instance of @ViewProps. See @IReactViewComponentBuilder.SetCreateProps")
   delegate IComponentProps ViewPropsFactory(ViewProps props);
@@ -54,15 +67,39 @@ namespace Microsoft.ReactNative
   delegate Object InitialStateDataFactory(IComponentProps props);
 
   [experimental]
-  DOC_STRING("Provides a factory method to create an instance of a ComponentView. See @IReactViewComponentBuilder.SetCreateView")
-  delegate ComponentView ComponentViewFactory(CreateComponentViewArgs args);
+  DOC_STRING("Provides a method to initialize an instance of a ComponentView. See @IReactViewComponentBuilder.SetComponentViewInitializer")
+  delegate void ComponentViewInitializer(ComponentView view);
+
+  [experimental]
+  delegate void HandleCommandDelegate(ComponentView source, String commandName, IJSValueReader args);
+
+  [experimental]
+  delegate void UpdateFinalizerDelegate(ComponentView source, ComponentViewUpdateMask updateMask);
+
+  [experimental]
+  delegate void UpdatePropsDelegate(ComponentView source, IComponentProps newProps, IComponentProps oldProps);
+
+  [experimental]
+  delegate void UpdateStateDelegate(ComponentView source, IComponentState newState);
+
+  [experimental]
+  delegate void MountChildComponentViewDelegate(ComponentView source, MountChildComponentViewArgs args);
+
+  [experimental]
+  delegate void UnmountChildComponentViewDelegate(ComponentView source, UnmountChildComponentViewArgs args);
+
+  [experimental]
+  runtimeclass EventEmitter {
+    void DispatchEvent(String eventName, JSValueArgWriter args);
+  };
+
+  [experimental]
+  delegate void UpdateEventEmitterDelegate(ComponentView source, EventEmitter eventEmitter);
 
   [webhosthidden]
   [experimental]
   interface IReactViewComponentBuilder
   {
-    void SetCreateComponentView(ComponentViewFactory impl);
-
     DOC_STRING("Create an implementation of your custom Props type that will be passed to your components @Composition.ICompositionViewComponent.UpdateProps method.")
     void SetCreateProps(ViewPropsFactory impl);
 
@@ -71,9 +108,24 @@ namespace Microsoft.ReactNative
     void SetInitialStateDataFactory(InitialStateDataFactory impl);
     void SetMeasureContentHandler(MeasureContentHandler impl);
     void SetLayoutHandler(LayoutHandler impl);
+
+    void SetComponentViewInitializer(ComponentViewInitializer initializer);
+    void SetCustomCommandHandler(HandleCommandDelegate impl);
+    void SetFinalizeUpdateHandler(UpdateFinalizerDelegate impl);
+    void SetUpdatePropsHandler(UpdatePropsDelegate impl);
+    void SetUpdateStateHandler(UpdateStateDelegate impl);
+    void SetUpdateEventEmitterHandler(UpdateEventEmitterDelegate impl);
+    void SetMountChildComponentViewHandler(MountChildComponentViewDelegate impl);
+    void SetUnmountChildComponentViewHandler(UnmountChildComponentViewDelegate impl);
   };
 
+  // [exclusiveto(ShadowNode)]
+  // [uuid(BF2A2A64-AB8B-47FC-BE69-E31DE6FC29A4)]
+  // interface IShadowNodeFactory
+  // {
+  // }
 
+  // [composable(IShadowNodeFactory, protected)]
   [webhosthidden]
   [experimental]
   unsealed runtimeclass ShadowNode
@@ -81,6 +133,7 @@ namespace Microsoft.ReactNative
     void EnsureUnsealed();
     Object Tag { get; set; };
     Object StateData{ get; set; };
+    EventEmitter EventEmitter { get; };
   };
 
   [webhosthidden]

package/Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp

@@ -118,11 +118,6 @@ using namespace winrt::Microsoft::ReactNative;
 
 namespace Mso::React {
 
-std::string getApplicationTempFolder() {
-  auto local = winrt::Windows::Storage::ApplicationData::Current().TemporaryFolder().Path();
-  return Microsoft::Common::Unicode::Utf16ToUtf8(local.c_str(), local.size()) + "\\";
-}
-
 //=============================================================================================
 // LoadedCallbackGuard ensures that the OnReactInstanceLoaded is always called.
 // It calls OnReactInstanceLoaded in destructor with a cancellation error.
@@ -573,6 +568,15 @@ Mso::DispatchQueueSettings CreateDispatchQueueSettings(
   return queueSettings;
 }
 
+std::unique_ptr<facebook::jsi::PreparedScriptStore> CreatePreparedScriptStore() noexcept {
+  std::unique_ptr<facebook::jsi::PreparedScriptStore> preparedScriptStore = nullptr;
+  wchar_t tempPath[MAX_PATH];
+  if (GetTempPathW(static_cast<DWORD>(std::size(tempPath)), tempPath)) {
+    preparedScriptStore = std::make_unique<facebook::react::BasePreparedScriptStoreImpl>(winrt::to_string(tempPath));
+  }
+  return preparedScriptStore;
+}
+
 #ifdef USE_FABRIC
 void ReactInstanceWin::InitializeBridgeless() noexcept {
   InitUIQueue();
@@ -640,7 +644,7 @@ void ReactInstanceWin::InitializeBridgeless() noexcept {
               }
 
               m_jsiRuntimeHolder = std::make_shared<Microsoft::ReactNative::HermesRuntimeHolder>(
-                  devSettings, m_jsMessageThread.Load(), CreateHermesPreparedScriptStore());
+                  devSettings, m_jsMessageThread.Load(), CreatePreparedScriptStore());
               auto jsRuntime = std::make_unique<Microsoft::ReactNative::HermesJSRuntime>(m_jsiRuntimeHolder);
               jsRuntime->getRuntime();
               m_bridgelessReactInstance = std::make_unique<facebook::react::ReactInstance>(
@@ -657,7 +661,8 @@ void ReactInstanceWin::InitializeBridgeless() noexcept {
             facebook::react::ReactInstance::JSRuntimeFlags options;
             m_bridgelessReactInstance->initializeRuntime(options, [=](facebook::jsi::Runtime &runtime) {
               auto logger = [loggingHook = GetLoggingCallback()](const std::string &message, unsigned int logLevel) {
-                loggingHook(static_cast<facebook::react::RCTLogLevel>(logLevel), message.c_str());
+                if (loggingHook)
+                  loggingHook(static_cast<facebook::react::RCTLogLevel>(logLevel), message.c_str());
               };
               facebook::react::bindNativeLogger(runtime, logger);
 
@@ -713,19 +718,6 @@ void ReactInstanceWin::InitializeBridgeless() noexcept {
 }
 #endif
 
-std::unique_ptr<facebook::jsi::PreparedScriptStore> ReactInstanceWin::CreateHermesPreparedScriptStore() noexcept {
-  std::unique_ptr<facebook::jsi::PreparedScriptStore> preparedScriptStore = nullptr;
-  if (Microsoft::ReactNative::HasPackageIdentity()) {
-    preparedScriptStore = std::make_unique<facebook::react::BasePreparedScriptStoreImpl>(getApplicationTempFolder());
-  } else {
-    wchar_t tempPath[MAX_PATH];
-    if (GetTempPathW(static_cast<DWORD>(std::size(tempPath)), tempPath)) {
-      preparedScriptStore = std::make_unique<facebook::react::BasePreparedScriptStoreImpl>(winrt::to_string(tempPath));
-    }
-  }
-  return preparedScriptStore;
-}
-
 void ReactInstanceWin::FireInstanceCreatedCallback() noexcept {
   // The InstanceCreated event can be used to augment the JS environment for all JS code.  So it needs to be
   // triggered before any platform JS code is run. Using m_jsMessageThread instead of jsDispatchQueue avoids
@@ -803,7 +795,7 @@ void ReactInstanceWin::InitializeWithBridge() noexcept {
           } else {
             switch (m_options.JsiEngine()) {
               case JSIEngine::Hermes: {
-                preparedScriptStore = CreateHermesPreparedScriptStore();
+                preparedScriptStore = CreatePreparedScriptStore();
 
                 auto hermesRuntimeHolder = std::make_shared<Microsoft::ReactNative::HermesRuntimeHolder>(
                     devSettings, m_jsMessageThread.Load(), std::move(preparedScriptStore));
@@ -815,17 +807,7 @@ void ReactInstanceWin::InitializeWithBridge() noexcept {
               case JSIEngine::V8:
 #if defined(USE_V8)
               {
-                if (Microsoft::ReactNative::HasPackageIdentity()) {
-                  preparedScriptStore =
-                      std::make_unique<facebook::react::BasePreparedScriptStoreImpl>(getApplicationTempFolder());
-                } else {
-                  wchar_t tempPath[MAX_PATH];
-                  if (GetTempPathW(static_cast<DWORD>(std::size(tempPath)), tempPath)) {
-                    preparedScriptStore =
-                        std::make_unique<facebook::react::BasePreparedScriptStoreImpl>(winrt::to_string(tempPath));
-                  }
-                }
-
+                preparedScriptStore = CreatePreparedScriptStore();
                 bool enableMultiThreadSupport{false};
 #ifdef USE_FABRIC
                 enableMultiThreadSupport = Microsoft::ReactNative::IsFabricEnabled(m_reactContext->Properties());

package/Microsoft.ReactNative/ReactNativeIsland.idl

@@ -59,6 +59,9 @@ namespace Microsoft.ReactNative
 
     DOC_STRING("Forward input to the RootView. Only required when not using ContentIslands")
     Int64 SendMessage(UInt32 Msg, UInt64 WParam, Int64 LParam);
+
+    void OnMounted();
+    void OnUnmounted();
   }
   }
 

package/PropertySheets/External/Microsoft.ReactNative.Composition.Package.props

@@ -11,4 +11,5 @@
   <Import Project="$(MSBuildThisFileDirectory)Microsoft.ReactNative.Common.props" />
    <!-- Fixes NuGet restore issues: -->
   <Import Project="$(ReactNativeWindowsDir)\PropertySheets\NuGet.CSharp.props" />
+  <Import Project="$(ReactNativeWindowsDir)\PropertySheets\WinUI.props" />
 </Project>

package/PropertySheets/External/Microsoft.ReactNative.Composition.Package.targets

@@ -14,5 +14,9 @@
     <!-- Needed for ucrtbased.dll when running a debug build. -->
     <SDKReference Include="Microsoft.VCLibs, Version=14.0" Condition="'$(Configuration)' == 'Debug'" />
   </ItemGroup>
+
+  <ItemGroup Condition="'$(UseExperimentalNuget)' == 'true'">
+    <PackageReference Include="$(WinUIPackageName)" Version="$(WinUIPackageVersion)" Condition="'$(OverrideWinUIPackage)'!='true'" />
+  </ItemGroup>
   
 </Project>

package/PropertySheets/External/Microsoft.ReactNative.Cpp.PackageReferences.props

@@ -5,8 +5,18 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!-- Only include Microsoft.ReactNative.* NuGet packages that C++ (app and lib) projects need when using UseExperimentalNuget. -->
-  <ItemGroup>
-    <PackageReference Include="Microsoft.ReactNative" Version="$(ReactNativeWindowsVersion)" />
-    <PackageReference Include="Microsoft.ReactNative.Cxx" Version="$(ReactNativeWindowsVersion)" />
-  </ItemGroup>
+  <Choose>
+    <When Condition="'$(UseFabric)' == 'true'">
+      <ItemGroup>
+        <PackageReference Include="Microsoft.ReactNative" Version="$(ReactNativeWindowsVersion)-Fabric" />
+        <PackageReference Include="Microsoft.ReactNative.Cxx" Version="$(ReactNativeWindowsVersion)-Fabric" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+       <ItemGroup>
+        <PackageReference Include="Microsoft.ReactNative" Version="$(ReactNativeWindowsVersion)" />
+        <PackageReference Include="Microsoft.ReactNative.Cxx" Version="$(ReactNativeWindowsVersion)" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
 </Project>

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,11 +10,11 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.74.19</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.74.21</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>74</ReactNativeWindowsMinor>
-    <ReactNativeWindowsPatch>19</ReactNativeWindowsPatch>
+    <ReactNativeWindowsPatch>21</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>003e7035d3c8e0fa14036ff257ca7916359f6b2c</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>cd70c894ca067363614e483ac519e18d57a96a72</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>

package/PropertySheets/WinUI.props

@@ -7,7 +7,7 @@
       For local testing of internal versions, modify the WinUI3Version, and comment out the addition nuget source in NuGet.Config
     -->
     <!-- This value is also used by the CLI, see /packages/@react-native-windows/generate-windows -->
-    <WinUI3Version Condition="'$(WinUI3Version)'=='' AND '$(UseExperimentalWinUI3)'=='true'">1.5.240124002-experimental2</WinUI3Version>
+    <WinUI3Version Condition="'$(WinUI3Version)'=='' AND '$(UseExperimentalWinUI3)'=='true'">1.6.240701003-experimental2</WinUI3Version>
     <WinUI3Version Condition="'$(WinUI3Version)'==''">1.5.240227000</WinUI3Version>
   </PropertyGroup>
 

package/Scripts/Microsoft.ReactNative.VersionCheck.targets

@@ -66,6 +66,8 @@
 
     <PropertyGroup>
       <_ReactNativeWindowsVersionCheckNugetVersion>$$nuGetPackageVersion$$</_ReactNativeWindowsVersionCheckNugetVersion>
+      <!-- Strip out the -Fabric qualifier from the version string if present -->
+      <_ReactNativeWindowsVersionCheckNugetVersion>$(_ReactNativeWindowsVersionCheckNugetVersion.Replace('-Fabric', ''))</_ReactNativeWindowsVersionCheckNugetVersion>
     </PropertyGroup>
    
     <!-- Validate package.json file -->

package/Shared/Shared.vcxitems

@@ -89,6 +89,10 @@
       <DependentUpon>$(ReactNativeWindowsDir)Microsoft.ReactNative\UriImageManager.idl</DependentUpon>
       <SubType>Code</SubType>
     </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\ContentIslandComponentView.cpp">
+      <ExcludedFromBuild Condition="'$(UseFabric)' != 'true'">true</ExcludedFromBuild>
+      <DependentUpon>$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionComponentView.idl</DependentUpon>
+    </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\CompositionViewComponentView.cpp">
       <ExcludedFromBuild Condition="'$(UseFabric)' != 'true'">true</ExcludedFromBuild>
     </ClCompile>
@@ -155,6 +159,9 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\AbiViewComponentDescriptor.cpp">
       <ExcludedFromBuild Condition="'$(UseFabric)' != 'true'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\AbiEventEmitter.cpp">
+      <ExcludedFromBuild Condition="'$(UseFabric)' != 'true'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\AbiViewProps.cpp">
       <ExcludedFromBuild Condition="'$(UseFabric)' != 'true'">true</ExcludedFromBuild>
     </ClCompile>

package/Shared/Shared.vcxitems.filters

@@ -323,6 +323,7 @@
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\utils\jsi-utils.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\TextDrawing.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)Networking\NetworkPropertyIds.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\AbiEventEmitter.cpp" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Source Files">

package/just-task.js

@@ -28,7 +28,7 @@ option('clean');
 
 function codegen(test) {
   execSync(
-    `react-native-windows-codegen --files src/**/*Native*.js --namespace Microsoft::ReactNativeSpecs --libraryName rnwcore --modulesWindows --modulesCxx${
+    `react-native-windows-codegen --files src/**/*Native*.js --namespace Microsoft::ReactNativeSpecs --libraryName rnwcore --modulesWindows --internalComponents --modulesCxx${
       test ? ' --test' : ''
     }`,
     {env: process.env},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.74.19",
+  "version": "0.74.21",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -26,7 +26,7 @@
     "@react-native-community/cli": "13.6.9",
     "@react-native-community/cli-platform-android": "13.6.9",
     "@react-native-community/cli-platform-ios": "13.6.9",
-    "@react-native-windows/cli": "0.74.3",
+    "@react-native-windows/cli": "0.74.5",
     "@react-native/assets": "1.0.0",
     "@react-native/assets-registry": "0.74.87",
     "@react-native/codegen": "0.74.87",
@@ -64,7 +64,7 @@
     "yargs": "^17.6.2"
   },
   "devDependencies": {
-    "@react-native-windows/codegen": "0.74.2",
+    "@react-native-windows/codegen": "0.74.3",
     "@react-native/metro-config": "0.74.87",
     "@rnw-scripts/babel-react-native-config": "0.0.0",
     "@rnw-scripts/eslint-config": "1.2.9",