react-native-windows 0.74.0-preview.3 → 0.74.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (66) hide show
  1. package/Microsoft.ReactNative/CompositionComponentView.idl +18 -3
  2. package/Microsoft.ReactNative/CompositionContext.idl +5 -5
  3. package/Microsoft.ReactNative/CompositionRootView.idl +22 -8
  4. package/Microsoft.ReactNative/CompositionSwitcher.idl +2 -2
  5. package/Microsoft.ReactNative/CompositionUIService.idl +8 -6
  6. package/Microsoft.ReactNative/Fabric/AbiViewProps.cpp +8 -1
  7. package/Microsoft.ReactNative/Fabric/AbiViewProps.h +7 -2
  8. package/Microsoft.ReactNative/Fabric/Composition/ActivityIndicatorComponentView.cpp +4 -3
  9. package/Microsoft.ReactNative/Fabric/Composition/ActivityIndicatorComponentView.h +5 -5
  10. package/Microsoft.ReactNative/Fabric/Composition/ComponentViewRegistry.cpp +1 -1
  11. package/Microsoft.ReactNative/Fabric/Composition/ComponentViewRegistry.h +2 -1
  12. package/Microsoft.ReactNative/Fabric/Composition/CompositionContextHelper.cpp +181 -154
  13. package/Microsoft.ReactNative/Fabric/Composition/CompositionContextHelper.h +8 -8
  14. package/Microsoft.ReactNative/Fabric/Composition/CompositionContextHelper_emptyimpl.cpp +13 -13
  15. package/Microsoft.ReactNative/Fabric/Composition/CompositionHelpers.h +1 -1
  16. package/Microsoft.ReactNative/Fabric/Composition/CompositionHwndHost.cpp +14 -11
  17. package/Microsoft.ReactNative/Fabric/Composition/CompositionRootView.cpp +36 -12
  18. package/Microsoft.ReactNative/Fabric/Composition/CompositionRootView.h +16 -10
  19. package/Microsoft.ReactNative/Fabric/Composition/CompositionRootView_emptyimpl.cpp +15 -4
  20. package/Microsoft.ReactNative/Fabric/Composition/CompositionUIService.cpp +20 -9
  21. package/Microsoft.ReactNative/Fabric/Composition/CompositionUIService.h +6 -4
  22. package/Microsoft.ReactNative/Fabric/Composition/CompositionUIService_emptyimpl.cpp +5 -2
  23. package/Microsoft.ReactNative/Fabric/Composition/CompositionViewComponentView.cpp +180 -128
  24. package/Microsoft.ReactNative/Fabric/Composition/CompositionViewComponentView.h +25 -19
  25. package/Microsoft.ReactNative/Fabric/Composition/DebuggingOverlayComponentView.cpp +2 -2
  26. package/Microsoft.ReactNative/Fabric/Composition/DebuggingOverlayComponentView.h +2 -2
  27. package/Microsoft.ReactNative/Fabric/Composition/ImageComponentView.cpp +16 -22
  28. package/Microsoft.ReactNative/Fabric/Composition/ImageComponentView.h +5 -5
  29. package/Microsoft.ReactNative/Fabric/Composition/Modal/WindowsModalHostViewComponentView.cpp +9 -10
  30. package/Microsoft.ReactNative/Fabric/Composition/Modal/WindowsModalHostViewComponentView.h +5 -5
  31. package/Microsoft.ReactNative/Fabric/Composition/ParagraphComponentView.cpp +6 -5
  32. package/Microsoft.ReactNative/Fabric/Composition/ParagraphComponentView.h +5 -5
  33. package/Microsoft.ReactNative/Fabric/Composition/ReactCompositionViewComponentBuilder.cpp +1 -1
  34. package/Microsoft.ReactNative/Fabric/Composition/ReactCompositionViewComponentBuilder.h +5 -2
  35. package/Microsoft.ReactNative/Fabric/Composition/RootComponentView.cpp +7 -3
  36. package/Microsoft.ReactNative/Fabric/Composition/RootComponentView.h +2 -2
  37. package/Microsoft.ReactNative/Fabric/Composition/ScrollViewComponentView.cpp +36 -35
  38. package/Microsoft.ReactNative/Fabric/Composition/ScrollViewComponentView.h +6 -6
  39. package/Microsoft.ReactNative/Fabric/Composition/SwitchComponentView.cpp +9 -9
  40. package/Microsoft.ReactNative/Fabric/Composition/SwitchComponentView.h +6 -6
  41. package/Microsoft.ReactNative/Fabric/Composition/TextInput/WindowsTextInputComponentView.cpp +25 -19
  42. package/Microsoft.ReactNative/Fabric/Composition/TextInput/WindowsTextInputComponentView.h +6 -6
  43. package/Microsoft.ReactNative/Fabric/Composition/Theme.cpp +13 -3
  44. package/Microsoft.ReactNative/Fabric/Composition/Theme.h +16 -8
  45. package/Microsoft.ReactNative/Fabric/Composition/Theme_emptyimpl.cpp +3 -3
  46. package/Microsoft.ReactNative/Fabric/Composition/UnimplementedNativeViewComponentView.cpp +5 -8
  47. package/Microsoft.ReactNative/Fabric/Composition/UnimplementedNativeViewComponentView.h +3 -3
  48. package/Microsoft.ReactNative/Fabric/FabricUIManagerModule.h +1 -1
  49. package/Microsoft.ReactNative/Fabric/IComponentViewRegistry.h +1 -1
  50. package/Microsoft.ReactNative/Modules/Animated/NativeAnimatedNodeManager.cpp +2 -1
  51. package/Microsoft.ReactNative/Modules/Animated/PropsAnimatedNode.cpp +7 -5
  52. package/Microsoft.ReactNative/Theme.idl +12 -1
  53. package/Microsoft.ReactNative/Utils/KeyboardUtils.cpp +10 -2
  54. package/Microsoft.ReactNative/Utils/KeyboardUtils.h +4 -1
  55. package/Microsoft.ReactNative/ViewProps.idl +11 -1
  56. package/Microsoft.ReactNative/packages.lock.json +70 -42
  57. package/Microsoft.ReactNative.Cxx/AutoDraw.h +6 -4
  58. package/Microsoft.ReactNative.Cxx/{CompositionSwitcher.interop.h → CompositionSwitcher.Experimental.interop.h} +3 -3
  59. package/Microsoft.ReactNative.Cxx/DesktopWindowBridge.h +2 -0
  60. package/Microsoft.ReactNative.Managed/Microsoft.ReactNative.Managed.csproj +2 -11
  61. package/PropertySheets/External/Microsoft.ReactNative.Composition.CppApp.props +1 -1
  62. package/PropertySheets/External/Microsoft.ReactNative.WindowsSdk.Default.props +5 -3
  63. package/PropertySheets/Generated/PackageVersion.g.props +2 -2
  64. package/Scripts/OfficeReact.Win32.nuspec +2 -0
  65. package/package.json +8 -5
  66. package/templates/cpp-app/windows/MyApp/MyApp.cpp +2 -7
@@ -1,12 +1,12 @@
1
1
 
2
2
  #include "pch.h"
3
3
  #include "CompositionContextHelper.h"
4
- #if __has_include("Composition.SystemCompositionContextHelper.g.cpp")
5
- #include "Composition.SystemCompositionContextHelper.g.cpp"
4
+ #if __has_include("Composition.Experimental.SystemCompositionContextHelper.g.cpp")
5
+ #include "Composition.Experimental.SystemCompositionContextHelper.g.cpp"
6
6
  #endif
7
7
  #ifdef USE_WINUI3
8
- #if __has_include("Composition.MicrosoftCompositionContextHelper.g.cpp")
9
- #include "Composition.MicrosoftCompositionContextHelper.g.cpp"
8
+ #if __has_include("Composition.Experimental.MicrosoftCompositionContextHelper.g.cpp")
9
+ #include "Composition.Experimental.MicrosoftCompositionContextHelper.g.cpp"
10
10
  #endif
11
11
  #endif
12
12
 
@@ -23,7 +23,7 @@
23
23
  #include <winrt/Microsoft.UI.Composition.interop.h>
24
24
  #endif
25
25
 
