react-native-windows 0.74.6 → 0.74.8

package/Shared/Networking/WinRTHttpResource.cpp

@@ -5,6 +5,7 @@
 
 #include "WinRTHttpResource.h"
 
+#include "HttpSettings.g.cpp"
 #include <CppRuntimeOptions.h>
 #include <Networking/IBlobResource.h>
 #include <ReactPropertyBag.h>
@@ -12,6 +13,7 @@
 #include <Utils/WinRTConversions.h>
 #include <utilities.h>
 #include "IRedirectEventSource.h"
+#include "Networking/NetworkPropertyIds.h"
 #include "OriginPolicyHttpFilter.h"
 #include "RedirectHttpFilter.h"
 
@@ -310,7 +312,9 @@ void WinRTHttpResource::SendRequest(
       m_onError(requestId, Utilities::HResultToString(e), false);
     }
   } catch (...) {
-    m_onError(requestId, "Unidentified error sending HTTP request", false);
+    if (m_onError) {
+      m_onError(requestId, "Unidentified error sending HTTP request", false);
+    }
   }
 }
 
@@ -329,7 +333,9 @@ void WinRTHttpResource::AbortRequest(int64_t requestId) noexcept /*override*/ {
   try {
     request.Cancel();
   } catch (hresult_error const &e) {
-    m_onError(requestId, Utilities::HResultToString(e), false);
+    if (m_onError) {
+      m_onError(requestId, Utilities::HResultToString(e), false);
+    }
   }
 }
 
