react-native-windows 0.74.20 → 0.74.22

package/Microsoft.ReactNative/ComponentView.idl

@@ -49,6 +49,15 @@ namespace Microsoft.ReactNative
     All           = 0x0000000F,
   };
 
+  enum FocusNavigationDirection
+  {
+    None,
+    Next,
+    Previous,
+    First,
+    Last,
+  };
+
   [webhosthidden]
   [experimental]
   interface IComponentState 
@@ -60,16 +69,10 @@ namespace Microsoft.ReactNative
     void UpdateStateWithMutationAndPriority(StateUpdateMutation mutation, EventPriority priority);
   };
 
-  [experimental]
-  [webhosthidden]
-  unsealed runtimeclass CreateComponentViewArgs {
-    Int32 Tag {get;};
-    IReactContext ReactContext { get;};
-  };
-
   [experimental]
   [webhosthidden]
   runtimeclass LosingFocusEventArgs : Microsoft.ReactNative.Composition.Input.RoutedEventArgs {
+    FocusNavigationDirection Direction { get; };
     Microsoft.ReactNative.ComponentView NewFocusedComponent { get; };
     Microsoft.ReactNative.ComponentView OldFocusedComponent { get; };
 
@@ -80,6 +83,7 @@ namespace Microsoft.ReactNative
   [experimental]
   [webhosthidden]
   runtimeclass GettingFocusEventArgs : Microsoft.ReactNative.Composition.Input.RoutedEventArgs {
+    FocusNavigationDirection Direction { get; };
     Microsoft.ReactNative.ComponentView NewFocusedComponent { get; };
     Microsoft.ReactNative.ComponentView OldFocusedComponent { get; };
 
@@ -89,40 +93,48 @@ namespace Microsoft.ReactNative
 
   [experimental]
   [webhosthidden]
-  unsealed runtimeclass ComponentView {
-    ComponentView(CreateComponentViewArgs args);
+  runtimeclass LayoutMetricsChangedArgs {
+    LayoutMetrics NewLayoutMetrics { get; };
+    LayoutMetrics OldLayoutMetrics { get; };
+  };
+
 
+  // [exclusiveto(ComponentView)]
+  // [uuid(AEE8C30B-0E56-4FB8-8A80-D5CA9DE90916)]
+  // interface IComponentViewFactory
+  // {
+  // }
+
+  // [composable(IComponentViewFactory, protected)]
+  [experimental]
+  [webhosthidden]
+  unsealed runtimeclass ComponentView {
     Int32 Tag { get; };
     ComponentView Parent { get; };
     IVectorView<ComponentView> Children { get; };
-    IReactContext ReactContext { get;};
+    IReactContext ReactContext { get; };
+    LayoutMetrics LayoutMetrics { get; };
+    IInspectable UserData;
 
-    overridable void MountChildComponentView(ComponentView childComponentView, UInt32 index);
-    overridable void UnmountChildComponentView(ComponentView childComponentView, UInt32 index);
-    overridable void HandleCommand(String commandName, IJSValueReader args);
-    overridable void UpdateProps(IComponentProps props, IComponentProps oldProps);
-    overridable void UpdateState(IComponentState state);
-    overridable void UpdateLayoutMetrics(LayoutMetrics metrics, LayoutMetrics oldMetrics);
-    overridable void FinalizeUpdates(ComponentViewUpdateMask updateMask);
+    Boolean TryFocus();
 
     DOC_STRING("Used to handle key down events when this component is focused, or if a child component did not handle the key down")
-    overridable void OnKeyDown(Microsoft.ReactNative.Composition.Input.KeyboardSource source, Microsoft.ReactNative.Composition.Input.KeyRoutedEventArgs args);
-
+    event Windows.Foundation.EventHandler<Microsoft.ReactNative.Composition.Input.KeyRoutedEventArgs> KeyDown;
     DOC_STRING("Used to handle key up events when this component is focused, or if a child component did not handle the key up")
-    overridable void OnKeyUp(Microsoft.ReactNative.Composition.Input.KeyboardSource source, Microsoft.ReactNative.Composition.Input.KeyRoutedEventArgs args);
-
-    overridable void OnCharacterReceived(Microsoft.ReactNative.Composition.Input.KeyboardSource source, Microsoft.ReactNative.Composition.Input.CharacterReceivedRoutedEventArgs args);
-
-    overridable void OnPointerPressed(Microsoft.ReactNative.Composition.Input.PointerRoutedEventArgs args);
-    overridable void OnPointerReleased(Microsoft.ReactNative.Composition.Input.PointerRoutedEventArgs args);
-    overridable void OnPointerMoved(Microsoft.ReactNative.Composition.Input.PointerRoutedEventArgs args);
-    overridable void OnPointerWheelChanged(Microsoft.ReactNative.Composition.Input.PointerRoutedEventArgs args);
-    overridable void OnPointerEntered(Microsoft.ReactNative.Composition.Input.PointerRoutedEventArgs args);
-    overridable void OnPointerExited(Microsoft.ReactNative.Composition.Input.PointerRoutedEventArgs args);
-    overridable void OnPointerCaptureLost();
-
-    Boolean TryFocus();
+    event Windows.Foundation.EventHandler<Microsoft.ReactNative.Composition.Input.KeyRoutedEventArgs> KeyUp;
+    event Windows.Foundation.EventHandler<Microsoft.ReactNative.Composition.Input.CharacterReceivedRoutedEventArgs> CharacterReceived;
+    event Windows.Foundation.EventHandler<Microsoft.ReactNative.Composition.Input.PointerRoutedEventArgs> PointerPressed;
+    event Windows.Foundation.EventHandler<Microsoft.ReactNative.Composition.Input.PointerRoutedEventArgs> PointerReleased;
+    event Windows.Foundation.EventHandler<Microsoft.ReactNative.Composition.Input.PointerRoutedEventArgs> PointerMoved;
+    event Windows.Foundation.EventHandler<Microsoft.ReactNative.Composition.Input.PointerRoutedEventArgs> PointerWheelChanged;
+    event Windows.Foundation.EventHandler<Microsoft.ReactNative.Composition.Input.PointerRoutedEventArgs> PointerEntered;
+    event Windows.Foundation.EventHandler<Microsoft.ReactNative.Composition.Input.PointerRoutedEventArgs> PointerExited;
+    event Windows.Foundation.EventHandler<ComponentView> PointerCaptureLost;
     
+    event Windows.Foundation.EventHandler<ComponentView> Destroying;
+    event Windows.Foundation.EventHandler<LayoutMetricsChangedArgs> LayoutMetricsChanged;
+    event Windows.Foundation.EventHandler<ComponentView> Mounted;
+    event Windows.Foundation.EventHandler<ComponentView> Unmounted;
     event Windows.Foundation.EventHandler<LosingFocusEventArgs> LosingFocus;
     event Windows.Foundation.EventHandler<GettingFocusEventArgs> GettingFocus;
     event Windows.Foundation.EventHandler<Microsoft.ReactNative.Composition.Input.RoutedEventArgs> LostFocus;

package/Microsoft.ReactNative/Composition.Input.idl

@@ -23,6 +23,7 @@ namespace Microsoft.ReactNative.Composition.Input
     Windows.System.VirtualKey Key { get; };
     Microsoft.UI.Input.PhysicalKeyStatus KeyStatus { get; };
     Windows.System.VirtualKey OriginalKey { get; };
+    KeyboardSource KeyboardSource { get; };
   }
 
   interface CharacterReceivedRoutedEventArgs requires RoutedEventArgs
@@ -30,6 +31,7 @@ namespace Microsoft.ReactNative.Composition.Input
     Boolean Handled { get; set; };
     Microsoft.UI.Input.PhysicalKeyStatus KeyStatus { get; };
     Int32 KeyCode { get; };
+    KeyboardSource KeyboardSource { get; };
   };
 
   interface IPointerPointTransform
@@ -104,6 +106,7 @@ namespace Microsoft.ReactNative.Composition.Input
     UInt64 Timestamp { get; };
     PointerPoint GetOffsetPoint(
         Windows.Foundation.Point offset);
+    Microsoft.UI.Input.PointerPoint Inner { get; };
   };
 
   runtimeclass PointerRoutedEventArgs : RoutedEventArgs

package/Microsoft.ReactNative/CompositionComponentView.idl

@@ -29,116 +29,135 @@ namespace Microsoft.ReactNative.Composition
   namespace Experimental {
     [webhosthidden]
     [experimental]
-    interface IInternalCreateComponentViewArgs
+    interface IInternalComponentView
     {
       ICompositionContext CompositionContext { get; };
     }
   }
 
-  [experimental]
-  [webhosthidden]
-  runtimeclass CreateCompositionComponentViewArgs : Microsoft.ReactNative.CreateComponentViewArgs {
-    Microsoft.UI.Composition.Compositor Compositor { get; };
-    ComponentViewFeatures Features;
-  };
+  // [exclusiveto(ComponentView)]
+  // [uuid(ABFAC092-E527-47DC-9CF9-7A4003B0AFB0)]
+  // interface IComponentViewFactory
+  // {
+  // }
 
+  // [composable(IComponentViewFactory, protected)]
   [experimental]
   [webhosthidden]
   unsealed runtimeclass ComponentView : Microsoft.ReactNative.ComponentView {
-    ComponentView(CreateCompositionComponentViewArgs args);
-
     Microsoft.UI.Composition.Compositor Compositor { get; };
     RootComponentView Root { get; };
     Theme Theme;
-    overridable void OnThemeChanged();
+
+    event Windows.Foundation.EventHandler<IInspectable> ThemeChanged;
     Boolean CapturePointer(Microsoft.ReactNative.Composition.Input.Pointer pointer);
     void ReleasePointerCapture(Microsoft.ReactNative.Composition.Input.Pointer pointer);
   };
 
   namespace Experimental {
+
+    [webhosthidden]
+    [experimental]
+    delegate Microsoft.ReactNative.Composition.Experimental.IVisual CreateInternalVisualDelegate(Microsoft.ReactNative.ComponentView view);
+
     [webhosthidden]
     [experimental]
     DOC_STRING("Custom ViewComponents need to implement this interface to be able to provide a custom"
     " visual using the composition context that allows custom compositors. This is only required for"
     " custom components that need to support running in RNW instances with custom compositors. Most"
-    " custom components can just override CreateVisual on ViewComponentView."
+  " custom components can just set CreateVisualHandler on ViewComponentView."
     " This will be removed in a future version")
     interface IInternalCreateVisual
     {
-      Microsoft.ReactNative.Composition.Experimental.IVisual CreateInternalVisual();
+      CreateInternalVisualDelegate CreateInternalVisualHandler;
     }
   }
 
+  // [exclusiveto(ViewComponentView)]
+  // [uuid(756AA1DF-ED74-467E-9BAA-3797B39B1875)]
+  // interface IViewComponentViewFactory
+  // {
+  // }
+
+  // [composable(IViewComponentViewFactory, protected)]
   [experimental]
   [webhosthidden]
   unsealed runtimeclass ViewComponentView : ComponentView {
-    ViewComponentView(CreateCompositionComponentViewArgs args);
 
     Microsoft.ReactNative.ViewProps ViewProps { get; };
+  };
 
-    overridable Microsoft.UI.Composition.Visual CreateVisual();
+  // Some other interfaces we could consider implementing/exposing
+  // Use ifdef USE_EXPERIMENTAL_WINUI3 to add these
+  // Microsoft.UI.Content.IContentLink // Use ifdef USE_EXPERIMENTAL_WINUI3
+  // Microsoft.UI.Content.IContentSiteBridge 
+  // Microsoft.UI.Content.IContentSiteBridge2 // Use ifdef USE_EXPERIMENTAL_WINUI3
+  [experimental]
+  [webhosthidden]
+  runtimeclass ContentIslandComponentView : ViewComponentView { 
+    void Connect(Microsoft.UI.Content.ContentIsland contentIsland);
   };
 
   [experimental]
   [webhosthidden]
   [default_interface]
-  unsealed runtimeclass SwitchComponentView : ViewComponentView {
+  runtimeclass SwitchComponentView : ViewComponentView {
   };
 
   [experimental]
   [webhosthidden]
   [default_interface]
-  unsealed runtimeclass RootComponentView : ViewComponentView {
+  runtimeclass RootComponentView : ViewComponentView {
     Microsoft.ReactNative.ComponentView GetFocusedComponent();
   };
   
   [experimental]
   [webhosthidden]
   [default_interface]
-  unsealed runtimeclass DebuggingOverlayComponentView : ViewComponentView {
+  runtimeclass DebuggingOverlayComponentView : ViewComponentView {
   };
 
   [experimental]
   [webhosthidden]
   [default_interface]
-  unsealed runtimeclass ActivityIndicatorComponentView : ViewComponentView {
+  runtimeclass ActivityIndicatorComponentView : ViewComponentView {
   };
 
   [experimental]
   [webhosthidden]
   [default_interface]
-  unsealed runtimeclass WindowsModalHostComponentView : ViewComponentView {
+  runtimeclass WindowsModalHostComponentView : ViewComponentView {
   };
 
   [experimental]
   [webhosthidden]
   [default_interface]
-  unsealed runtimeclass ImageComponentView : ViewComponentView {
+  runtimeclass ImageComponentView : ViewComponentView {
     Microsoft.ReactNative.ImageProps ViewProps { get; };
   };
 
   [experimental]
   [webhosthidden]
   [default_interface]
-  unsealed runtimeclass ParagraphComponentView : ViewComponentView {
+  runtimeclass ParagraphComponentView : ViewComponentView {
   };
 
   [experimental]
   [webhosthidden]
   [default_interface]
-  unsealed runtimeclass ScrollViewComponentView : ViewComponentView {
+  runtimeclass ScrollViewComponentView : ViewComponentView {
   };
 
   [experimental]
   [webhosthidden]
   [default_interface]
-  unsealed runtimeclass UnimplementedNativeViewComponentView : ViewComponentView {
+  runtimeclass UnimplementedNativeViewComponentView : ViewComponentView {
   };
 
   [experimental]
   [webhosthidden]
   [default_interface]
-  unsealed runtimeclass WindowsTextInputComponentView : ViewComponentView {
+  runtimeclass WindowsTextInputComponentView : ViewComponentView {
   };
   
 } // namespace Microsoft.ReactNative

package/Microsoft.ReactNative/CompositionSwitcher.idl

@@ -3,6 +3,7 @@
 
 #include "NamespaceRedirect.h"
 #include "DocString.h"
+import "Composition.Input.idl";
 
 namespace Microsoft.ReactNative.Composition.Experimental
 {
@@ -112,6 +113,8 @@ namespace Microsoft.ReactNative.Composition.Experimental
     Windows.Foundation.Numerics.Vector3 ScrollPosition { get; };
     void ScrollBy(Windows.Foundation.Numerics.Vector3 offset, Boolean animate);
     void TryUpdatePosition(Windows.Foundation.Numerics.Vector3 position, Boolean animate);
+    void OnPointerPressed(Microsoft.ReactNative.Composition.Input.PointerRoutedEventArgs args);
+    Boolean Horizontal;
   }
 
   [webhosthidden]

package/Microsoft.ReactNative/Fabric/AbiEventEmitter.cpp

@@ -0,0 +1,21 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#include "AbiEventEmitter.h"
+#include "JsiWriter.h"
+
+namespace winrt::Microsoft::ReactNative::implementation {
+
+EventEmitter::EventEmitter(facebook::react::EventEmitter::Shared const &eventEmitter) : m_eventEmitter(eventEmitter) {}
+
+void EventEmitter::DispatchEvent(
+    winrt::hstring eventName,
+    const winrt::Microsoft::ReactNative::JSValueArgWriter &args) {
+  m_eventEmitter->dispatchEvent(winrt::to_string(eventName), [args](facebook::jsi::Runtime &runtime) {
+    auto writer = winrt::make<JsiWriter>(runtime);
+    args(writer);
+    return winrt::get_self<JsiWriter>(writer)->MoveResult();
+  });
+}
+
+} // namespace winrt::Microsoft::ReactNative::implementation

package/Microsoft.ReactNative/Fabric/AbiEventEmitter.h

@@ -0,0 +1,23 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#pragma once
+
+#include "ViewProps.g.h"
+
+#include "EventEmitter.g.h"
+#include <react/renderer/core/EventEmitter.h>
+#include <winrt/Microsoft.ReactNative.h>
+
+namespace winrt::Microsoft::ReactNative::implementation {
+
+struct EventEmitter : EventEmitterT<EventEmitter> {
+  EventEmitter(facebook::react::EventEmitter::Shared const &eventEmitter);
+
+  void DispatchEvent(winrt::hstring eventName, const winrt::Microsoft::ReactNative::JSValueArgWriter &args);
+
+ private:
+  facebook::react::EventEmitter::Shared const m_eventEmitter;
+};
+
+} // namespace winrt::Microsoft::ReactNative::implementation

package/Microsoft.ReactNative/Fabric/AbiShadowNode.cpp

@@ -65,6 +65,13 @@ void ShadowNode::StateData(winrt::IInspectable tag) noexcept {
   }
 }
 
+winrt::Microsoft::ReactNative::EventEmitter ShadowNode::EventEmitter() const noexcept {
+  if (auto shadowNode = m_shadowNode.lock()) {
+    return winrt::make<winrt::Microsoft::ReactNative::implementation::EventEmitter>(shadowNode->getEventEmitter());
+  }
+  return nullptr;
+}
+
 } // namespace winrt::Microsoft::ReactNative::implementation
 
 namespace Microsoft::ReactNative {

package/Microsoft.ReactNative/Fabric/AbiShadowNode.h

@@ -8,6 +8,7 @@
 #include "YogaLayoutableShadowNode.g.h"
 #include <react/components/rnwcore/EventEmitters.h>
 #include <unordered_map>
+#include "AbiEventEmitter.h"
 #include "AbiState.h"
 #include "AbiViewProps.h"
 
@@ -42,6 +43,8 @@ struct ShadowNode : ShadowNodeT<ShadowNode> {
   winrt::IInspectable StateData() const noexcept;
   void StateData(winrt::IInspectable tag) noexcept;
 
+  winrt::Microsoft::ReactNative::EventEmitter EventEmitter() const noexcept;
+
  protected:
   facebook::react::ShadowNode::Weak m_shadowNode;
   winrt::IInspectable m_tag;