26
- namespace Microsoft::ReactNative::Composition {
26
+ namespace Microsoft::ReactNative::Composition::Experimental {
27
27
 
28
28
  template <typename TSpriteVisual>
29
29
  struct CompositionTypeTraits {};
@@ -91,7 +91,8 @@ struct CompositionTypeTraits<WindowsTypeTag> {
91
91
  using IInnerCompositionVisual = IWindowsCompositionVisual;
92
92
  using IInnerCompositionBrush = IWindowsCompositionBrush;
93
93
  using IInnerCompositionDrawingSurface = IWindowsCompositionDrawingSurfaceInner;
94
- using CompositionContextHelper = winrt::Microsoft::ReactNative::Composition::SystemCompositionContextHelper;
94
+ using CompositionContextHelper =
95
+ winrt::Microsoft::ReactNative::Composition::Experimental::SystemCompositionContextHelper;
95
96
  };
96
97
  using WindowsTypeRedirects = CompositionTypeTraits<WindowsTypeTag>;
97
98
 
@@ -159,7 +160,8 @@ struct CompositionTypeTraits<MicrosoftTypeTag> {
159
160
  using IInnerCompositionVisual = IMicrosoftCompositionVisual;
160
161
  using IInnerCompositionBrush = IMicrosoftCompositionBrush;
161
162
  using IInnerCompositionDrawingSurface = IMicrosoftCompositionDrawingSurfaceInner;
162
- using CompositionContextHelper = winrt::Microsoft::ReactNative::Composition::MicrosoftCompositionContextHelper;
163
+ using CompositionContextHelper =
164
+ winrt::Microsoft::ReactNative::Composition::Experimental::MicrosoftCompositionContextHelper;
163
165
  };
164
166
  using MicrosoftTypeRedirects = CompositionTypeTraits<MicrosoftTypeTag>;
165
167
  #endif
@@ -188,7 +190,7 @@ struct GeometrySource : public winrt::implements<
188
190
  template <typename TTypeRedirects>
189
191
  struct CompDropShadow : public winrt::implements<
190
192
  CompDropShadow<TTypeRedirects>,
191
- winrt::Microsoft::ReactNative::Composition::IDropShadow,
193
+ winrt::Microsoft::ReactNative::Composition::Experimental::IDropShadow,
192
194
  typename TTypeRedirects::IInnerCompositionDropShadow> {
193
195
  CompDropShadow(typename TTypeRedirects::DropShadow const &shadow) : m_shadow(shadow) {}
194
196
 
@@ -223,7 +225,7 @@ using MicrosoftCompDropShadow = CompDropShadow<MicrosoftTypeRedirects>;
223
225
  template <typename TTypeRedirects>
224
226
  struct CompBrush : public winrt::implements<
225
227
  CompBrush<TTypeRedirects>,
226
- winrt::Microsoft::ReactNative::Composition::IBrush,
228
+ winrt::Microsoft::ReactNative::Composition::Experimental::IBrush,
227
229
  typename TTypeRedirects::IInnerCompositionBrush> {
228
230
  CompBrush(typename TTypeRedirects::CompositionBrush const &brush) : m_brush(brush) {}
229
231
 
@@ -242,8 +244,8 @@ using MicrosoftCompBrush = CompBrush<MicrosoftTypeRedirects>;
242
244
  template <typename TTypeRedirects>
243
245
  struct CompDrawingSurfaceBrush : public winrt::implements<
244
246
  CompDrawingSurfaceBrush<TTypeRedirects>,
245
- winrt::Microsoft::ReactNative::Composition::IDrawingSurfaceBrush,
246
- winrt::Microsoft::ReactNative::Composition::IBrush,
247
+ winrt::Microsoft::ReactNative::Composition::Experimental::IDrawingSurfaceBrush,
248
+ winrt::Microsoft::ReactNative::Composition::Experimental::IBrush,
247
249
  typename TTypeRedirects::IInnerCompositionBrush,
248
250
  ICompositionDrawingSurfaceInterop,
249
251
  typename TTypeRedirects::IInnerCompositionDrawingSurface> {
@@ -254,13 +256,19 @@ struct CompDrawingSurfaceBrush : public winrt::implements<
254
256
  drawingSurface.as(m_drawingSurfaceInterop);
255
257
  }
256
258
 
257
- HRESULT BeginDraw(ID2D1DeviceContext **deviceContextOut, POINT *offset) noexcept {
259
+ HRESULT BeginDraw(ID2D1DeviceContext **deviceContextOut, float xDpi, float yDpi, POINT *offset) noexcept {
258
260
  #ifdef DEBUG
259
261
  // Drawing to a zero sized surface is a waste of time
260
262
  auto size = m_drawingSurfaceInterop.as<typename TTypeRedirects::CompositionDrawingSurface>().Size();
261
263
  assert(size.Width != 0 && size.Height != 0);
262
264
  #endif
263
- return m_drawingSurfaceInterop->BeginDraw(nullptr, __uuidof(ID2D1DeviceContext), (void **)deviceContextOut, offset);
265
+
266
+ auto hr =
267
+ m_drawingSurfaceInterop->BeginDraw(nullptr, __uuidof(ID2D1DeviceContext), (void **)deviceContextOut, offset);
268
+ if (SUCCEEDED(hr)) {
269
+ (*deviceContextOut)->SetDpi(xDpi, yDpi);
270
+ }
271
+ return hr;
264
272
  }
265
273
 
266
274
  HRESULT EndDraw() noexcept {
@@ -284,23 +292,23 @@ struct CompDrawingSurfaceBrush : public winrt::implements<
284
292
  m_brush.VerticalAlignmentRatio(ratio);
285
293
  }
286
294
 
287
- void Stretch(winrt::Microsoft::ReactNative::Composition::CompositionStretch mode) noexcept {
295
+ void Stretch(winrt::Microsoft::ReactNative::Composition::Experimental::CompositionStretch mode) noexcept {
288
296
  static_assert(
289
- static_cast<winrt::Microsoft::ReactNative::Composition::CompositionStretch>(
297
+ static_cast<winrt::Microsoft::ReactNative::Composition::Experimental::CompositionStretch>(
290
298
  TTypeRedirects::CompositionStretch::None) ==
291
- winrt::Microsoft::ReactNative::Composition::CompositionStretch::None);
299
+ winrt::Microsoft::ReactNative::Composition::Experimental::CompositionStretch::None);
292
300
  static_assert(
293
- static_cast<winrt::Microsoft::ReactNative::Composition::CompositionStretch>(
301
+ static_cast<winrt::Microsoft::ReactNative::Composition::Experimental::CompositionStretch>(
294
302
  TTypeRedirects::CompositionStretch::Fill) ==
295
- winrt::Microsoft::ReactNative::Composition::CompositionStretch::Fill);
303
+ winrt::Microsoft::ReactNative::Composition::Experimental::CompositionStretch::Fill);
296
304
  static_assert(
297
- static_cast<winrt::Microsoft::ReactNative::Composition::CompositionStretch>(
305
+ static_cast<winrt::Microsoft::ReactNative::Composition::Experimental::CompositionStretch>(
298
306
  TTypeRedirects::CompositionStretch::Uniform) ==
299
- winrt::Microsoft::ReactNative::Composition::CompositionStretch::Uniform);
307
+ winrt::Microsoft::ReactNative::Composition::Experimental::CompositionStretch::Uniform);
300
308
  static_assert(
301
- static_cast<winrt::Microsoft::ReactNative::Composition::CompositionStretch>(
309
+ static_cast<winrt::Microsoft::ReactNative::Composition::Experimental::CompositionStretch>(
302
310
  TTypeRedirects::CompositionStretch::UniformToFill) ==
303
- winrt::Microsoft::ReactNative::Composition::CompositionStretch::UniformToFill);
311
+ winrt::Microsoft::ReactNative::Composition::Experimental::CompositionStretch::UniformToFill);
304
312
 
305
313
  m_brush.Stretch(static_cast<typename TTypeRedirects::CompositionStretch>(mode));
306
314
  }
@@ -316,19 +324,19 @@ using MicrosoftCompDrawingSurfaceBrush = CompDrawingSurfaceBrush<MicrosoftTypeRe
316
324
 
317
325
  template <typename TTypeRedirects>
318
326
  void SetAnimationClass(
319
- winrt::Microsoft::ReactNative::Composition::AnimationClass value,
327
+ winrt::Microsoft::ReactNative::Composition::Experimental::AnimationClass value,
320
328
  typename const TTypeRedirects::Visual &visual) {
321
329
  constexpr int64_t ScrollBarExpandBeginTime = 400; // ms
322
330
  constexpr int64_t ScrollBarExpandDuration = 167; // ms
323
331
  constexpr int64_t SwitchDuration = 167; // ms
324
332
 
325
333
  switch (value) {
326
- case winrt::Microsoft::ReactNative::Composition::AnimationClass::None: {
334
+ case winrt::Microsoft::ReactNative::Composition::Experimental::AnimationClass::None: {
327
335
  visual.ImplicitAnimations(nullptr);
328
336
  break;
329
337
  }
330
338
 
331
- case winrt::Microsoft::ReactNative::Composition::AnimationClass::SwitchThumb: {
339
+ case winrt::Microsoft::ReactNative::Composition::Experimental::AnimationClass::SwitchThumb: {
332
340
  auto compositor = visual.Compositor();
333
341
  auto offsetAnimation = compositor.CreateVector3KeyFrameAnimation();
334
342
  offsetAnimation.InsertExpressionKeyFrame(
@@ -344,7 +352,7 @@ void SetAnimationClass(
344
352
  break;
345
353
  }
346
354
 
347
- case winrt::Microsoft::ReactNative::Composition::AnimationClass::ScrollBar: {
355
+ case winrt::Microsoft::ReactNative::Composition::Experimental::AnimationClass::ScrollBar: {
348
356
  auto compositor = visual.Compositor();
349
357
 
350
358
  auto opacityAnimation = compositor.CreateScalarKeyFrameAnimation();
@@ -360,15 +368,15 @@ void SetAnimationClass(
360
368
  break;
361
369
  }
362
370
 
363
- case winrt::Microsoft::ReactNative::Composition::AnimationClass::ScrollBarThumbVertical:
364
- case winrt::Microsoft::ReactNative::Composition::AnimationClass::ScrollBarThumbHorizontal: {
371
+ case winrt::Microsoft::ReactNative::Composition::Experimental::AnimationClass::ScrollBarThumbVertical:
372
+ case winrt::Microsoft::ReactNative::Composition::Experimental::AnimationClass::ScrollBarThumbHorizontal: {
365
373
  auto compositor = visual.Compositor();
366
374
  auto offsetAnimation = compositor.CreateVector3KeyFrameAnimation();
367
375
  // We cannot just use a DelayTime, since we want changes to the offset in the scrolling dirction to happen
368
376
  // immediately, and only delay the offset changes used when hiding/showing the scrollbar
369
377
  float delayStartFrameOffset =
370
378
  static_cast<float>(ScrollBarExpandBeginTime) / (ScrollBarExpandBeginTime + ScrollBarExpandDuration);
371
- if (value == winrt::Microsoft::ReactNative::Composition::AnimationClass::ScrollBarThumbVertical) {
379
+ if (value == winrt::Microsoft::ReactNative::Composition::Experimental::AnimationClass::ScrollBarThumbVertical) {
372
380
  offsetAnimation.InsertExpressionKeyFrame(
373
381
  0.0f, L"vector3(this.CurrentValue.X, this.FinalValue.Y, this.FinalValue.Z)");
374
382
  offsetAnimation.InsertExpressionKeyFrame(
@@ -407,7 +415,9 @@ struct CompVisualImpl {
407
415
  return m_visual;
408
416
  }
409
417
 
410
- void InsertAt(const winrt::Microsoft::ReactNative::Composition::IVisual &visual, uint32_t index) noexcept {
418
+ void InsertAt(
419
+ const winrt::Microsoft::ReactNative::Composition::Experimental::IVisual &visual,
420
+ uint32_t index) noexcept {
411
421
  auto containerChildren = InnerVisual().as<typename TTypeRedirects::ContainerVisual>().Children();
412
422
  auto compVisual = TTypeRedirects::CompositionContextHelper::InnerVisual(visual);
413
423
  if (index == 0) {
@@ -420,13 +430,13 @@ struct CompVisualImpl {
420
430
  containerChildren.InsertAbove(compVisual, insertAfter.Current());
421
431
  }
422
432
 
423
- void Remove(const winrt::Microsoft::ReactNative::Composition::IVisual &visual) noexcept {
433
+ void Remove(const winrt::Microsoft::ReactNative::Composition::Experimental::IVisual &visual) noexcept {
424
434
  auto compVisual = TTypeRedirects::CompositionContextHelper::InnerVisual(visual);
425
435
  auto containerChildren = InnerVisual().as<typename TTypeRedirects::ContainerVisual>().Children();
426
436
  containerChildren.Remove(compVisual);
427
437
  }
428
438
 
429
- winrt::Microsoft::ReactNative::Composition::IVisual GetAt(uint32_t index) noexcept {
439
+ winrt::Microsoft::ReactNative::Composition::Experimental::IVisual GetAt(uint32_t index) noexcept {
430
440
  auto containerChildren = m_visual.as<typename TTypeRedirects::ContainerVisual>().Children();
431
441
  auto it = containerChildren.First();
432
442
  for (uint32_t i = 0; i < index; i++)
@@ -488,11 +498,12 @@ struct CompVisualImpl {
488
498
  m_visual.RelativeSizeAdjustment(relativeSizeAdjustment);
489
499
  }
490
500
 
491
- winrt::Microsoft::ReactNative::Composition::BackfaceVisibility BackfaceVisibility() const noexcept {
492
- return static_cast<winrt::Microsoft::ReactNative::Composition::BackfaceVisibility>(m_visual.BackfaceVisibility());
501
+ winrt::Microsoft::ReactNative::Composition::Experimental::BackfaceVisibility BackfaceVisibility() const noexcept {
502
+ return static_cast<winrt::Microsoft::ReactNative::Composition::Experimental::BackfaceVisibility>(
503
+ m_visual.BackfaceVisibility());
493
504
  }
494
505
 
495
- void BackfaceVisibility(winrt::Microsoft::ReactNative::Composition::BackfaceVisibility value) noexcept {
506
+ void BackfaceVisibility(winrt::Microsoft::ReactNative::Composition::Experimental::BackfaceVisibility value) noexcept {
496
507
  m_visual.BackfaceVisibility(static_cast<typename TTypeRedirects::CompositionBackfaceVisibility>(value));
497
508
  }
498
509
 
@@ -504,7 +515,7 @@ struct CompVisualImpl {
504
515
  m_visual.Comment(value);
505
516
  }
506
517
 
507
- void AnimationClass(winrt::Microsoft::ReactNative::Composition::AnimationClass value) noexcept {
518
+ void AnimationClass(winrt::Microsoft::ReactNative::Composition::Experimental::AnimationClass value) noexcept {
508
519
  SetAnimationClass<TTypeRedirects>(value, m_visual);
509
520
  }
510
521
 
@@ -515,7 +526,7 @@ struct CompVisualImpl {
515
526
  template <typename TTypeRedirects>
516
527
  struct CompVisual : public winrt::implements<
517
528
  CompVisual<TTypeRedirects>,
518
- winrt::Microsoft::ReactNative::Composition::IVisual,
529
+ winrt::Microsoft::ReactNative::Composition::Experimental::IVisual,
519
530
  typename TTypeRedirects::IInnerCompositionVisual,
520
531
  IVisualInterop>,
521
532
  CompVisualImpl<TTypeRedirects> {
@@ -540,8 +551,8 @@ using MicrosoftCompVisual = CompVisual<MicrosoftTypeRedirects>;
540
551
  template <typename TTypeRedirects>
541
552
  struct CompSpriteVisual : winrt::implements<
542
553
  CompSpriteVisual<TTypeRedirects>,
543
- winrt::Microsoft::ReactNative::Composition::ISpriteVisual,
544
- winrt::Microsoft::ReactNative::Composition::IVisual,
554
+ winrt::Microsoft::ReactNative::Composition::Experimental::ISpriteVisual,
555
+ winrt::Microsoft::ReactNative::Composition::Experimental::IVisual,
545
556
  typename TTypeRedirects::IInnerCompositionVisual,
546
557
  IVisualInterop>,
547
558
  CompVisualImpl<TTypeRedirects, typename TTypeRedirects::SpriteVisual> {
@@ -558,11 +569,11 @@ struct CompSpriteVisual : winrt::implements<
558
569
  Super::SetClippingPath(clippingPath);
559
570
  }
560
571
 
561
- void Brush(const winrt::Microsoft::ReactNative::Composition::IBrush &brush) noexcept {
572
+ void Brush(const winrt::Microsoft::ReactNative::Composition::Experimental::IBrush &brush) noexcept {
562
573
  Super::m_visual.Brush(TTypeRedirects::CompositionContextHelper::InnerBrush(brush));
563
574
  }
564
575
 
565
- void Shadow(const winrt::Microsoft::ReactNative::Composition::IDropShadow &shadow) noexcept {
576
+ void Shadow(const winrt::Microsoft::ReactNative::Composition::Experimental::IDropShadow &shadow) noexcept {
566
577
  Super::m_visual.Shadow(TTypeRedirects::CompositionContextHelper::InnerDropShadow(shadow));
567
578
  }
568
579
  };
@@ -572,13 +583,14 @@ using MicrosoftCompSpriteVisual = CompSpriteVisual<MicrosoftTypeRedirects>;
572
583
  #endif
573
584
 
574
585
  template <typename TTypeRedirects>
575
- struct CompRoundedRectangleVisual : winrt::implements<
576
- CompRoundedRectangleVisual<TTypeRedirects>,
577
- winrt::Microsoft::ReactNative::Composition::IRoundedRectangleVisual,
578
- winrt::Microsoft::ReactNative::Composition::IVisual,
579
- typename TTypeRedirects::IInnerCompositionVisual,
580
- IVisualInterop>,
581
- CompVisualImpl<TTypeRedirects> {
586
+ struct CompRoundedRectangleVisual
587
+ : winrt::implements<
588
+ CompRoundedRectangleVisual<TTypeRedirects>,
589
+ winrt::Microsoft::ReactNative::Composition::Experimental::IRoundedRectangleVisual,
590
+ winrt::Microsoft::ReactNative::Composition::Experimental::IVisual,
591
+ typename TTypeRedirects::IInnerCompositionVisual,
592
+ IVisualInterop>,
593
+ CompVisualImpl<TTypeRedirects> {
582
594
  using Super = CompVisualImpl<TTypeRedirects>;
583
595
  CompRoundedRectangleVisual(typename TTypeRedirects::ShapeVisual const &visual) : Super(visual) {
584
596
  auto compositor = visual.Compositor();
@@ -622,7 +634,7 @@ struct CompRoundedRectangleVisual : winrt::implements<
622
634
  Super::m_visual.RelativeSizeAdjustment(relativeSizeAdjustment);
623
635
  }
624
636
 
625
- void Brush(const winrt::Microsoft::ReactNative::Composition::IBrush &brush) noexcept {
637
+ void Brush(const winrt::Microsoft::ReactNative::Composition::Experimental::IBrush &brush) noexcept {
626
638
  m_spriteShape.FillBrush(TTypeRedirects::CompositionContextHelper::InnerBrush(brush));
627
639
  }
628
640
 
@@ -631,7 +643,7 @@ struct CompRoundedRectangleVisual : winrt::implements<
631
643
  updateGeometry();
632
644
  }
633
645
 
634
- void StrokeBrush(const winrt::Microsoft::ReactNative::Composition::IBrush &brush) noexcept {
646
+ void StrokeBrush(const winrt::Microsoft::ReactNative::Composition::Experimental::IBrush &brush) noexcept {
635
647
  m_spriteShape.StrokeBrush(TTypeRedirects::CompositionContextHelper::InnerBrush(brush));
636
648
  }
637
649
 
@@ -653,9 +665,10 @@ using WindowsCompRoundedRectangleVisual = CompRoundedRectangleVisual<WindowsType
653
665
  using MicrosoftCompRoundedRectangleVisual = CompRoundedRectangleVisual<MicrosoftTypeRedirects>;
654
666
  #endif
655
667
 
656
- struct CompScrollPositionChangedArgs : winrt::implements<
657
- CompScrollPositionChangedArgs,
658
- winrt::Microsoft::ReactNative::Composition::IScrollPositionChangedArgs> {
668
+ struct CompScrollPositionChangedArgs
669
+ : winrt::implements<
670
+ CompScrollPositionChangedArgs,
671
+ winrt::Microsoft::ReactNative::Composition::Experimental::IScrollPositionChangedArgs> {
659
672
  CompScrollPositionChangedArgs(winrt::Windows::Foundation::Numerics::float2 position) : m_position(position) {}
660
673
 
661
674
  winrt::Windows::Foundation::Numerics::float2 Position() const noexcept {
@@ -669,8 +682,8 @@ struct CompScrollPositionChangedArgs : winrt::implements<
669
682
  template <typename TTypeRedirects>
670
683
  struct CompScrollerVisual : winrt::implements<
671
684
  CompScrollerVisual<TTypeRedirects>,
672
- winrt::Microsoft::ReactNative::Composition::IScrollVisual,
673
- winrt::Microsoft::ReactNative::Composition::IVisual,
685
+ winrt::Microsoft::ReactNative::Composition::Experimental::IScrollVisual,
686
+ winrt::Microsoft::ReactNative::Composition::Experimental::IVisual,
674
687
  typename TTypeRedirects::IInnerCompositionVisual,
675
688
  IVisualInterop> {
676
689
  struct ScrollInteractionTrackerOwner
@@ -749,7 +762,9 @@ struct CompScrollerVisual : winrt::implements<
749
762
  return m_visual;
750
763
  }
751
764
 
752
- void InsertAt(const winrt::Microsoft::ReactNative::Composition::IVisual &visual, uint32_t index) noexcept {
765
+ void InsertAt(
766
+ const winrt::Microsoft::ReactNative::Composition::Experimental::IVisual &visual,
767
+ uint32_t index) noexcept {
753
768
  auto containerChildren = m_contentVisual.Children();
754
769
  auto compVisual = TTypeRedirects::CompositionContextHelper::InnerVisual(visual);
755
770
  if (index == 0) {
@@ -762,13 +777,13 @@ struct CompScrollerVisual : winrt::implements<
762
777
  containerChildren.InsertAbove(compVisual, insertAfter.Current());
763
778
  }
764
779
 
765
- void Remove(const winrt::Microsoft::ReactNative::Composition::IVisual &visual) noexcept {
780
+ void Remove(const winrt::Microsoft::ReactNative::Composition::Experimental::IVisual &visual) noexcept {
766
781
  auto compVisual = TTypeRedirects::CompositionContextHelper::InnerVisual(visual);
767
782
  auto containerChildren = m_contentVisual.Children();
768
783
  containerChildren.Remove(compVisual);
769
784
  }
770
785
 
771
- winrt::Microsoft::ReactNative::Composition::IVisual GetAt(uint32_t index) noexcept {
786
+ winrt::Microsoft::ReactNative::Composition::Experimental::IVisual GetAt(uint32_t index) noexcept {
772
787
  auto containerChildren = m_visual.as<typename TTypeRedirects::ContainerVisual>().Children();
773
788
  auto it = containerChildren.First();
774
789
  for (uint32_t i = 0; i < index; i++)
@@ -776,7 +791,7 @@ struct CompScrollerVisual : winrt::implements<
776
791
  return TTypeRedirects::CompositionContextHelper::CreateVisual(it.Current());
777
792
  }
778
793
 
779
- void Brush(const winrt::Microsoft::ReactNative::Composition::IBrush &brush) noexcept {
794
+ void Brush(const winrt::Microsoft::ReactNative::Composition::Experimental::IBrush &brush) noexcept {
780
795
  m_visual.Brush(TTypeRedirects::CompositionContextHelper::InnerBrush(brush));
781
796
  }
782
797
 
@@ -824,11 +839,12 @@ struct CompScrollerVisual : winrt::implements<
824
839
  m_visual.RelativeSizeAdjustment(relativeSizeAdjustment);
825
840
  }
826
841
 
827
- winrt::Microsoft::ReactNative::Composition::BackfaceVisibility BackfaceVisibility() {
828
- return static_cast<winrt::Microsoft::ReactNative::Composition::BackfaceVisibility>(m_visual.BackfaceVisibility());
842
+ winrt::Microsoft::ReactNative::Composition::Experimental::BackfaceVisibility BackfaceVisibility() {
843
+ return static_cast<winrt::Microsoft::ReactNative::Composition::Experimental::BackfaceVisibility>(
844
+ m_visual.BackfaceVisibility());
829
845
  }
830
846
 
831
- void BackfaceVisibility(winrt::Microsoft::ReactNative::Composition::BackfaceVisibility value) {
847
+ void BackfaceVisibility(winrt::Microsoft::ReactNative::Composition::Experimental::BackfaceVisibility value) {
832
848
  m_visual.BackfaceVisibility(static_cast<typename TTypeRedirects::CompositionBackfaceVisibility>(value));
833
849
  }
834
850
 
@@ -852,13 +868,14 @@ struct CompScrollerVisual : winrt::implements<
852
868
  m_visual.Clip(clip);
853
869
  }
854
870
 
855
- void Shadow(const winrt::Microsoft::ReactNative::Composition::IDropShadow &shadow) noexcept {
871
+ void Shadow(const winrt::Microsoft::ReactNative::Composition::Experimental::IDropShadow &shadow) noexcept {
856
872
  m_visual.Shadow(TTypeRedirects::CompositionContextHelper::InnerDropShadow(shadow));
857
873
  }
858
874
 
859
875
  winrt::event_token ScrollPositionChanged(
860
876
  winrt::Windows::Foundation::EventHandler<
861
- winrt::Microsoft::ReactNative::Composition::IScrollPositionChangedArgs> const &handler) noexcept {
877
+ winrt::Microsoft::ReactNative::Composition::Experimental::IScrollPositionChangedArgs> const
878
+ &handler) noexcept {
862
879
  return m_scrollPositionChangedEvent.add(handler);
863
880
  }
864
881
 
@@ -927,7 +944,7 @@ struct CompScrollerVisual : winrt::implements<
927
944
  }
928
945
  }
929
946
 
930
- void AnimationClass(winrt::Microsoft::ReactNative::Composition::AnimationClass value) noexcept {
947
+ void AnimationClass(winrt::Microsoft::ReactNative::Composition::Experimental::AnimationClass value) noexcept {
931
948
  SetAnimationClass<TTypeRedirects>(value, m_visual);
932
949
  }
933
950
 
@@ -949,8 +966,8 @@ struct CompScrollerVisual : winrt::implements<
949
966
  winrt::Windows::Foundation::Numerics::float3 m_currentPosition;
950
967
  winrt::Windows::Foundation::Numerics::float2 m_contentSize{0};
951
968
  winrt::Windows::Foundation::Numerics::float2 m_visualSize{0};
952
- winrt::event<
953
- winrt::Windows::Foundation::EventHandler<winrt::Microsoft::ReactNative::Composition::IScrollPositionChangedArgs>>
969
+ winrt::event<winrt::Windows::Foundation::EventHandler<
970
+ winrt::Microsoft::ReactNative::Composition::Experimental::IScrollPositionChangedArgs>>
954
971
  m_scrollPositionChangedEvent;
955
972
  typename TTypeRedirects::SpriteVisual m_visual{nullptr};
956
973
  typename TTypeRedirects::SpriteVisual m_contentVisual{nullptr};
@@ -965,8 +982,8 @@ using MicrosoftCompScrollerVisual = CompScrollerVisual<MicrosoftTypeRedirects>;
965
982
  template <typename TTypeRedirects>
966
983
  struct CompActivityVisual : winrt::implements<
967
984
  CompActivityVisual<TTypeRedirects>,
968
- winrt::Microsoft::ReactNative::Composition::IActivityVisual,
969
- winrt::Microsoft::ReactNative::Composition::IVisual,
985
+ winrt::Microsoft::ReactNative::Composition::Experimental::IActivityVisual,
986
+ winrt::Microsoft::ReactNative::Composition::Experimental::IVisual,
970
987
  typename TTypeRedirects::IInnerCompositionVisual,
971
988
  IVisualInterop> {
972
989
  /************************************************************************************
@@ -1311,7 +1328,7 @@ struct CompActivityVisual : winrt::implements<
1311
1328
  _root.StartAnimation(L"Progress", progressAnimation);
1312
1329
  }
1313
1330
 
1314
- void Brush(winrt::Microsoft::ReactNative::Composition::IBrush brush) noexcept {
1331
+ void Brush(winrt::Microsoft::ReactNative::Composition::Experimental::IBrush brush) noexcept {
1315
1332
  auto innerBrush = TTypeRedirects::CompositionContextHelper::InnerBrush(brush);
1316
1333
  if (brush) {
1317
1334
  _themeProperties.InsertVector4(
@@ -1330,7 +1347,9 @@ struct CompActivityVisual : winrt::implements<
1330
1347
  return m_visual;
1331
1348
  }
1332
1349
 
1333
- void InsertAt(const winrt::Microsoft::ReactNative::Composition::IVisual &visual, uint32_t index) noexcept {
1350
+ void InsertAt(
1351
+ const winrt::Microsoft::ReactNative::Composition::Experimental::IVisual &visual,
1352
+ uint32_t index) noexcept {
1334
1353
  auto containerChildren = m_contentVisual.Children();
1335
1354
  auto compVisual = typename TTypeRedirects::CompositionContextHelper::InnerVisual(visual);
1336
1355
  if (index == 0) {
@@ -1343,13 +1362,13 @@ struct CompActivityVisual : winrt::implements<
1343
1362
  containerChildren.InsertAbove(compVisual, insertAfter.Current());
1344
1363
  }
1345
1364
 
1346
- void Remove(const winrt::Microsoft::ReactNative::Composition::IVisual &visual) noexcept {
1365
+ void Remove(const winrt::Microsoft::ReactNative::Composition::Experimental::IVisual &visual) noexcept {
1347
1366
  auto compVisual = typename TTypeRedirects::CompositionContextHelper::InnerVisual(visual);
1348
1367
  auto containerChildren = m_contentVisual.Children();
1349
1368
  containerChildren.Remove(compVisual);
1350
1369
  }
1351
1370
 
1352
- winrt::Microsoft::ReactNative::Composition::IVisual GetAt(uint32_t index) noexcept {
1371
+ winrt::Microsoft::ReactNative::Composition::Experimental::IVisual GetAt(uint32_t index) noexcept {
1353
1372
  auto containerChildren = m_visual.as<typename TTypeRedirects::ContainerVisual>().Children();
1354
1373
  auto it = containerChildren.First();
1355
1374
  for (uint32_t i = 0; i < index; i++)
@@ -1399,11 +1418,12 @@ struct CompActivityVisual : winrt::implements<
1399
1418
  m_visual.RelativeSizeAdjustment(relativeSizeAdjustment);
1400
1419
  }
1401
1420
 
1402
- winrt::Microsoft::ReactNative::Composition::BackfaceVisibility BackfaceVisibility() const noexcept {
1403
- return static_cast<winrt::Microsoft::ReactNative::Composition::BackfaceVisibility>(m_visual.BackfaceVisibility());
1421
+ winrt::Microsoft::ReactNative::Composition::Experimental::BackfaceVisibility BackfaceVisibility() const noexcept {
1422
+ return static_cast<winrt::Microsoft::ReactNative::Composition::Experimental::BackfaceVisibility>(
1423
+ m_visual.BackfaceVisibility());
1404
1424
  }
1405
1425
 
1406
- void BackfaceVisibility(winrt::Microsoft::ReactNative::Composition::BackfaceVisibility value) noexcept {
1426
+ void BackfaceVisibility(winrt::Microsoft::ReactNative::Composition::Experimental::BackfaceVisibility value) noexcept {
1407
1427
  m_visual.BackfaceVisibility(static_cast<typename TTypeRedirects::CompositionBackfaceVisibility>(value));
1408
1428
  }
1409
1429
 
@@ -1427,7 +1447,7 @@ struct CompActivityVisual : winrt::implements<
1427
1447
  m_visual.Clip(clip);
1428
1448
  }
1429
1449
 
1430
- void AnimationClass(winrt::Microsoft::ReactNative::Composition::AnimationClass value) noexcept {
1450
+ void AnimationClass(winrt::Microsoft::ReactNative::Composition::Experimental::AnimationClass value) noexcept {
1431
1451
  SetAnimationClass<TTypeRedirects>(value, m_visual);
1432
1452
  }
1433
1453
 
@@ -1441,8 +1461,9 @@ using MicrosoftCompActivityVisual = CompActivityVisual<MicrosoftTypeRedirects>;
1441
1461
  #endif
1442
1462
 
1443
1463
  template <typename TTypeRedirects>
1444
- struct CompCaretVisual
1445
- : winrt::implements<CompCaretVisual<TTypeRedirects>, winrt::Microsoft::ReactNative::Composition::ICaretVisual> {
1464
+ struct CompCaretVisual : winrt::implements<
1465
+ CompCaretVisual<TTypeRedirects>,
1466
+ winrt::Microsoft::ReactNative::Composition::Experimental::ICaretVisual> {
1446
1467
  CompCaretVisual(typename TTypeRedirects::Compositor const &compositor)
1447
1468
  : m_compositor(compositor),
1448
1469
  m_compVisual(compositor.CreateSpriteVisual()),
@@ -1468,13 +1489,13 @@ struct CompCaretVisual
1468
1489
  m_opacityAnimation.IterationCount(500);
1469
1490
  }
1470
1491
 
1471
- winrt::Microsoft::ReactNative::Composition::IVisual CreateVisual() const noexcept;
1492
+ winrt::Microsoft::ReactNative::Composition::Experimental::IVisual CreateVisual() const noexcept;
1472
1493
 
1473
- winrt::Microsoft::ReactNative::Composition::IVisual InnerVisual() const noexcept {
1494
+ winrt::Microsoft::ReactNative::Composition::Experimental::IVisual InnerVisual() const noexcept {
1474
1495
  return m_visual;
1475
1496
  }
1476
1497
 
1477
- void Brush(winrt::Microsoft::ReactNative::Composition::IBrush brush) noexcept {
1498
+ void Brush(winrt::Microsoft::ReactNative::Composition::Experimental::IBrush brush) noexcept {
1478
1499
  m_compVisual.Brush(TTypeRedirects::CompositionContextHelper::InnerBrush(brush));
1479
1500
  }
1480
1501
 
@@ -1502,35 +1523,36 @@ struct CompCaretVisual
1502
1523
  }
1503
1524
  }
1504
1525
 
1505
- void AnimationClass(winrt::Microsoft::ReactNative::Composition::AnimationClass value) noexcept {
1526
+ void AnimationClass(winrt::Microsoft::ReactNative::Composition::Experimental::AnimationClass value) noexcept {
1506
1527
  SetAnimationClass(value, m_compVisual);
1507
1528
  }
1508
1529
 
1509
1530
  private:
1510
1531
  bool m_isVisible{true};
1511
1532
  typename TTypeRedirects::SpriteVisual m_compVisual;
1512
- winrt::Microsoft::ReactNative::Composition::IVisual m_visual;
1533
+ winrt::Microsoft::ReactNative::Composition::Experimental::IVisual m_visual;
1513
1534
  typename TTypeRedirects::ScalarKeyFrameAnimation m_opacityAnimation;
1514
1535
  typename TTypeRedirects::Compositor m_compositor{nullptr};
1515
1536
  };
1516
1537
 
1517
- winrt::Microsoft::ReactNative::Composition::IVisual CompCaretVisual<WindowsTypeRedirects>::CreateVisual()
1538
+ winrt::Microsoft::ReactNative::Composition::Experimental::IVisual CompCaretVisual<WindowsTypeRedirects>::CreateVisual()
1518
1539
  const noexcept {
1519
- return winrt::make<Composition::WindowsCompSpriteVisual>(m_compVisual);
1540
+ return winrt::make<Composition::Experimental::WindowsCompSpriteVisual>(m_compVisual);
1520
1541
  }
1521
1542
  using WindowsCompCaretVisual = CompCaretVisual<WindowsTypeRedirects>;
1522
1543
 
1523
1544
  #ifdef USE_WINUI3
1524
- winrt::Microsoft::ReactNative::Composition::IVisual CompCaretVisual<MicrosoftTypeRedirects>::CreateVisual()
1525
- const noexcept {
1526
- return winrt::make<Composition::MicrosoftCompSpriteVisual>(m_compVisual);
1545
+ winrt::Microsoft::ReactNative::Composition::Experimental::IVisual
1546
+ CompCaretVisual<MicrosoftTypeRedirects>::CreateVisual() const noexcept {
1547
+ return winrt::make<Composition::Experimental::MicrosoftCompSpriteVisual>(m_compVisual);
1527
1548
  }
1528
1549
  using MicrosoftCompCaretVisual = CompCaretVisual<MicrosoftTypeRedirects>;
1529
1550
  #endif
1530
1551
 
1531
1552
  template <typename TTypeRedirects>
1532
- struct CompFocusVisual
1533
- : winrt::implements<CompFocusVisual<TTypeRedirects>, winrt::Microsoft::ReactNative::Composition::IFocusVisual> {
1553
+ struct CompFocusVisual : winrt::implements<
1554
+ CompFocusVisual<TTypeRedirects>,
1555
+ winrt::Microsoft::ReactNative::Composition::Experimental::IFocusVisual> {
1534
1556
  CompFocusVisual(typename TTypeRedirects::Compositor const &compositor)
1535
1557
  : m_compVisual(compositor.CreateSpriteVisual()), m_brush(compositor.CreateNineGridBrush()) {
1536
1558
  m_visual = CreateVisual();
@@ -1542,9 +1564,9 @@ struct CompFocusVisual
1542
1564
  m_brush.IsCenterHollow(true);
1543
1565
  }
1544
1566
 
1545
- winrt::Microsoft::ReactNative::Composition::IVisual CreateVisual() noexcept;
1567
+ winrt::Microsoft::ReactNative::Composition::Experimental::IVisual CreateVisual() noexcept;
1546
1568
 
1547
- winrt::Microsoft::ReactNative::Composition::IVisual InnerVisual() const noexcept {
1569
+ winrt::Microsoft::ReactNative::Composition::Experimental::IVisual InnerVisual() const noexcept {
1548
1570
  return m_visual;
1549
1571
  }
1550
1572
 
@@ -1573,7 +1595,7 @@ struct CompFocusVisual
1573
1595
  m_brush.SetInsets(inset, inset, inset, inset);
1574
1596
  }
1575
1597
 
1576
- void AnimationClass(winrt::Microsoft::ReactNative::Composition::AnimationClass value) noexcept {
1598
+ void AnimationClass(winrt::Microsoft::ReactNative::Composition::Experimental::AnimationClass value) noexcept {
1577
1599
  SetAnimationClass(value, m_compVisual);
1578
1600
  }
1579
1601
 
@@ -1581,17 +1603,19 @@ struct CompFocusVisual
1581
1603
  float m_scaleFactor{0};
1582
1604
  typename TTypeRedirects::CompositionNineGridBrush m_brush;
1583
1605
  typename TTypeRedirects::SpriteVisual m_compVisual;
1584
- winrt::Microsoft::ReactNative::Composition::IVisual m_visual{nullptr};
1606
+ winrt::Microsoft::ReactNative::Composition::Experimental::IVisual m_visual{nullptr};
1585
1607
  };
1586
1608
 
1587
- winrt::Microsoft::ReactNative::Composition::IVisual CompFocusVisual<WindowsTypeRedirects>::CreateVisual() noexcept {
1588
- return winrt::make<Composition::WindowsCompSpriteVisual>(m_compVisual);
1609
+ winrt::Microsoft::ReactNative::Composition::Experimental::IVisual
1610
+ CompFocusVisual<WindowsTypeRedirects>::CreateVisual() noexcept {
1611
+ return winrt::make<Composition::Experimental::WindowsCompSpriteVisual>(m_compVisual);
1589
1612
  }
1590
1613
  using WindowsCompFocusVisual = CompFocusVisual<WindowsTypeRedirects>;
1591
1614
 
1592
1615
  #ifdef USE_WINUI3
1593
- winrt::Microsoft::ReactNative::Composition::IVisual CompFocusVisual<MicrosoftTypeRedirects>::CreateVisual() noexcept {
1594
- return winrt::make<Composition::MicrosoftCompSpriteVisual>(m_compVisual);
1616
+ winrt::Microsoft::ReactNative::Composition::Experimental::IVisual
1617
+ CompFocusVisual<MicrosoftTypeRedirects>::CreateVisual() noexcept {
1618
+ return winrt::make<Composition::Experimental::MicrosoftCompSpriteVisual>(m_compVisual);
1595
1619
  }
1596
1620
  using MicrosoftCompFocusVisual = CompFocusVisual<MicrosoftTypeRedirects>;
1597
1621
  #endif
@@ -1599,7 +1623,7 @@ using MicrosoftCompFocusVisual = CompFocusVisual<MicrosoftTypeRedirects>;
1599
1623
  template <typename TTypeRedirects>
1600
1624
  struct CompContext : winrt::implements<
1601
1625
  CompContext<TTypeRedirects>,
1602
- winrt::Microsoft::ReactNative::Composition::ICompositionContext,
1626
+ winrt::Microsoft::ReactNative::Composition::Experimental::ICompositionContext,
1603
1627
  typename TTypeRedirects::IInnerCompositionCompositor,
1604
1628
  ICompositionContextInterop> {
1605
1629
  CompContext(typename TTypeRedirects::Compositor const &compositor) : m_compositor(compositor) {}
@@ -1673,26 +1697,28 @@ struct CompContext : winrt::implements<
1673
1697
  return m_d2dDevice;
1674
1698
  }
1675
1699
 
1676
- winrt::Microsoft::ReactNative::Composition::ISpriteVisual CreateSpriteVisual() noexcept;
1700
+ winrt::Microsoft::ReactNative::Composition::Experimental::ISpriteVisual CreateSpriteVisual() noexcept;
1677
1701
 
1678
- winrt::Microsoft::ReactNative::Composition::IRoundedRectangleVisual CreateRoundedRectangleVisual() noexcept;
1702
+ winrt::Microsoft::ReactNative::Composition::Experimental::IRoundedRectangleVisual
1703
+ CreateRoundedRectangleVisual() noexcept;
1679
1704
 
1680
- winrt::Microsoft::ReactNative::Composition::IScrollVisual CreateScrollerVisual() noexcept;
1705
+ winrt::Microsoft::ReactNative::Composition::Experimental::IScrollVisual CreateScrollerVisual() noexcept;
1681
1706
 
1682
- winrt::Microsoft::ReactNative::Composition::IActivityVisual CreateActivityVisual() noexcept;
1707
+ winrt::Microsoft::ReactNative::Composition::Experimental::IActivityVisual CreateActivityVisual() noexcept;
1683
1708
 
1684
- winrt::Microsoft::ReactNative::Composition::IDropShadow CreateDropShadow() noexcept;
1709
+ winrt::Microsoft::ReactNative::Composition::Experimental::IDropShadow CreateDropShadow() noexcept;
1685
1710
 
1686
- winrt::Microsoft::ReactNative::Composition::IBrush CreateColorBrush(winrt::Windows::UI::Color color) noexcept;
1711
+ winrt::Microsoft::ReactNative::Composition::Experimental::IBrush CreateColorBrush(
1712
+ winrt::Windows::UI::Color color) noexcept;
1687
1713
 
1688
- winrt::Microsoft::ReactNative::Composition::IDrawingSurfaceBrush CreateDrawingSurfaceBrush(
1714
+ winrt::Microsoft::ReactNative::Composition::Experimental::IDrawingSurfaceBrush CreateDrawingSurfaceBrush(
1689
1715
  winrt::Windows::Foundation::Size surfaceSize,
1690
1716
  winrt::Windows::Graphics::DirectX::DirectXPixelFormat pixelFormat,
1691
1717
  winrt::Windows::Graphics::DirectX::DirectXAlphaMode alphaMode) noexcept;
1692
1718
 
1693
- winrt::Microsoft::ReactNative::Composition::ICaretVisual CreateCaretVisual() noexcept;
1719
+ winrt::Microsoft::ReactNative::Composition::Experimental::ICaretVisual CreateCaretVisual() noexcept;
1694
1720
 
1695
- winrt::Microsoft::ReactNative::Composition::IFocusVisual CreateFocusVisual() noexcept;
1721
+ winrt::Microsoft::ReactNative::Composition::Experimental::IFocusVisual CreateFocusVisual() noexcept;
1696
1722
 
1697
1723
  typename TTypeRedirects::CompositionGraphicsDevice CompositionGraphicsDevice() noexcept;
1698
1724
 
@@ -1709,52 +1735,53 @@ struct CompContext : winrt::implements<
1709
1735
  winrt::com_ptr<ID3D11DeviceContext> m_d3dDeviceContext;
1710
1736
  };
1711
1737
 
1712
- winrt::Microsoft::ReactNative::Composition::ISpriteVisual
1738
+ winrt::Microsoft::ReactNative::Composition::Experimental::ISpriteVisual
1713
1739
  CompContext<WindowsTypeRedirects>::CreateSpriteVisual() noexcept {
1714
- return winrt::make<Composition::WindowsCompSpriteVisual>(m_compositor.CreateSpriteVisual());
1740
+ return winrt::make<Composition::Experimental::WindowsCompSpriteVisual>(m_compositor.CreateSpriteVisual());
1715
1741
  }
1716
1742
 
1717
- winrt::Microsoft::ReactNative::Composition::IScrollVisual
1743
+ winrt::Microsoft::ReactNative::Composition::Experimental::IScrollVisual
1718
1744
  CompContext<WindowsTypeRedirects>::CreateScrollerVisual() noexcept {
1719
- return winrt::make<Composition::WindowsCompScrollerVisual>(m_compositor.CreateSpriteVisual());
1745
+ return winrt::make<Composition::Experimental::WindowsCompScrollerVisual>(m_compositor.CreateSpriteVisual());
1720
1746
  }
1721
1747
 
1722
- winrt::Microsoft::ReactNative::Composition::IRoundedRectangleVisual
1748
+ winrt::Microsoft::ReactNative::Composition::Experimental::IRoundedRectangleVisual
1723
1749
  CompContext<WindowsTypeRedirects>::CreateRoundedRectangleVisual() noexcept {
1724
- return winrt::make<Composition::WindowsCompRoundedRectangleVisual>(m_compositor.CreateShapeVisual());
1750
+ return winrt::make<Composition::Experimental::WindowsCompRoundedRectangleVisual>(m_compositor.CreateShapeVisual());
1725
1751
  }
1726
1752
 
1727
- winrt::Microsoft::ReactNative::Composition::IActivityVisual
1753
+ winrt::Microsoft::ReactNative::Composition::Experimental::IActivityVisual
1728
1754
  CompContext<WindowsTypeRedirects>::CreateActivityVisual() noexcept {
1729
- return winrt::make<Composition::WindowsCompActivityVisual>(m_compositor.CreateSpriteVisual());
1755
+ return winrt::make<Composition::Experimental::WindowsCompActivityVisual>(m_compositor.CreateSpriteVisual());
1730
1756
  }
1731
1757
 
1732
- winrt::Microsoft::ReactNative::Composition::IDropShadow CompContext<WindowsTypeRedirects>::CreateDropShadow() noexcept {
1733
- return winrt::make<Composition::WindowsCompDropShadow>(m_compositor.CreateDropShadow());
1758
+ winrt::Microsoft::ReactNative::Composition::Experimental::IDropShadow
1759
+ CompContext<WindowsTypeRedirects>::CreateDropShadow() noexcept {
1760
+ return winrt::make<Composition::Experimental::WindowsCompDropShadow>(m_compositor.CreateDropShadow());
1734
1761
  }
1735
1762
 
1736
- winrt::Microsoft::ReactNative::Composition::IBrush CompContext<WindowsTypeRedirects>::CreateColorBrush(
1763
+ winrt::Microsoft::ReactNative::Composition::Experimental::IBrush CompContext<WindowsTypeRedirects>::CreateColorBrush(
1737
1764
  winrt::Windows::UI::Color color) noexcept {
1738
- return winrt::make<Composition::WindowsCompBrush>(m_compositor.CreateColorBrush(color));
1765
+ return winrt::make<Composition::Experimental::WindowsCompBrush>(m_compositor.CreateColorBrush(color));
1739
1766
  }
1740
1767
 
1741
- winrt::Microsoft::ReactNative::Composition::IDrawingSurfaceBrush
1768
+ winrt::Microsoft::ReactNative::Composition::Experimental::IDrawingSurfaceBrush
1742
1769
  CompContext<WindowsTypeRedirects>::CreateDrawingSurfaceBrush(
1743
1770
  winrt::Windows::Foundation::Size surfaceSize,
1744
1771
  winrt::Windows::Graphics::DirectX::DirectXPixelFormat pixelFormat,
1745
1772
  winrt::Windows::Graphics::DirectX::DirectXAlphaMode alphaMode) noexcept {
1746
- return winrt::make<Composition::WindowsCompDrawingSurfaceBrush>(
1773
+ return winrt::make<Composition::Experimental::WindowsCompDrawingSurfaceBrush>(
1747
1774
  m_compositor, CompositionGraphicsDevice().CreateDrawingSurface(surfaceSize, pixelFormat, alphaMode));
1748
1775
  }
1749
1776
 
1750
- winrt::Microsoft::ReactNative::Composition::ICaretVisual
1777
+ winrt::Microsoft::ReactNative::Composition::Experimental::ICaretVisual
1751
1778
  CompContext<WindowsTypeRedirects>::CreateCaretVisual() noexcept {
1752
- return winrt::make<Composition::WindowsCompCaretVisual>(m_compositor);
1779
+ return winrt::make<Composition::Experimental::WindowsCompCaretVisual>(m_compositor);
1753
1780
  }
1754
1781
 
1755
- winrt::Microsoft::ReactNative::Composition::IFocusVisual
1782
+ winrt::Microsoft::ReactNative::Composition::Experimental::IFocusVisual
1756
1783
  CompContext<WindowsTypeRedirects>::CreateFocusVisual() noexcept {
1757
- return winrt::make<Composition::WindowsCompFocusVisual>(m_compositor);
1784
+ return winrt::make<Composition::Experimental::WindowsCompFocusVisual>(m_compositor);
1758
1785
  }
1759
1786
 
1760
1787
  template <>
@@ -1779,42 +1806,42 @@ CompContext<WindowsTypeRedirects>::CompositionGraphicsDevice() noexcept {
1779
1806
  using WindowsCompContext = CompContext<WindowsTypeRedirects>;
1780
1807
 
1781
1808
  #ifdef USE_WINUI3
1782
- winrt::Microsoft::ReactNative::Composition::ISpriteVisual
1809
+ winrt::Microsoft::ReactNative::Composition::Experimental::ISpriteVisual
1783
1810
  CompContext<MicrosoftTypeRedirects>::CreateSpriteVisual() noexcept {
1784
- return winrt::make<Composition::MicrosoftCompSpriteVisual>(m_compositor.CreateSpriteVisual());
1811
+ return winrt::make<Composition::Experimental::MicrosoftCompSpriteVisual>(m_compositor.CreateSpriteVisual());
1785
1812
  }
1786
1813
 
1787
- winrt::Microsoft::ReactNative::Composition::IScrollVisual
1814
+ winrt::Microsoft::ReactNative::Composition::Experimental::IScrollVisual
1788
1815
  CompContext<MicrosoftTypeRedirects>::CreateScrollerVisual() noexcept {
1789
- return winrt::make<Composition::MicrosoftCompScrollerVisual>(m_compositor.CreateSpriteVisual());
1816
+ return winrt::make<Composition::Experimental::MicrosoftCompScrollerVisual>(m_compositor.CreateSpriteVisual());
1790
1817
  }
1791
1818
 
1792
- winrt::Microsoft::ReactNative::Composition::IRoundedRectangleVisual
1819
+ winrt::Microsoft::ReactNative::Composition::Experimental::IRoundedRectangleVisual
1793
1820
  CompContext<MicrosoftTypeRedirects>::CreateRoundedRectangleVisual() noexcept {
1794
- return winrt::make<Composition::MicrosoftCompRoundedRectangleVisual>(m_compositor.CreateShapeVisual());
1821
+ return winrt::make<Composition::Experimental::MicrosoftCompRoundedRectangleVisual>(m_compositor.CreateShapeVisual());
1795
1822
  }
1796
1823
 
1797
- winrt::Microsoft::ReactNative::Composition::IActivityVisual
1824
+ winrt::Microsoft::ReactNative::Composition::Experimental::IActivityVisual
1798
1825
  CompContext<MicrosoftTypeRedirects>::CreateActivityVisual() noexcept {
1799
- return winrt::make<Composition::MicrosoftCompActivityVisual>(m_compositor.CreateSpriteVisual());
1826
+ return winrt::make<Composition::Experimental::MicrosoftCompActivityVisual>(m_compositor.CreateSpriteVisual());
1800
1827
  }
1801
1828
 
1802
- winrt::Microsoft::ReactNative::Composition::IDropShadow
1829
+ winrt::Microsoft::ReactNative::Composition::Experimental::IDropShadow
1803
1830
  CompContext<MicrosoftTypeRedirects>::CreateDropShadow() noexcept {
1804
- return winrt::make<Composition::MicrosoftCompDropShadow>(m_compositor.CreateDropShadow());
1831
+ return winrt::make<Composition::Experimental::MicrosoftCompDropShadow>(m_compositor.CreateDropShadow());
1805
1832
  }
1806
1833
 
1807
- winrt::Microsoft::ReactNative::Composition::IBrush CompContext<MicrosoftTypeRedirects>::CreateColorBrush(
1834
+ winrt::Microsoft::ReactNative::Composition::Experimental::IBrush CompContext<MicrosoftTypeRedirects>::CreateColorBrush(
1808
1835
  winrt::Windows::UI::Color color) noexcept {
1809
- return winrt::make<Composition::MicrosoftCompBrush>(m_compositor.CreateColorBrush(color));
1836
+ return winrt::make<Composition::Experimental::MicrosoftCompBrush>(m_compositor.CreateColorBrush(color));
1810
1837
  }
1811
1838
 
1812
- winrt::Microsoft::ReactNative::Composition::IDrawingSurfaceBrush
1839
+ winrt::Microsoft::ReactNative::Composition::Experimental::IDrawingSurfaceBrush
1813
1840
  CompContext<MicrosoftTypeRedirects>::CreateDrawingSurfaceBrush(
1814
1841
  winrt::Windows::Foundation::Size surfaceSize,
1815
1842
  winrt::Windows::Graphics::DirectX::DirectXPixelFormat pixelFormat,
1816
1843
  winrt::Windows::Graphics::DirectX::DirectXAlphaMode alphaMode) noexcept {
1817
- return winrt::make<Composition::MicrosoftCompDrawingSurfaceBrush>(
1844
+ return winrt::make<Composition::Experimental::MicrosoftCompDrawingSurfaceBrush>(
1818
1845
  m_compositor,
1819
1846
  CompositionGraphicsDevice().CreateDrawingSurface(
1820
1847
  surfaceSize,
@@ -1822,14 +1849,14 @@ CompContext<MicrosoftTypeRedirects>::CreateDrawingSurfaceBrush(
1822
1849
  static_cast<winrt::Microsoft::Graphics::DirectX::DirectXAlphaMode>(alphaMode)));
1823
1850
  }
1824
1851
 
1825
- winrt::Microsoft::ReactNative::Composition::ICaretVisual
1852
+ winrt::Microsoft::ReactNative::Composition::Experimental::ICaretVisual
1826
1853
  CompContext<MicrosoftTypeRedirects>::CreateCaretVisual() noexcept {
1827
- return winrt::make<Composition::MicrosoftCompCaretVisual>(m_compositor);
1854
+ return winrt::make<Composition::Experimental::MicrosoftCompCaretVisual>(m_compositor);
1828
1855
  }
1829
1856
 
1830
- winrt::Microsoft::ReactNative::Composition::IFocusVisual
1857
+ winrt::Microsoft::ReactNative::Composition::Experimental::IFocusVisual
1831
1858
  CompContext<MicrosoftTypeRedirects>::CreateFocusVisual() noexcept {
1832
- return winrt::make<Composition::MicrosoftCompFocusVisual>(m_compositor);
1859
+ return winrt::make<Composition::Experimental::MicrosoftCompFocusVisual>(m_compositor);
1833
1860
  }
1834
1861
 
1835
1862
  template <>
@@ -1845,19 +1872,19 @@ CompContext<MicrosoftTypeRedirects>::CompositionGraphicsDevice() noexcept {
1845
1872
  using MicrosoftCompContext = CompContext<MicrosoftTypeRedirects>;
1846
1873
  #endif
1847
1874
 
1848
- } // namespace Microsoft::ReactNative::Composition
1875
+ } // namespace Microsoft::ReactNative::Composition::Experimental
1849
1876
 
1850
- namespace winrt::Microsoft::ReactNative::Composition::implementation {
1877
+ namespace winrt::Microsoft::ReactNative::Composition::Experimental::implementation {
1851
1878
 
1852
1879
  ICompositionContext SystemCompositionContextHelper::CreateContext(
1853
1880
  winrt::Windows::UI::Composition::Compositor const &compositor) noexcept {
1854
- return winrt::make<::Microsoft::ReactNative::Composition::WindowsCompContext>(compositor);
1881
+ return winrt::make<::Microsoft::ReactNative::Composition::Experimental::WindowsCompContext>(compositor);
1855
1882
  }
1856
1883
 
1857
1884
  IVisual SystemCompositionContextHelper::CreateVisual(winrt::Windows::UI::Composition::Visual const &visual) noexcept {
1858
1885
  if (auto spriteVisual = visual.try_as<winrt::Windows::UI::Composition::SpriteVisual>())
1859
- return winrt::make<::Microsoft::ReactNative::Composition::WindowsCompSpriteVisual>(spriteVisual);
1860
- return winrt::make<::Microsoft::ReactNative::Composition::WindowsCompVisual>(visual);
1886
+ return winrt::make<::Microsoft::ReactNative::Composition::Experimental::WindowsCompSpriteVisual>(spriteVisual);
1887
+ return winrt::make<::Microsoft::ReactNative::Composition::Experimental::WindowsCompVisual>(visual);
1861
1888
  }
1862
1889
 
1863
1890
  winrt::Windows::UI::Composition::Compositor SystemCompositionContextHelper::InnerCompositor(
@@ -1896,14 +1923,14 @@ winrt::Windows::UI::Composition::ICompositionSurface SystemCompositionContextHel
1896
1923
  #ifdef USE_WINUI3
1897
1924
  ICompositionContext MicrosoftCompositionContextHelper::CreateContext(
1898
1925
  winrt::Microsoft::UI::Composition::Compositor const &compositor) noexcept {
1899
- return winrt::make<::Microsoft::ReactNative::Composition::MicrosoftCompContext>(compositor);
1926
+ return winrt::make<::Microsoft::ReactNative::Composition::Experimental::MicrosoftCompContext>(compositor);
1900
1927
  }
1901
1928
 
1902
1929
  IVisual MicrosoftCompositionContextHelper::CreateVisual(
1903
1930
  winrt::Microsoft::UI::Composition::Visual const &visual) noexcept {
1904
1931
  if (auto spriteVisual = visual.try_as<winrt::Microsoft::UI::Composition::SpriteVisual>())
1905
- return winrt::make<::Microsoft::ReactNative::Composition::MicrosoftCompSpriteVisual>(spriteVisual);
1906
- return winrt::make<::Microsoft::ReactNative::Composition::MicrosoftCompVisual>(visual);
1932
+ return winrt::make<::Microsoft::ReactNative::Composition::Experimental::MicrosoftCompSpriteVisual>(spriteVisual);
1933
+ return winrt::make<::Microsoft::ReactNative::Composition::Experimental::MicrosoftCompVisual>(visual);
1907
1934
  }
1908
1935
 
1909
1936
  winrt::Microsoft::UI::Composition::Compositor MicrosoftCompositionContextHelper::InnerCompositor(
@@ -1941,4 +1968,4 @@ winrt::Microsoft::UI::Composition::ICompositionSurface MicrosoftCompositionConte
1941
1968
  }
1942
1969
  #endif
1943
1970
 
1944
- } // namespace winrt::Microsoft::ReactNative::Composition::implementation
1971
+ } // namespace winrt::Microsoft::ReactNative::Composition::Experimental::implementation