@@ -645,7 +651,20 @@ void WinRTHttpResource::AddResponseHandler(shared_ptr<IResponseHandler> response
   using namespace winrt::Microsoft::ReactNative;
   using winrt::Windows::Web::Http::HttpClient;
 
-  auto redirFilter = winrt::make<RedirectHttpFilter>();
+  winrt::hstring defaultUserAgent;
+  if (inspectableProperties) {
+    auto propBag = ReactPropertyBag{inspectableProperties.as<IReactPropertyBag>()};
+    if (auto userAgentProp = propBag.Get(DefaultUserAgentPropertyId())) {
+      defaultUserAgent = *userAgentProp;
+    }
+  }
+
+  auto userAgent = GetRuntimeOptionString("Http.UserAgent");
+  if (userAgent.size() > 0) {
+    defaultUserAgent = winrt::to_hstring(userAgent);
+  }
+
+  auto redirFilter = winrt::make<RedirectHttpFilter>(defaultUserAgent);
   HttpClient client;
 
   if (static_cast<OriginPolicy>(GetRuntimeOptionInt("Http.OriginPolicy")) == OriginPolicy::None) {
@@ -665,14 +684,12 @@ void WinRTHttpResource::AddResponseHandler(shared_ptr<IResponseHandler> response
 
   // Register resource as HTTP module proxy.
   if (inspectableProperties) {
-    auto propId = ReactPropertyId<ReactNonAbiValue<weak_ptr<IHttpModuleProxy>>>{L"HttpModule.Proxy"};
-    auto propBag = ReactPropertyBag{inspectableProperties.try_as<IReactPropertyBag>()};
+    auto propBag = ReactPropertyBag{inspectableProperties.as<IReactPropertyBag>()};
     auto moduleProxy = weak_ptr<IHttpModuleProxy>{result};
-    propBag.Set(propId, std::move(moduleProxy));
+    propBag.Set(HttpModuleProxyPropertyId(), std::move(moduleProxy));
 
     // #11439 - Best-effort attempt to set up the HTTP handler after an initial call to addNetworkingHandler failed.
-    auto blobRcPropId = ReactPropertyId<ReactNonAbiValue<weak_ptr<Networking::IBlobResource>>>{L"Blob.Resource"};
-    if (auto prop = propBag.Get(blobRcPropId)) {
+    if (auto prop = propBag.Get(BlobResourcePropertyId())) {
       if (auto blobRc = prop.Value().lock()) {
         blobRc->AddNetworkingHandler();
       }
@@ -690,3 +707,14 @@ void WinRTHttpResource::AddResponseHandler(shared_ptr<IResponseHandler> response
 #pragma endregion IHttpResource
 
 } // namespace Microsoft::React::Networking
+
+namespace winrt::Microsoft::ReactNative::implementation {
+
+void HttpSettings::SetDefaultUserAgent(
+    const winrt::Microsoft::ReactNative::ReactInstanceSettings &settings,
+    const winrt::hstring &userAgent) noexcept {
+  winrt::Microsoft::ReactNative::ReactPropertyBag(settings.Properties())
+      .Set(::Microsoft::React::DefaultUserAgentPropertyId(), userAgent);
+};
+
+} // namespace winrt::Microsoft::ReactNative::implementation

package/Shared/Networking/WinRTHttpResource.h

@@ -5,6 +5,7 @@
 
 #include "IHttpResource.h"
 
+#include "HttpSettings.g.h"
 #include <Modules/IHttpModuleProxy.h>
 #include "IWinRTHttpRequestFactory.h"
 #include "WinRTTypes.h"
@@ -108,3 +109,19 @@ class WinRTHttpResource : public IHttpResource,
 };
 
 } // namespace Microsoft::React::Networking
+
+namespace winrt::Microsoft::ReactNative::implementation {
+
+struct HttpSettings {
+  HttpSettings() = default;
+
+  static void SetDefaultUserAgent(
+      const winrt::Microsoft::ReactNative::ReactInstanceSettings &settings,
+      const winrt::hstring &userAgent) noexcept;
+};
+
+} // namespace winrt::Microsoft::ReactNative::implementation
+
+namespace winrt::Microsoft::ReactNative::factory_implementation {
+struct HttpSettings : HttpSettingsT<HttpSettings, implementation::HttpSettings> {};
+} // namespace winrt::Microsoft::ReactNative::factory_implementation

package/Shared/Shared.vcxitems

@@ -64,14 +64,9 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\CompositionDynamicAutomationProvider.cpp">
       <ExcludedFromBuild Condition="'$(UseFabric)' != 'true'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\CompositionRootView.cpp">
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\ReactNativeIsland.cpp">
       <ExcludedFromBuild Condition="'$(UseFabric)' != 'true'">true</ExcludedFromBuild>
-      <DependentUpon>$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionRootView.idl</DependentUpon>
-      <SubType>Code</SubType>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\CompositionRootView_emptyimpl.cpp">
-      <ExcludedFromBuild Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' != 'true'">true</ExcludedFromBuild>
-      <DependentUpon>$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionRootView.idl</DependentUpon>
+      <DependentUpon>$(ReactNativeWindowsDir)Microsoft.ReactNative\ReactNativeIsland.idl</DependentUpon>
       <SubType>Code</SubType>
     </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\CompositionUIService.cpp">
@@ -256,6 +251,7 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)Modules\StatusBarManagerModule.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)Modules\WebSocketModule.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)Networking\DefaultBlobResource.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)Networking\NetworkPropertyIds.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)Networking\OriginPolicyHttpFilter.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)Networking\RedirectHttpFilter.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)Networking\WinRTHttpResource.cpp" />
@@ -287,7 +283,7 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\CompositionHwndHost.h" />
     <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\CompositionRootView.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\ReactNativeIsland.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" />
@@ -618,6 +614,7 @@
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\componentregistry\native\NativeComponentRegistryBinding.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <Midl Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\HttpSettings.idl" />
     <Midl Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\IJSValueReader.idl" />
     <Midl Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\IJSValueWriter.idl" />
     <Midl Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\IReactContext.idl" />
@@ -643,7 +640,7 @@
     <Midl Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\FocusManager.idl" />
     <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\CompositionRootView.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\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

@@ -218,7 +218,7 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\CompositionDynamicAutomationProvider.cpp">
       <Filter>Source Files\Fabric\Composition</Filter>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\CompositionRootView.cpp">
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\ReactNativeIsland.cpp">
       <Filter>Source Files\Fabric\Composition</Filter>
     </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\CompositionUIService.cpp">
@@ -230,7 +230,7 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\CompositionHwndHost.cpp">
       <Filter>Source Files\Fabric</Filter>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\CompositionRootView.cpp">
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\ReactNativeIsland.cpp">
       <Filter>Source Files\Fabric</Filter>
     </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\CompositionUIService.cpp">
