From b85bba7d2dbb912cfa88cc9b1bd3ace7ce775cb3 Mon Sep 17 00:00:00 2001
From: Giuseppe Lippolis <workgroupengineering@outlook.com>
Date: Wed, 30 Jun 2021 18:51:18 +0200
Subject: [PATCH 01/23] fixes: Dialog cancel consistency on windows

---
 src/Windows/Avalonia.Win32/SystemDialogImpl.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Windows/Avalonia.Win32/SystemDialogImpl.cs b/src/Windows/Avalonia.Win32/SystemDialogImpl.cs
index ad81cc1778..f595a58c91 100644
--- a/src/Windows/Avalonia.Win32/SystemDialogImpl.cs
+++ b/src/Windows/Avalonia.Win32/SystemDialogImpl.cs
@@ -19,7 +19,7 @@ namespace Avalonia.Win32
             var hWnd = parent?.PlatformImpl?.Handle?.Handle ?? IntPtr.Zero;
             return Task.Factory.StartNew(() =>
             {
-                var result = Array.Empty<string>();
+                string[] result = default;
 
                 Guid clsid = dialog is OpenFileDialog ? UnmanagedMethods.ShellIds.OpenFileDialog : UnmanagedMethods.ShellIds.SaveFileDialog;
                 Guid iid = UnmanagedMethods.ShellIds.IFileDialog;
@@ -100,7 +100,7 @@ namespace Avalonia.Win32
         {
             return Task.Factory.StartNew(() =>
             {
-                string result = string.Empty;
+                string result = default;
 
                 var hWnd = parent?.PlatformImpl?.Handle?.Handle ?? IntPtr.Zero;
                 Guid clsid = UnmanagedMethods.ShellIds.OpenFileDialog;
@@ -164,7 +164,7 @@ namespace Avalonia.Win32
                     }
                 }
             }
-            return "";
+            return default;
         }
     }
 }

From f6fce366cdec5da49ba04d1417354903be5ea378 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Wed, 14 Jul 2021 15:52:17 +0200
Subject: [PATCH 02/23] Added failing tests for TextLayout when used with a
 transform.

---
 .../Media/TextFormatting/TextLayoutTests.cs   |  97 ++++++++++++++++++
 .../TextLayout/TextLayout_Basic.expected.png  | Bin 0 -> 2177 bytes
 .../TextLayout_Rotated.expected.png           | Bin 0 -> 2628 bytes
 .../TextLayout/TextLayout_Basic.expected.png  | Bin 0 -> 2013 bytes
 .../TextLayout_Rotated.expected.png           | Bin 0 -> 2468 bytes
 5 files changed, 97 insertions(+)
 create mode 100644 tests/Avalonia.RenderTests/Media/TextFormatting/TextLayoutTests.cs
 create mode 100644 tests/TestFiles/Direct2D1/Media/TextFormatting/TextLayout/TextLayout_Basic.expected.png
 create mode 100644 tests/TestFiles/Direct2D1/Media/TextFormatting/TextLayout/TextLayout_Rotated.expected.png
 create mode 100644 tests/TestFiles/Skia/Media/TextFormatting/TextLayout/TextLayout_Basic.expected.png
 create mode 100644 tests/TestFiles/Skia/Media/TextFormatting/TextLayout/TextLayout_Rotated.expected.png

diff --git a/tests/Avalonia.RenderTests/Media/TextFormatting/TextLayoutTests.cs b/tests/Avalonia.RenderTests/Media/TextFormatting/TextLayoutTests.cs
new file mode 100644
index 0000000000..c0a27eb9ca
--- /dev/null
+++ b/tests/Avalonia.RenderTests/Media/TextFormatting/TextLayoutTests.cs
@@ -0,0 +1,97 @@
+using Avalonia.Controls;
+using Avalonia.Media;
+using Avalonia.Media.TextFormatting;
+using Avalonia.Platform;
+using Avalonia.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Xunit;
+
+#if AVALONIA_SKIA
+namespace Avalonia.Skia.RenderTests
+#else
+
+using Avalonia.Direct2D1.RenderTests;
+
+namespace Avalonia.Direct2D1.RenderTests.Media
+#endif
+{
+    public class TextLayoutTests : TestBase
+    {
+        public TextLayoutTests()
+            : base(@"Media\TextFormatting\TextLayout")
+        {
+        }
+
+        [Fact]
+        public async Task TextLayout_Basic()
+        {
+            var t = new TextLayout(
+                "Avalonia!",
+                new Typeface(TestFontFamily),
+                24,
+                Brushes.Black);
+
+            var target = new Border
+            {
+                Width = 200,
+                Height = 200,
+                Background = Brushes.White,
+                Child = new DrawnControl(c =>
+                {
+                    var textRect = new Rect(t.Size);
+                    var bounds = new Rect(0, 0, 200, 200);
+                    var rect = bounds.CenterRect(textRect);
+                    c.DrawRectangle(Brushes.Yellow, null, rect);
+                    t.Draw(c, rect.Position);
+                }),
+            };
+
+            await RenderToFile(target);
+            CompareImages();
+        }
+
+        [Fact]
+        public async Task TextLayout_Rotated()
+        {
+            var t = new TextLayout(
+                "Avalonia!",
+                new Typeface(TestFontFamily),
+                24,
+                Brushes.Black);
+
+            var target = new Border
+            {
+                Width = 200,
+                Height = 200,
+                Background = Brushes.White,
+                Child = new DrawnControl(c =>
+                {
+                    var textRect = new Rect(t.Size);
+                    var bounds = new Rect(0, 0, 200, 200);
+                    var rect = bounds.CenterRect(textRect);
+                    var rotate = Matrix.CreateTranslation(-100, -100) *
+                        Matrix.CreateRotation(MathUtilities.Deg2Rad(90)) *
+                        Matrix.CreateTranslation(100, 100);
+                    using var transform = c.PushPreTransform(rotate);
+                    c.DrawRectangle(Brushes.Yellow, null, rect);
+                    t.Draw(c, rect.Position);
+                }),
+            };
+
+            await RenderToFile(target);
+            CompareImages();
+        }
+
+        private class DrawnControl : Control
+        {
+            private readonly Action<DrawingContext> _render;
+            public DrawnControl(Action<DrawingContext> render) => _render = render;
+            public override void Render(DrawingContext context) => _render(context);
+        }
+    }
+}
diff --git a/tests/TestFiles/Direct2D1/Media/TextFormatting/TextLayout/TextLayout_Basic.expected.png b/tests/TestFiles/Direct2D1/Media/TextFormatting/TextLayout/TextLayout_Basic.expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..215e83106f449cded8d491e55c90a8633372394b
GIT binary patch
literal 2177
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
bYU$|suX6&*OX|Z8-w1#=1O~=?MBn`{PFKEQ

literal 0
HcmV?d00001

diff --git a/tests/TestFiles/Direct2D1/Media/TextFormatting/TextLayout/TextLayout_Rotated.expected.png b/tests/TestFiles/Direct2D1/Media/TextFormatting/TextLayout/TextLayout_Rotated.expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..237a799224e78218188d224b904679c1741b56f9
GIT binary patch
literal 2628
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

literal 0
HcmV?d00001

diff --git a/tests/TestFiles/Skia/Media/TextFormatting/TextLayout/TextLayout_Basic.expected.png b/tests/TestFiles/Skia/Media/TextFormatting/TextLayout/TextLayout_Basic.expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..220932ff41084338bb176fec16989ad4a51f1d21
GIT binary patch
literal 2013
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
J_7>dPe*lXVSIGbX

literal 0
HcmV?d00001

diff --git a/tests/TestFiles/Skia/Media/TextFormatting/TextLayout/TextLayout_Rotated.expected.png b/tests/TestFiles/Skia/Media/TextFormatting/TextLayout/TextLayout_Rotated.expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..26fe2b0c91ad39e98f97b40711fcd8cc436186af
GIT binary patch
literal 2468
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
WTo~Uu_X%vfr0{kQ*diOxn128}S%RYg

literal 0
HcmV?d00001


From 0eede21249b4def32362d92d8b95b64602db67bb Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Wed, 14 Jul 2021 15:53:07 +0200
Subject: [PATCH 03/23] Use pre-transform when drawing TextLayout.

Using a post-transform breaks when there's a transform applied to the drawing context.
---
 .../Media/TextFormatting/ShapedTextCharacters.cs                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Visuals/Media/TextFormatting/ShapedTextCharacters.cs b/src/Avalonia.Visuals/Media/TextFormatting/ShapedTextCharacters.cs
