react-native-windows 0.74.5 → 0.74.7

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

@@ -49,8 +49,8 @@ struct WindowsTextInputComponentView
   void HandleCommand(winrt::hstring commandName, const winrt::Microsoft::ReactNative::IJSValueReader &args) noexcept
       override;
   void OnRenderingDeviceLost() noexcept override;
-  void onFocusLost() noexcept override;
-  void onFocusGained() noexcept override;
+  void onLostFocus(const winrt::Microsoft::ReactNative::Composition::Input::RoutedEventArgs &args) noexcept override;
+  void onGotFocus(const winrt::Microsoft::ReactNative::Composition::Input::RoutedEventArgs &args) noexcept override;
   std::string DefaultControlType() const noexcept override;
   std::string DefaultAccessibleName() const noexcept override;
   std::string DefaultHelpText() const noexcept override;

package/Microsoft.ReactNative/Fabric/FabricUIManagerModule.cpp

@@ -12,7 +12,6 @@
 #include <Fabric/FabricUIManagerModule.h>
 #include <Fabric/ReactNativeConfigProperties.h>
 #include <Fabric/WindowsComponentDescriptorRegistry.h>
-#include <ICompositionRootView.h>
 #include <IReactContext.h>
 #include <IReactRootView.h>
 #include <JSI/jsi.h>
@@ -144,6 +143,7 @@ const IComponentViewRegistry &FabricUIManager::GetViewRegistry() const noexcept
 void FabricUIManager::startSurface(
     const winrt::Microsoft::ReactNative::CompositionRootView &rootView,
     facebook::react::SurfaceId surfaceId,
+    const facebook::react::LayoutConstraints &layoutConstraints,
     const std::string &moduleName,
     const folly::dynamic &initialProps) noexcept {
   m_surfaceRegistry.insert({surfaceId, {rootView}});
@@ -158,22 +158,16 @@ void FabricUIManager::startSurface(
     root->start(rootView);
   });
 
-  facebook::react::LayoutContext context;
-  facebook::react::LayoutConstraints constraints;
-  context.pointScaleFactor = rootView.ScaleFactor();
-  context.fontSizeMultiplier = rootView.ScaleFactor();
-  constraints.minimumSize.height = rootView.Size().Height;
-  constraints.minimumSize.width = rootView.Size().Width;
-  constraints.maximumSize.height = rootView.Size().Height;
-  constraints.maximumSize.width = rootView.Size().Width;
-  constraints.layoutDirection = facebook::react::LayoutDirection::LeftToRight;
+  facebook::react::LayoutContext layoutContext;
+  layoutContext.pointScaleFactor = rootView.ScaleFactor();
+  layoutContext.fontSizeMultiplier = rootView.ScaleFactor();
 
   m_surfaceManager->startSurface(
       surfaceId,
       moduleName,
       initialProps,
-      constraints, // layout constraints
-      context // layout context
+      layoutConstraints,
+      layoutContext // layout context
   );
 }
 

package/Microsoft.ReactNative/Fabric/FabricUIManagerModule.h

@@ -31,6 +31,7 @@ struct FabricUIManager final : public std::enable_shared_from_this<FabricUIManag
   void startSurface(
       const winrt::Microsoft::ReactNative::CompositionRootView &rootView,
       facebook::react::SurfaceId surfaceId,
+      const facebook::react::LayoutConstraints &layoutConstraints,
       const std::string &moduleName,
       const folly::dynamic &initialProps) noexcept;
 

package/Microsoft.ReactNative/FocusManager.idl

@@ -0,0 +1,22 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+import "ComponentView.idl";
+#include "DocString.h"
+
+namespace Microsoft.ReactNative.Composition
+{
+
+  [default_interface]
+  [webhosthidden]
+  [experimental]
+  runtimeclass FocusManager
+  {
+    DOC_STRING("Retrieves the first component that can receive focus based on the specified scope.")
+    static Microsoft.ReactNative.ComponentView FindFirstFocusableElement(Microsoft.ReactNative.ComponentView searchScope);
+
+    DOC_STRING("Retrieves the last component that can receive focus based on the specified scope.")
+    static Microsoft.ReactNative.ComponentView FindLastFocusableElement(Microsoft.ReactNative.ComponentView searchScope);
+  }
+
+} // namespace Microsoft.ReactNative.Composition

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,11 +10,11 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.74.5</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.74.7</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>74</ReactNativeWindowsMinor>
-    <ReactNativeWindowsPatch>5</ReactNativeWindowsPatch>
+    <ReactNativeWindowsPatch>7</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>481f89da064d5a33f4b5b79088dc760bd49f6dd2</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>92b63ecf09a8f2c61a3c972e76bfdb535707d87b</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>

package/Shared/Shared.vcxitems

@@ -69,11 +69,6 @@
       <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>
-      <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>
@@ -84,6 +79,11 @@
       <DependentUpon>$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionUIService.idl</DependentUpon>
       <SubType>Code</SubType>
     </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\FocusManager.cpp">
+      <ExcludedFromBuild Condition="'$(UseFabric)' != 'true'">true</ExcludedFromBuild>
+      <DependentUpon>$(ReactNativeWindowsDir)Microsoft.ReactNative\FocusManager.idl</DependentUpon>
+      <SubType>Code</SubType>
+    </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\UriImageManager.cpp">
       <ExcludedFromBuild Condition="'$(UseFabric)' != 'true'">true</ExcludedFromBuild>
       <DependentUpon>$(ReactNativeWindowsDir)Microsoft.ReactNative\UriImageManager.idl</DependentUpon>
@@ -635,6 +635,7 @@
     <Midl Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\ComponentView.idl" />
     <Midl Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Composition.Input.idl" />
     <Midl Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionComponentView.idl" />
+    <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" />

package/package.json

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

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

@@ -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});
   }
 }
 

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