@@ -322,6 +322,7 @@
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\ExecutionContext.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\utils\jsi-utils.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\TextDrawing.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)Networking\NetworkPropertyIds.cpp" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Source Files">
@@ -759,7 +760,7 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\CompositionDynamicAutomationProvider.h">
       <Filter>Header Files\Fabric\Composition</Filter>
     </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\CompositionRootView.h">
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\ReactNativeIsland.h">
       <Filter>Header Files\Fabric\Composition</Filter>
     </ClInclude>
     <ClInclude Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\CompositionUIService.h">
@@ -822,6 +823,7 @@
     </None>
   </ItemGroup>
   <ItemGroup>
+    <Midl Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\HttpSettings.idl" />
     <Midl Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\IJSValueReader.idl" />
     <Midl Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\IJSValueWriter.idl" />
     <Midl Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\IReactContext.idl" />

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.74.6",
+  "version": "0.74.8",
   "license": "MIT",
   "repository": {
     "type": "git",

package/templates/cpp-app/windows/MyApp/MyApp.cpp

@@ -25,7 +25,7 @@ float ScaleFactor(HWND hwnd) noexcept {
 }
 
 void UpdateRootViewSizeToAppWindow(
-    winrt::Microsoft::ReactNative::CompositionRootView const &rootView,
+    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);
@@ -34,8 +34,9 @@ void UpdateRootViewSizeToAppWindow(
   // Do not relayout when minimized
   if (window.Presenter().as<winrt::Microsoft::UI::Windowing::OverlappedPresenter>().State() !=
       winrt::Microsoft::UI::Windowing::OverlappedPresenterState::Minimized) {
-    rootView.Arrange(size);
-    rootView.Size(size);
+    winrt::Microsoft::ReactNative::LayoutConstraints constraints;
+    constraints.MaximumSize = constraints.MinimumSize = size;
+    rootView.Arrange(constraints, {0,0});
   }
 }
 
@@ -110,7 +111,7 @@ _Use_decl_annotations_ int CALLBACK WinMain(HINSTANCE instance, HINSTANCE, PSTR
   // Create a RootView which will present a react-native component
   winrt::Microsoft::ReactNative::ReactViewOptions viewOptions;
   viewOptions.ComponentName(mainComponentName);
-  auto rootView = winrt::Microsoft::ReactNative::CompositionRootView(compositor);
+  auto rootView = winrt::Microsoft::ReactNative::ReactNativeIsland(compositor);
   rootView.ReactViewHost(winrt::Microsoft::ReactNative::ReactCoreInjection::MakeViewHost(host, viewOptions));
 
   // Update the size of the RootView when the AppWindow changes size

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

@@ -1,149 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-#include "pch.h"
-
-#include "CompositionRootView.h"
-
-#include "CompositionRootView.g.cpp"
-#include "FocusNavigationRequest.g.cpp"
-
-namespace winrt::Microsoft::ReactNative::implementation {
-
-//! This class ensures that we access ReactRootView from UI thread.
-struct CompositionReactViewInstance
-    : public winrt::implements<CompositionReactViewInstance, winrt::Microsoft::ReactNative::IReactViewInstance> {
-  CompositionReactViewInstance(
-      winrt::weak_ref<winrt::Microsoft::ReactNative::implementation::CompositionRootView> &&) noexcept {}
-
-  void InitRootView(
-      winrt::Microsoft::ReactNative::IReactContext,
-      winrt::Microsoft::ReactNative::ReactViewOptions) noexcept {}
-
-  void UpdateRootView() noexcept {}
-  void UninitRootView() noexcept {}
-};
-
-//===========================================================================
-// ReactViewInstance inline implementation
-//===========================================================================
-
-CompositionRootView::CompositionRootView() noexcept {}
-CompositionRootView::~CompositionRootView() noexcept {}
-
-CompositionRootView::CompositionRootView(const winrt::Microsoft::UI::Composition::Compositor &compositor) noexcept {}
-
-ReactNative::IReactViewHost CompositionRootView::ReactViewHost() noexcept {
-  return nullptr;
-}
-
-void CompositionRootView::ReactViewHost(winrt::Microsoft::ReactNative::IReactViewHost const &) noexcept {}
-
-winrt::Microsoft::UI::Composition::Visual CompositionRootView::RootVisual() noexcept {
-  return nullptr;
-}
-
-winrt::Microsoft::ReactNative::Composition::Experimental::IVisual CompositionRootView::InternalRootVisual() noexcept {
-  return nullptr;
-}
-
-void CompositionRootView::InternalRootVisual(
-    const winrt::Microsoft::ReactNative::Composition::Experimental::IVisual &) noexcept {}
-
-winrt::Microsoft::UI::Content::ContentIsland CompositionRootView::Island() noexcept {
-  return nullptr;
-}
-
-winrt::Windows::Foundation::Size CompositionRootView::Size() noexcept {
-  return {};
-}
-
-void CompositionRootView::Size(winrt::Windows::Foundation::Size) noexcept {}
-
-float CompositionRootView::ScaleFactor() noexcept {
-  return 0;
-}
-
-void CompositionRootView::ScaleFactor(float) noexcept {}
-
-winrt::Microsoft::ReactNative::Composition::Theme CompositionRootView::Theme() noexcept {
-  return nullptr;
-}
-void CompositionRootView::Theme(const winrt::Microsoft::ReactNative::Composition::Theme &) noexcept {}
-
-winrt::Microsoft::ReactNative::Composition::ICustomResourceLoader CompositionRootView::Resources() noexcept {
-  return nullptr;
-}
-void CompositionRootView::Resources(
-    const winrt::Microsoft::ReactNative::Composition::ICustomResourceLoader &) noexcept {}
-
-winrt::IInspectable CompositionRootView::GetUiaProvider() noexcept {
-  return nullptr;
-}
-
-std::string CompositionRootView::JSComponentName() const noexcept {
-  return {};
-}
-
-int64_t CompositionRootView::GetActualHeight() const noexcept {
-  return 0;
-}
-
-int64_t CompositionRootView::GetActualWidth() const noexcept {
-  return 0;
-}
-
-int64_t CompositionRootView::GetTag() const noexcept {
-  return 0;
-}
-
-int64_t CompositionRootView::RootTag() const noexcept {
-  return 0;
-}
-
-void CompositionRootView::SetTag(int64_t) noexcept {}
-
-void CompositionRootView::SetWindow(uint64_t) noexcept {}
-
-int64_t CompositionRootView::SendMessage(uint32_t, uint64_t, int64_t) noexcept {
-  return 0;
-}
-
-void CompositionRootView::InitRootView(
-    winrt::Microsoft::ReactNative::IReactContext &&,
-    winrt::Microsoft::ReactNative::ReactViewOptions &&) noexcept {}
-
-void CompositionRootView::UpdateRootView() noexcept {}
-
-void CompositionRootView::UpdateRootViewInternal() noexcept {}
-
-void CompositionRootView::UninitRootView() noexcept {}
-
-void CompositionRootView::ClearLoadingUI() noexcept {}
-
-void CompositionRootView::EnsureLoadingUI() noexcept {}
-
-void CompositionRootView::ShowInstanceLoaded() noexcept {}
-
-void CompositionRootView::ShowInstanceError() noexcept {}
-
-void CompositionRootView::ShowInstanceLoading() noexcept {}
-
-winrt::Windows::Foundation::Size CompositionRootView::Measure(winrt::Windows::Foundation::Size const &) const {
-  return {};
-}
-
-winrt::Windows::Foundation::Size CompositionRootView::Arrange(winrt::Windows::Foundation::Size) const {
-  return {};
-}
-
-winrt::Microsoft::ReactNative::Composition::implementation::RootComponentView *
-CompositionRootView::GetComponentView() noexcept {
-  return nullptr;
-}
-
-winrt::Microsoft::ReactNative::FocusNavigationResult CompositionRootView::NavigateFocus(
-    const winrt::Microsoft::ReactNative::FocusNavigationRequest &) noexcept {
-  return nullptr;
-}
-
-} // namespace winrt::Microsoft::ReactNative::implementation

package/Microsoft.ReactNative/Views/ICompositionRootView.h

@@ -1,18 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-#pragma once
-
-#include <Fabric/Composition/CompositionHelpers.h>
-#include <IReactRootView.h>
-#include <React.h>
-#include <folly/dynamic.h>
-#include <winrt/Windows.UI.Composition.h>
-
-namespace Microsoft::ReactNative {
-
-struct ICompositionRootView : public facebook::react::IReactRootView {
-  virtual float ScaleFactor() noexcept = 0;
-};
-
-} // namespace Microsoft::ReactNative