index b304b19910..3c17dabbb0 100644
--- a/src/Avalonia.Visuals/Media/TextFormatting/ShapedTextCharacters.cs
+++ b/src/Avalonia.Visuals/Media/TextFormatting/ShapedTextCharacters.cs
@@ -47,7 +47,7 @@ namespace Avalonia.Media.TextFormatting
         /// <inheritdoc/>
         public override void Draw(DrawingContext drawingContext, Point origin)
         {
-            using (drawingContext.PushPostTransform(Matrix.CreateTranslation(origin)))
+            using (drawingContext.PushPreTransform(Matrix.CreateTranslation(origin)))
             {
                 if (GlyphRun.GlyphIndices.Length == 0)
                 {

From 7aa6152b340d3c65ffbdcde5761f9fc56459f2fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?=
 <wieslawsoltes@users.noreply.github.com>
Date: Mon, 23 Aug 2021 16:53:07 +0200
Subject: [PATCH 04/23] Revert "Fix skia OpacityMask push and pop methods"

This reverts commit dc404b545e534ea904911ca9647f312f77e7ed6d.
---
 src/Skia/Avalonia.Skia/DrawingContextImpl.cs | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
index c9a5544672..1f186396ab 100644
--- a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
+++ b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
@@ -534,11 +534,7 @@ namespace Avalonia.Skia
         public void PushOpacityMask(IBrush mask, Rect bounds)
         {
             // TODO: This should be disposed
-            var paint = new SKPaint()
-            {
-                IsAntialias = true,
-                Style = SKPaintStyle.StrokeAndFill
-            };
+            var paint = new SKPaint();
 
             Canvas.SaveLayer(paint);
             _maskStack.Push(CreatePaint(paint, mask, bounds, true));
@@ -547,14 +543,7 @@ namespace Avalonia.Skia
         /// <inheritdoc />
         public void PopOpacityMask()
         {
-            using (var paint = new SKPaint
-            {
-                IsAntialias = true,
-                Style = SKPaintStyle.StrokeAndFill,
-                BlendMode = SKBlendMode.DstIn,
-                Color = new SKColor(0, 0, 0, 255),
-                ColorFilter = SKColorFilter.CreateLumaColor()
-            })
+            using (var paint = new SKPaint { BlendMode = SKBlendMode.DstIn })
             {
                 Canvas.SaveLayer(paint);
                 using (var paintWrapper = _maskStack.Pop())

From 51862d1b4b6cfc346c63eafd39369ca85259d6dc Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Mon, 23 Aug 2021 17:15:41 +0200
Subject: [PATCH 05/23] Don't display warning when TryCreateAndRegister
 succeeds.

---
 .../WinRT/Composition/WinUICompositorConnection.cs               | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Windows/Avalonia.Win32/WinRT/Composition/WinUICompositorConnection.cs b/src/Windows/Avalonia.Win32/WinRT/Composition/WinUICompositorConnection.cs
index 1c3c959acf..bc8f5a606c 100644
--- a/src/Windows/Avalonia.Win32/WinRT/Composition/WinUICompositorConnection.cs
+++ b/src/Windows/Avalonia.Win32/WinRT/Composition/WinUICompositorConnection.cs
@@ -144,6 +144,7 @@ namespace Avalonia.Win32.WinRT.Composition
                 try
                 {
                     TryCreateAndRegisterCore(angle);
+                    return;
                 }
                 catch (Exception e)
                 {

From 9718a77fa95d86f3b6224f50234a2f17a4150313 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Mon, 23 Aug 2021 23:42:13 +0200
Subject: [PATCH 06/23] Skip TextLayout render tests on OSX.

They were failing due to slightly different text rendering on that platform.
---
 .../Media/TextFormatting/TextLayoutTests.cs              | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tests/Avalonia.RenderTests/Media/TextFormatting/TextLayoutTests.cs b/tests/Avalonia.RenderTests/Media/TextFormatting/TextLayoutTests.cs
index c0a27eb9ca..b1a2d00b00 100644
--- a/tests/Avalonia.RenderTests/Media/TextFormatting/TextLayoutTests.cs
+++ b/tests/Avalonia.RenderTests/Media/TextFormatting/TextLayoutTests.cs
@@ -10,6 +10,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Xunit;
+using System.Runtime.InteropServices;
 
 #if AVALONIA_SKIA
 namespace Avalonia.Skia.RenderTests
@@ -30,6 +31,10 @@ namespace Avalonia.Direct2D1.RenderTests.Media
         [Fact]
         public async Task TextLayout_Basic()
         {
+            // Skip test on OSX: text rendering is subtly different.
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+                return;
+
             var t = new TextLayout(
                 "Avalonia!",
                 new Typeface(TestFontFamily),
@@ -58,6 +63,10 @@ namespace Avalonia.Direct2D1.RenderTests.Media
         [Fact]
         public async Task TextLayout_Rotated()
         {
+            // Skip test on OSX: text rendering is subtly different.
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+                return;
+
             var t = new TextLayout(
                 "Avalonia!",
                 new Typeface(TestFontFamily),

From 0f83ccb4b026d3fec9ee4864c9874aca971feff3 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Mon, 23 Aug 2021 18:30:18 -0400
Subject: [PATCH 07/23] ContentPresenter should create child without content,
 if template was set (#6226)

* Fix #6224

* Fix data templates Match

* Do not use preview features

* Do not create Child if Content is null and DataTemplate was set

* Update src/Avalonia.Base/Utilities/TypeUtilities.cs

* Update src/Avalonia.Controls/Presenters/ContentPresenter.cs

* Update src/Avalonia.Controls/Presenters/ContentPresenter.cs
---
 .../ControlCatalog/Pages/ComboBoxPage.xaml    | 32 ++++++-
 src/Avalonia.Base/Utilities/TypeUtilities.cs  | 34 +++++---
 .../Presenters/ContentPresenter.cs            |  6 +-
 .../Templates/FuncDataTemplate`1.cs           |  6 +-
 .../Templates/DataTemplate.cs                 |  1 -
 .../ContentPresenterTests_Standalone.cs       | 86 +++++++++++++++++++
 6 files changed, 147 insertions(+), 18 deletions(-)

diff --git a/samples/ControlCatalog/Pages/ComboBoxPage.xaml b/samples/ControlCatalog/Pages/ComboBoxPage.xaml
index 025b85492c..d440b7cce3 100644
--- a/samples/ControlCatalog/Pages/ComboBoxPage.xaml
+++ b/samples/ControlCatalog/Pages/ComboBoxPage.xaml
@@ -1,12 +1,20 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              x:Class="ControlCatalog.Pages.ComboBoxPage"
-             xmlns:sys="clr-namespace:System;assembly=netstandard">
+             xmlns:sys="using:System"
+             xmlns:col="using:System.Collections">
   <StackPanel Orientation="Vertical" Spacing="4">
     <TextBlock Classes="h1">ComboBox</TextBlock>
     <TextBlock Classes="h2">A drop-down list.</TextBlock>
 
-    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0 16 0 0" Spacing="8">
+    <WrapPanel HorizontalAlignment="Center" Margin="0 16 0 0"
+               MaxWidth="750">
+      <WrapPanel.Styles>
+        <Style Selector="ComboBox">
+          <Setter Property="Width" Value="250" />
+          <Setter Property="Margin" Value="10" />
+        </Style>
+      </WrapPanel.Styles>
       <ComboBox PlaceholderText="Pick an Item">
         <ComboBoxItem>Inline Items</ComboBoxItem>
         <ComboBoxItem>Inline Item 2</ComboBoxItem>
@@ -14,6 +22,24 @@
         <ComboBoxItem>Inline Item 4</ComboBoxItem>
       </ComboBox>
 
+      <ComboBox>
+        <ComboBox.Items>
+          <col:ArrayList>
+            <x:Null />
+            <sys:String>Hello</sys:String>
+            <sys:String>World</sys:String>
+          </col:ArrayList>
+        </ComboBox.Items>
+        <ComboBox.ItemTemplate>
+          <DataTemplate>
+            <Panel>
+              <TextBlock Text="{Binding}" />
+              <TextBlock Text="Null object" IsVisible="{Binding Converter={x:Static ObjectConverters.IsNull}}" />
+            </Panel>
+          </DataTemplate>
+        </ComboBox.ItemTemplate>
+      </ComboBox>
+
       <ComboBox SelectedIndex="0">
         <ComboBoxItem>
           <Panel>
@@ -46,7 +72,7 @@
           <sys:Exception /> 
         </DataValidationErrors.Error>
       </ComboBox>
-    </StackPanel>
+    </WrapPanel>
 
   </StackPanel>
 </UserControl>
diff --git a/src/Avalonia.Base/Utilities/TypeUtilities.cs b/src/Avalonia.Base/Utilities/TypeUtilities.cs
index 9f2308a062..179ded3549 100644
--- a/src/Avalonia.Base/Utilities/TypeUtilities.cs
+++ b/src/Avalonia.Base/Utilities/TypeUtilities.cs
@@ -93,13 +93,25 @@ namespace Avalonia.Utilities
             return !type.IsValueType || IsNullableType(type);
         }
 
+        /// <summary>
+        /// Returns a value indicating whether value can be casted to the specified type.
+        /// If value is null, checks if instances of that type can be null.
+        /// </summary>
+        /// <typeparam name="T">The type to cast to</typeparam>
+        /// <param name="value">The value to check if cast possible</param>
+        /// <returns>True if the cast is possible, otherwise false.</returns>
+        public static bool CanCast<T>(object value)
+        {
+            return value is T || (value is null && AcceptsNull(typeof(T)));
+        }
+
         /// <summary>
         /// Try to convert a value to a type by any means possible.
         /// </summary>
-        /// <param name="to">The type to cast to.</param>
-        /// <param name="value">The value to cast.</param>
+        /// <param name="to">The type to convert to.</param>
+        /// <param name="value">The value to convert.</param>
         /// <param name="culture">The culture to use.</param>
-        /// <param name="result">If successful, contains the cast value.</param>
+        /// <param name="result">If successful, contains the convert value.</param>
         /// <returns>True if the cast was successful, otherwise false.</returns>
         public static bool TryConvert(Type to, object value, CultureInfo culture, out object result)
         {
@@ -216,10 +228,10 @@ namespace Avalonia.Utilities
         /// Try to convert a value to a type using the implicit conversions allowed by the C#
         /// language.
         /// </summary>
-        /// <param name="to">The type to cast to.</param>
-        /// <param name="value">The value to cast.</param>
-        /// <param name="result">If successful, contains the cast value.</param>
-        /// <returns>True if the cast was successful, otherwise false.</returns>
+        /// <param name="to">The type to convert to.</param>
+        /// <param name="value">The value to convert.</param>
+        /// <param name="result">If successful, contains the converted value.</param>
+        /// <returns>True if the convert was successful, otherwise false.</returns>
         public static bool TryConvertImplicit(Type to, object value, out object result)
         {
             if (value == null)
@@ -278,8 +290,8 @@ namespace Avalonia.Utilities
         /// Convert a value to a type by any means possible, returning the default for that type
         /// if the value could not be converted.
         /// </summary>
-        /// <param name="value">The value to cast.</param>
-        /// <param name="type">The type to cast to..</param>
+        /// <param name="value">The value to convert.</param>
+        /// <param name="type">The type to convert to..</param>
         /// <param name="culture">The culture to use.</param>
         /// <returns>A value of <paramref name="type"/>.</returns>
         public static object ConvertOrDefault(object value, Type type, CultureInfo culture)
@@ -291,8 +303,8 @@ namespace Avalonia.Utilities
         /// Convert a value to a type using the implicit conversions allowed by the C# language or
         /// return the default for the type if the value could not be converted.
         /// </summary>
-        /// <param name="value">The value to cast.</param>
-        /// <param name="type">The type to cast to..</param>
+        /// <param name="value">The value to convert.</param>
+        /// <param name="type">The type to convert to.</param>
         /// <returns>A value of <paramref name="type"/>.</returns>
         public static object ConvertImplicitOrDefault(object value, Type type)
         {
diff --git a/src/Avalonia.Controls/Presenters/ContentPresenter.cs b/src/Avalonia.Controls/Presenters/ContentPresenter.cs
index 472727823a..1a46d84558 100644
--- a/src/Avalonia.Controls/Presenters/ContentPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/ContentPresenter.cs
@@ -327,7 +327,11 @@ namespace Avalonia.Controls.Presenters
             var oldChild = Child;
             var newChild = content as IControl;
 
-            if (content != null && newChild == null)
+            // We want to allow creating Child from the Template, if Content is null.
+            // But it's important to not use DataTemplates, otherwise we will break content presenters in many places,
+            // otherwise it will blow up every ContentPresenter without Content set.
+            if (newChild == null
+                && (content != null || ContentTemplate != null))
             {
                 var dataTemplate = this.FindDataTemplate(content, ContentTemplate) ?? 
                     (
diff --git a/src/Avalonia.Controls/Templates/FuncDataTemplate`1.cs b/src/Avalonia.Controls/Templates/FuncDataTemplate`1.cs
index 4a6a1c6cfb..8e7b290247 100644
--- a/src/Avalonia.Controls/Templates/FuncDataTemplate`1.cs
+++ b/src/Avalonia.Controls/Templates/FuncDataTemplate`1.cs
@@ -1,5 +1,7 @@
 using System;
 
+using Avalonia.Utilities;
+
 namespace Avalonia.Controls.Templates
 {
     /// <summary>
@@ -16,7 +18,7 @@ namespace Avalonia.Controls.Templates
         /// </param>
         /// <param name="supportsRecycling">Whether the control can be recycled.</param>
         public FuncDataTemplate(Func<T, INameScope, IControl> build, bool supportsRecycling = false)
-            : base(typeof(T), CastBuild(build), supportsRecycling)
+            : base(o => TypeUtilities.CanCast<T>(o), CastBuild(build), supportsRecycling)
         {
         }
 
@@ -63,7 +65,7 @@ namespace Avalonia.Controls.Templates
         /// <returns>The weakly typed function.</returns>
         private static Func<object, bool> CastMatch(Func<T, bool> f)
         {
-            return o => (o is T) && f((T)o);
+            return o => TypeUtilities.CanCast<T>(o) && f((T)o);
         }
 
         /// <summary>
diff --git a/src/Markup/Avalonia.Markup.Xaml/Templates/DataTemplate.cs b/src/Markup/Avalonia.Markup.Xaml/Templates/DataTemplate.cs
index 650534b347..b7db1a3fbb 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Templates/DataTemplate.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Templates/DataTemplate.cs
@@ -9,7 +9,6 @@ namespace Avalonia.Markup.Xaml.Templates
     {
         public Type DataType { get; set; }
 
-        //we need content to be object otherwise portable.xaml is crashing
         [Content]
         [TemplateContent]
         public object Content { get; set; }
diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Standalone.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Standalone.cs
index c7aa583b6f..6b744ed79c 100644
--- a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Standalone.cs
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Standalone.cs
@@ -264,5 +264,91 @@ namespace Avalonia.Controls.UnitTests.Presenters
             // InheritanceParent is exposed via StylingParent.
             Assert.Same(logicalParent, ((IStyledElement)child).StylingParent);
         }
+
+        [Fact]
+        public void Should_Create_Child_Even_With_Null_Content_When_ContentTemplate_Is_Set()
+        {
+            var target = new ContentPresenter
+            {
+                ContentTemplate = new FuncDataTemplate<object>(_ => true, (_, __) => new TextBlock
+                {
+                    Text = "Hello World"
+                }),
+                Content = null
+            };
+
+            target.UpdateChild();
+
+            var textBlock = Assert.IsType<TextBlock>(target.Child);
+            Assert.Equal("Hello World", textBlock.Text);
+        }
+
+        [Fact]
+        public void Should_Not_Create_Child_Even_With_Null_Content_And_DataTemplates_InsteadOf_ContentTemplate()
+        {
+            var target = new ContentPresenter
+            {
+                DataTemplates =
+                {
+                    new FuncDataTemplate<object>(_ => true, (_, __) => new TextBlock
+                    {
+                        Text = "Hello World"
+                    })
+                },
+                Content = null
+            };
+
+            target.UpdateChild();
+
+            Assert.Null(target.Child);
+        }
+
+        [Fact]
+        public void Should_Not_Create_Child_When_Content_And_Template_Are_Null()
+        {
+            var target = new ContentPresenter
+            {
+                ContentTemplate = null,
+                Content = null
+            };
+
+            target.UpdateChild();
+
+            Assert.Null(target.Child);
+        }
+
+        [Fact]
+        public void Should_Not_Create_When_Child_Content_Is_Null_But_Expected_ValueType_With_FuncDataTemplate()
+        {
+            var target = new ContentPresenter
+            {
+                ContentTemplate = new FuncDataTemplate<int>(_ => true, (_, __) => new TextBlock
+                {
+                    Text = "Hello World"
+                }),
+                Content = null
+            };
+
+            target.UpdateChild();
+
+            Assert.Null(target.Child);
+        }
+
+        [Fact]
+        public void Should_Create_Child_When_Content_Is_Null_And_Expected_NullableValueType_With_FuncDataTemplate()
+        {
+            var target = new ContentPresenter
+            {
+                ContentTemplate = new FuncDataTemplate<int?>(_ => true, (_, __) => new TextBlock
+                {
+                    Text = "Hello World"
+                }),
+                Content = null
+            };
+
+            target.UpdateChild();
+
+            Assert.NotNull(target.Child);
+        }
     }
 }

From 5df9e5760c8eb76dd6f3b49db77635b4eb3d4619 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 24 Aug 2021 14:04:40 +0200
Subject: [PATCH 08/23] Add #nullable and XML doc comments to system dialogs.

---
 src/Avalonia.Controls/SystemDialog.cs | 99 ++++++++++++++++++++++++---
 1 file changed, 89 insertions(+), 10 deletions(-)

diff --git a/src/Avalonia.Controls/SystemDialog.cs b/src/Avalonia.Controls/SystemDialog.cs
index e74b950f23..d81926ecc7 100644
--- a/src/Avalonia.Controls/SystemDialog.cs
+++ b/src/Avalonia.Controls/SystemDialog.cs
@@ -4,30 +4,65 @@ using System.Linq;
 using System.Threading.Tasks;
 using Avalonia.Controls.Platform;
 
+#nullable enable
+
 namespace Avalonia.Controls
 {
+    /// <summary>
+    /// Base class for system file dialogs.
+    /// </summary>
     public abstract class FileDialog : FileSystemDialog
     {
+        /// <summary>
+        /// Gets or sets a collection of filters which determine the types of files displayed in an
+        /// <see cref="OpenFileDialog"/> or an <see cref="SaveFileDialog"/>.
+        /// </summary>
         public List<FileDialogFilter> Filters { get; set; } = new List<FileDialogFilter>();
-        public string InitialFileName { get; set; }        
+
+        /// <summary>
+        /// Gets or sets initial file name that is displayed when the dialog is opened.
+        /// </summary>
+        public string? InitialFileName { get; set; }        
     }
 
+    /// <summary>
+    /// Base class for system file and directory dialogs.
+    /// </summary>
     public abstract class FileSystemDialog : SystemDialog
     {
         [Obsolete("Use Directory")]
-        public string InitialDirectory
+        public string? InitialDirectory
         {
             get => Directory;
             set => Directory = value;
         }
-        public string Directory { get; set; }
+
+        /// <summary>
+        /// Gets or sets the initial directory that will be displayed when the file system dialog
+        /// is opened.
+        /// </summary>
+        public string? Directory { get; set; }
     }
 
+    /// <summary>
+    /// Represents a system dialog that prompts the user to select a location for saving a file.
+    /// </summary>
     public class SaveFileDialog : FileDialog
     {
-        public string DefaultExtension { get; set; }
+        /// <summary>
+        /// Gets or sets the default extension to be used to save the file (including the period ".").
+        /// </summary>
+        public string? DefaultExtension { get; set; }
 
-        public async Task<string> ShowAsync(Window parent)
+        /// <summary>
+        /// Shows the save file dialog.
+        /// </summary>
+        /// <param name="parent">The parent window.</param>
+        /// <returns>
+        /// A task that on completion contains the full path of the save location, or null if the
+        /// dialog was canceled.
+        /// </returns>
+        public async Task<string?> ShowAsync(Window parent)
         {
             if(parent == null)
                 throw new ArgumentNullException(nameof(parent));
@@ -37,11 +72,25 @@ namespace Avalonia.Controls
         }
     }
 
+    /// <summary>
+    /// Represents a system dialog that allows the user to select one or more files to open.
+    /// </summary>
     public class OpenFileDialog : FileDialog
     {
+        /// <summary>
+        /// Gets or sets a value indicating whether the user can select multiple files.
+        /// </summary>
         public bool AllowMultiple { get; set; }
 
-        public Task<string[]> ShowAsync(Window parent)
+        /// <summary>
+        /// Shows the open file dialog.
+        /// </summary>
+        /// <param name="parent">The parent window.</param>
+        /// <returns>
+        /// A task that on completion returns an array containing the full path to the selected
+        /// files, or null if the dialog was canceled.
+        /// </returns>
+        public Task<string[]?> ShowAsync(Window parent)
         {
             if(parent == null)
                 throw new ArgumentNullException(nameof(parent));
@@ -49,15 +98,27 @@ namespace Avalonia.Controls
         }
     }
 
+    /// <summary>
+    /// Represents a system dialog that allows the user to select a directory.
+    /// </summary>
     public class OpenFolderDialog : FileSystemDialog
     {
         [Obsolete("Use Directory")]
-        public string DefaultDirectory
+        public string? DefaultDirectory
         {
             get => Directory;
             set => Directory = value;
         }
-        public Task<string> ShowAsync(Window parent)
+
+        /// <summary>
+        /// Shows the open folder dialog.
+        /// </summary>
+        /// <param name="parent">The parent window.</param>
+        /// <returns>
+        /// A task that on completion returns the full path of the selected directory, or null if the
+        /// dialog was canceled.
+        /// </returns>
+        public Task<string?> ShowAsync(Window parent)
         {
             if(parent == null)
                 throw new ArgumentNullException(nameof(parent));
@@ -65,14 +126,32 @@ namespace Avalonia.Controls
         }
     }
 
+
+    /// <summary>
+    /// Base class for system dialogs.
+    /// </summary>
     public abstract class SystemDialog
     {
-        public string Title { get; set; }
+        /// <summary>
+        /// Gets or sets the dialog title.
+        /// </summary>
+        public string? Title { get; set; }
     }
 
+    /// <summary>
+    /// Represents a filter in an <see cref="OpenFileDialog"/> or an <see cref="SaveFileDialog"/>.
+    /// </summary>
     public class FileDialogFilter
     {
-        public string Name { get; set; }
+        /// <summary>
+        /// Gets or sets the name of the filter, e.g. ("Text files (.txt)").
+        /// </summary>
+        public string? Name { get; set; }
+
+        /// <summary>
+        /// Gets or sets a list of file extensions matched by the filter (e.g. "txt" or "*" for all
+        /// files).
+        /// </summary>
         public List<string> Extensions { get; set; } = new List<string>();
     }
 }

From 1a95905efe9a3c00f712c0e68c9fefaceb23103e Mon Sep 17 00:00:00 2001
From: Sergey Mikolaytis <blasterloremaster@gmail.com>
Date: Wed, 25 Aug 2021 03:37:06 +0300
Subject: [PATCH 09/23] [Menu] [Interaction] Allow end user to change menu show
 delay globally (#6392)

Co-authored-by: Max Katz <maxkatz6@outlook.com>
---
 src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs b/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs
index 984faa4d60..209feb351c 100644
--- a/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs
+++ b/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs
@@ -115,7 +115,7 @@ namespace Avalonia.Controls.Platform
 
         protected IMenu? Menu { get; private set; }
 
-        protected static TimeSpan MenuShowDelay { get; } = TimeSpan.FromMilliseconds(400);
+        public static TimeSpan MenuShowDelay { get; set; } = TimeSpan.FromMilliseconds(400);
 
         protected internal virtual void GotFocus(object sender, GotFocusEventArgs e)
         {

From dcc033f8197dd857ab8b02faef5ce81f3873fb37 Mon Sep 17 00:00:00 2001
From: kaminova <45092470+kaminova@users.noreply.github.com>
Date: Wed, 25 Aug 2021 04:13:54 +0200
Subject: [PATCH 10/23] Close popup if combobox is not visible (#6404)

* Close popup if combobox is not visible

* fix unsupported feature

Co-authored-by: kaminova <flake@inbox@gmail.com>
Co-authored-by: Max Katz <maxkatz6@outlook.com>
---
 src/Avalonia.Controls/ComboBox.cs             | 30 ++++++++++----
 .../Mixins/DisposableMixin.cs                 | 38 +++++++++++++++++
 src/Avalonia.Controls/Primitives/Popup.cs     | 41 ++++++++-----------
 3 files changed, 77 insertions(+), 32 deletions(-)
 create mode 100644 src/Avalonia.Controls/Mixins/DisposableMixin.cs

diff --git a/src/Avalonia.Controls/ComboBox.cs b/src/Avalonia.Controls/ComboBox.cs
index 57c07916db..274696d501 100644
--- a/src/Avalonia.Controls/ComboBox.cs
+++ b/src/Avalonia.Controls/ComboBox.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Linq;
+using System.Reactive.Disposables;
 using Avalonia.Controls.Generators;
+using Avalonia.Controls.Mixins;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Shapes;
@@ -80,7 +82,7 @@ namespace Avalonia.Controls
         private bool _isDropDownOpen;
         private Popup _popup;
         private object _selectionBoxItem;
-        private IDisposable _subscriptionsOnOpen;
+        private readonly CompositeDisposable _subscriptionsOnOpen = new CompositeDisposable();
 
         /// <summary>
         /// Initializes static members of the <see cref="ComboBox"/> class.
@@ -291,6 +293,7 @@ namespace Avalonia.Controls
 
             _popup = e.NameScope.Get<Popup>("PART_Popup");
             _popup.Opened += PopupOpened;
+            _popup.Closed += PopupClosed;
         }
 
         internal void ItemFocused(ComboBoxItem dropDownItem)
@@ -303,8 +306,7 @@ namespace Avalonia.Controls
 
         private void PopupClosed(object sender, EventArgs e)
         {
-            _subscriptionsOnOpen?.Dispose();
-            _subscriptionsOnOpen = null;
+            _subscriptionsOnOpen.Clear();
 
             if (CanFocus(this))
             {
@@ -316,20 +318,34 @@ namespace Avalonia.Controls
         {
             TryFocusSelectedItem();
 
-            _subscriptionsOnOpen?.Dispose();
-            _subscriptionsOnOpen = null;
+            _subscriptionsOnOpen.Clear();
 
             var toplevel = this.GetVisualRoot() as TopLevel;
             if (toplevel != null)
             {
-                _subscriptionsOnOpen = toplevel.AddDisposableHandler(PointerWheelChangedEvent, (s, ev) =>
+                toplevel.AddDisposableHandler(PointerWheelChangedEvent, (s, ev) =>
                 {
                     //eat wheel scroll event outside dropdown popup while it's open
                     if (IsDropDownOpen && (ev.Source as IVisual).GetVisualRoot() == toplevel)
                     {
                         ev.Handled = true;
                     }
-                }, Interactivity.RoutingStrategies.Tunnel);
+                }, Interactivity.RoutingStrategies.Tunnel).DisposeWith(_subscriptionsOnOpen);
+            }
+
+            this.GetObservable(IsVisibleProperty).Subscribe(IsVisibleChanged).DisposeWith(_subscriptionsOnOpen);
+
+            foreach (var parent in this.GetVisualAncestors().OfType<IControl>())
+            {
+                parent.GetObservable(IsVisibleProperty).Subscribe(IsVisibleChanged).DisposeWith(_subscriptionsOnOpen);
+            }
+        }
+
+        private void IsVisibleChanged(bool isVisible)
+        {
+            if (!isVisible && IsDropDownOpen)
+            {
+                IsDropDownOpen = false;
             }
         }
 
diff --git a/src/Avalonia.Controls/Mixins/DisposableMixin.cs b/src/Avalonia.Controls/Mixins/DisposableMixin.cs
new file mode 100644
index 0000000000..9b30b4ba4c
--- /dev/null
+++ b/src/Avalonia.Controls/Mixins/DisposableMixin.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Reactive.Disposables;
+
+namespace Avalonia.Controls.Mixins
+{
+    /// <summary>
+    /// Extension methods associated with the IDisposable interface.
+    /// </summary>
+    public static class DisposableMixin
+    {
+        /// <summary>
+        /// Ensures the provided disposable is disposed with the specified <see cref="CompositeDisposable"/>.
+        /// </summary>
+        /// <typeparam name="T">
+        /// The type of the disposable.
+        /// </typeparam>
+        /// <param name="item">
+        /// The disposable we are going to want to be disposed by the CompositeDisposable.
+        /// </param>
+        /// <param name="compositeDisposable">
+        /// The <see cref="CompositeDisposable"/> to which <paramref name="item"/> will be added.
+        /// </param>
+        /// <returns>
+        /// The disposable.
+        /// </returns>
+        public static T DisposeWith<T>(this T item, CompositeDisposable compositeDisposable)
+            where T : IDisposable
+        {
+            if (compositeDisposable is null)
+            {
+                throw new ArgumentNullException(nameof(compositeDisposable));
+            }
+
+            compositeDisposable.Add(item);
+            return item;
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Primitives/Popup.cs b/src/Avalonia.Controls/Primitives/Popup.cs
index d5fb69a672..e804c4b4a9 100644
--- a/src/Avalonia.Controls/Primitives/Popup.cs
+++ b/src/Avalonia.Controls/Primitives/Popup.cs
@@ -2,6 +2,7 @@ using System;
 using System.ComponentModel;
 using System.Linq;
 using System.Reactive.Disposables;
+using Avalonia.Controls.Mixins;
 using Avalonia.Controls.Diagnostics;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives.PopupPositioning;
@@ -393,18 +394,8 @@ namespace Avalonia.Controls.Primitives
 
             var handlerCleanup = new CompositeDisposable(5);
 
-            void DeferCleanup(IDisposable? disposable)
-            {
-                if (disposable is null)
-                {
-                    return;
-                }
-
-                handlerCleanup.Add(disposable);
-            }
-
-            DeferCleanup(popupHost.BindConstraints(this, WidthProperty, MinWidthProperty, MaxWidthProperty,
-                HeightProperty, MinHeightProperty, MaxHeightProperty, TopmostProperty));
+            popupHost.BindConstraints(this, WidthProperty, MinWidthProperty, MaxWidthProperty,
+                HeightProperty, MinHeightProperty, MaxHeightProperty, TopmostProperty).DisposeWith(handlerCleanup);
 
             popupHost.SetChild(Child);
             ((ISetLogicalParent)popupHost).SetParent(this);
@@ -418,19 +409,19 @@ namespace Avalonia.Controls.Primitives
                 PlacementConstraintAdjustment,
                 PlacementRect);
 
-            DeferCleanup(SubscribeToEventHandler<IPopupHost, EventHandler<TemplateAppliedEventArgs>>(popupHost, RootTemplateApplied,
+            SubscribeToEventHandler<IPopupHost, EventHandler<TemplateAppliedEventArgs>>(popupHost, RootTemplateApplied,
                 (x, handler) => x.TemplateApplied += handler,
-                (x, handler) => x.TemplateApplied -= handler));
+                (x, handler) => x.TemplateApplied -= handler).DisposeWith(handlerCleanup);
 
             if (topLevel is Window window)
             {
-                DeferCleanup(SubscribeToEventHandler<Window, EventHandler>(window, WindowDeactivated,
+                SubscribeToEventHandler<Window, EventHandler>(window, WindowDeactivated,
                     (x, handler) => x.Deactivated += handler,
-                    (x, handler) => x.Deactivated -= handler));
+                    (x, handler) => x.Deactivated -= handler).DisposeWith(handlerCleanup);
                 
-                DeferCleanup(SubscribeToEventHandler<IWindowImpl, Action>(window.PlatformImpl, WindowLostFocus,
+                SubscribeToEventHandler<IWindowImpl, Action>(window.PlatformImpl, WindowLostFocus,
                         (x, handler) => x.LostFocus += handler,
-                        (x, handler) => x.LostFocus -= handler));
+                        (x, handler) => x.LostFocus -= handler).DisposeWith(handlerCleanup);
             }
             else
             {
@@ -438,13 +429,13 @@ namespace Avalonia.Controls.Primitives
 
                 if (parentPopupRoot?.Parent is Popup popup)
                 {
-                    DeferCleanup(SubscribeToEventHandler<Popup, EventHandler<EventArgs>>(popup, ParentClosed,
+                    SubscribeToEventHandler<Popup, EventHandler<EventArgs>>(popup, ParentClosed,
                         (x, handler) => x.Closed += handler,
-                        (x, handler) => x.Closed -= handler));
+                        (x, handler) => x.Closed -= handler).DisposeWith(handlerCleanup);
                 }
             }
 
-            DeferCleanup(InputManager.Instance?.Process.Subscribe(ListenForNonClientClick));
+            InputManager.Instance?.Process.Subscribe(ListenForNonClientClick).DisposeWith(handlerCleanup);
 
             var cleanupPopup = Disposable.Create((popupHost, handlerCleanup), state =>
             {
@@ -466,17 +457,17 @@ namespace Avalonia.Controls.Primitives
                     dismissLayer.IsVisible = true;
                     dismissLayer.InputPassThroughElement = _overlayInputPassThroughElement;
                     
-                    DeferCleanup(Disposable.Create(() =>
+                    Disposable.Create(() =>
                     {
                         dismissLayer.IsVisible = false;
                         dismissLayer.InputPassThroughElement = null;
-                    }));
+                    }).DisposeWith(handlerCleanup);
                     
-                    DeferCleanup(SubscribeToEventHandler<LightDismissOverlayLayer, EventHandler<PointerPressedEventArgs>>(
+                    SubscribeToEventHandler<LightDismissOverlayLayer, EventHandler<PointerPressedEventArgs>>(
                         dismissLayer,
                         PointerPressedDismissOverlay,
                         (x, handler) => x.PointerPressed += handler,
-                        (x, handler) => x.PointerPressed -= handler));
+                        (x, handler) => x.PointerPressed -= handler).DisposeWith(handlerCleanup);
                 }
             }
 

From cd80536d58834f52e6b2746463dbb2b9c0cc4759 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Wed, 25 Aug 2021 18:21:34 +0200
Subject: [PATCH 11/23] Added failing test for #6439.

---
 .../KeyboardNavigationTests_Tab.cs            | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Tab.cs b/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Tab.cs
index edcbf75a1d..9a117bb71d 100644
--- a/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Tab.cs
+++ b/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Tab.cs
@@ -1225,5 +1225,32 @@ namespace Avalonia.Input.UnitTests
                 "Button2", "Button3", "Button5", "Button1", "Button6", "Button4"
             }, result);
         }
+
+        [Fact]
+        public void Cannot_Focus_Child_Of_Disabled_Control()
+        {
+            Button start;
+            Button expected;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    (start = new Button { Name = "Button1" }),
+                    new Border
+                    {
+                        IsEnabled = false,
+                        Child = new Button { Name = "Button2" },
+                    },
+                    (expected = new Button { Name = "Button3" }),
+                }
+            };
+
+            var current = (IInputElement)start;
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
+
+            Assert.Same(expected, result);
+        }
     }
 }

From 341e435321df26178dcaddfea768eaaa65a8b4d6 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Wed, 25 Aug 2021 19:10:18 +0200
Subject: [PATCH 12/23] Check enabled state as well as visibility.

WPF and Avalonia's `IsEnabled` properties are slightly different.

In WPF if reflects both the enabled state of the actual control and the effectively enabled state which comes from ancestor controls. In Avalonia that effectively enabled state is exposed on a different property: `IsEffectivelyEnabled`. When I ported the tab navigation code from WPF, I didn't take that into account.

WPF's visibility property however doesn't reflect the state of a control's owners and so tab navigation for invisible controls works correctly. Take advantage of this fact by changing any checks for `IsVisible` to also check `IsEnabled`.
---
 src/Avalonia.Input/Navigation/TabNavigation.cs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/Avalonia.Input/Navigation/TabNavigation.cs b/src/Avalonia.Input/Navigation/TabNavigation.cs
index ed7df67bf2..c8290cb3b7 100644
--- a/src/Avalonia.Input/Navigation/TabNavigation.cs
+++ b/src/Avalonia.Input/Navigation/TabNavigation.cs
@@ -234,7 +234,7 @@ namespace Avalonia.Input.Navigation
             // Return the first visible element.
             var uiElement = e as InputElement;
 
-            if (uiElement is null || uiElement.IsVisible)
+            if (uiElement is null || IsVisibleAndEnabled(uiElement))
             {
                 if (e is IVisual elementAsVisual)
                 {
@@ -245,7 +245,7 @@ namespace Avalonia.Input.Navigation
                     {
                         if (children[i] is InputElement ie)
                         {
-                            if (ie.IsVisible)
+                            if (IsVisibleAndEnabled(ie))
                                 return ie;
                             else
                             {
@@ -270,7 +270,7 @@ namespace Avalonia.Input.Navigation
             // Return the last visible element.
             var uiElement = e as InputElement;
 
-            if (uiElement == null || uiElement.IsVisible)
+            if (uiElement == null || IsVisibleAndEnabled(uiElement))
             {
                 var elementAsVisual = e as IVisual;
 
@@ -283,7 +283,7 @@ namespace Avalonia.Input.Navigation
                     {
                         if (children[i] is InputElement ie)
                         {
-                            if (ie.IsVisible)
+                            if (IsVisibleAndEnabled(ie))
                                 return ie;
                             else
                             {
@@ -600,7 +600,7 @@ namespace Avalonia.Input.Navigation
                     var vchild = children[i];
                     if (vchild == elementAsVisual)
                         break;
-                    if (vchild.IsVisible == true && vchild is IInputElement ie)
+                    if (vchild is IInputElement ie && IsVisibleAndEnabled(ie))
                         prev = ie;
                 }
                 return prev;
@@ -668,5 +668,6 @@ namespace Avalonia.Input.Navigation
         }
 
         private static bool IsTabStopOrGroup(IInputElement e) => IsTabStop(e) || IsGroup(e);
+        private static bool IsVisibleAndEnabled(IInputElement e) => e.IsVisible && e.IsEnabled;
     }
 }

From 8dbf3bf86e2ecdb3432a18ad02ab4c45189f37d2 Mon Sep 17 00:00:00 2001
From: Giuseppe Lippolis <workgroupengineering@outlook.com>
Date: Thu, 26 Aug 2021 17:57:35 +0200
Subject: [PATCH 13/23] fixes(Win32.Interop): field
 'Direct2DImageSurface._oldDpi' is never assigned to, and will always have its
 default value

---
 src/Windows/Avalonia.Win32.Interop/Wpf/Direct2DImageSurface.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Windows/Avalonia.Win32.Interop/Wpf/Direct2DImageSurface.cs b/src/Windows/Avalonia.Win32.Interop/Wpf/Direct2DImageSurface.cs
index 5b04c5d7ff..bc0a399d7f 100644
--- a/src/Windows/Avalonia.Win32.Interop/Wpf/Direct2DImageSurface.cs
+++ b/src/Windows/Avalonia.Win32.Interop/Wpf/Direct2DImageSurface.cs
@@ -150,6 +150,7 @@ namespace Avalonia.Win32.Interop.Wpf
             if (_image == null || _oldDpi.X != dpi.X || _oldDpi.Y != dpi.Y)
             {
                 _image = new D3DImage(dpi.X, dpi.Y);
+                _oldDpi = dpi;
             }
             _impl.ImageSource = _image;
             

From 3867a68ade09cd12910afc5256e7b73c05703571 Mon Sep 17 00:00:00 2001
From: Tako <53405089+Takoooooo@users.noreply.github.com>
Date: Thu, 26 Aug 2021 22:07:58 +0300
Subject: [PATCH 14/23] Fix EntryPointNotFound on Windows 8 due to missing
 version check (#6471)

* Prevent calls to unavailable entrypoint 'GetDpiForMonitor' on Win8 (#5357)

* Introduce Windows8 platform constant

* wip

Co-authored-by: Tim Schneeberger <tim.schneeberger@outlook.de>
Co-authored-by: Tim Schneeberger <thebone.main@gmail.com>
Co-authored-by: Dan Walmsley <dan@walms.co.uk>
---
 src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj | 1 +
 src/Windows/Avalonia.Direct2D1/HwndRenderTarget.cs       | 3 ++-
 src/Windows/Avalonia.Win32/FramebufferManager.cs         | 2 +-
 src/Windows/Avalonia.Win32/PlatformConstants.cs          | 7 ++++++-
 src/Windows/Avalonia.Win32/Win32GlManager.cs             | 4 +---
 src/Windows/Avalonia.Win32/Win32Platform.cs              | 2 +-
 src/Windows/Avalonia.Win32/WindowImpl.cs                 | 4 ++--
 7 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj b/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj
index cda95d2ebb..8533e1e176 100644
--- a/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj
+++ b/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj
@@ -12,6 +12,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\packages\Avalonia\Avalonia.csproj" />
+    <ProjectReference Include="..\Avalonia.Win32\Avalonia.Win32.csproj" />
   </ItemGroup>
   <Import Project="..\..\..\build\Rx.props" />
   <Import Project="..\..\..\build\SharpDX.props" />
diff --git a/src/Windows/Avalonia.Direct2D1/HwndRenderTarget.cs b/src/Windows/Avalonia.Direct2D1/HwndRenderTarget.cs
index 589f85f208..0597e88ed6 100644
--- a/src/Windows/Avalonia.Direct2D1/HwndRenderTarget.cs
+++ b/src/Windows/Avalonia.Direct2D1/HwndRenderTarget.cs
@@ -1,4 +1,5 @@
 using Avalonia.Platform;
+using Avalonia.Win32;
 using Avalonia.Win32.Interop;
 using SharpDX;
 using SharpDX.DXGI;
@@ -21,7 +22,7 @@ namespace Avalonia.Direct2D1
 
         protected override Size2F GetWindowDpi()
         {
-            if (UnmanagedMethods.ShCoreAvailable)
+            if (UnmanagedMethods.ShCoreAvailable && Win32Platform.WindowsVersion > PlatformConstants.Windows8)
             {
                 uint dpix, dpiy;
 
diff --git a/src/Windows/Avalonia.Win32/FramebufferManager.cs b/src/Windows/Avalonia.Win32/FramebufferManager.cs
index 699dc7c25d..0240ac9701 100644
--- a/src/Windows/Avalonia.Win32/FramebufferManager.cs
+++ b/src/Windows/Avalonia.Win32/FramebufferManager.cs
@@ -87,7 +87,7 @@ namespace Avalonia.Win32
 
         private Vector GetCurrentDpi()
         {
-            if (UnmanagedMethods.ShCoreAvailable)
+            if (UnmanagedMethods.ShCoreAvailable && Win32Platform.WindowsVersion > PlatformConstants.Windows8)
             {
                 var monitor =
                     UnmanagedMethods.MonitorFromWindow(_hwnd, UnmanagedMethods.MONITOR.MONITOR_DEFAULTTONEAREST);
diff --git a/src/Windows/Avalonia.Win32/PlatformConstants.cs b/src/Windows/Avalonia.Win32/PlatformConstants.cs
index af1eca29be..9dd4780637 100644
--- a/src/Windows/Avalonia.Win32/PlatformConstants.cs
+++ b/src/Windows/Avalonia.Win32/PlatformConstants.cs
@@ -1,8 +1,13 @@
+using System;
+
 namespace Avalonia.Win32
 {
-    static class PlatformConstants
+    public static class PlatformConstants
     {
         public const string WindowHandleType = "HWND";
         public const string CursorHandleType = "HCURSOR";
+
+        public static readonly Version Windows8 = new Version(6, 2);
+        public static readonly Version Windows7 = new Version(6, 1);
     }
 }
diff --git a/src/Windows/Avalonia.Win32/Win32GlManager.cs b/src/Windows/Avalonia.Win32/Win32GlManager.cs
index e159ba3b78..e70ea52106 100644
--- a/src/Windows/Avalonia.Win32/Win32GlManager.cs
+++ b/src/Windows/Avalonia.Win32/Win32GlManager.cs
@@ -1,4 +1,3 @@
-using System;
 using Avalonia.OpenGL;
 using Avalonia.OpenGL.Angle;
 using Avalonia.OpenGL.Egl;
@@ -9,7 +8,6 @@ namespace Avalonia.Win32
 {
     static class Win32GlManager
     {
-        private static readonly Version Windows7 = new Version(6, 1);
 
         public static void Initialize()
         {
@@ -22,7 +20,7 @@ namespace Avalonia.Win32
                     return wgl;
                 }
 
-                if (opts?.AllowEglInitialization ?? Win32Platform.WindowsVersion > Windows7)
+                if (opts?.AllowEglInitialization ?? Win32Platform.WindowsVersion > PlatformConstants.Windows7)
                 {
                     var egl = EglPlatformOpenGlInterface.TryCreate(() => new AngleWin32EglDisplay());
 
diff --git a/src/Windows/Avalonia.Win32/Win32Platform.cs b/src/Windows/Avalonia.Win32/Win32Platform.cs
index a881c45cd0..c011a458c3 100644
--- a/src/Windows/Avalonia.Win32/Win32Platform.cs
+++ b/src/Windows/Avalonia.Win32/Win32Platform.cs
@@ -94,7 +94,7 @@ namespace Avalonia
 
 namespace Avalonia.Win32
 {
-    class Win32Platform : IPlatformThreadingInterface, IPlatformSettings, IWindowingPlatform, IPlatformIconLoader, IPlatformLifetimeEventsImpl
+    public class Win32Platform : IPlatformThreadingInterface, IPlatformSettings, IWindowingPlatform, IPlatformIconLoader, IPlatformLifetimeEventsImpl
     {
         private static readonly Win32Platform s_instance = new Win32Platform();
         private static Thread _uiThread;
diff --git a/src/Windows/Avalonia.Win32/WindowImpl.cs b/src/Windows/Avalonia.Win32/WindowImpl.cs
index 0b7bd13082..3b7d3efa2f 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.cs
@@ -764,8 +764,8 @@ namespace Avalonia.Win32
                 RegisterTouchWindow(_hwnd, 0);
             }
 
-            if (ShCoreAvailable)
-            {
+            if (ShCoreAvailable && Win32Platform.WindowsVersion > PlatformConstants.Windows8)
+			{
                 var monitor = MonitorFromWindow(
                     _hwnd,
                     MONITOR.MONITOR_DEFAULTTONEAREST);

From 8b6f264379637b3b2c0a770327171765e880edc5 Mon Sep 17 00:00:00 2001
From: Giuseppe Lippolis <workgroupengineering@outlook.com>
Date: Fri, 27 Aug 2021 15:50:55 +0200
Subject: [PATCH 15/23] ref(test): removed warning CS0105 The using directive
 for 'System' appeared previously in this namespace

---
 tests/Avalonia.Controls.UnitTests/Utils/HotKeyManagerTests.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/Avalonia.Controls.UnitTests/Utils/HotKeyManagerTests.cs b/tests/Avalonia.Controls.UnitTests/Utils/HotKeyManagerTests.cs
index 2a3db9992c..b0eb694944 100644
--- a/tests/Avalonia.Controls.UnitTests/Utils/HotKeyManagerTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Utils/HotKeyManagerTests.cs
@@ -10,7 +10,6 @@ using Avalonia.Styling;
 using Avalonia.UnitTests;
 using Moq;
 using Xunit;
-using System;
 using Avalonia.Input.Raw;
 using Factory = System.Func<int, System.Action<object>, Avalonia.Controls.Window, Avalonia.AvaloniaObject>;
 

From 7d8e6ea75f908f334f4413af18780f7946ac1a9f Mon Sep 17 00:00:00 2001
From: Giuseppe Lippolis <workgroupengineering@outlook.com>
Date: Fri, 27 Aug 2021 15:54:33 +0200
Subject: [PATCH 16/23] ref(tests): warning CS0067 The event
 'KeyboardDeviceTests.DelegateCommand.CanExecuteChanged' is never used

---
 tests/Avalonia.Input.UnitTests/KeyboardDeviceTests.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/Avalonia.Input.UnitTests/KeyboardDeviceTests.cs b/tests/Avalonia.Input.UnitTests/KeyboardDeviceTests.cs
index 7730cee78c..c354dbe72e 100644
--- a/tests/Avalonia.Input.UnitTests/KeyboardDeviceTests.cs
+++ b/tests/Avalonia.Input.UnitTests/KeyboardDeviceTests.cs
@@ -2,7 +2,6 @@
 using System.Windows.Input;
 using Avalonia.Controls;
 using Avalonia.Input.Raw;
-using Avalonia.Interactivity;
 using Avalonia.UnitTests;
 using Moq;
 using Xunit;
@@ -126,7 +125,7 @@ namespace Avalonia.Input.UnitTests
         {
             private readonly Action _action;
             public DelegateCommand(Action action) => _action = action;
-            public event EventHandler CanExecuteChanged;
+            public event EventHandler CanExecuteChanged { add { } remove { } }
             public bool CanExecute(object parameter) => true;
             public void Execute(object parameter) => _action();
         }

From df5250e155410e7cbb238fdc75a9f7ee71816aaf Mon Sep 17 00:00:00 2001
From: Giuseppe Lippolis <workgroupengineering@outlook.com>
Date: Fri, 27 Aug 2021 16:16:06 +0200
Subject: [PATCH 17/23] ref(tests): warning CS0067 The event
 'TrackingResourceProvider.OwnerChanged' is never used

---
 .../MarkupExtensions/DynamicResourceExtensionTests.cs           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/DynamicResourceExtensionTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/DynamicResourceExtensionTests.cs
index e7f0230254..592dbfc0d1 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/DynamicResourceExtensionTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/DynamicResourceExtensionTests.cs
@@ -923,7 +923,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
         public bool HasResources => true;
         public List<object> RequestedResources { get; } = new List<object>();
 
-        public event EventHandler OwnerChanged;
+        public event EventHandler OwnerChanged { add { } remove { } }
 
         public void AddOwner(IResourceHost owner) => Owner = owner;
         public void RemoveOwner(IResourceHost owner) => Owner = null;

From 7ee5446ee4838b06d483e1cfe47e69812219029a Mon Sep 17 00:00:00 2001
From: Giuseppe Lippolis <workgroupengineering@outlook.com>
Date: Fri, 27 Aug 2021 18:12:06 +0200
Subject: [PATCH 18/23] fixes(DataGrid): Warning CS0649 Field
 'DataGridPathGroupDescription._valueConverter' is never assigned to, and will
 always have its default value null

---
 .../Collections/DataGridGroupDescription.cs                | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Controls.DataGrid/Collections/DataGridGroupDescription.cs b/src/Avalonia.Controls.DataGrid/Collections/DataGridGroupDescription.cs
index 9d8ebbfac1..587dd228a3 100644
--- a/src/Avalonia.Controls.DataGrid/Collections/DataGridGroupDescription.cs
+++ b/src/Avalonia.Controls.DataGrid/Collections/DataGridGroupDescription.cs
@@ -83,8 +83,9 @@ namespace Avalonia.Collections
             if (key == null)
                 key = item;
 
-            if (_valueConverter != null)
-                key = _valueConverter.Convert(key, typeof(object), level, culture);
+            var valueConverter = ValueConverter;
+            if (valueConverter != null)
+                key = valueConverter.Convert(key, typeof(object), level, culture);
 
             return key;
         }
@@ -99,6 +100,8 @@ namespace Avalonia.Collections
         }
         public override string PropertyName => _propertyPath;
 
+        public IValueConverter ValueConverter { get => _valueConverter; set => _valueConverter = value; }
+
         private Type GetPropertyType(object o)
         {
             return o.GetType().GetNestedPropertyType(_propertyPath);

From 56709c9982d78063984c4865278a7afd913e571b Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Sun, 29 Aug 2021 14:59:29 -0400
Subject: [PATCH 19/23] Add text box clipboard events

---
 src/Avalonia.Controls/TextBox.cs              | 47 +++++++++++++++----
 .../TextBoxClipboardEventArgs.cs              | 18 +++++++
 2 files changed, 57 insertions(+), 8 deletions(-)
 create mode 100644 src/Avalonia.Controls/TextBoxClipboardEventArgs.cs

diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index 0eade8d6df..657d8fae8f 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -500,6 +500,10 @@ namespace Avalonia.Controls
             }
         }
 
+        public event EventHandler<TextBoxClipboardEventArgs> CopyingToClipboard;
+        public event EventHandler<TextBoxClipboardEventArgs> CuttingToClipboard;
+        public event EventHandler<TextBoxClipboardEventArgs> PastingFromClipboard;
+
         protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
             _presenter = e.NameScope.Get<TextPresenter>("PART_TextPresenter");
@@ -638,27 +642,54 @@ namespace Avalonia.Controls
         public async void Cut()
         {
             var text = GetSelection();
-            if (text is null) return;
+            if (string.IsNullOrEmpty(text))
+            {
+                return;
+            }
 
-            SnapshotUndoRedo();
-            Copy();
-            DeleteSelection();
+            var eventArgs = new TextBoxClipboardEventArgs();
+            CuttingToClipboard?.Invoke(this, eventArgs);
+            if (!eventArgs.Handled)
+            {
+                SnapshotUndoRedo();
+                await ((IClipboard)AvaloniaLocator.Current.GetService(typeof(IClipboard)))
+                    .SetTextAsync(text);
+                DeleteSelection();
+            }
         }
 
         public async void Copy()
         {
             var text = GetSelection();
-            if (text is null) return;
+            if (string.IsNullOrEmpty(text))
+            {
+                return;
+            }
 
-            await ((IClipboard)AvaloniaLocator.Current.GetService(typeof(IClipboard)))
-                .SetTextAsync(text);
+            var eventArgs = new TextBoxClipboardEventArgs();
+            CopyingToClipboard?.Invoke(this, eventArgs);
+            if (!eventArgs.Handled)
+            {
+                await ((IClipboard)AvaloniaLocator.Current.GetService(typeof(IClipboard)))
+                    .SetTextAsync(text);
+            }
         }
 
         public async void Paste()
         {
+            var eventArgs = new TextBoxClipboardEventArgs();
+            PastingFromClipboard?.Invoke(this, eventArgs);
+            if (eventArgs.Handled)
+            {
+                return;
+            }
+
             var text = await ((IClipboard)AvaloniaLocator.Current.GetService(typeof(IClipboard))).GetTextAsync();
 
-            if (text is null) return;
+            if (string.IsNullOrEmpty(text))
+            {
+                return;
+            }
 
             SnapshotUndoRedo();
             HandleTextInput(text);
diff --git a/src/Avalonia.Controls/TextBoxClipboardEventArgs.cs b/src/Avalonia.Controls/TextBoxClipboardEventArgs.cs
new file mode 100644
index 0000000000..0fe4cadf39
--- /dev/null
+++ b/src/Avalonia.Controls/TextBoxClipboardEventArgs.cs
@@ -0,0 +1,18 @@
+using System;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Provides event data for the <see cref="TextBox.CuttingToClipboard"/>, <see cref="TextBox.CopyingToClipboard"/> and <see cref="TextBox.PasteFromClipboard"/> events.
+    /// </summary>
+    /// <remarks>
+    /// If you perform any action in the handler for a clipboard event, set the Handled property to true; otherwise, the default action is performed.
+    /// </remarks>
+    public class TextBoxClipboardEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets a value that marks the event as handled. A true value for Handled prevents most handlers along the event from handling the same event again.
+        /// </summary>
+        public bool Handled { get; set; }
+    }
+}

From 825ddc9ccaa2e3d7e002564f96f22c3b1d23a2d8 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Sun, 29 Aug 2021 18:29:56 -0400
Subject: [PATCH 20/23] Use routed events

---
 src/Avalonia.Controls/TextBox.cs              | 44 +++++++++++++++----
 .../TextBoxClipboardEventArgs.cs              | 18 --------
 2 files changed, 35 insertions(+), 27 deletions(-)
 delete mode 100644 src/Avalonia.Controls/TextBoxClipboardEventArgs.cs

diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index 657d8fae8f..9eae928eeb 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -145,6 +145,18 @@ namespace Avalonia.Controls
                 (o, v) => o.UndoLimit = v,
                 unsetValue: -1);
 
+        public static readonly RoutedEvent<RoutedEventArgs> CopyingToClipboardEvent =
+            RoutedEvent.Register<TextBox, RoutedEventArgs>(
+                "CopyingToClipboard", RoutingStrategies.Bubble);
+
+        public static readonly RoutedEvent<RoutedEventArgs> CuttingToClipboardEvent =
+            RoutedEvent.Register<TextBox, RoutedEventArgs>(
+                "CuttingToClipboard", RoutingStrategies.Bubble);
+
+        public static readonly RoutedEvent<RoutedEventArgs> PastingFromClipboardEvent =
+            RoutedEvent.Register<TextBox, RoutedEventArgs>(
+                "PastingFromClipboard", RoutingStrategies.Bubble);
+
         readonly struct UndoRedoState : IEquatable<UndoRedoState>
         {
             public string Text { get; }
@@ -500,9 +512,23 @@ namespace Avalonia.Controls
             }
         }
 
-        public event EventHandler<TextBoxClipboardEventArgs> CopyingToClipboard;
-        public event EventHandler<TextBoxClipboardEventArgs> CuttingToClipboard;
-        public event EventHandler<TextBoxClipboardEventArgs> PastingFromClipboard;
+        public event EventHandler<RoutedEventArgs> CopyingToClipboard
+        {
+            add => AddHandler(CopyingToClipboardEvent, value);
+            remove => RemoveHandler(CopyingToClipboardEvent, value);
+        }
+
+        public event EventHandler<RoutedEventArgs> CuttingToClipboard
+        {
+            add => AddHandler(CuttingToClipboardEvent, value);
+            remove => RemoveHandler(CuttingToClipboardEvent, value);
+        }
+
+        public event EventHandler<RoutedEventArgs> PastingFromClipboard
+        {
+            add => AddHandler(PastingFromClipboardEvent, value);
+            remove => RemoveHandler(PastingFromClipboardEvent, value);
+        }
 
         protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
@@ -647,8 +673,8 @@ namespace Avalonia.Controls
                 return;
             }
 
-            var eventArgs = new TextBoxClipboardEventArgs();
-            CuttingToClipboard?.Invoke(this, eventArgs);
+            var eventArgs = new RoutedEventArgs(CuttingToClipboardEvent);
+            RaiseEvent(eventArgs);
             if (!eventArgs.Handled)
             {
                 SnapshotUndoRedo();
@@ -666,8 +692,8 @@ namespace Avalonia.Controls
                 return;
             }
 
-            var eventArgs = new TextBoxClipboardEventArgs();
-            CopyingToClipboard?.Invoke(this, eventArgs);
+            var eventArgs = new RoutedEventArgs(CopyingToClipboardEvent);
+            RaiseEvent(eventArgs);
             if (!eventArgs.Handled)
             {
                 await ((IClipboard)AvaloniaLocator.Current.GetService(typeof(IClipboard)))
@@ -677,8 +703,8 @@ namespace Avalonia.Controls
 
         public async void Paste()
         {
-            var eventArgs = new TextBoxClipboardEventArgs();
-            PastingFromClipboard?.Invoke(this, eventArgs);
+            var eventArgs = new RoutedEventArgs(PastingFromClipboardEvent);
+            RaiseEvent(eventArgs);
             if (eventArgs.Handled)
             {
                 return;
diff --git a/src/Avalonia.Controls/TextBoxClipboardEventArgs.cs b/src/Avalonia.Controls/TextBoxClipboardEventArgs.cs
deleted file mode 100644
index 0fe4cadf39..0000000000
--- a/src/Avalonia.Controls/TextBoxClipboardEventArgs.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-
-namespace Avalonia.Controls
-{
-    /// <summary>
-    /// Provides event data for the <see cref="TextBox.CuttingToClipboard"/>, <see cref="TextBox.CopyingToClipboard"/> and <see cref="TextBox.PasteFromClipboard"/> events.
-    /// </summary>
-    /// <remarks>
-    /// If you perform any action in the handler for a clipboard event, set the Handled property to true; otherwise, the default action is performed.
-    /// </remarks>
-    public class TextBoxClipboardEventArgs : EventArgs
-    {
-        /// <summary>
-        /// Gets or sets a value that marks the event as handled. A true value for Handled prevents most handlers along the event from handling the same event again.
-        /// </summary>
-        public bool Handled { get; set; }
-    }
-}

From 10e3fc78283e3c6beff5ce7d066e8b703eeed8ef Mon Sep 17 00:00:00 2001
From: Giuseppe Lippolis <workgroupengineering@outlook.com>
Date: Mon, 30 Aug 2021 10:39:17 +0200
Subject: [PATCH 21/23] fixes(DataGrid): Warning CS0414 The field
 'CellEditBinding.SubjectWrapper._settingSourceValue' is assigned but its
 value is never used

---
 .../Utils/CellEditBinding.cs                        | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/Avalonia.Controls.DataGrid/Utils/CellEditBinding.cs b/src/Avalonia.Controls.DataGrid/Utils/CellEditBinding.cs
index 6ac77fbb99..1d1a595ccf 100644
--- a/src/Avalonia.Controls.DataGrid/Utils/CellEditBinding.cs
+++ b/src/Avalonia.Controls.DataGrid/Utils/CellEditBinding.cs
@@ -1,10 +1,8 @@
 using Avalonia.Data;
 using Avalonia.Reactive;
 using System;
-using System.ComponentModel.DataAnnotations;
 using System.Collections.Generic;
 using System.Reactive.Subjects;
-using System.Text;
 
 namespace Avalonia.Controls.Utils
 {
@@ -67,11 +65,14 @@ namespace Avalonia.Controls.Utils
 
             private void SetSourceValue(object value)
             {
-                _settingSourceValue = true;
+                if (!_settingSourceValue)
+                {
+                    _settingSourceValue = true;
 
-                _sourceSubject.OnNext(value);
+                    _sourceSubject.OnNext(value);
 
-                _settingSourceValue = false;
+                    _settingSourceValue = false;
+                }
             }
             private void SetControlValue(object value)
             {
@@ -157,4 +158,4 @@ namespace Avalonia.Controls.Utils
             }
         }
     }
-}
\ No newline at end of file
+}

From c8b97e358e5aac8c8a320ef45d64fe76f4a118af Mon Sep 17 00:00:00 2001
From: Giuseppe Lippolis <workgroupengineering@outlook.com>
Date: Mon, 30 Aug 2021 17:39:02 +0200
Subject: [PATCH 22/23] fixes(Doc): fixes AvaloniaList XML Comments

---
 src/Avalonia.Base/Collections/AvaloniaList.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Avalonia.Base/Collections/AvaloniaList.cs b/src/Avalonia.Base/Collections/AvaloniaList.cs
index 2c7f34c5be..2f1cb2888e 100644
--- a/src/Avalonia.Base/Collections/AvaloniaList.cs
+++ b/src/Avalonia.Base/Collections/AvaloniaList.cs
@@ -280,8 +280,8 @@ namespace Avalonia.Collections
         /// <summary>
         /// Gets a range of items from the collection.
         /// </summary>
-        /// <param name="index">The first index to remove.</param>
-        /// <param name="count">The number of items to remove.</param>
+        /// <param name="index">The zero-based <see cref="AvaloniaList{T}"/> index at which the range starts.</param>
+        /// <param name="count">The number of elements in the range.</param>
         public IEnumerable<T> GetRange(int index, int count)
         {
             return _inner.GetRange(index, count);
@@ -455,7 +455,7 @@ namespace Avalonia.Collections
         }
 
         /// <summary>
-        /// Ensures that the capacity of the list is at least <see cref="capacity"/>.
+        /// Ensures that the capacity of the list is at least <see cref="Capacity"/>.
         /// </summary>
         /// <param name="capacity">The capacity.</param>
         public void EnsureCapacity(int capacity)

From 3aa38398ff28012d7d296966a6df7d86e42f1424 Mon Sep 17 00:00:00 2001
From: Sergey Mikolaytis <blasterloremaster@gmail.com>
Date: Tue, 31 Aug 2021 23:47:25 +0300
Subject: [PATCH 23/23] Fix alt down shortcuts and allow alt down handling for
 end users (#6491)

* [Menu] [Interaction] Allow end user to change menu show delay globally

* Fix all alt down handle = true by AccessKeyHandler

Co-authored-by: Max Katz <maxkatz6@outlook.com>
---
 src/Avalonia.Input/AccessKeyHandler.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Avalonia.Input/AccessKeyHandler.cs b/src/Avalonia.Input/AccessKeyHandler.cs
index 5c4af68d79..5082265ea6 100644
--- a/src/Avalonia.Input/AccessKeyHandler.cs
+++ b/src/Avalonia.Input/AccessKeyHandler.cs
@@ -157,10 +157,9 @@ namespace Avalonia.Input
 
                     _restoreFocusElement?.Focus();
                     _restoreFocusElement = null;
+                    
+                    e.Handled = true;
                 }
-
-                // We always handle the Alt key.
-                e.Handled = true;
             }
             else if (_altIsDown)
             {