From a71910f92866ea1577b4ff0d36dac77fc4f18d5e Mon Sep 17 00:00:00 2001
From: amwx <armccormickwx@gmail.com>
Date: Wed, 17 Mar 2021 21:43:45 -0500
Subject: [PATCH 01/43] Initial Flyout Impl

---
 src/Avalonia.Controls/Flyouts/Flyout.cs       |  65 ++++
 src/Avalonia.Controls/Flyouts/FlyoutBase.cs   | 315 ++++++++++++++++++
 .../Flyouts/FlyoutPlacementMode.cs            |  80 +++++
 .../Flyouts/FlyoutPresenter.cs                |  10 +
 .../Controls/FlyoutPresenter.xaml             |  39 +++
 5 files changed, 509 insertions(+)
 create mode 100644 src/Avalonia.Controls/Flyouts/Flyout.cs
 create mode 100644 src/Avalonia.Controls/Flyouts/FlyoutBase.cs
 create mode 100644 src/Avalonia.Controls/Flyouts/FlyoutPlacementMode.cs
 create mode 100644 src/Avalonia.Controls/Flyouts/FlyoutPresenter.cs
 create mode 100644 src/Avalonia.Themes.Fluent/Controls/FlyoutPresenter.xaml

diff --git a/src/Avalonia.Controls/Flyouts/Flyout.cs b/src/Avalonia.Controls/Flyouts/Flyout.cs
new file mode 100644
index 0000000000..723a5e84f8
--- /dev/null
+++ b/src/Avalonia.Controls/Flyouts/Flyout.cs
@@ -0,0 +1,65 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Text;
+using Avalonia.Controls.Primitives;
+using Avalonia.Styling;
+
+#nullable enable
+
+namespace Avalonia.Controls
+{
+    public class Flyout : FlyoutBase
+    {
+        public static readonly StyledProperty<object> ContentProperty =
+            AvaloniaProperty.Register<Flyout, object>(nameof(Content));
+
+        public Styles? FlyoutPresenterStyle
+        {
+            get
+            {
+                if (_styles == null)
+                {
+                    _styles = new Styles();
+                    _styles.CollectionChanged += OnFlyoutPresenterStylesChanged;
+                }
+
+                return _styles;
+            }
+        }
+
+        private Styles? _styles;
+        private bool _stylesDirty;
+
+        public object Content
+        {
+            get => GetValue(ContentProperty);
+            set => SetValue(ContentProperty, value);
+        }
+
+        protected override Control CreatePresenter()
+        {
+            return new FlyoutPresenter
+            {
+                [!ContentControl.ContentProperty] = this[!ContentProperty]
+            };
+        }
+
+        protected override void OnOpened()
+        {
+            if (_styles != null && _stylesDirty)
+            {
+                // Presenter for flyout generally shouldn't be public, so
+                // we should be ok to just reset the styles
+                _popup.Child.Styles.Clear();
+                _popup.Child.Styles.Add(_styles);
+            }
+            base.OnOpened();
+        }
+
+        private void OnFlyoutPresenterStylesChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            _stylesDirty = true;
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Flyouts/FlyoutBase.cs b/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
new file mode 100644
index 0000000000..64ab07a658
--- /dev/null
+++ b/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
@@ -0,0 +1,315 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Text;
+using Avalonia.Layout;
+
+#nullable enable
+
+namespace Avalonia.Controls.Primitives
+{
+    public abstract class FlyoutBase : AvaloniaObject
+    {
+        private static readonly DirectProperty<FlyoutBase, bool> IsOpenProperty =
+           AvaloniaProperty.RegisterDirect<FlyoutBase, bool>(nameof(IsOpen),
+               x => x.IsOpen);
+
+        public static readonly DirectProperty<FlyoutBase, Control?> TargetProperty =
+            AvaloniaProperty.RegisterDirect<FlyoutBase, Control?>(nameof(Target), x => x.Target);
+
+        public static readonly DirectProperty<FlyoutBase, FlyoutPlacementMode> PlacementProperty =
+            AvaloniaProperty.RegisterDirect<FlyoutBase, FlyoutPlacementMode>(nameof(Placement),
+                x => x.Placement, (x, v) => x.Placement = v);
+
+        public static readonly AttachedProperty<FlyoutBase?> AttachedFlyoutProperty =
+            AvaloniaProperty.RegisterAttached<FlyoutBase, Control, FlyoutBase?>("AttachedFlyout", null);
+
+        private bool _isOpen;
+        private Control? _target;
+        protected Popup? _popup;
+
+        public bool IsOpen
+        {
+            get => _isOpen;
+            private set => SetAndRaise(IsOpenProperty, ref _isOpen, value);
+        }
+
+        public FlyoutPlacementMode Placement
+        {
+            get => GetValue(PlacementProperty);
+            set => SetValue(PlacementProperty, value);
+        }
+
+        public Control? Target
+        {
+            get => _target;
+            private set => SetAndRaise(TargetProperty, ref _target, value);
+        }
+
+        public event EventHandler? Closed;
+        public event EventHandler<CancelEventArgs>? Closing;
+        public event EventHandler? Opened;
+        public event EventHandler? Opening;
+
+        public static FlyoutBase? GetAttachedFlyout(Control element)
+        {
+            return element.GetValue(AttachedFlyoutProperty);
+        }
+
+        public static void SetAttachedFlyout(Control element, FlyoutBase? value)
+        {
+            element.SetValue(AttachedFlyoutProperty, value);
+        }
+
+        public static void ShowAttachedFlyout(Control flyoutOwner)
+        {
+            var flyout = GetAttachedFlyout(flyoutOwner);
+            flyout?.ShowAt(flyoutOwner);
+        }
+
+        public void ShowAt(Control placementTarget)
+        {
+            ShowAtCore(placementTarget);
+        }
+
+        public void ShowAt(Control placementTarget, bool showAtPointer)
+        {
+            ShowAtCore(placementTarget, showAtPointer);
+        }
+
+        public void Hide(bool canCancel = true)
+        {
+            if (!IsOpen)
+            {
+                return;
+            }
+
+            if (canCancel)
+            {
+                bool cancel = false;
+
+                var closing = new CancelEventArgs();
+                Closing?.Invoke(this, closing);
+                if (cancel || closing.Cancel)
+                {
+                    return;
+                }
+            }
+
+            IsOpen = _popup.IsOpen = false;
+            
+            OnClosed();
+        }
+
+        protected virtual void ShowAtCore(Control placementTarget, bool showAtPointer = false)
+        {
+            if (placementTarget == null)
+                throw new ArgumentNullException("placementTarget cannot be null");
+
+            if (_popup == null)
+            {
+                InitPopup();
+            }
+
+            if (IsOpen)
+            {
+                if (placementTarget == Target)
+                {
+                    return;
+                }
+                else // Close before opening a new one
+                {
+                    Hide(false);
+                }
+            }
+
+            if (_popup.Parent != null && _popup.Parent != placementTarget)
+            {
+                ((ISetLogicalParent)_popup).SetParent(null);
+            }
+
+            _popup.PlacementTarget = Target = placementTarget;
+
+            ((ISetLogicalParent)_popup).SetParent(placementTarget);
+
+            if (_popup.Child == null)
+            {
+                _popup.Child = CreatePresenter();
+            }
+
+            OnOpening();
+            IsOpen = _popup.IsOpen = true;
+            PositionPopup(showAtPointer);
+            OnOpened();
+        }
+
+        protected virtual void OnOpening()
+        {
+            Opening?.Invoke(this, null);
+        }
+
+        protected virtual void OnOpened()
+        {
+            Opened?.Invoke(this, null);
+        }
+
+        protected virtual void OnClosing(CancelEventArgs args)
+        {
+            Closing?.Invoke(this, args);
+        }
+
+        protected virtual void OnClosed()
+        {
+            Closed?.Invoke(this, null);
+        }
+
+        protected abstract Control CreatePresenter();
+
+        private void InitPopup()
+        {
+            _popup = new Popup();
+            _popup.WindowManagerAddShadowHint = false;
+            _popup.IsLightDismissEnabled = true;            
+
+            _popup.Opened += OnPopupOpened;
+            _popup.Closed += OnPopupClosed;
+        }
+
+        private void OnPopupOpened(object sender, EventArgs e)
+        {
+            IsOpen = true;
+            OnOpened();
+        }
+
+        private void OnPopupClosed(object sender, EventArgs e)
+        {
+            Hide();
+        }
+
+        private void PositionPopup(bool showAtPointer)
+        {
+            Size sz;
+            if(_popup.DesiredSize == Size.Empty)
+            {
+                sz = LayoutHelper.MeasureChild(_popup, Size.Infinity, new Thickness());
+            }
+            else
+            {
+                sz = _popup.DesiredSize;
+            }
+
+            if (showAtPointer)
+            {
+                _popup.PlacementMode = PlacementMode.Pointer;
+            }
+            else
+            {
+                _popup.PlacementMode = PlacementMode.AnchorAndGravity;
+                _popup.PlacementConstraintAdjustment =
+                    PopupPositioning.PopupPositionerConstraintAdjustment.SlideX |
+                    PopupPositioning.PopupPositionerConstraintAdjustment.SlideY;
+            }
+
+
+            var trgtBnds = Target?.Bounds ?? Rect.Empty;
+
+            switch (Placement)
+            {
+                case FlyoutPlacementMode.Top: //Above & centered
+                    _popup.PlacementRect = new Rect(-sz.Width / 2, 0, sz.Width, 1);
+                    _popup.PlacementGravity = PopupPositioning.PopupGravity.Top;
+
+                    break;
+
+                case FlyoutPlacementMode.TopEdgeAlignedLeft:
+                    _popup.PlacementRect = new Rect(0, 0, 0, 0);
+                    _popup.PlacementGravity = PopupPositioning.PopupGravity.TopRight;
+                    
+                    break;
+
+                case FlyoutPlacementMode.TopEdgeAlignedRight:
+                    _popup.PlacementRect = new Rect(trgtBnds.Width - 1, 0, 10, 1);
+                    _popup.PlacementGravity = PopupPositioning.PopupGravity.TopLeft;
+                    
+                    break;
+
+                case FlyoutPlacementMode.RightEdgeAlignedTop:
+                    _popup.PlacementRect = new Rect(trgtBnds.Width - 1, 0, 1, 1);
+                    _popup.PlacementGravity = PopupPositioning.PopupGravity.BottomRight;
+                    _popup.PlacementAnchor = PopupPositioning.PopupAnchor.Right;
+
+                    break;
+
+                case FlyoutPlacementMode.Right: //Right & centered
+                    _popup.PlacementRect = new Rect(trgtBnds.Width - 1, 0, 1, trgtBnds.Height);
+                    _popup.PlacementGravity = PopupPositioning.PopupGravity.Right;
+                    _popup.PlacementAnchor = PopupPositioning.PopupAnchor.Right;
+
+                    break;
+
+                case FlyoutPlacementMode.RightEdgeAlignedBottom:
+                    _popup.PlacementRect = new Rect(trgtBnds.Width - 1, trgtBnds.Height - 1, 1, 1);
+                    _popup.PlacementGravity = PopupPositioning.PopupGravity.TopRight;
+                    _popup.PlacementAnchor = PopupPositioning.PopupAnchor.Right;
+
+                    break;
+
+                case FlyoutPlacementMode.Bottom: //Below & centered
+                    _popup.PlacementRect = new Rect(0, trgtBnds.Height - 1, trgtBnds.Width, 1);
+                    _popup.PlacementGravity = PopupPositioning.PopupGravity.Bottom;
+                    _popup.PlacementAnchor = PopupPositioning.PopupAnchor.Bottom;
+
+                    break;
+
+                case FlyoutPlacementMode.BottomEdgeAlignedLeft:
+                    _popup.PlacementRect = new Rect(0, trgtBnds.Height - 1, 1, 1);
+                    _popup.PlacementGravity = PopupPositioning.PopupGravity.BottomRight;
+                    _popup.PlacementAnchor = PopupPositioning.PopupAnchor.Bottom;
+
+                    break;
+
+                case FlyoutPlacementMode.BottomEdgeAlignedRight:
+                    _popup.PlacementRect = new Rect(trgtBnds.Width - 1, trgtBnds.Height - 1, 1, 1);
+                    _popup.PlacementGravity = PopupPositioning.PopupGravity.BottomLeft;
+                    _popup.PlacementAnchor = PopupPositioning.PopupAnchor.Bottom;
+
+                    break;
+
+                case FlyoutPlacementMode.LeftEdgeAlignedTop:
+                    _popup.PlacementRect = new Rect(0, 0, 1, 1);
+                    _popup.PlacementGravity = PopupPositioning.PopupGravity.BottomLeft;
+                    _popup.PlacementAnchor = PopupPositioning.PopupAnchor.Left;
+
+                    break;
+
+                case FlyoutPlacementMode.Left: //Left & centered
+                    _popup.PlacementRect = new Rect(0, 0, 1, trgtBnds.Height);
+                    _popup.PlacementGravity = PopupPositioning.PopupGravity.Left;
+                    _popup.PlacementAnchor = PopupPositioning.PopupAnchor.Left;
+
+                    break;
+
+                case FlyoutPlacementMode.LeftEdgeAlignedBottom:
+                    _popup.PlacementRect = new Rect(0, trgtBnds.Height - 1, 1, 1);
+                    _popup.PlacementGravity = PopupPositioning.PopupGravity.TopLeft;
+                    _popup.PlacementAnchor = PopupPositioning.PopupAnchor.BottomLeft;
+
+                    break;
+
+                case FlyoutPlacementMode.Full:
+                    //Not sure how the get this to work
+                    //Popup should display at max size in the middle of the VisualRoot/Window of the Target
+                    throw new NotSupportedException("FlyoutPlacementMode.Full is not supported at this time");
+                //break;
+
+                //includes Auto (not sure what determines that)...
+                default:
+                    //This is just FlyoutPlacementMode.Top behavior (above & centered)
+                    _popup.PlacementRect = new Rect(-sz.Width / 2, 0, sz.Width, 1);
+                    _popup.PlacementGravity = PopupPositioning.PopupGravity.Top;
+
+                    break;
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Flyouts/FlyoutPlacementMode.cs b/src/Avalonia.Controls/Flyouts/FlyoutPlacementMode.cs
new file mode 100644
index 0000000000..15987daa50
--- /dev/null
+++ b/src/Avalonia.Controls/Flyouts/FlyoutPlacementMode.cs
@@ -0,0 +1,80 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Avalonia.Controls
+{
+    public enum FlyoutPlacementMode
+    {
+        /// <summary>
+        /// Preferred location is above the target element
+        /// </summary>
+        Top = 0,
+
+        /// <summary>
+        /// Preferred location is below the target element
+        /// </summary>
+        Bottom = 1,
+
+        /// <summary>
+        /// Preferred location is to the left of the target element
+        /// </summary>
+        Left = 2,
+
+        /// <summary>
+        /// Preferred location is to the right of the target element
+        /// </summary>
+        Right = 3,
+
+        /// <summary>
+        /// Preferred location is centered on the screen
+        /// </summary>
+        Full = 4,
+
+        /// <summary>
+        /// Preferred location is above the target element, with the left edge of the flyout
+        /// aligned with the left edge of the target element
+        /// </summary>
+        TopEdgeAlignedLeft = 5,
+
+        /// <summary>
+        /// Preferred location is above the target element, with the right edge of flyout aligned with right edge of the target element.
+        /// </summary>
+        TopEdgeAlignedRight = 6,
+
+        /// <summary>
+        /// Preferred location is below the target element, with the left edge of flyout aligned with left edge of the target element.
+        /// </summary>
+        BottomEdgeAlignedLeft = 7,
+
+        /// <summary>
+        /// Preferred location is below the target element, with the right edge of flyout aligned with right edge of the target element.
+        /// </summary>
+        BottomEdgeAlignedRight = 8,
+
+        /// <summary>
+        /// Preferred location is to the left of the target element, with the top edge of flyout aligned with top edge of the target element.
+        /// </summary>
+        LeftEdgeAlignedTop = 9,
+
+        /// <summary>
+        /// Preferred location is to the left of the target element, with the bottom edge of flyout aligned with bottom edge of the target element.
+        /// </summary>
+        LeftEdgeAlignedBottom = 10,
+
+        /// <summary>
+        /// Preferred location is to the right of the target element, with the top edge of flyout aligned with top edge of the target element.
+        /// </summary>
+        RightEdgeAlignedTop = 11,
+
+        /// <summary>
+        /// Preferred location is to the right of the target element, with the bottom edge of flyout aligned with bottom edge of the target element.
+        /// </summary>
+        RightEdgeAlignedBottom = 12,
+
+        /// <summary>
+        /// Preferred location is determined automatically.
+        /// </summary>
+        Auto = 13
+    }
+}
diff --git a/src/Avalonia.Controls/Flyouts/FlyoutPresenter.cs b/src/Avalonia.Controls/Flyouts/FlyoutPresenter.cs
new file mode 100644
index 0000000000..80477d6969
--- /dev/null
+++ b/src/Avalonia.Controls/Flyouts/FlyoutPresenter.cs
@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Avalonia.Controls
+{
+    public class FlyoutPresenter : ContentControl
+    {
+    }
+}
diff --git a/src/Avalonia.Themes.Fluent/Controls/FlyoutPresenter.xaml b/src/Avalonia.Themes.Fluent/Controls/FlyoutPresenter.xaml
new file mode 100644
index 0000000000..2be49d007b
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/FlyoutPresenter.xaml
@@ -0,0 +1,39 @@
+<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Style Selector="FlyoutPresenter">
+    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+    <Setter Property="VerticalContentAlignment" Value="Stretch" />
+    <Setter Property="Background" Value="{DynamicResource FlyoutPresenterBackground}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource FlyoutBorderThemeBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource FlyoutBorderThemeThickness}" />
+    <Setter Property="Padding" Value="{DynamicResource FlyoutContentThemePadding}" />
+    <Setter Property="MinWidth" Value="{DynamicResource FlyoutThemeMinWidth}" />
+    <Setter Property="MaxWidth" Value="{DynamicResource FlyoutThemeMaxWidth}" />
+    <Setter Property="MinHeight" Value="{DynamicResource FlyoutThemeMinHeight}" />
+    <Setter Property="MaxHeight" Value="{DynamicResource FlyoutThemeMaxHeight}" />
+    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+    <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Name="LayoutRoot"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                Padding="{DynamicResource FlyoutBorderThemePadding}">
+          <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                        VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
+            <ContentPresenter Content="{TemplateBinding Content}"
+                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                              Margin="{TemplateBinding Padding}"
+                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                              HorizontalContentAlignment="Stretch"
+                              VerticalContentAlignment="Stretch" />
+          </ScrollViewer>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+  <Style Selector="FlyoutPresenter /template/ Border#LayoutRoot">
+    <Setter Property="CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />
+  </Style>
+</Styles>

From 5b270a31421ca57f269facf7114343edcc7759e5 Mon Sep 17 00:00:00 2001
From: amwx <armccormickwx@gmail.com>
Date: Wed, 17 Mar 2021 21:49:22 -0500
Subject: [PATCH 02/43] Add Flyout property to Button

---
 src/Avalonia.Controls/Button.cs | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/Avalonia.Controls/Button.cs b/src/Avalonia.Controls/Button.cs
index c779e4b0cb..121087d262 100644
--- a/src/Avalonia.Controls/Button.cs
+++ b/src/Avalonia.Controls/Button.cs
@@ -2,6 +2,7 @@ using System;
 using System.Linq;
 using System.Windows.Input;
 using Avalonia.Controls.Metadata;
+using Avalonia.Controls.Primitives;
 using Avalonia.Data;
 using Avalonia.Input;
 using Avalonia.Interactivity;
@@ -78,9 +79,14 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<bool> IsPressedProperty =
             AvaloniaProperty.Register<Button, bool>(nameof(IsPressed));
 
+        public static readonly DirectProperty<Button, FlyoutBase> FlyoutProperty =
+            AvaloniaProperty.RegisterDirect<Button, FlyoutBase>(nameof(Flyout),
+                x => x.Flyout, (x, v) => x.Flyout = v);
+
         private ICommand _command;
         private bool _commandCanExecute = true;
         private KeyGesture _hotkey;
+        private FlyoutBase _flyout;
 
         /// <summary>
         /// Initializes static members of the <see cref="Button"/> class.
@@ -169,6 +175,12 @@ namespace Avalonia.Controls
             private set { SetValue(IsPressedProperty, value); }
         }
 
+        public FlyoutBase Flyout
+        {
+            get => _flyout;
+            set => SetAndRaise(FlyoutProperty, ref _flyout, value);
+        }
+
         protected override bool IsEnabledCore => base.IsEnabledCore && _commandCanExecute; 
 
         /// <inheritdoc/>
@@ -278,6 +290,8 @@ namespace Avalonia.Controls
         /// </summary>
         protected virtual void OnClick()
         {
+            OpenFlyout();
+
             var e = new RoutedEventArgs(ClickEvent);
             RaiseEvent(e);
 
@@ -288,6 +302,11 @@ namespace Avalonia.Controls
             }
         }
 
+        protected virtual void OpenFlyout()
+        {
+            _flyout?.ShowAt(this);
+        }
+
         /// <inheritdoc/>
         protected override void OnPointerPressed(PointerPressedEventArgs e)
         {

From a1583ef3e87b38cf9a169d0daa15cc8eb9178477 Mon Sep 17 00:00:00 2001
From: amwx <armccormickwx@gmail.com>
Date: Thu, 18 Mar 2021 00:13:07 -0500
Subject: [PATCH 03/43] Couple fixes

---
 src/Avalonia.Controls/Flyouts/Flyout.cs     |  2 +
 src/Avalonia.Controls/Flyouts/FlyoutBase.cs | 43 ++++++++-------------
 2 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/src/Avalonia.Controls/Flyouts/Flyout.cs b/src/Avalonia.Controls/Flyouts/Flyout.cs
index 723a5e84f8..ed16628605 100644
--- a/src/Avalonia.Controls/Flyouts/Flyout.cs
+++ b/src/Avalonia.Controls/Flyouts/Flyout.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Text;
 using Avalonia.Controls.Primitives;
+using Avalonia.Metadata;
 using Avalonia.Styling;
 
 #nullable enable
@@ -31,6 +32,7 @@ namespace Avalonia.Controls
         private Styles? _styles;
         private bool _stylesDirty;
 
+        [Content]
         public object Content
         {
             get => GetValue(ContentProperty);
diff --git a/src/Avalonia.Controls/Flyouts/FlyoutBase.cs b/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
index 64ab07a658..ca267dc5e9 100644
--- a/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
+++ b/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
@@ -17,9 +17,8 @@ namespace Avalonia.Controls.Primitives
         public static readonly DirectProperty<FlyoutBase, Control?> TargetProperty =
             AvaloniaProperty.RegisterDirect<FlyoutBase, Control?>(nameof(Target), x => x.Target);
 
-        public static readonly DirectProperty<FlyoutBase, FlyoutPlacementMode> PlacementProperty =
-            AvaloniaProperty.RegisterDirect<FlyoutBase, FlyoutPlacementMode>(nameof(Placement),
-                x => x.Placement, (x, v) => x.Placement = v);
+        public static readonly StyledProperty<FlyoutPlacementMode> PlacementProperty =
+            AvaloniaProperty.Register<FlyoutBase, FlyoutPlacementMode>(nameof(Placement));
 
         public static readonly AttachedProperty<FlyoutBase?> AttachedFlyoutProperty =
             AvaloniaProperty.RegisterAttached<FlyoutBase, Control, FlyoutBase?>("AttachedFlyout", null);
@@ -128,9 +127,11 @@ namespace Avalonia.Controls.Primitives
                 ((ISetLogicalParent)_popup).SetParent(null);
             }
 
-            _popup.PlacementTarget = Target = placementTarget;
-
-            ((ISetLogicalParent)_popup).SetParent(placementTarget);
+            if (_popup.PlacementTarget != placementTarget)
+            {
+                _popup.PlacementTarget = Target = placementTarget;
+                ((ISetLogicalParent)_popup).SetParent(placementTarget);
+            }
 
             if (_popup.Child == null)
             {
@@ -138,8 +139,8 @@ namespace Avalonia.Controls.Primitives
             }
 
             OnOpening();
-            IsOpen = _popup.IsOpen = true;
             PositionPopup(showAtPointer);
+            IsOpen = _popup.IsOpen = true;            
             OnOpened();
         }
 
@@ -189,13 +190,14 @@ namespace Avalonia.Controls.Primitives
         private void PositionPopup(bool showAtPointer)
         {
             Size sz;
-            if(_popup.DesiredSize == Size.Empty)
+            if(_popup.Child.DesiredSize == Size.Empty)
             {
-                sz = LayoutHelper.MeasureChild(_popup, Size.Infinity, new Thickness());
+                // Popup may not have been shown yet. Measure content
+                sz = LayoutHelper.MeasureChild(_popup.Child, Size.Infinity, new Thickness());
             }
             else
             {
-                sz = _popup.DesiredSize;
+                sz = _popup.Child.DesiredSize;
             }
 
             if (showAtPointer)
@@ -210,90 +212,78 @@ namespace Avalonia.Controls.Primitives
                     PopupPositioning.PopupPositionerConstraintAdjustment.SlideY;
             }
 
-
             var trgtBnds = Target?.Bounds ?? Rect.Empty;
 
             switch (Placement)
             {
                 case FlyoutPlacementMode.Top: //Above & centered
-                    _popup.PlacementRect = new Rect(-sz.Width / 2, 0, sz.Width, 1);
+                    _popup.PlacementRect = new Rect(0, 0, trgtBnds.Width-1, 1);
                     _popup.PlacementGravity = PopupPositioning.PopupGravity.Top;
-
+                    _popup.PlacementAnchor = PopupPositioning.PopupAnchor.Top;
                     break;
 
                 case FlyoutPlacementMode.TopEdgeAlignedLeft:
                     _popup.PlacementRect = new Rect(0, 0, 0, 0);
-                    _popup.PlacementGravity = PopupPositioning.PopupGravity.TopRight;
-                    
+                    _popup.PlacementGravity = PopupPositioning.PopupGravity.TopRight;                    
                     break;
 
                 case FlyoutPlacementMode.TopEdgeAlignedRight:
                     _popup.PlacementRect = new Rect(trgtBnds.Width - 1, 0, 10, 1);
-                    _popup.PlacementGravity = PopupPositioning.PopupGravity.TopLeft;
-                    
+                    _popup.PlacementGravity = PopupPositioning.PopupGravity.TopLeft;                    
                     break;
 
                 case FlyoutPlacementMode.RightEdgeAlignedTop:
                     _popup.PlacementRect = new Rect(trgtBnds.Width - 1, 0, 1, 1);
                     _popup.PlacementGravity = PopupPositioning.PopupGravity.BottomRight;
                     _popup.PlacementAnchor = PopupPositioning.PopupAnchor.Right;
-
                     break;
 
                 case FlyoutPlacementMode.Right: //Right & centered
                     _popup.PlacementRect = new Rect(trgtBnds.Width - 1, 0, 1, trgtBnds.Height);
                     _popup.PlacementGravity = PopupPositioning.PopupGravity.Right;
                     _popup.PlacementAnchor = PopupPositioning.PopupAnchor.Right;
-
                     break;
 
                 case FlyoutPlacementMode.RightEdgeAlignedBottom:
                     _popup.PlacementRect = new Rect(trgtBnds.Width - 1, trgtBnds.Height - 1, 1, 1);
                     _popup.PlacementGravity = PopupPositioning.PopupGravity.TopRight;
                     _popup.PlacementAnchor = PopupPositioning.PopupAnchor.Right;
-
                     break;
 
                 case FlyoutPlacementMode.Bottom: //Below & centered
                     _popup.PlacementRect = new Rect(0, trgtBnds.Height - 1, trgtBnds.Width, 1);
                     _popup.PlacementGravity = PopupPositioning.PopupGravity.Bottom;
                     _popup.PlacementAnchor = PopupPositioning.PopupAnchor.Bottom;
-
                     break;
 
                 case FlyoutPlacementMode.BottomEdgeAlignedLeft:
                     _popup.PlacementRect = new Rect(0, trgtBnds.Height - 1, 1, 1);
                     _popup.PlacementGravity = PopupPositioning.PopupGravity.BottomRight;
                     _popup.PlacementAnchor = PopupPositioning.PopupAnchor.Bottom;
-
                     break;
 
                 case FlyoutPlacementMode.BottomEdgeAlignedRight:
                     _popup.PlacementRect = new Rect(trgtBnds.Width - 1, trgtBnds.Height - 1, 1, 1);
                     _popup.PlacementGravity = PopupPositioning.PopupGravity.BottomLeft;
                     _popup.PlacementAnchor = PopupPositioning.PopupAnchor.Bottom;
-
                     break;
 
                 case FlyoutPlacementMode.LeftEdgeAlignedTop:
                     _popup.PlacementRect = new Rect(0, 0, 1, 1);
                     _popup.PlacementGravity = PopupPositioning.PopupGravity.BottomLeft;
                     _popup.PlacementAnchor = PopupPositioning.PopupAnchor.Left;
-
                     break;
 
                 case FlyoutPlacementMode.Left: //Left & centered
                     _popup.PlacementRect = new Rect(0, 0, 1, trgtBnds.Height);
                     _popup.PlacementGravity = PopupPositioning.PopupGravity.Left;
                     _popup.PlacementAnchor = PopupPositioning.PopupAnchor.Left;
-
                     break;
 
                 case FlyoutPlacementMode.LeftEdgeAlignedBottom:
                     _popup.PlacementRect = new Rect(0, trgtBnds.Height - 1, 1, 1);
                     _popup.PlacementGravity = PopupPositioning.PopupGravity.TopLeft;
                     _popup.PlacementAnchor = PopupPositioning.PopupAnchor.BottomLeft;
-
                     break;
 
                 case FlyoutPlacementMode.Full:
@@ -307,7 +297,6 @@ namespace Avalonia.Controls.Primitives
                     //This is just FlyoutPlacementMode.Top behavior (above & centered)
                     _popup.PlacementRect = new Rect(-sz.Width / 2, 0, sz.Width, 1);
                     _popup.PlacementGravity = PopupPositioning.PopupGravity.Top;
-
                     break;
             }
         }

From be0cdd157b343b42ca9746f47e9337dd7bc3a20c Mon Sep 17 00:00:00 2001
From: amwx <armccormickwx@gmail.com>
Date: Thu, 18 Mar 2021 21:27:22 -0500
Subject: [PATCH 04/43] Add ShowMode to FlyoutBase

---
 src/Avalonia.Controls/Flyouts/FlyoutBase.cs   | 89 ++++++++++++++++++-
 .../Flyouts/FlyoutShowMode.cs                 | 24 +++++
 2 files changed, 110 insertions(+), 3 deletions(-)
 create mode 100644 src/Avalonia.Controls/Flyouts/FlyoutShowMode.cs

diff --git a/src/Avalonia.Controls/Flyouts/FlyoutBase.cs b/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
index ca267dc5e9..85e460a25f 100644
--- a/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
+++ b/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
@@ -1,7 +1,7 @@
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Text;
+using Avalonia.Input;
+using Avalonia.Input.Raw;
 using Avalonia.Layout;
 
 #nullable enable
@@ -20,12 +20,19 @@ namespace Avalonia.Controls.Primitives
         public static readonly StyledProperty<FlyoutPlacementMode> PlacementProperty =
             AvaloniaProperty.Register<FlyoutBase, FlyoutPlacementMode>(nameof(Placement));
 
+        public static readonly DirectProperty<FlyoutBase, FlyoutShowMode> ShowModeProperty =
+            AvaloniaProperty.RegisterDirect<FlyoutBase, FlyoutShowMode>(nameof(ShowMode),
+                x => x.ShowMode, (x, v) => x.ShowMode = v);
+
         public static readonly AttachedProperty<FlyoutBase?> AttachedFlyoutProperty =
             AvaloniaProperty.RegisterAttached<FlyoutBase, Control, FlyoutBase?>("AttachedFlyout", null);
 
         private bool _isOpen;
         private Control? _target;
         protected Popup? _popup;
+        private FlyoutShowMode _showMode = FlyoutShowMode.Standard;
+        Rect? enlargedPopupRect;
+        IDisposable? transientDisposable;
 
         public bool IsOpen
         {
@@ -39,6 +46,12 @@ namespace Avalonia.Controls.Primitives
             set => SetValue(PlacementProperty, value);
         }
 
+        public FlyoutShowMode ShowMode
+        {
+            get => _showMode;
+            set => SetAndRaise(ShowModeProperty, ref _showMode, value);
+        }
+
         public Control? Target
         {
             get => _target;
@@ -96,7 +109,11 @@ namespace Avalonia.Controls.Primitives
             }
 
             IsOpen = _popup.IsOpen = false;
-            
+
+            // Ensure this isn't active
+            transientDisposable?.Dispose();
+            transientDisposable = null;
+
             OnClosed();
         }
 
@@ -142,6 +159,72 @@ namespace Avalonia.Controls.Primitives
             PositionPopup(showAtPointer);
             IsOpen = _popup.IsOpen = true;            
             OnOpened();
+                        
+            if (ShowMode == FlyoutShowMode.Standard)
+            {
+                // Try and focus content inside Flyout
+                if (_popup.Child.Focusable)
+                {
+                    FocusManager.Instance?.Focus(_popup.Child);
+                }
+                else
+                {
+                    var nextFocus = KeyboardNavigationHandler.GetNext(_popup.Child, NavigationDirection.Next);
+                    if (nextFocus != null)
+                    {
+                        FocusManager.Instance?.Focus(nextFocus);
+                    }
+                }
+            }
+            else if (ShowMode == FlyoutShowMode.TransientWithDismissOnPointerMoveAway)
+            {
+                transientDisposable = InputManager.Instance?.Process.Subscribe(HandleTransientDismiss);
+            }
+        }
+
+        private void HandleTransientDismiss(RawInputEventArgs args)
+        {
+            if (args is RawPointerEventArgs pArgs && pArgs.Type == RawPointerEventType.Move)
+            {
+                if (enlargedPopupRect == null)
+                {
+                    if (_popup?.Host is PopupRoot root)
+                    { 
+                        var tmp = root.Bounds.Inflate(100);
+                        var scPt = root.PointToScreen(tmp.TopLeft);
+                        enlargedPopupRect = new Rect(scPt.X, scPt.Y, tmp.Width, tmp.Height);
+                    }
+                    else if (_popup?.Host is OverlayPopupHost host)
+                    {
+                        // Overlay popups are in Window client coordinates, just use that
+                        enlargedPopupRect = host.Bounds.Inflate(100);
+                    }
+
+                    return;
+                }
+
+                if (_popup?.Host is PopupRoot)
+                {
+                    var pt = pArgs.Root.PointToScreen(pArgs.Position);
+                    if (!enlargedPopupRect?.Contains(new Point(pt.X, pt.Y)) ?? false)
+                    {
+                        Hide(false);
+                        enlargedPopupRect = null;
+                        transientDisposable?.Dispose();
+                        transientDisposable = null;
+                    }
+                }
+                else if (_popup?.Host is OverlayPopupHost)
+                {
+                    if (!enlargedPopupRect?.Contains(pArgs.Position) ?? false)
+                    {
+                        Hide(false);
+                        enlargedPopupRect = null;
+                        transientDisposable?.Dispose();
+                        transientDisposable = null;
+                    }
+                }
+            }
         }
 
         protected virtual void OnOpening()
diff --git a/src/Avalonia.Controls/Flyouts/FlyoutShowMode.cs b/src/Avalonia.Controls/Flyouts/FlyoutShowMode.cs
new file mode 100644
index 0000000000..cb5b5f00c0
--- /dev/null
+++ b/src/Avalonia.Controls/Flyouts/FlyoutShowMode.cs
@@ -0,0 +1,24 @@
+namespace Avalonia.Controls
+{
+    // Note: FlyoutShowMode.Auto was removed. MS Docs just say:
+    // The show mode is determined automatically based on the method used to show the flyout.
+    // and AFAICT Flyouts generally open with "Standard" behavior
+
+    public enum FlyoutShowMode
+    {
+        /// <summary>
+        /// Behavior is typical of a flyout shown reactively, like a context menu. The open flyout takes focus. For a CommandBarFlyout, it opens in it's expanded state.
+        /// </summary>
+        Standard,
+
+        /// <summary>
+        /// Behavior is typical of a flyout shown proactively. The open flyout does not take focus. For a CommandBarFlyout, it opens in it's collapsed state.
+        /// </summary>
+        Transient,
+
+        /// <summary>
+        /// The flyout exhibits Transient behavior while the cursor is close to it, but is dismissed when the cursor moves away.
+        /// </summary>
+        TransientWithDismissOnPointerMoveAway
+    }
+}

From 4bd187d362ada2fe60b8010fb1525c47e5173bae Mon Sep 17 00:00:00 2001
From: amwx <armccormickwx@gmail.com>
Date: Thu, 18 Mar 2021 21:28:40 -0500
Subject: [PATCH 05/43] Add MenuFlyout

---
 src/Avalonia.Controls/Flyouts/MenuFlyout.cs   | 87 +++++++++++++++++++
 .../Flyouts/MenuFlyoutPresenter.cs            | 36 ++++++++
 .../Accents/FluentControlResourcesDark.xaml   |  5 ++
 .../Accents/FluentControlResourcesLight.xaml  |  5 ++
 .../Controls/FluentControls.xaml              |  2 +
 .../Controls/FlyoutPresenter.xaml             |  5 ++
 .../Controls/MenuFlyoutPresenter.xaml         | 36 ++++++++
 7 files changed, 176 insertions(+)
 create mode 100644 src/Avalonia.Controls/Flyouts/MenuFlyout.cs
 create mode 100644 src/Avalonia.Controls/Flyouts/MenuFlyoutPresenter.cs
 create mode 100644 src/Avalonia.Themes.Fluent/Controls/MenuFlyoutPresenter.xaml

diff --git a/src/Avalonia.Controls/Flyouts/MenuFlyout.cs b/src/Avalonia.Controls/Flyouts/MenuFlyout.cs
new file mode 100644
index 0000000000..8eea5f211d
--- /dev/null
+++ b/src/Avalonia.Controls/Flyouts/MenuFlyout.cs
@@ -0,0 +1,87 @@
+using System.Collections;
+using System.Collections.Specialized;
+using Avalonia.Collections;
+using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Templates;
+using Avalonia.Input;
+using Avalonia.Metadata;
+using Avalonia.Styling;
+
+#nullable enable
+
+namespace Avalonia.Controls
+{
+    public class MenuFlyout : FlyoutBase
+    {
+        public MenuFlyout()
+        {
+            _items = new AvaloniaList<object>();
+        }
+
+        public static readonly DirectProperty<MenuFlyout, IEnumerable> ItemsProperty =
+            ItemsControl.ItemsProperty.AddOwner<MenuFlyout>(x => x.Items,
+                (x, v) => x.Items = v);
+
+        public static readonly DirectProperty<MenuFlyout, IDataTemplate?> ItemTemplateProperty =
+            AvaloniaProperty.RegisterDirect<MenuFlyout, IDataTemplate?>(nameof(ItemTemplate),
+                x => x.ItemTemplate, (x, v) => x.ItemTemplate = v);
+
+        public Styles? FlyoutPresenterStyle
+        {
+            get
+            {
+                if (_styles == null)
+                {
+                    _styles = new Styles();
+                    _styles.CollectionChanged += OnMenuFlyoutPresenterStyleChanged;
+                }
+
+                return _styles;
+            }
+        }
+
+        [Content]
+        public IEnumerable Items
+        {
+            get => _items;
+            set => SetAndRaise(ItemsProperty, ref _items, value);
+        }
+
+        public IDataTemplate? ItemTemplate
+        {
+            get => _itemTemplate;
+            set => SetAndRaise(ItemTemplateProperty, ref _itemTemplate, value);
+        }
+
+        private Styles? _styles;
+        private bool _stylesDirty = true;
+        private IEnumerable _items;
+        private IDataTemplate? _itemTemplate;
+
+        protected override Control CreatePresenter()
+        {
+            return new MenuFlyoutPresenter
+            {
+                [!ItemsControl.ItemsProperty] = this[!ItemsProperty],
+                [!ItemsControl.ItemTemplateProperty] = this[!ItemTemplateProperty]
+            };
+        }
+
+        protected override void OnOpened()
+        {
+            if (_styles != null && _stylesDirty)
+            {
+                // Presenter for flyout generally shouldn't be public, so
+                // we should be ok to just reset the styles
+                _popup.Child.Styles.Clear();
+                _popup.Child.Styles.Add(_styles);
+            }
+            base.OnOpened();
+        }
+
+        private void OnMenuFlyoutPresenterStyleChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            _stylesDirty = true;
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Flyouts/MenuFlyoutPresenter.cs b/src/Avalonia.Controls/Flyouts/MenuFlyoutPresenter.cs
new file mode 100644
index 0000000000..7e59d824fa
--- /dev/null
+++ b/src/Avalonia.Controls/Flyouts/MenuFlyoutPresenter.cs
@@ -0,0 +1,36 @@
+using Avalonia.Controls.Generators;
+using Avalonia.Controls.Platform;
+using Avalonia.Controls.Primitives;
+using Avalonia.LogicalTree;
+
+namespace Avalonia.Controls
+{
+    public class MenuFlyoutPresenter : MenuBase
+    {
+        public MenuFlyoutPresenter()
+            :base(new DefaultMenuInteractionHandler(true))
+        {
+
+        }
+
+        public override void Close()
+        {
+            // DefaultMenuInteractionHandler calls this
+            var host = this.FindLogicalAncestorOfType<Popup>();
+            if (host != null)
+            {
+                host.IsOpen = false;
+            }
+        }
+
+        public override void Open()
+        {
+            //Ignore
+        }
+
+        protected override IItemContainerGenerator CreateItemContainerGenerator()
+        {
+            return new MenuItemContainerGenerator(this);
+        }
+    }
+}
diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml
index abc02a6371..ae1fe42031 100644
--- a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml
+++ b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml
@@ -809,5 +809,10 @@
     <StaticResource x:Key="CalendarDatePickerForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
     <StaticResource x:Key="CalendarDatePickerBorderBrush" ResourceKey="SystemControlForegroundBaseMediumBrush" />
     <Thickness x:Key="CalendarDatePickerBorderThemeThickness">1</Thickness>
+
+    <!-- Resources for FlyoutPresenter.xaml -->
+    <StaticResource x:Key="FlyoutPresenterBackground" ResourceKey="SystemControlBackgroundChromeMediumLowBrush" />
+    <StaticResource x:Key="FlyoutBorderThemeBrush" ResourceKey="SystemControlForegroundChromeHighBrush" />
+
   </Style.Resources>
 </Style>
diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml
index 6a2a04f732..5af24f57a8 100644
--- a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml
+++ b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml
@@ -807,5 +807,10 @@
     <StaticResource x:Key="CalendarDatePickerForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
     <StaticResource x:Key="CalendarDatePickerBorderBrush" ResourceKey="SystemControlForegroundBaseMediumBrush" />
     <Thickness x:Key="CalendarDatePickerBorderThemeThickness">1</Thickness>
+
+    <!-- Resources for FlyoutPresenter.xaml -->
+    <StaticResource x:Key="FlyoutPresenterBackground" ResourceKey="SystemControlBackgroundChromeMediumLowBrush" />
+    <StaticResource x:Key="FlyoutBorderThemeBrush" ResourceKey="SystemControlForegroundChromeHighBrush" />
+    
   </Style.Resources>
 </Style>
diff --git a/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml b/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
index 0acb8f4f6e..16e05ffdfd 100644
--- a/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
@@ -59,4 +59,6 @@
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/SplitView.xaml"/>
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/DatePicker.xaml"/>  
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/TimePicker.xaml"/>  
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/FlyoutPresenter.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/MenuFlyoutPresenter.xaml"/>
 </Styles>
diff --git a/src/Avalonia.Themes.Fluent/Controls/FlyoutPresenter.xaml b/src/Avalonia.Themes.Fluent/Controls/FlyoutPresenter.xaml
index 2be49d007b..3a8df060fa 100644
--- a/src/Avalonia.Themes.Fluent/Controls/FlyoutPresenter.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/FlyoutPresenter.xaml
@@ -1,4 +1,9 @@
 <Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Styles.Resources>
+    <Thickness x:Key="FlyoutBorderThemeThickness">1</Thickness>
+    <Thickness x:Key="FlyoutBorderThemePadding">0</Thickness>
+  </Styles.Resources>
+  
   <Style Selector="FlyoutPresenter">
     <Setter Property="HorizontalContentAlignment" Value="Stretch" />
     <Setter Property="VerticalContentAlignment" Value="Stretch" />
diff --git a/src/Avalonia.Themes.Fluent/Controls/MenuFlyoutPresenter.xaml b/src/Avalonia.Themes.Fluent/Controls/MenuFlyoutPresenter.xaml
new file mode 100644
index 0000000000..41a6e1cb65
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/MenuFlyoutPresenter.xaml
@@ -0,0 +1,36 @@
+<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  
+  <Style Selector="MenuFlyoutPresenter">
+    <Setter Property="Background" Value="{DynamicResource MenuFlyoutPresenterBackground}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource MenuFlyoutPresenterBorderBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource MenuFlyoutPresenterBorderThemeThickness}" />
+    <Setter Property="Padding" Value="{DynamicResource MenuFlyoutPresenterThemePadding}" />
+    <Setter Property="MaxWidth" Value="{DynamicResource FlyoutThemeMaxWidth}" />
+    <Setter Property="MinHeight" Value="{DynamicResource MenuFlyoutThemeMinHeight}" />
+    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+    <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Name="LayoutRoot"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                Padding="{DynamicResource FlyoutBorderThemePadding}">
+          <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                        VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
+            <ItemsPresenter Name="PART_ItemsPresenter"
+                            Items="{TemplateBinding Items}"
+                            ItemsPanel="{TemplateBinding ItemsPanel}"
+                            ItemTemplate="{TemplateBinding ItemTemplate}"
+                            Margin="{DynamicResource MenuFlyoutScrollerMargin}"
+                            KeyboardNavigation.TabNavigation="Continue"
+                            Grid.IsSharedSizeScope="True" />
+          </ScrollViewer>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+  <Style Selector="MenuFlyoutPresenter /template/ Border#LayoutRoot">
+    <Setter Property="CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />
+  </Style>
+</Styles>

From b1b9f6f7d2ca93a995a04c583f33e72e53e0a321 Mon Sep 17 00:00:00 2001
From: amwx <armccormickwx@gmail.com>
Date: Thu, 18 Mar 2021 22:39:10 -0500
Subject: [PATCH 06/43] ContextFlyouts

---
 src/Avalonia.Controls/Control.cs            | 17 ++++++++++
 src/Avalonia.Controls/Flyouts/FlyoutBase.cs | 36 +++++++++++++++++++++
 2 files changed, 53 insertions(+)

diff --git a/src/Avalonia.Controls/Control.cs b/src/Avalonia.Controls/Control.cs
index 4aab92c428..ebfe98a175 100644
--- a/src/Avalonia.Controls/Control.cs
+++ b/src/Avalonia.Controls/Control.cs
@@ -37,9 +37,16 @@ namespace Avalonia.Controls
         /// <summary>
         /// Defines the <see cref="ContextMenu"/> property.
         /// </summary>
+        [Obsolete("Prefer ContextFlyout")]
         public static readonly StyledProperty<ContextMenu?> ContextMenuProperty =
             AvaloniaProperty.Register<Control, ContextMenu?>(nameof(ContextMenu));
 
+        /// <summary>
+        /// Defines the <see cref="ContextFlyout"/> property
+        /// </summary>
+        public static readonly StyledProperty<FlyoutBase?> ContextFlyoutProperty =
+            AvaloniaProperty.Register<Control, FlyoutBase?>(nameof(ContextFlyout));
+
         /// <summary>
         /// Event raised when an element wishes to be scrolled into view.
         /// </summary>
@@ -70,12 +77,22 @@ namespace Avalonia.Controls
         /// <summary>
         /// Gets or sets a context menu to the control.
         /// </summary>
+        [Obsolete("Prefer ContextFlyout")]
         public ContextMenu? ContextMenu
         {
             get => GetValue(ContextMenuProperty);
             set => SetValue(ContextMenuProperty, value);
         }
 
+        /// <summary>
+        /// Gets or sets a context flyout to the control
+        /// </summary>
+        public FlyoutBase? ContextFlyout
+        {
+            get => GetValue(ContextFlyoutProperty);
+            set => SetValue(ContextFlyoutProperty, value);
+        }
+
         /// <summary>
         /// Gets or sets a user-defined object attached to the control.
         /// </summary>
diff --git a/src/Avalonia.Controls/Flyouts/FlyoutBase.cs b/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
index 85e460a25f..f3f4febbb0 100644
--- a/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
+++ b/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
@@ -10,6 +10,11 @@ namespace Avalonia.Controls.Primitives
 {
     public abstract class FlyoutBase : AvaloniaObject
     {
+        static FlyoutBase()
+        {
+            Control.ContextFlyoutProperty.Changed.Subscribe(OnContextFlyoutPropertyChanged);
+        }
+
         private static readonly DirectProperty<FlyoutBase, bool> IsOpenProperty =
            AvaloniaProperty.RegisterDirect<FlyoutBase, bool>(nameof(IsOpen),
                x => x.IsOpen);
@@ -383,5 +388,36 @@ namespace Avalonia.Controls.Primitives
                     break;
             }
         }
+
+        private static void OnContextFlyoutPropertyChanged(AvaloniaPropertyChangedEventArgs<FlyoutBase> args)
+        {
+            if (args.Sender is Control c)
+            {
+                if (args.OldValue.GetValueOrDefault() is FlyoutBase)
+                {
+                    c.PointerReleased -= OnControlWithContextFlyoutPointerReleased;
+                }
+                if (args.NewValue.GetValueOrDefault() is FlyoutBase)
+                {
+                    c.PointerReleased += OnControlWithContextFlyoutPointerReleased;
+                }
+            }
+        }
+
+        private static void OnControlWithContextFlyoutPointerReleased(object sender, PointerReleasedEventArgs e)
+        {
+            if (sender is Control c)
+            {
+                if (e.InitialPressMouseButton == MouseButton.Right &&
+                e.GetCurrentPoint(c).Properties.PointerUpdateKind == PointerUpdateKind.RightButtonReleased)
+                {
+                    if (c.ContextFlyout != null)
+                    {
+                        c.ContextFlyout.ShowAt(c, true);
+                    }
+                }
+            }
+            
+        }
     }
 }

From 780dd1bc74ca87113cce57295a7ef343c25eed78 Mon Sep 17 00:00:00 2001
From: amwx <armccormickwx@gmail.com>
Date: Fri, 19 Mar 2021 17:23:35 -0500
Subject: [PATCH 07/43] Show ContextFlyout on right click

---
 src/Avalonia.Controls/Flyouts/FlyoutBase.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Avalonia.Controls/Flyouts/FlyoutBase.cs b/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
index f3f4febbb0..5f00c1eafe 100644
--- a/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
+++ b/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
@@ -389,15 +389,15 @@ namespace Avalonia.Controls.Primitives
             }
         }
 
-        private static void OnContextFlyoutPropertyChanged(AvaloniaPropertyChangedEventArgs<FlyoutBase> args)
+        private static void OnContextFlyoutPropertyChanged(AvaloniaPropertyChangedEventArgs args)
         {
             if (args.Sender is Control c)
             {
-                if (args.OldValue.GetValueOrDefault() is FlyoutBase)
+                if (args.OldValue is FlyoutBase)
                 {
                     c.PointerReleased -= OnControlWithContextFlyoutPointerReleased;
                 }
-                if (args.NewValue.GetValueOrDefault() is FlyoutBase)
+                if (args.NewValue is FlyoutBase)
                 {
                     c.PointerReleased += OnControlWithContextFlyoutPointerReleased;
                 }

From a7472af1305a5be4b62957db6a8e2ef629512960 Mon Sep 17 00:00:00 2001
From: amwx <armccormickwx@gmail.com>
Date: Fri, 19 Mar 2021 17:24:16 -0500
Subject: [PATCH 08/43] Use Classes instead of Styles

---
 src/Avalonia.Controls/Flyouts/Flyout.cs     | 39 ++++++++-------------
 src/Avalonia.Controls/Flyouts/MenuFlyout.cs | 39 ++++++++-------------
 2 files changed, 28 insertions(+), 50 deletions(-)

diff --git a/src/Avalonia.Controls/Flyouts/Flyout.cs b/src/Avalonia.Controls/Flyouts/Flyout.cs
index ed16628605..ff6f78a6f4 100644
--- a/src/Avalonia.Controls/Flyouts/Flyout.cs
+++ b/src/Avalonia.Controls/Flyouts/Flyout.cs
@@ -15,22 +15,9 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<object> ContentProperty =
             AvaloniaProperty.Register<Flyout, object>(nameof(Content));
 
-        public Styles? FlyoutPresenterStyle
-        {
-            get
-            {
-                if (_styles == null)
-                {
-                    _styles = new Styles();
-                    _styles.CollectionChanged += OnFlyoutPresenterStylesChanged;
-                }
-
-                return _styles;
-            }
-        }
+        public Classes? FlyoutPresenterClasses => _classes ??= new Classes();
 
-        private Styles? _styles;
-        private bool _stylesDirty;
+        private Classes? _classes;
 
         [Content]
         public object Content
@@ -49,19 +36,21 @@ namespace Avalonia.Controls
 
         protected override void OnOpened()
         {
-            if (_styles != null && _stylesDirty)
+            if (FlyoutPresenterClasses != null)
             {
-                // Presenter for flyout generally shouldn't be public, so
-                // we should be ok to just reset the styles
-                _popup.Child.Styles.Clear();
-                _popup.Child.Styles.Add(_styles);
+                //Remove any classes no longer in use
+                for (int i = _popup.Child.Classes.Count - 1; i >= 0; i--)
+                {
+                    if (!FlyoutPresenterClasses.Contains(_popup.Child.Classes[i]))
+                    {
+                        _popup.Child.Classes.RemoveAt(i);
+                    }
+                }
+
+                //Add new classes
+                _popup.Child.Classes.AddRange(FlyoutPresenterClasses);
             }
             base.OnOpened();
         }
-
-        private void OnFlyoutPresenterStylesChanged(object sender, NotifyCollectionChangedEventArgs e)
-        {
-            _stylesDirty = true;
-        }
     }
 }
diff --git a/src/Avalonia.Controls/Flyouts/MenuFlyout.cs b/src/Avalonia.Controls/Flyouts/MenuFlyout.cs
index 8eea5f211d..4cea5199f1 100644
--- a/src/Avalonia.Controls/Flyouts/MenuFlyout.cs
+++ b/src/Avalonia.Controls/Flyouts/MenuFlyout.cs
@@ -26,19 +26,7 @@ namespace Avalonia.Controls
             AvaloniaProperty.RegisterDirect<MenuFlyout, IDataTemplate?>(nameof(ItemTemplate),
                 x => x.ItemTemplate, (x, v) => x.ItemTemplate = v);
 
-        public Styles? FlyoutPresenterStyle
-        {
-            get
-            {
-                if (_styles == null)
-                {
-                    _styles = new Styles();
-                    _styles.CollectionChanged += OnMenuFlyoutPresenterStyleChanged;
-                }
-
-                return _styles;
-            }
-        }
+        public Classes? FlyoutPresenterClasses => _classes ??= new Classes();
 
         [Content]
         public IEnumerable Items
@@ -53,8 +41,7 @@ namespace Avalonia.Controls
             set => SetAndRaise(ItemTemplateProperty, ref _itemTemplate, value);
         }
 
-        private Styles? _styles;
-        private bool _stylesDirty = true;
+        private Classes? _classes;
         private IEnumerable _items;
         private IDataTemplate? _itemTemplate;
 
@@ -69,19 +56,21 @@ namespace Avalonia.Controls
 
         protected override void OnOpened()
         {
-            if (_styles != null && _stylesDirty)
+            if (FlyoutPresenterClasses != null)
             {
-                // Presenter for flyout generally shouldn't be public, so
-                // we should be ok to just reset the styles
-                _popup.Child.Styles.Clear();
-                _popup.Child.Styles.Add(_styles);
+                //Remove any classes no longer in use
+                for (int i = _popup.Child.Classes.Count - 1; i >= 0; i--)
+                {
+                    if (!FlyoutPresenterClasses.Contains(_popup.Child.Classes[i]))
+                    {
+                        _popup.Child.Classes.RemoveAt(i);
+                    }
+                }
+
+                //Add new classes
+                _popup.Child.Classes.AddRange(FlyoutPresenterClasses);
             }
             base.OnOpened();
         }
-
-        private void OnMenuFlyoutPresenterStyleChanged(object sender, NotifyCollectionChangedEventArgs e)
-        {
-            _stylesDirty = true;
-        }
     }
 }

From 88fb92d8c0dc6d5b623cb5c2d13090db65aa9f73 Mon Sep 17 00:00:00 2001
From: amwx <armccormickwx@gmail.com>
Date: Fri, 19 Mar 2021 17:42:00 -0500
Subject: [PATCH 09/43] DefaultTheme styles

---
 src/Avalonia.Themes.Default/DefaultTheme.xaml |  2 ++
 .../FlyoutPresenter.xaml                      | 30 +++++++++++++++++++
 .../MenuFlyoutPresenter.xaml                  | 28 +++++++++++++++++
 3 files changed, 60 insertions(+)
 create mode 100644 src/Avalonia.Themes.Default/FlyoutPresenter.xaml
 create mode 100644 src/Avalonia.Themes.Default/MenuFlyoutPresenter.xaml

diff --git a/src/Avalonia.Themes.Default/DefaultTheme.xaml b/src/Avalonia.Themes.Default/DefaultTheme.xaml
index 107fc07875..4ae9ea4812 100644
--- a/src/Avalonia.Themes.Default/DefaultTheme.xaml
+++ b/src/Avalonia.Themes.Default/DefaultTheme.xaml
@@ -60,4 +60,6 @@
   <StyleInclude Source="resm:Avalonia.Themes.Default.SplitView.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.DatePicker.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.TimePicker.xaml?assembly=Avalonia.Themes.Default"/>
+  <StyleInclude Source="resm:Avalonia.Themes.Default.FlyoutPresenter.xaml?assembly=Avalonia.Themes.Default"/>
+  <StyleInclude Source="resm:Avalonia.Themes.Default.MenuFlyoutPresenter.xaml?assembly=Avalonia.Themes.Default"/>
 </Styles>
diff --git a/src/Avalonia.Themes.Default/FlyoutPresenter.xaml b/src/Avalonia.Themes.Default/FlyoutPresenter.xaml
new file mode 100644
index 0000000000..39ee8e5a6e
--- /dev/null
+++ b/src/Avalonia.Themes.Default/FlyoutPresenter.xaml
@@ -0,0 +1,30 @@
+<Styles xmlns="https://github.com/avaloniaui">
+  <Style Selector="FlyoutPresenter">
+    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+    <Setter Property="VerticalContentAlignment" Value="Stretch" />
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+    <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Name="LayoutRoot"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}">
+          <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                        VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
+            <ContentPresenter Content="{TemplateBinding Content}"
+                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                              Margin="{TemplateBinding Padding}"
+                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                              HorizontalContentAlignment="Stretch"
+                              VerticalContentAlignment="Stretch" />
+          </ScrollViewer>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+</Styles>
diff --git a/src/Avalonia.Themes.Default/MenuFlyoutPresenter.xaml b/src/Avalonia.Themes.Default/MenuFlyoutPresenter.xaml
new file mode 100644
index 0000000000..612203d3d7
--- /dev/null
+++ b/src/Avalonia.Themes.Default/MenuFlyoutPresenter.xaml
@@ -0,0 +1,28 @@
+<Styles xmlns="https://github.com/avaloniaui">
+  <Style Selector="MenuFlyoutPresenter">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+    <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Name="LayoutRoot"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}">
+          <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                        VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
+            <ItemsPresenter Name="PART_ItemsPresenter"
+                            Items="{TemplateBinding Items}"
+                            ItemsPanel="{TemplateBinding ItemsPanel}"
+                            ItemTemplate="{TemplateBinding ItemTemplate}"
+                            Margin="{TemplateBinding Padding}"
+                            KeyboardNavigation.TabNavigation="Continue"
+                            Grid.IsSharedSizeScope="True" />
+          </ScrollViewer>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+</Styles>

From b6f5571495e52ce75c7d920a10be1d4836d7eed0 Mon Sep 17 00:00:00 2001
From: amwx <armccormickwx@gmail.com>
Date: Fri, 19 Mar 2021 17:44:28 -0500
Subject: [PATCH 10/43] TextBox uses ContextFlyout

---
 src/Avalonia.Themes.Default/TextBox.xaml         | 10 +++++++++-
 src/Avalonia.Themes.Fluent/Controls/TextBox.xaml | 12 ++++++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/Avalonia.Themes.Default/TextBox.xaml b/src/Avalonia.Themes.Default/TextBox.xaml
index 9085cfc2c6..6dce77e96d 100644
--- a/src/Avalonia.Themes.Default/TextBox.xaml
+++ b/src/Avalonia.Themes.Default/TextBox.xaml
@@ -3,6 +3,14 @@
     <StreamGeometry x:Key="TextBoxClearButtonData">M 11.416016,10 20,1.4160156 18.583984,0 10,8.5839846 1.4160156,0 0,1.4160156 8.5839844,10 0,18.583985 1.4160156,20 10,11.416015 18.583984,20 20,18.583985 Z</StreamGeometry>
     <StreamGeometry x:Key="PasswordBoxRevealButtonData">m10.051 7.0032c2.215 0 4.0105 1.7901 4.0105 3.9984s-1.7956 3.9984-4.0105 3.9984c-2.215 0-4.0105-1.7901-4.0105-3.9984s1.7956-3.9984 4.0105-3.9984zm0 1.4994c-1.3844 0-2.5066 1.1188-2.5066 2.499s1.1222 2.499 2.5066 2.499 2.5066-1.1188 2.5066-2.499-1.1222-2.499-2.5066-2.499zm0-5.0026c4.6257 0 8.6188 3.1487 9.7267 7.5613 0.10085 0.40165-0.14399 0.80877-0.54686 0.90931-0.40288 0.10054-0.81122-0.14355-0.91208-0.54521-0.94136-3.7492-4.3361-6.4261-8.2678-6.4261-3.9334 0-7.3292 2.6792-8.2689 6.4306-0.10063 0.40171-0.50884 0.64603-0.91177 0.54571s-0.648-0.5073-0.54737-0.90901c1.106-4.4152 5.1003-7.5667 9.728-7.5667z</StreamGeometry>
     <StreamGeometry x:Key="PasswordBoxHideButtonData">m0.21967 0.21965c-0.26627 0.26627-0.29047 0.68293-0.07262 0.97654l0.07262 0.08412 4.0346 4.0346c-1.922 1.3495-3.3585 3.365-3.9554 5.7495-0.10058 0.4018 0.14362 0.8091 0.54543 0.9097 0.40182 0.1005 0.80909-0.1436 0.90968-0.5455 0.52947-2.1151 1.8371-3.8891 3.5802-5.0341l1.8096 1.8098c-0.70751 0.7215-1.1438 1.71-1.1438 2.8003 0 2.2092 1.7909 4 4 4 1.0904 0 2.0788-0.4363 2.8004-1.1438l5.9193 5.9195c0.2929 0.2929 0.7677 0.2929 1.0606 0 0.2663-0.2662 0.2905-0.6829 0.0726-0.9765l-0.0726-0.0841-6.1135-6.1142 0.0012-0.0015-1.2001-1.1979-2.8699-2.8693 2e-3 -8e-4 -2.8812-2.8782 0.0012-0.0018-1.1333-1.1305-4.3064-4.3058c-0.29289-0.29289-0.76777-0.29289-1.0607 0zm7.9844 9.0458 3.5351 3.5351c-0.45 0.4358-1.0633 0.704-1.7392 0.704-1.3807 0-2.5-1.1193-2.5-2.5 0-0.6759 0.26824-1.2892 0.7041-1.7391zm1.7959-5.7655c-1.0003 0-1.9709 0.14807-2.8889 0.425l1.237 1.2362c0.5358-0.10587 1.0883-0.16119 1.6519-0.16119 3.9231 0 7.3099 2.6803 8.2471 6.4332 0.1004 0.4018 0.5075 0.6462 0.9094 0.5459 0.4019-0.1004 0.6463-0.5075 0.5459-0.9094-1.103-4.417-5.0869-7.5697-9.7024-7.5697zm0.1947 3.5093 3.8013 3.8007c-0.1018-2.0569-1.7488-3.7024-3.8013-3.8007z</StreamGeometry>
+
+    <MenuFlyout x:Key="DefaultTextBoxContextFlyout">
+      <MenuItem x:Name="TextBoxContextFlyoutCutItem" Header="Cut" Command="{Binding $parent[TextBox].Cut}" IsEnabled="{Binding $parent[TextBox].CanCut}" InputGesture="{x:Static TextBox.CutGesture}" />
+      <MenuItem x:Name="TextBoxContextFlyoutCopyItem" Header="Copy" Command="{Binding $parent[TextBox].Copy}" IsEnabled="{Binding $parent[TextBox].CanCopy}" InputGesture="{x:Static TextBox.CopyGesture}"/>
+      <MenuItem x:Name="TextBoxContextFlyoutPasteItem" Header="Paste" Command="{Binding $parent[TextBox].Paste}" IsEnabled="{Binding $parent[TextBox].CanPaste}" InputGesture="{x:Static TextBox.PasteGesture}"/>
+    </MenuFlyout>
+
+    <!-- ContextMenu obsolete, prefer ContextFlyout --> 
     <ContextMenu x:Key="DefaultTextBoxContextMenu" x:Name="TextBoxContextMenu">
       <MenuItem x:Name="TextBoxContextMenuCutItem" Header="Cut" Command="{Binding $parent[TextBox].Cut}" IsEnabled="{Binding $parent[TextBox].CanCut}" InputGesture="{x:Static TextBox.CutGesture}" />
       <MenuItem x:Name="TextBoxContextMenuCopyItem" Header="Copy" Command="{Binding $parent[TextBox].Copy}" IsEnabled="{Binding $parent[TextBox].CanCopy}" InputGesture="{x:Static TextBox.CopyGesture}"/>
@@ -17,7 +25,7 @@
     <Setter Property="SelectionBrush" Value="{DynamicResource HighlightBrush}"/>
     <Setter Property="SelectionForegroundBrush" Value="{DynamicResource HighlightForegroundBrush}"/>
     <Setter Property="Padding" Value="4"/>
-    <Setter Property="ContextMenu" Value="{StaticResource DefaultTextBoxContextMenu}" />
+    <Setter Property="ContextFlyout" Value="{StaticResource DefaultTextBoxContextFlyout}" />
     <Setter Property="Template">
       <ControlTemplate>
         <Border Name="border"
diff --git a/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml b/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
index 139a61abdf..688d4917cd 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
@@ -14,11 +14,19 @@
     <StreamGeometry x:Key="TextBoxClearButtonData">M 11.416016,10 20,1.4160156 18.583984,0 10,8.5839846 1.4160156,0 0,1.4160156 8.5839844,10 0,18.583985 1.4160156,20 10,11.416015 18.583984,20 20,18.583985 Z</StreamGeometry>
     <StreamGeometry x:Key="PasswordBoxRevealButtonData">m10.051 7.0032c2.215 0 4.0105 1.7901 4.0105 3.9984s-1.7956 3.9984-4.0105 3.9984c-2.215 0-4.0105-1.7901-4.0105-3.9984s1.7956-3.9984 4.0105-3.9984zm0 1.4994c-1.3844 0-2.5066 1.1188-2.5066 2.499s1.1222 2.499 2.5066 2.499 2.5066-1.1188 2.5066-2.499-1.1222-2.499-2.5066-2.499zm0-5.0026c4.6257 0 8.6188 3.1487 9.7267 7.5613 0.10085 0.40165-0.14399 0.80877-0.54686 0.90931-0.40288 0.10054-0.81122-0.14355-0.91208-0.54521-0.94136-3.7492-4.3361-6.4261-8.2678-6.4261-3.9334 0-7.3292 2.6792-8.2689 6.4306-0.10063 0.40171-0.50884 0.64603-0.91177 0.54571s-0.648-0.5073-0.54737-0.90901c1.106-4.4152 5.1003-7.5667 9.728-7.5667z</StreamGeometry>
     <StreamGeometry x:Key="PasswordBoxHideButtonData">m0.21967 0.21965c-0.26627 0.26627-0.29047 0.68293-0.07262 0.97654l0.07262 0.08412 4.0346 4.0346c-1.922 1.3495-3.3585 3.365-3.9554 5.7495-0.10058 0.4018 0.14362 0.8091 0.54543 0.9097 0.40182 0.1005 0.80909-0.1436 0.90968-0.5455 0.52947-2.1151 1.8371-3.8891 3.5802-5.0341l1.8096 1.8098c-0.70751 0.7215-1.1438 1.71-1.1438 2.8003 0 2.2092 1.7909 4 4 4 1.0904 0 2.0788-0.4363 2.8004-1.1438l5.9193 5.9195c0.2929 0.2929 0.7677 0.2929 1.0606 0 0.2663-0.2662 0.2905-0.6829 0.0726-0.9765l-0.0726-0.0841-6.1135-6.1142 0.0012-0.0015-1.2001-1.1979-2.8699-2.8693 2e-3 -8e-4 -2.8812-2.8782 0.0012-0.0018-1.1333-1.1305-4.3064-4.3058c-0.29289-0.29289-0.76777-0.29289-1.0607 0zm7.9844 9.0458 3.5351 3.5351c-0.45 0.4358-1.0633 0.704-1.7392 0.704-1.3807 0-2.5-1.1193-2.5-2.5 0-0.6759 0.26824-1.2892 0.7041-1.7391zm1.7959-5.7655c-1.0003 0-1.9709 0.14807-2.8889 0.425l1.237 1.2362c0.5358-0.10587 1.0883-0.16119 1.6519-0.16119 3.9231 0 7.3099 2.6803 8.2471 6.4332 0.1004 0.4018 0.5075 0.6462 0.9094 0.5459 0.4019-0.1004 0.6463-0.5075 0.5459-0.9094-1.103-4.417-5.0869-7.5697-9.7024-7.5697zm0.1947 3.5093 3.8013 3.8007c-0.1018-2.0569-1.7488-3.7024-3.8013-3.8007z</StreamGeometry>
+
+    <MenuFlyout x:Key="DefaultTextBoxContextFlyout">
+      <MenuItem x:Name="TextBoxContextFlyoutCutItem" Header="Cut" Command="{Binding $parent[TextBox].Cut}" IsEnabled="{Binding $parent[TextBox].CanCut}" InputGesture="{x:Static TextBox.CutGesture}" />
+      <MenuItem x:Name="TextBoxContextFlyoutCopyItem" Header="Copy" Command="{Binding $parent[TextBox].Copy}" IsEnabled="{Binding $parent[TextBox].CanCopy}" InputGesture="{x:Static TextBox.CopyGesture}"/>
+      <MenuItem x:Name="TextBoxContextFlyoutPasteItem" Header="Paste" Command="{Binding $parent[TextBox].Paste}" IsEnabled="{Binding $parent[TextBox].CanPaste}" InputGesture="{x:Static TextBox.PasteGesture}"/>
+    </MenuFlyout>
+
+    <!-- ContextMenu obsolete, prefer ContextFlyout -->
     <ContextMenu x:Key="DefaultTextBoxContextMenu" x:Name="TextBoxContextMenu">
       <MenuItem x:Name="TextBoxContextMenuCutItem" Header="Cut" Command="{Binding $parent[TextBox].Cut}" IsEnabled="{Binding $parent[TextBox].CanCut}" InputGesture="{x:Static TextBox.CutGesture}" />
       <MenuItem x:Name="TextBoxContextMenuCopyItem" Header="Copy" Command="{Binding $parent[TextBox].Copy}" IsEnabled="{Binding $parent[TextBox].CanCopy}" InputGesture="{x:Static TextBox.CopyGesture}"/>
       <MenuItem x:Name="TextBoxContextMenuPasteItem" Header="Paste" Command="{Binding $parent[TextBox].Paste}" IsEnabled="{Binding $parent[TextBox].CanPaste}" InputGesture="{x:Static TextBox.PasteGesture}"/>
-    </ContextMenu>
+    </ContextMenu>    
   </Styles.Resources>
 
   <Style Selector="TextBox">
@@ -33,7 +41,7 @@
     <Setter Property="MinWidth" Value="{DynamicResource TextControlThemeMinWidth}" />
     <Setter Property="Padding" Value="{DynamicResource TextControlThemePadding}" />
     <Setter Property="FocusAdorner" Value="{x:Null}" />
-    <Setter Property="ContextMenu" Value="{StaticResource DefaultTextBoxContextMenu}" />
+    <Setter Property="ContextFlyout" Value="{StaticResource DefaultTextBoxContextFlyout}" />
     <Setter Property="Template">
       <ControlTemplate>
         <DataValidationErrors>

From 4a7bdc79552b842af3e1133192523c62d864dc8a Mon Sep 17 00:00:00 2001
From: amwx <armccormickwx@gmail.com>
Date: Fri, 19 Mar 2021 18:13:20 -0500
Subject: [PATCH 11/43] Fix TextBox Cut/Copy commands with Flyout

---
 src/Avalonia.Controls/TextBox.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index 1d75f08a41..3082ffaf15 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -492,7 +492,12 @@ namespace Avalonia.Controls
         {
             base.OnLostFocus(e);
 
-            if (ContextMenu == null || !ContextMenu.IsOpen)
+            if ((ContextFlyout == null) && (ContextMenu == null || !ContextMenu.IsOpen))
+            {
+                ClearSelection();
+                RevealPassword = false;
+            }
+            if (ContextFlyout == null || !ContextFlyout.IsOpen)
             {
                 ClearSelection();
                 RevealPassword = false;

From ca17a9d0aa464500c429c091cab0f64c7ed61a50 Mon Sep 17 00:00:00 2001
From: amwx <armccormickwx@gmail.com>
Date: Fri, 19 Mar 2021 18:14:59 -0500
Subject: [PATCH 12/43] Sample Pages

---
 samples/ControlCatalog/MainView.xaml          |   6 +
 .../Pages/ContextFlyoutPage.axaml             | 102 +++++++
 .../Pages/ContextFlyoutPage.axaml.cs          |  45 +++
 .../ControlCatalog/Pages/FlyoutsPage.axaml    | 264 ++++++++++++++++++
 .../ControlCatalog/Pages/FlyoutsPage.axaml.cs |  81 ++++++
 .../ViewModels/ContextFlyoutPageViewModel.cs  |  78 ++++++
 6 files changed, 576 insertions(+)
 create mode 100644 samples/ControlCatalog/Pages/ContextFlyoutPage.axaml
 create mode 100644 samples/ControlCatalog/Pages/ContextFlyoutPage.axaml.cs
 create mode 100644 samples/ControlCatalog/Pages/FlyoutsPage.axaml
 create mode 100644 samples/ControlCatalog/Pages/FlyoutsPage.axaml.cs
 create mode 100644 samples/ControlCatalog/ViewModels/ContextFlyoutPageViewModel.cs

diff --git a/samples/ControlCatalog/MainView.xaml b/samples/ControlCatalog/MainView.xaml
index 142c532d75..6537c470d5 100644
--- a/samples/ControlCatalog/MainView.xaml
+++ b/samples/ControlCatalog/MainView.xaml
@@ -21,6 +21,9 @@
       <TabItem Header="Carousel"><pages:CarouselPage/></TabItem>
       <TabItem Header="CheckBox"><pages:CheckBoxPage/></TabItem>
       <TabItem Header="ComboBox"><pages:ComboBoxPage/></TabItem>
+      <TabItem Header="ContextFlyout">
+        <pages:ContextFlyoutPage/>
+      </TabItem>
       <TabItem Header="ContextMenu"><pages:ContextMenuPage/></TabItem>
       <TabItem Header="Cursor"
                ScrollViewer.VerticalScrollBarVisibility="Disabled">
@@ -38,6 +41,9 @@
         <pages:CalendarDatePickerPage/></TabItem>
       <TabItem Header="Drag+Drop"><pages:DragAndDropPage/></TabItem>
       <TabItem Header="Expander"><pages:ExpanderPage/></TabItem>
+      <TabItem Header="Flyouts">
+        <pages:FlyoutsPage />
+      </TabItem>
       <TabItem Header="Image"
                ScrollViewer.VerticalScrollBarVisibility="Disabled"
                ScrollViewer.HorizontalScrollBarVisibility="Disabled">
diff --git a/samples/ControlCatalog/Pages/ContextFlyoutPage.axaml b/samples/ControlCatalog/Pages/ContextFlyoutPage.axaml
new file mode 100644
index 0000000000..e15637aa0f
--- /dev/null
+++ b/samples/ControlCatalog/Pages/ContextFlyoutPage.axaml
@@ -0,0 +1,102 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="ControlCatalog.Pages.ContextFlyoutPage">
+    <UserControl.Styles>
+        <Style Selector="FlyoutPresenter.NoPadding">
+            <Setter Property="Padding" Value="0" />
+        </Style>
+    </UserControl.Styles>
+    
+    <StackPanel Orientation="Vertical" Spacing="4">
+        <TextBlock Classes="h1">Context Flyout</TextBlock>
+        <TextBlock Classes="h2">A right click Flyout that can be applied to any control.</TextBlock>
+
+        <StackPanel Orientation="Horizontal"
+              Margin="0,16,0,0"
+              HorizontalAlignment="Center"
+              Spacing="16">
+            <Border Background="{DynamicResource SystemAccentColor}"
+                    Margin="16"
+                    Padding="48,48,48,48">
+                <Border.ContextFlyout>
+                    <MenuFlyout>
+                        <MenuItem Header="Standard _Menu Item" InputGesture="Ctrl+A" />
+                        <MenuItem Header="_Disabled Menu Item" IsEnabled="False" InputGesture="Ctrl+D" />
+                        <Separator/>
+                        <MenuItem Header="Menu with _Submenu">
+                            <MenuItem Header="Submenu _1"/>
+                            <MenuItem Header="Submenu _2"/>
+                        </MenuItem>
+                        <MenuItem Header="Menu Item with _Icon" InputGesture="Ctrl+Shift+B">
+                            <MenuItem.Icon>
+                                <Image Source="/Assets/github_icon.png"/>
+                            </MenuItem.Icon>
+                        </MenuItem>
+                        <MenuItem Header="Menu Item with _Checkbox">
+                            <MenuItem.Icon>
+                                <CheckBox BorderThickness="0" IsHitTestVisible="False" IsChecked="True"/>
+                            </MenuItem.Icon>
+                        </MenuItem>
+                    </MenuFlyout>
+                </Border.ContextFlyout>
+                <TextBlock Text="Defined in XAML"/>
+            </Border>
+            <Border Background="{DynamicResource SystemAccentColor}"
+                    Margin="16"
+                    Padding="48,48,48,48">
+                <Border.ContextMenu>
+                    <ContextMenu Items="{Binding MenuItems}">
+                        <ContextMenu.Styles>
+                            <Style Selector="MenuItem">
+                                <Setter Property="Header" Value="{Binding Header}"/>
+                                <Setter Property="Items" Value="{Binding Items}"/>
+                                <Setter Property="Command" Value="{Binding Command}"/>
+                                <Setter Property="CommandParameter" Value="{Binding CommandParameter}"/>
+                            </Style>
+                        </ContextMenu.Styles>
+                    </ContextMenu>
+                </Border.ContextMenu>
+                <TextBlock Text="Dynamically Generated"/>
+            </Border>
+        </StackPanel>
+
+        <TextBlock Text="Custom ContextFlyout for TextBox" />
+
+        <TextBox Name="TextBox" Width="150" HorizontalAlignment="Center" ContextMenu="{x:Null}">
+            <TextBox.ContextFlyout>
+                <Flyout FlyoutPresenterClasses="NoPadding">
+                    <StackPanel Orientation="Horizontal">
+                        <StackPanel.Styles>
+                            <Style Selector="Button">
+                                <Setter Property="Background" Value="Transparent" />
+                                <Setter Property="Height" Value="40" />
+                                <Setter Property="Width" Value="40" />
+                                <Setter Property="VerticalContentAlignment" Value="Center" />
+                            </Style>
+                            <Style Selector="Button:disabled /template/ ContentPresenter#PART_ContentPresenter">
+                                <Setter Property="Background" Value="Transparent" />
+                                <Setter Property="Opacity" Value="0.5" />
+                            </Style>
+                        </StackPanel.Styles>
+                        <Button Name="CutButton" Command="{Binding $parent[TextBox].Cut}" IsEnabled="{Binding $parent[TextBox].CanCut}">
+                            <PathIcon Width="14" Height="14" Data="M5.22774,2.08072 C5.43359778,1.94704 5.7011484,1.98419259 5.86368634,2.15675215 L5.91939,2.22774 L12.5191,12.3904 C12.956,12.1419 13.4614,12.0000019 14,12.0000019 C15.6569,12.0000019 17,13.3431 17,15.0000019 C17,16.6569 15.6569,18.0000019 14,18.0000019 C12.3431,18.0000019 11,16.6569 11,15.0000019 C11,14.3201402 11.226152,13.693011 11.6073785,13.1899092 L11.7401,13.0269 L10,10.3474 L8.25991,13.0269 C8.72078,13.5543 9,14.2446 9,15.0000019 C9,16.6569 7.65685,18.0000019 6,18.0000019 C4.34315,18.0000019 3,16.6569 3,15.0000019 C3,13.3431 4.34315,12.0000019 6,12.0000019 C6.46163143,12.0000019 6.89890041,12.1042536 7.28955831,12.2905296 L7.4809,12.3904 L9.40382,9.42936 L5.08072,2.77238 C4.93033,2.54079 4.99615,2.23112 5.22774,2.08072 Z M14,13 C12.8954,13 12,13.8954 12,15 C12,16.1046 12.8954,17 14,17 C15.1046,17 16,16.1046 16,15 C16,13.8954 15.1046,13 14,13 Z M6,13 C4.89543,13 4,13.8954 4,15 C4,16.1046 4.89543,17 6,17 C7.10457,17 8,16.1046 8,15 C8,13.8954 7.10457,13 6,13 Z M14.7723,2.08072 C15.0039,2.23112 15.0697,2.54079 14.9193,2.77238 L11.1924,8.51133 L10.5962,7.59329 L14.0806,2.22774 C14.231,1.99615 14.5407,1.93033 14.7723,2.08072 Z" />
+                        </Button>
+                        <Button Name="CopyButton" Content="Copy" Command="{Binding $parent[TextBox].Copy}" IsEnabled="{Binding $parent[TextBox].CanCopy}">
+                            <PathIcon Width="14" Height="14" Data="M5.50280381,4.62704038 L5.5,6.75 L5.5,17.2542087 C5.5,19.0491342 6.95507456,20.5042087 8.75,20.5042087 L17.3662868,20.5044622 C17.057338,21.3782241 16.2239751,22.0042087 15.2444057,22.0042087 L8.75,22.0042087 C6.12664744,22.0042087 4,19.8775613 4,17.2542087 L4,6.75 C4,5.76928848 4.62744523,4.93512464 5.50280381,4.62704038 Z M17.75,2 C18.9926407,2 20,3.00735931 20,4.25 L20,17.25 C20,18.4926407 18.9926407,19.5 17.75,19.5 L8.75,19.5 C7.50735931,19.5 6.5,18.4926407 6.5,17.25 L6.5,4.25 C6.5,3.00735931 7.50735931,2 8.75,2 L17.75,2 Z M17.75,3.5 L8.75,3.5 C8.33578644,3.5 8,3.83578644 8,4.25 L8,17.25 C8,17.6642136 8.33578644,18 8.75,18 L17.75,18 C18.1642136,18 18.5,17.6642136 18.5,17.25 L18.5,4.25 C18.5,3.83578644 18.1642136,3.5 17.75,3.5 Z" />
+                        </Button>
+                        <Button Name="PasteButton" Content="Paste" Command="{Binding $parent[TextBox].Paste}" IsEnabled="{Binding $parent[TextBox].CanPaste}">
+                            <PathIcon Width="14" Height="14" Data="M13.75,2 C14.940864,2 15.9156449,2.92516159 15.9948092,4.09595119 L16,4.25 L16,4.25 C16,4.16530567 15.9953205,4.0817043 15.9862059,3.99944035 L17.75,4 C18.9926407,4 20,5.00735931 20,6.25 L20,19.75 C20,20.9926407 18.9926407,22 17.75,22 L6.25,22 C5.00735931,22 4,20.9926407 4,19.75 L4,6.25 C4,5.00735931 5.00735931,4 6.25,4 L8.01379413,3.99944035 C8.00733496,4.05773764 8.00310309,4.11670658 8.00118552,4.17626017 L8,4.25 C8,3.00735931 9.00735931,2 10.25,2 L13.75,2 Z M13.75,6.5 L10.25,6.5 C9.45594921,6.5 8.75796956,6.08867052 8.357512,5.4674625 L8.37902077,5.50019943 L8.37902077,5.50019943 L6.25,5.5 C5.83578644,5.5 5.5,5.83578644 5.5,6.25 L5.5,19.75 C5.5,20.1642136 5.83578644,20.5 6.25,20.5 L17.75,20.5 C18.1642136,20.5 18.5,20.1642136 18.5,19.75 L18.5,6.25 C18.5,5.83578644 18.1642136,5.5 17.75,5.5 L15.6209792,5.50019943 L15.642488,5.4674625 C15.2420304,6.08867052 14.5440508,6.5 13.75,6.5 Z M13.75,3.5 L10.25,3.5 C9.83578644,3.5 9.5,3.83578644 9.5,4.25 C9.5,4.66421356 9.83578644,5 10.25,5 L13.75,5 C14.1642136,5 14.5,4.66421356 14.5,4.25 C14.5,3.83578644 14.1642136,3.5 13.75,3.5 Z" />
+                        </Button>
+                        <Button Name="ClearButton" Content="Clear" Command="{Binding $parent[TextBox].Clear}">
+                            <PathIcon Width="14" Height="14" Data="M3.52499419,3.71761187 L3.61611652,3.61611652 C4.0717282,3.16050485 4.79154862,3.13013074 5.28238813,3.52499419 L5.38388348,3.61611652 L14,12.233 L22.6161165,3.61611652 C23.1042719,3.12796116 23.8957281,3.12796116 24.3838835,3.61611652 C24.8720388,4.10427189 24.8720388,4.89572811 24.3838835,5.38388348 L15.767,14 L24.3838835,22.6161165 C24.8394952,23.0717282 24.8698693,23.7915486 24.4750058,24.2823881 L24.3838835,24.3838835 C23.9282718,24.8394952 23.2084514,24.8698693 22.7176119,24.4750058 L22.6161165,24.3838835 L14,15.767 L5.38388348,24.3838835 C4.89572811,24.8720388 4.10427189,24.8720388 3.61611652,24.3838835 C3.12796116,23.8957281 3.12796116,23.1042719 3.61611652,22.6161165 L12.233,14 L3.61611652,5.38388348 C3.16050485,4.9282718 3.13013074,4.20845138 3.52499419,3.71761187 L3.61611652,3.61611652 L3.52499419,3.71761187 Z" />
+                        </Button>
+                    </StackPanel>
+                </Flyout>
+            </TextBox.ContextFlyout>
+        </TextBox>
+    
+    </StackPanel>
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/ContextFlyoutPage.axaml.cs b/samples/ControlCatalog/Pages/ContextFlyoutPage.axaml.cs
new file mode 100644
index 0000000000..e64d4a2cdd
--- /dev/null
+++ b/samples/ControlCatalog/Pages/ContextFlyoutPage.axaml.cs
@@ -0,0 +1,45 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using ControlCatalog.ViewModels;
+using Avalonia.Interactivity;
+namespace ControlCatalog.Pages
+{
+    public class ContextFlyoutPage : UserControl
+    {
+        private TextBox _textBox;
+
+        public ContextFlyoutPage()
+        {
+            InitializeComponent();
+
+            var vm = new ContextFlyoutPageViewModel();
+            vm.View = this;
+            DataContext = vm;
+
+            _textBox = this.FindControl<TextBox>("TextBox");
+
+            var cutButton = this.FindControl<Button>("CutButton");
+            cutButton.Click += CloseFlyout;
+
+            var copyButton = this.FindControl<Button>("CopyButton");
+            copyButton.Click += CloseFlyout;
+
+            var pasteButton = this.FindControl<Button>("PasteButton");
+            pasteButton.Click += CloseFlyout;
+
+            var clearButton = this.FindControl<Button>("ClearButton");
+            clearButton.Click += CloseFlyout;
+        }
+
+        private void CloseFlyout(object sender, RoutedEventArgs e)
+        {
+            _textBox.ContextFlyout.Hide();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+    }
+}
diff --git a/samples/ControlCatalog/Pages/FlyoutsPage.axaml b/samples/ControlCatalog/Pages/FlyoutsPage.axaml
new file mode 100644
index 0000000000..c4d0bc3e67
--- /dev/null
+++ b/samples/ControlCatalog/Pages/FlyoutsPage.axaml
@@ -0,0 +1,264 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="700"
+             x:Class="ControlCatalog.Pages.FlyoutsPage">
+
+    <UserControl.Resources>
+        <MenuFlyout x:Key="SharedMenuFlyout">
+            <MenuItem Header="Item 1">
+                <MenuItem Header="Subitem 1" />
+                <MenuItem Header="Subitem 2" />
+                <MenuItem Header="Subitem 3" />
+            </MenuItem>
+            <MenuItem Header="Item 2" InputGesture="Ctrl+A" />
+            <MenuItem Header="Item 3" />
+        </MenuFlyout>
+        <Flyout Placement="Bottom" x:Key="BasicFlyout">
+            <Panel Width="100" Height="100">
+                <TextBlock Text="Flyout Content!" />
+            </Panel>
+        </Flyout>
+    </UserControl.Resources>
+
+    <ScrollViewer HorizontalScrollBarVisibility="Disabled">
+        <StackPanel Spacing="10">
+            <TextBlock FontSize="18" Text="Button with a Flyout" />
+            <StackPanel>
+                <Border BorderBrush="{DynamicResource SystemControlHighlightBaseLowBrush}"
+                        BorderThickness="1" Padding="15">
+                    <Button Content="Click Me!" Flyout="{StaticResource BasicFlyout}" />
+                </Border>
+                <Panel Background="{DynamicResource SystemControlBackgroundBaseLowBrush}">
+                    <TextBlock Name="ButtonFlyoutXamlText" Padding="15" />
+                </Panel>
+            </StackPanel>
+
+            <TextBlock FontSize="18" Text="MenuFlyout" />
+            <StackPanel>
+                <Border BorderBrush="{DynamicResource SystemControlHighlightBaseLowBrush}"
+                        BorderThickness="1" Padding="15">
+                    <Button Content="Click Me!" Flyout="{StaticResource SharedMenuFlyout}" />
+                </Border>
+                <Panel Background="{DynamicResource SystemControlBackgroundBaseLowBrush}">
+                    <TextBlock Name="MenuFlyoutXamlText" Padding="15" />
+                </Panel>
+            </StackPanel>
+
+            <TextBlock FontSize="18" Text="Attached Flyouts" />
+            <StackPanel>
+                <Border BorderBrush="{DynamicResource SystemControlHighlightBaseLowBrush}"
+                        BorderThickness="1" Padding="15">
+                    <Panel Background="{DynamicResource SystemControlBackgroundBaseLowBrush}"
+                           HorizontalAlignment="Left"
+                           Height="100"
+                           Name="AttachedFlyoutPanel">
+                        <FlyoutBase.AttachedFlyout>
+                            <Flyout>
+                                <Panel Height="100">
+                                    <TextBlock Text="Attached Flyout!"
+                                               VerticalAlignment="Center"
+                                               Margin="10"/>
+                                </Panel>
+                            </Flyout>
+                        </FlyoutBase.AttachedFlyout>
+
+                        <TextBlock Text="Double click panel to launch AttachedFlyout"
+                                   VerticalAlignment="Center"
+                                   Margin="10"/>
+
+                    </Panel>
+                </Border>
+                <Panel Background="{DynamicResource SystemControlBackgroundBaseLowBrush}">
+                    <TextBlock Name="AttachedFlyoutXamlText" Padding="15" />
+                </Panel>
+            </StackPanel>
+
+
+            <TextBlock FontSize="18" Text="Sharing Flyouts" />
+            <StackPanel>
+                <Border BorderBrush="{DynamicResource SystemControlHighlightBaseLowBrush}"
+                        BorderThickness="1" Padding="15">
+                    <StackPanel Orientation="Horizontal" Spacing="30">
+                        <Button Content="Launch Flyout on this button" Flyout="{StaticResource SharedMenuFlyout}"/>
+                        <Button Content="Launch Flyout on this button" Flyout="{StaticResource SharedMenuFlyout}"/>
+                    </StackPanel>
+                </Border>
+                <Panel Background="{DynamicResource SystemControlBackgroundBaseLowBrush}">
+                    <TextBlock Name="SharedFlyoutXamlText" Padding="15" />
+                </Panel>
+            </StackPanel>
+
+            <TextBlock FontSize="18" Text="Flyout Placements" />
+            <StackPanel>
+                <Border BorderBrush="{DynamicResource SystemControlHighlightBaseLowBrush}"
+                        BorderThickness="1" Padding="15">
+                    <UniformGrid Columns="3">
+                        <UniformGrid.Styles>
+                            <Style Selector="Button">
+                                <Setter Property="Margin" Value="10" />
+                            </Style>
+                        </UniformGrid.Styles>
+                        <Button Content="Placement=Top">
+                            <Button.Flyout>
+                                <Flyout Placement="Top">
+                                    <Panel Width="100" Height="100">
+                                        <TextBlock Text="Flyout Content!" />
+                                    </Panel>
+                                </Flyout>
+                            </Button.Flyout>
+                        </Button>
+                        <Button Content="Placement=Bottom">
+                            <Button.Flyout>
+                                <Flyout Placement="Bottom">
+                                    <Panel Width="100" Height="100">
+                                        <TextBlock Text="Flyout Content!" />
+                                    </Panel>
+                                </Flyout>
+                            </Button.Flyout>
+                        </Button>
+                        <Button Content="Placement=Left">
+                            <Button.Flyout>
+                                <Flyout Placement="Left">
+                                    <Panel Width="100" Height="100">
+                                        <TextBlock Text="Flyout Content!" />
+                                    </Panel>
+                                </Flyout>
+                            </Button.Flyout>
+                        </Button>
+                        <Button Content="Placement=Right">
+                            <Button.Flyout>
+                                <Flyout Placement="Right">
+                                    <Panel Width="100" Height="100">
+                                        <TextBlock Text="Flyout Content!" />
+                                    </Panel>
+                                </Flyout>
+                            </Button.Flyout>
+                        </Button>
+                        <Button Content="Placement=TopEdgeAlignedLeft">
+                            <Button.Flyout>
+                                <Flyout Placement="TopEdgeAlignedLeft">
+                                    <Panel Width="100" Height="100">
+                                        <TextBlock Text="Flyout Content!" />
+                                    </Panel>
+                                </Flyout>
+                            </Button.Flyout>
+                        </Button>
+                        <Button Content="Placement=TopEdgeAlignedRight">
+                            <Button.Flyout>
+                                <Flyout Placement="TopEdgeAlignedRight">
+                                    <Panel Width="100" Height="100">
+                                        <TextBlock Text="Flyout Content!" />
+                                    </Panel>
+                                </Flyout>
+                            </Button.Flyout>
+                        </Button>
+                        <Button Content="Placement=BottomEdgeAlignedLeft">
+                            <Button.Flyout>
+                                <Flyout Placement="BottomEdgeAlignedLeft">
+                                    <Panel Width="100" Height="100">
+                                        <TextBlock Text="Flyout Content!" />
+                                    </Panel>
+                                </Flyout>
+                            </Button.Flyout>
+                        </Button>
+                        <Button Content="Placement=BottomEdgeAlignedRight">
+                            <Button.Flyout>
+                                <Flyout Placement="BottomEdgeAlignedRight">
+                                    <Panel Width="100" Height="100">
+                                        <TextBlock Text="Flyout Content!" />
+                                    </Panel>
+                                </Flyout>
+                            </Button.Flyout>
+                        </Button>
+                        <Button Content="Placement=LeftEdgeAlignedTop">
+                            <Button.Flyout>
+                                <Flyout Placement="LeftEdgeAlignedTop">
+                                    <Panel Width="100" Height="100">
+                                        <TextBlock Text="Flyout Content!" />
+                                    </Panel>
+                                </Flyout>
+                            </Button.Flyout>
+                        </Button>
+                        <Button Content="Placement=LeftEdgeAlignedBottom">
+                            <Button.Flyout>
+                                <Flyout Placement="LeftEdgeAlignedBottom">
+                                    <Panel Width="100" Height="100">
+                                        <TextBlock Text="Flyout Content!" />
+                                    </Panel>
+                                </Flyout>
+                            </Button.Flyout>
+                        </Button>
+                        <Button Content="Placement=RightEdgeAlignedBottom">
+                            <Button.Flyout>
+                                <Flyout Placement="RightEdgeAlignedTop">
+                                    <Panel Width="100" Height="100">
+                                        <TextBlock Text="Flyout Content!" />
+                                    </Panel>
+                                </Flyout>
+                            </Button.Flyout>
+                        </Button>
+                        <Button Content="Placement=RightEdgeAlignedBottom">
+                            <Button.Flyout>
+                                <Flyout Placement="RightEdgeAlignedBottom">
+                                    <Panel Width="100" Height="100">
+                                        <TextBlock Text="Flyout Content!" />
+                                    </Panel>
+                                </Flyout>
+                            </Button.Flyout>
+                        </Button>
+
+                    </UniformGrid>
+                </Border>
+            </StackPanel>
+
+            <TextBlock FontSize="18" Text="Flyout ShowMode" />
+            <StackPanel>
+                <Border BorderBrush="{DynamicResource SystemControlHighlightBaseLowBrush}"
+                        BorderThickness="1" Padding="15">
+                    <WrapPanel Orientation="Horizontal">
+                        <WrapPanel.Styles>
+                            <Style Selector="Button">
+                                <Setter Property="Margin" Value="4" />
+                            </Style>
+                        </WrapPanel.Styles>
+                        <Button Content="ShowMode=Standard (default)">
+                            <Button.Flyout>
+                                <Flyout>
+                                    <StackPanel Width="200">
+                                        <TextBox />
+                                        <TextBlock Text="Standard ShowMode attempts to focus the Flyout when its opened" TextWrapping="Wrap"/>
+                                    </StackPanel>
+                                </Flyout>
+                            </Button.Flyout>
+                        </Button>
+                        <Button Content="ShowMode=Transient">
+                            <Button.Flyout>
+                                <Flyout ShowMode="Transient">
+                                    <StackPanel Width="200">
+                                        <TextBox />
+                                        <TextBlock Text="Transient ShowMode does not focus the Flyout when opened" TextWrapping="Wrap"/>
+                                    </StackPanel>
+                                </Flyout>
+                            </Button.Flyout>
+                        </Button>
+                        <Button Content="ShowMode=TransientWithDismissOnPointerMoveAway">
+                            <Button.Flyout>
+                                <Flyout ShowMode="TransientWithDismissOnPointerMoveAway">
+                                    <StackPanel Width="200">
+                                        <TextBox />
+                                        <TextBlock Text="Show in Transient mode (no focus), but closes the Flyout when the pointer moves away" TextWrapping="Wrap"/>
+                                    </StackPanel>
+                                </Flyout>
+                            </Button.Flyout>
+                        </Button>
+                        
+                    </WrapPanel>
+                </Border>
+            </StackPanel>
+            
+        </StackPanel>
+    </ScrollViewer>
+    
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/FlyoutsPage.axaml.cs b/samples/ControlCatalog/Pages/FlyoutsPage.axaml.cs
new file mode 100644
index 0000000000..0803d178b9
--- /dev/null
+++ b/samples/ControlCatalog/Pages/FlyoutsPage.axaml.cs
@@ -0,0 +1,81 @@
+using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Markup.Xaml;
+using Avalonia.Interactivity;
+
+namespace ControlCatalog.Pages
+{
+    public class FlyoutsPage : UserControl
+    {
+        public FlyoutsPage()
+        {
+            InitializeComponent();
+
+            var afp = this.FindControl<Panel>("AttachedFlyoutPanel");
+            if (afp != null)
+            {
+                afp.DoubleTapped += Afp_DoubleTapped;
+            }
+
+            SetXamlTexts();
+        }
+
+        private void Afp_DoubleTapped(object sender, RoutedEventArgs e)
+        {
+            if (sender is Panel p)
+            {
+                FlyoutBase.ShowAttachedFlyout(p);
+            }
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+
+        private void SetXamlTexts()
+        {
+            var bfxt = this.FindControl<TextBlock>("ButtonFlyoutXamlText");
+            bfxt.Text = "<Button Content=\"Click me!\">\n" +
+                        "    <Button.Flyout>\n" +
+                        "        <Flyout>\n" +
+                        "            <Panel Width=\"100\" Height=\"100\">\n" +
+                        "                <TextBlock Text=\"Flyout Content!\" />\n" +
+                        "            </Panel>\n" +
+                        "        </Flyout>\n" +
+                        "    </Button.Flyout>\n</Button>";
+
+            var mfxt = this.FindControl<TextBlock>("MenuFlyoutXamlText");
+            mfxt.Text = "<Button Content=\"Click me!\">\n" +
+                    "    <Button.Flyout>\n" +
+                    "        <MenuFlyout>\n" +
+                    "            <MenuItem Header=\"Item 1\">\n" +
+                    "            <MenuItem Header=\"Item 2\">\n" +
+                    "        </MenuFlyout>\n" +
+                    "    </Button.Flyout>\n</Button>";
+
+            var afxt = this.FindControl<TextBlock>("AttachedFlyoutXamlText");
+            afxt.Text = "<Panel Name=\"AttachedFlyoutPanel\">\n" +
+                "    <FlyoutBase.AttachedFlyout>\n" +
+                "        <Flyout>\n" +
+                "            <Panel Height=\"100\">\n" +
+                "                <TextBlock Text=\"Attached Flyout\" />\n" +
+                "            </Panel>\n" +
+                "        </Flyout>\n" +
+                "    </FlyoutBase.AttachedFlyout>\n</Panel>" + 
+                "\n\n In DoubleTapped handler:\n" +
+                "FlyoutBase.ShowAttachedFlyout(AttachedFlyoutPanel);";
+
+            var sfxt = this.FindControl<TextBlock>("SharedFlyoutXamlText");
+            sfxt.Text = "Declare a flyout in Resources:\n" +
+                "<Window.Resources>\n" +
+                "    <Flyout x:Key=\"SharedFlyout\">\n" +
+                "        <Panel Width=\"100\" Height=\"100\">\n" +
+                "            <TextBlock Text=\"Flyout Content!\" />\n" +
+                "        </Panel>\n" +
+                "    </Flyout>\n</Window.Resources>\n\n" +
+                "Then attach the flyout where you want it:\n" +
+                "<Button Content=\"Launch Flyout here\" Flyout=\"{StaticResource SharedFlyout}\" />";
+        }
+    }
+}
diff --git a/samples/ControlCatalog/ViewModels/ContextFlyoutPageViewModel.cs b/samples/ControlCatalog/ViewModels/ContextFlyoutPageViewModel.cs
new file mode 100644
index 0000000000..8e7fc442f6
--- /dev/null
+++ b/samples/ControlCatalog/ViewModels/ContextFlyoutPageViewModel.cs
@@ -0,0 +1,78 @@
+using System.Collections.Generic;
+using System.Reactive;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.VisualTree;
+using MiniMvvm;
+
+namespace ControlCatalog.ViewModels
+{
+    public class ContextFlyoutPageViewModel
+    {
+        public Control View { get; set; }
+        public ContextFlyoutPageViewModel()
+        {
+            OpenCommand = MiniCommand.CreateFromTask(Open);
+            SaveCommand = MiniCommand.Create(Save);
+            OpenRecentCommand = MiniCommand.Create<string>(OpenRecent);
+
+            MenuItems = new[]
+            {
+                new MenuItemViewModel { Header = "_Open...", Command = OpenCommand },
+                new MenuItemViewModel { Header = "Save", Command = SaveCommand },
+                new MenuItemViewModel { Header = "-" },
+                new MenuItemViewModel
+                {
+                    Header = "Recent",
+                    Items = new[]
+                    {
+                        new MenuItemViewModel
+                        {
+                            Header = "File1.txt",
+                            Command = OpenRecentCommand,
+                            CommandParameter = @"c:\foo\File1.txt"
+                        },
+                        new MenuItemViewModel
+                        {
+                            Header = "File2.txt",
+                            Command = OpenRecentCommand,
+                            CommandParameter = @"c:\foo\File2.txt"
+                        },
+                    }
+                },
+            };
+        }
+
+        public IReadOnlyList<MenuItemViewModel> MenuItems { get; set; }
+        public MiniCommand OpenCommand { get; }
+        public MiniCommand SaveCommand { get; }
+        public MiniCommand OpenRecentCommand { get; }
+
+        public async Task Open()
+        {
+            var window = View?.GetVisualRoot() as Window;
+            if (window == null)
+                return;
+            var dialog = new OpenFileDialog();
+            var result = await dialog.ShowAsync(window);
+
+            if (result != null)
+            {
+                foreach (var path in result)
+                {
+                    System.Diagnostics.Debug.WriteLine($"Opened: {path}");
+                }
+            }
+        }
+
+        public void Save()
+        {
+            System.Diagnostics.Debug.WriteLine("Save");
+        }
+
+        public void OpenRecent(string path)
+        {
+            System.Diagnostics.Debug.WriteLine($"Open recent: {path}");
+        }
+    }
+}

From 461ea5488c52c5ac91271859b2cf9795a401b8b7 Mon Sep 17 00:00:00 2001
From: amwx <armccormickwx@gmail.com>
Date: Fri, 19 Mar 2021 19:24:33 -0500
Subject: [PATCH 13/43] Fixes

---
 src/Avalonia.Controls/Flyouts/FlyoutBase.cs | 4 ++--
 src/Avalonia.Controls/TextBox.cs            | 8 ++------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/Avalonia.Controls/Flyouts/FlyoutBase.cs b/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
index 5f00c1eafe..f51338565e 100644
--- a/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
+++ b/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
@@ -113,7 +113,8 @@ namespace Avalonia.Controls.Primitives
                 }
             }
 
-            IsOpen = _popup.IsOpen = false;
+            IsOpen = false;
+            _popup.IsOpen = false;
 
             // Ensure this isn't active
             transientDisposable?.Dispose();
@@ -267,7 +268,6 @@ namespace Avalonia.Controls.Primitives
         private void OnPopupOpened(object sender, EventArgs e)
         {
             IsOpen = true;
-            OnOpened();
         }
 
         private void OnPopupClosed(object sender, EventArgs e)
diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index 3082ffaf15..f2dadb3248 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -492,12 +492,8 @@ namespace Avalonia.Controls
         {
             base.OnLostFocus(e);
 
-            if ((ContextFlyout == null) && (ContextMenu == null || !ContextMenu.IsOpen))
-            {
-                ClearSelection();
-                RevealPassword = false;
-            }
-            if (ContextFlyout == null || !ContextFlyout.IsOpen)
+            if ((ContextFlyout == null || !ContextFlyout.IsOpen) &&
+                (ContextMenu == null || !ContextMenu.IsOpen))
             {
                 ClearSelection();
                 RevealPassword = false;

From 5662c22a727cbb2fea493427dcde637d25207d91 Mon Sep 17 00:00:00 2001
From: amwx <armccormickwx@gmail.com>
Date: Fri, 19 Mar 2021 22:05:00 -0500
Subject: [PATCH 14/43] Add Tests

---
 .../FlyoutTests.cs                            | 325 ++++++++++++++++++
 .../TextBoxTests.cs                           |  40 ++-
 2 files changed, 364 insertions(+), 1 deletion(-)
 create mode 100644 tests/Avalonia.Controls.UnitTests/FlyoutTests.cs

diff --git a/tests/Avalonia.Controls.UnitTests/FlyoutTests.cs b/tests/Avalonia.Controls.UnitTests/FlyoutTests.cs
new file mode 100644
index 0000000000..0dce73180e
--- /dev/null
+++ b/tests/Avalonia.Controls.UnitTests/FlyoutTests.cs
@@ -0,0 +1,325 @@
+using System;
+using System.Linq;
+using Avalonia.Input;
+using Avalonia.Markup.Xaml;
+using Avalonia.Media;
+using Avalonia.UnitTests;
+using Avalonia.VisualTree;
+using Xunit;
+
+namespace Avalonia.Controls.UnitTests
+{
+    public class FlyoutTests
+    {
+        [Fact]
+        public void Opening_Raises_Single_Opening_Event()
+        {
+            using (CreateServicesWithFocus())
+            {
+                var window = PreparedWindow();
+                window.Show();
+
+                int tracker = 0;
+                Flyout f = new Flyout();
+                f.Opening += (s, e) =>
+                {
+                    tracker++;
+                };
+                f.ShowAt(window);
+
+                Assert.Equal(1, tracker);
+            }
+        }
+
+        [Fact]
+        public void Opening_Raises_Single_Opened_Event()
+        {
+            using (CreateServicesWithFocus())
+            {
+                var window = PreparedWindow();
+                window.Show();
+
+                int tracker = 0;
+                Flyout f = new Flyout();
+                f.Opened += (s, e) =>
+                {
+                    tracker++;
+                };
+                f.ShowAt(window);
+
+                Assert.Equal(1, tracker);
+            }
+        }
+
+        [Fact]
+        public void Closing_Raises_Single_Closing_Event()
+        {
+            using (CreateServicesWithFocus())
+            {
+                var window = PreparedWindow();
+                window.Show();
+
+                int tracker = 0;
+                Flyout f = new Flyout();
+                f.Closing += (s, e) =>
+                {
+                    tracker++;
+                };
+                f.ShowAt(window);
+                f.Hide();
+
+                Assert.Equal(1, tracker);
+            }
+        }
+
+        [Fact]
+        public void Closing_Raises_Single_Closed_Event()
+        {
+            using (CreateServicesWithFocus())
+            {
+                var window = PreparedWindow();
+                window.Show();
+
+                int tracker = 0;
+                Flyout f = new Flyout();
+                f.Closed += (s, e) =>
+                {
+                    tracker++;
+                };
+                f.ShowAt(window);
+                f.Hide();
+
+                Assert.Equal(1, tracker);
+            }
+        }
+
+        [Fact]
+        public void Cancel_Closing_Keeps_Flyout_Open()
+        {
+            using (CreateServicesWithFocus())
+            {
+                var window = PreparedWindow();
+                window.Show();
+
+                int tracker = 0;
+                Flyout f = new Flyout();
+                f.Closing += (s, e) =>
+                {
+                    e.Cancel = true;
+                };
+                f.ShowAt(window);
+                f.Hide();
+
+                Assert.True(f.IsOpen);
+            }
+        }
+
+        [Fact]
+        public void Flyout_Has_Uncancellable_Close_Before_Showing_On_A_Different_Target()
+        {
+            using (CreateServicesWithFocus())
+            {
+                var window = PreparedWindow();
+                Button target1 = new Button();
+                Button target2 = new Button();
+
+                window.Content = new StackPanel
+                {
+                    Children =
+                    {
+                        target1,
+                        target2
+                    }
+                };
+                window.Show();
+
+                bool closingFired = false;
+                bool closedFired = false;
+                Flyout f = new Flyout();
+                f.Closing += (s, e) =>
+                {
+                    closingFired = true; //This shouldn't happen
+                };
+                f.Closed += (s, e) =>
+                {
+                    closedFired = true;
+                };
+
+                f.ShowAt(target1);
+
+                f.ShowAt(target2);
+
+                Assert.False(closingFired);
+                Assert.True(closedFired);
+            }
+        }
+
+        [Fact]
+        public void ShowMode_Standard_Attemps_Focus_Flyout_Content()
+        {
+            using (CreateServicesWithFocus())
+            {
+                var window = PreparedWindow();
+
+                var flyoutTextBox = new TextBox();
+                var button = new Button
+                {
+                    Flyout = new Flyout
+                    {
+                        ShowMode = FlyoutShowMode.Standard,
+                        Content = new Panel
+                        {
+                            Children =
+                            {
+                                flyoutTextBox
+                            }
+                        }
+                    }
+                };
+
+                window.Content = button;
+                window.Show();
+
+                button.Focus();
+                Assert.True(FocusManager.Instance?.Current == button);
+                button.Flyout.ShowAt(button);
+                Assert.False(button.IsFocused);
+                Assert.True(FocusManager.Instance?.Current == flyoutTextBox);
+            }
+        }
+
+        [Fact]
+        public void ShowMode_Transient_Does_Not_Move_Focus_From_Target()
+        {
+            using (CreateServicesWithFocus())
+            {
+                var window = PreparedWindow();
+
+                var flyoutTextBox = new TextBox();
+                var button = new Button
+                {
+                    Flyout = new Flyout
+                    {
+                        ShowMode = FlyoutShowMode.Transient,
+                        Content = new Panel
+                        {
+                            Children =
+                            {
+                                flyoutTextBox
+                            }
+                        }
+                    },
+                    Content = "Test"
+                };
+
+                window.Content = button;
+                window.Show();
+
+                FocusManager.Instance?.Focus(button);
+                Assert.True(FocusManager.Instance?.Current == button);
+                button.Flyout.ShowAt(button);
+                Assert.True(FocusManager.Instance?.Current == button);
+            }
+        }
+
+        [Fact]
+        public void ContextFlyout_Can_Be_Set_In_Styles()
+        {
+            using (CreateServicesWithFocus())
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Window.Styles>
+        <Style Selector='TextBlock'>
+            <Setter Property='ContextFlyout'>
+                <MenuFlyout>
+                    <MenuItem>Foo</MenuItem>
+                </MenuFlyout>
+            </Setter>
+        </Style>
+	</Window.Styles>
+
+    <StackPanel>
+        <TextBlock Name='target1'/>
+        <TextBlock Name='target2'/>
+    </StackPanel>
+</Window>";
+
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var target1 = window.Find<TextBlock>("target1");
+                var target2 = window.Find<TextBlock>("target2");
+                var mouse = new MouseTestHelper();
+
+                Assert.NotNull(target1.ContextFlyout);
+                Assert.NotNull(target2.ContextFlyout);
+                Assert.Same(target1.ContextFlyout, target2.ContextFlyout);
+
+                window.Show();
+
+                var menu = target1.ContextFlyout;
+                mouse.Click(target1, MouseButton.Right);
+                Assert.True(menu.IsOpen);
+                mouse.Click(target2, MouseButton.Right);
+                Assert.True(menu.IsOpen);
+            }
+        }
+
+        [Fact]
+        public void Setting_FlyoutPresenterClasses_Sets_Classes_On_FlyoutPresenter()
+        {
+            using (CreateServicesWithFocus())
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Window.Styles>
+        <Style Selector='FlyoutPresenter.TestClass'>
+            <Setter Property='Background' Value='Red' />
+        </Style>
+	</Window.Styles>
+</Window>";
+
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var flyoutPanel = new Panel();
+                var button = new Button
+                {
+                    Content = "Test",
+                    Flyout = new Flyout
+                    {
+                        Content = flyoutPanel
+                    }
+                };
+                window.Content = button;
+                window.Show();
+
+                (button.Flyout as Flyout).FlyoutPresenterClasses.Add("TestClass");
+
+                button.Flyout.ShowAt(button);
+
+                var presenter = flyoutPanel.GetVisualAncestors().OfType<FlyoutPresenter>().FirstOrDefault();
+                Assert.NotNull(presenter);
+                Assert.True((presenter.Background as ISolidColorBrush).Color == Colors.Red);
+            }
+        }
+
+        private IDisposable CreateServicesWithFocus()
+        {
+            return UnitTestApplication.Start(TestServices.StyledWindow.With(windowingPlatform:
+                new MockWindowingPlatform(null,
+                    x =>
+                    {
+                        return MockWindowingPlatform.CreatePopupMock(x).Object;
+                    }),
+                    focusManager: new FocusManager(),
+                    keyboardDevice: () => new KeyboardDevice()));
+        }
+
+        private Window PreparedWindow(object content = null)
+        {
+            var w = new Window { Content = content };
+            w.ApplyTemplate();
+            return w;
+        }
+    }
+}
diff --git a/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs b/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
index 9f09c19110..1eec1d84c1 100644
--- a/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
 using Avalonia.Controls.Presenters;
@@ -56,7 +57,44 @@ namespace Avalonia.Controls.UnitTests
                 Assert.Equal("123", target1.SelectedText);
             }
         }
-        
+
+        [Fact]
+        public void Opening_Context_Flyout_Does_not_Lose_Selection()
+        {
+            using (UnitTestApplication.Start(FocusServices))
+            {
+                var target1 = new TextBox
+                {
+                    Template = CreateTemplate(),
+                    Text = "1234",
+                    ContextFlyout = new MenuFlyout
+                    {
+                        Items = new List<MenuItem>
+                        {
+                            new MenuItem { Header = "Item 1" },
+                            new MenuItem {Header = "Item 2" },
+                            new MenuItem {Header = "Item 3" }
+                        }
+                    }
+                };
+                              
+
+                target1.ApplyTemplate();
+
+                var root = new TestRoot() { Child = target1 };
+
+                target1.SelectionStart = 0;
+                target1.SelectionEnd = 3;
+
+                target1.Focus();
+                Assert.True(target1.IsFocused);
+
+                target1.ContextFlyout.ShowAt(target1);
+
+                Assert.Equal("123", target1.SelectedText);
+            }
+        }
+
         [Fact]
         public void DefaultBindingMode_Should_Be_TwoWay()
         {

From 02b529cbd668eca48cc8b29d06a94b141e98bb55 Mon Sep 17 00:00:00 2001
From: amwx <armccormickwx@gmail.com>
Date: Fri, 19 Mar 2021 22:05:11 -0500
Subject: [PATCH 15/43] Make Tests work

---
 src/Avalonia.Controls/Control.cs            | 5 +++++
 src/Avalonia.Controls/Flyouts/Flyout.cs     | 5 +++--
 src/Avalonia.Controls/Flyouts/MenuFlyout.cs | 5 +++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/Avalonia.Controls/Control.cs b/src/Avalonia.Controls/Control.cs
index ebfe98a175..94ad985046 100644
--- a/src/Avalonia.Controls/Control.cs
+++ b/src/Avalonia.Controls/Control.cs
@@ -110,6 +110,11 @@ namespace Avalonia.Controls
         /// <inheritdoc/>
         void ISetterValue.Initialize(ISetter setter)
         {
+            if (setter is Setter s && s.Property == ContextFlyoutProperty)
+            {
+                return; // Allow ContextFlyout to not need wrapping in <Template>
+            }
+
             throw new InvalidOperationException(
                 "Cannot use a control as a Setter value. Wrap the control in a <Template>.");
         }
diff --git a/src/Avalonia.Controls/Flyouts/Flyout.cs b/src/Avalonia.Controls/Flyouts/Flyout.cs
index ff6f78a6f4..b1ca15bb4e 100644
--- a/src/Avalonia.Controls/Flyouts/Flyout.cs
+++ b/src/Avalonia.Controls/Flyouts/Flyout.cs
@@ -38,10 +38,11 @@ namespace Avalonia.Controls
         {
             if (FlyoutPresenterClasses != null)
             {
-                //Remove any classes no longer in use
+                //Remove any classes no longer in use, ignoring any pseudoclasses
                 for (int i = _popup.Child.Classes.Count - 1; i >= 0; i--)
                 {
-                    if (!FlyoutPresenterClasses.Contains(_popup.Child.Classes[i]))
+                    if (!FlyoutPresenterClasses.Contains(_popup.Child.Classes[i]) && 
+                        !_popup.Child.Classes[i].Contains(":"))
                     {
                         _popup.Child.Classes.RemoveAt(i);
                     }
diff --git a/src/Avalonia.Controls/Flyouts/MenuFlyout.cs b/src/Avalonia.Controls/Flyouts/MenuFlyout.cs
index 4cea5199f1..f147719281 100644
--- a/src/Avalonia.Controls/Flyouts/MenuFlyout.cs
+++ b/src/Avalonia.Controls/Flyouts/MenuFlyout.cs
@@ -58,10 +58,11 @@ namespace Avalonia.Controls
         {
             if (FlyoutPresenterClasses != null)
             {
-                //Remove any classes no longer in use
+                //Remove any classes no longer in use, ignoring pseudoclasses
                 for (int i = _popup.Child.Classes.Count - 1; i >= 0; i--)
                 {
-                    if (!FlyoutPresenterClasses.Contains(_popup.Child.Classes[i]))
+                    if (!FlyoutPresenterClasses.Contains(_popup.Child.Classes[i]) && 
+                        !_popup.Child.Classes[i].Contains(":"))
                     {
                         _popup.Child.Classes.RemoveAt(i);
                     }

From ca8d70844f317b2837cf46f6a370e49875aebe9a Mon Sep 17 00:00:00 2001
From: amwx <armccormickwx@gmail.com>
Date: Fri, 19 Mar 2021 22:20:05 -0500
Subject: [PATCH 16/43] Add docs and clean up

---
 src/Avalonia.Controls/Button.cs               |  6 +++
 src/Avalonia.Controls/Flyouts/Flyout.cs       | 16 ++++---
 src/Avalonia.Controls/Flyouts/FlyoutBase.cs   | 47 ++++++++++++++++++-
 .../Flyouts/FlyoutPlacementMode.cs            |  6 +--
 .../Flyouts/FlyoutPresenter.cs                |  6 +--
 src/Avalonia.Controls/Flyouts/MenuFlyout.cs   | 15 ++++--
 6 files changed, 75 insertions(+), 21 deletions(-)

diff --git a/src/Avalonia.Controls/Button.cs b/src/Avalonia.Controls/Button.cs
index 121087d262..16bb3c4377 100644
--- a/src/Avalonia.Controls/Button.cs
+++ b/src/Avalonia.Controls/Button.cs
@@ -79,6 +79,9 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<bool> IsPressedProperty =
             AvaloniaProperty.Register<Button, bool>(nameof(IsPressed));
 
+        /// <summary>
+        /// Defines the <see cref="Flyout"/> property
+        /// </summary>
         public static readonly DirectProperty<Button, FlyoutBase> FlyoutProperty =
             AvaloniaProperty.RegisterDirect<Button, FlyoutBase>(nameof(Flyout),
                 x => x.Flyout, (x, v) => x.Flyout = v);
@@ -175,6 +178,9 @@ namespace Avalonia.Controls
             private set { SetValue(IsPressedProperty, value); }
         }
 
+        /// <summary>
+        /// Gets or sets the Flyout that should be shown with this button
+        /// </summary>
         public FlyoutBase Flyout
         {
             get => _flyout;
diff --git a/src/Avalonia.Controls/Flyouts/Flyout.cs b/src/Avalonia.Controls/Flyouts/Flyout.cs
index b1ca15bb4e..865e5a0fd1 100644
--- a/src/Avalonia.Controls/Flyouts/Flyout.cs
+++ b/src/Avalonia.Controls/Flyouts/Flyout.cs
@@ -1,10 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Text;
-using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Primitives;
 using Avalonia.Metadata;
-using Avalonia.Styling;
 
 #nullable enable
 
@@ -12,13 +7,22 @@ namespace Avalonia.Controls
 {
     public class Flyout : FlyoutBase
     {
+        /// <summary>
+        /// Defines the <see cref="Content"/> property
+        /// </summary>
         public static readonly StyledProperty<object> ContentProperty =
             AvaloniaProperty.Register<Flyout, object>(nameof(Content));
 
+        /// <summary>
+        /// Gets the Classes collection to applied to the FlyoutPresenter this Flyout is hosting
+        /// </summary>
         public Classes? FlyoutPresenterClasses => _classes ??= new Classes();
 
         private Classes? _classes;
 
+        /// <summary>
+        /// Gets or sets the content to display in this flyout
+        /// </summary>
         [Content]
         public object Content
         {
diff --git a/src/Avalonia.Controls/Flyouts/FlyoutBase.cs b/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
index f51338565e..2ca637213f 100644
--- a/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
+++ b/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
@@ -15,20 +15,35 @@ namespace Avalonia.Controls.Primitives
             Control.ContextFlyoutProperty.Changed.Subscribe(OnContextFlyoutPropertyChanged);
         }
 
+        /// <summary>
+        /// Defines the <see cref="IsOpen"/> property
+        /// </summary>
         private static readonly DirectProperty<FlyoutBase, bool> IsOpenProperty =
            AvaloniaProperty.RegisterDirect<FlyoutBase, bool>(nameof(IsOpen),
                x => x.IsOpen);
 
+        /// <summary>
+        /// Defines the <see cref="Target"/> property
+        /// </summary>
         public static readonly DirectProperty<FlyoutBase, Control?> TargetProperty =
             AvaloniaProperty.RegisterDirect<FlyoutBase, Control?>(nameof(Target), x => x.Target);
 
+        /// <summary>
+        /// Defines the <see cref="Placement"/> property
+        /// </summary>
         public static readonly StyledProperty<FlyoutPlacementMode> PlacementProperty =
             AvaloniaProperty.Register<FlyoutBase, FlyoutPlacementMode>(nameof(Placement));
 
+        /// <summary>
+        /// Defines the <see cref="ShowMode"/> property
+        /// </summary>
         public static readonly DirectProperty<FlyoutBase, FlyoutShowMode> ShowModeProperty =
             AvaloniaProperty.RegisterDirect<FlyoutBase, FlyoutShowMode>(nameof(ShowMode),
                 x => x.ShowMode, (x, v) => x.ShowMode = v);
 
+        /// <summary>
+        /// Defines the AttachedFlyout property
+        /// </summary>
         public static readonly AttachedProperty<FlyoutBase?> AttachedFlyoutProperty =
             AvaloniaProperty.RegisterAttached<FlyoutBase, Control, FlyoutBase?>("AttachedFlyout", null);
 
@@ -39,24 +54,36 @@ namespace Avalonia.Controls.Primitives
         Rect? enlargedPopupRect;
         IDisposable? transientDisposable;
 
+        /// <summary>
+        /// Gets whether this Flyout is currently Open
+        /// </summary>
         public bool IsOpen
         {
             get => _isOpen;
             private set => SetAndRaise(IsOpenProperty, ref _isOpen, value);
         }
 
+        /// <summary>
+        /// Gets or sets the desired placement
+        /// </summary>
         public FlyoutPlacementMode Placement
         {
             get => GetValue(PlacementProperty);
             set => SetValue(PlacementProperty, value);
         }
 
+        /// <summary>
+        /// Gets or sets the desired ShowMode
+        /// </summary>
         public FlyoutShowMode ShowMode
         {
             get => _showMode;
             set => SetAndRaise(ShowModeProperty, ref _showMode, value);
         }
 
+        /// <summary>
+        /// Gets the Target used for showing the Flyout
+        /// </summary>
         public Control? Target
         {
             get => _target;
@@ -84,16 +111,29 @@ namespace Avalonia.Controls.Primitives
             flyout?.ShowAt(flyoutOwner);
         }
 
+        /// <summary>
+        /// Shows the Flyout at the given Control
+        /// </summary>
+        /// <param name="placementTarget">The control to show the Flyout at</param>
         public void ShowAt(Control placementTarget)
         {
             ShowAtCore(placementTarget);
         }
 
+        /// <summary>
+        /// Shows the Flyout for the given control at the current pointer location, as in a ContextFlyout
+        /// </summary>
+        /// <param name="placementTarget">The target control</param>
+        /// <param name="showAtPointer">True to show at pointer</param>
         public void ShowAt(Control placementTarget, bool showAtPointer)
         {
             ShowAtCore(placementTarget, showAtPointer);
         }
 
+        /// <summary>
+        /// Hides the Flyout
+        /// </summary>
+        /// <param name="canCancel">Whether or not this closing action can be cancelled</param>
         public void Hide(bool canCancel = true)
         {
             if (!IsOpen)
@@ -253,6 +293,10 @@ namespace Avalonia.Controls.Primitives
             Closed?.Invoke(this, null);
         }
 
+        /// <summary>
+        /// Used to create the content the Flyout displays
+        /// </summary>
+        /// <returns></returns>
         protected abstract Control CreatePresenter();
 
         private void InitPopup()
@@ -416,8 +460,7 @@ namespace Avalonia.Controls.Primitives
                         c.ContextFlyout.ShowAt(c, true);
                     }
                 }
-            }
-            
+            }            
         }
     }
 }
diff --git a/src/Avalonia.Controls/Flyouts/FlyoutPlacementMode.cs b/src/Avalonia.Controls/Flyouts/FlyoutPlacementMode.cs
index 15987daa50..0cde3c7b97 100644
--- a/src/Avalonia.Controls/Flyouts/FlyoutPlacementMode.cs
+++ b/src/Avalonia.Controls/Flyouts/FlyoutPlacementMode.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Avalonia.Controls
+namespace Avalonia.Controls
 {
     public enum FlyoutPlacementMode
     {
diff --git a/src/Avalonia.Controls/Flyouts/FlyoutPresenter.cs b/src/Avalonia.Controls/Flyouts/FlyoutPresenter.cs
index 80477d6969..5b753b20a2 100644
--- a/src/Avalonia.Controls/Flyouts/FlyoutPresenter.cs
+++ b/src/Avalonia.Controls/Flyouts/FlyoutPresenter.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Avalonia.Controls
+namespace Avalonia.Controls
 {
     public class FlyoutPresenter : ContentControl
     {
diff --git a/src/Avalonia.Controls/Flyouts/MenuFlyout.cs b/src/Avalonia.Controls/Flyouts/MenuFlyout.cs
index f147719281..54165cdf6e 100644
--- a/src/Avalonia.Controls/Flyouts/MenuFlyout.cs
+++ b/src/Avalonia.Controls/Flyouts/MenuFlyout.cs
@@ -1,11 +1,8 @@
 using System.Collections;
-using System.Collections.Specialized;
 using Avalonia.Collections;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
-using Avalonia.Input;
 using Avalonia.Metadata;
-using Avalonia.Styling;
 
 #nullable enable
 
@@ -18,16 +15,25 @@ namespace Avalonia.Controls
             _items = new AvaloniaList<object>();
         }
 
+        /// <summary>
+        /// Defines the <see cref="Items"/> property
+        /// </summary>
         public static readonly DirectProperty<MenuFlyout, IEnumerable> ItemsProperty =
             ItemsControl.ItemsProperty.AddOwner<MenuFlyout>(x => x.Items,
                 (x, v) => x.Items = v);
 
+        /// <summary>
+        /// Defines the <see cref="ItemTemplate"/> property
+        /// </summary>
         public static readonly DirectProperty<MenuFlyout, IDataTemplate?> ItemTemplateProperty =
             AvaloniaProperty.RegisterDirect<MenuFlyout, IDataTemplate?>(nameof(ItemTemplate),
                 x => x.ItemTemplate, (x, v) => x.ItemTemplate = v);
 
         public Classes? FlyoutPresenterClasses => _classes ??= new Classes();
 
+        /// <summary>
+        /// Gets or sets the items of the MenuFlyout
+        /// </summary>
         [Content]
         public IEnumerable Items
         {
@@ -35,6 +41,9 @@ namespace Avalonia.Controls
             set => SetAndRaise(ItemsProperty, ref _items, value);
         }
 
+        /// <summary>
+        /// Gets or sets the template used for the items
+        /// </summary>
         public IDataTemplate? ItemTemplate
         {
             get => _itemTemplate;

From dde40aae24a1a6e3ee105ba6929966fe052ea2d9 Mon Sep 17 00:00:00 2001
From: amwx <40413319+amwx@users.noreply.github.com>
Date: Sun, 21 Mar 2021 17:12:29 -0500
Subject: [PATCH 17/43] Update src/Avalonia.Themes.Fluent/Controls/TextBox.xaml

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

diff --git a/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml b/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
index 688d4917cd..f882a96408 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
@@ -26,7 +26,7 @@
       <MenuItem x:Name="TextBoxContextMenuCutItem" Header="Cut" Command="{Binding $parent[TextBox].Cut}" IsEnabled="{Binding $parent[TextBox].CanCut}" InputGesture="{x:Static TextBox.CutGesture}" />
       <MenuItem x:Name="TextBoxContextMenuCopyItem" Header="Copy" Command="{Binding $parent[TextBox].Copy}" IsEnabled="{Binding $parent[TextBox].CanCopy}" InputGesture="{x:Static TextBox.CopyGesture}"/>
       <MenuItem x:Name="TextBoxContextMenuPasteItem" Header="Paste" Command="{Binding $parent[TextBox].Paste}" IsEnabled="{Binding $parent[TextBox].CanPaste}" InputGesture="{x:Static TextBox.PasteGesture}"/>
-    </ContextMenu>    
+    </ContextMenu>
   </Styles.Resources>
 
   <Style Selector="TextBox">

From f7d100e7bd6304522ce05dae41bbd838943df0ee Mon Sep 17 00:00:00 2001
From: amwx <armccormickwx@gmail.com>
Date: Sun, 21 Mar 2021 17:34:43 -0500
Subject: [PATCH 18/43] Button Flyout StyledProperty and add change handler

---
 src/Avalonia.Controls/Button.cs | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/Avalonia.Controls/Button.cs b/src/Avalonia.Controls/Button.cs
index 16bb3c4377..4fe385a782 100644
--- a/src/Avalonia.Controls/Button.cs
+++ b/src/Avalonia.Controls/Button.cs
@@ -82,14 +82,12 @@ namespace Avalonia.Controls
         /// <summary>
         /// Defines the <see cref="Flyout"/> property
         /// </summary>
-        public static readonly DirectProperty<Button, FlyoutBase> FlyoutProperty =
-            AvaloniaProperty.RegisterDirect<Button, FlyoutBase>(nameof(Flyout),
-                x => x.Flyout, (x, v) => x.Flyout = v);
+        public static readonly StyledProperty<FlyoutBase> FlyoutProperty =
+            AvaloniaProperty.Register<Button, FlyoutBase>(nameof(Flyout));
 
         private ICommand _command;
         private bool _commandCanExecute = true;
         private KeyGesture _hotkey;
-        private FlyoutBase _flyout;
 
         /// <summary>
         /// Initializes static members of the <see cref="Button"/> class.
@@ -183,8 +181,8 @@ namespace Avalonia.Controls
         /// </summary>
         public FlyoutBase Flyout
         {
-            get => _flyout;
-            set => SetAndRaise(FlyoutProperty, ref _flyout, value);
+            get => GetValue(FlyoutProperty);
+            set => SetValue(FlyoutProperty, value);
         }
 
         protected override bool IsEnabledCore => base.IsEnabledCore && _commandCanExecute; 
@@ -310,7 +308,7 @@ namespace Avalonia.Controls
 
         protected virtual void OpenFlyout()
         {
-            _flyout?.ShowAt(this);
+            Flyout?.ShowAt(this);
         }
 
         /// <inheritdoc/>
@@ -361,6 +359,16 @@ namespace Avalonia.Controls
             {
                 UpdatePseudoClasses(change.NewValue.GetValueOrDefault<bool>());
             }
+            else if (change.Property == FlyoutProperty)
+            {
+                // If flyout is changed while one is already open, make sure we 
+                // close the old one first
+                if (change.OldValue.GetValueOrDefault() is FlyoutBase oldFlyout &&
+                    oldFlyout.IsOpen)
+                {
+                    oldFlyout.Hide();
+                }
+            }
         }
 
         protected override void UpdateDataValidation<T>(AvaloniaProperty<T> property, BindingValue<T> value)

From 8786250eb2bfe8c8b0df65d985f6ebcda3dfcfca Mon Sep 17 00:00:00 2001
From: amwx <armccormickwx@gmail.com>
Date: Sun, 21 Mar 2021 19:25:46 -0500
Subject: [PATCH 19/43] FlyoutBase updates

---
 src/Avalonia.Controls/Flyouts/FlyoutBase.cs   | 47 ++++++++++++++-----
 .../Flyouts/FlyoutPlacementMode.cs            |  9 ++--
 2 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/src/Avalonia.Controls/Flyouts/FlyoutBase.cs b/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
index 2ca637213f..3031165c4c 100644
--- a/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
+++ b/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
@@ -3,6 +3,7 @@ using System.ComponentModel;
 using Avalonia.Input;
 using Avalonia.Input.Raw;
 using Avalonia.Layout;
+using Avalonia.Logging;
 
 #nullable enable
 
@@ -133,8 +134,12 @@ namespace Avalonia.Controls.Primitives
         /// <summary>
         /// Hides the Flyout
         /// </summary>
-        /// <param name="canCancel">Whether or not this closing action can be cancelled</param>
-        public void Hide(bool canCancel = true)
+        public void Hide()
+        {
+            HideCore();
+        }
+
+        protected virtual void HideCore(bool canCancel = true)
         {
             if (!IsOpen)
             {
@@ -181,7 +186,7 @@ namespace Avalonia.Controls.Primitives
                 }
                 else // Close before opening a new one
                 {
-                    Hide(false);
+                    HideCore(false);
                 }
             }
 
@@ -232,17 +237,27 @@ namespace Avalonia.Controls.Primitives
         {
             if (args is RawPointerEventArgs pArgs && pArgs.Type == RawPointerEventType.Move)
             {
+                // In ShowMode = TransientWithDismissOnPointerMoveAway, the Flyout is kept
+                // shown as long as the pointer is within a certain px distance from the
+                // flyout itself. I'm not sure what WinUI uses, but I'm defaulting to 
+                // 100px, which seems about right
+                // enlargedPopupRect is the Flyout bounds enlarged 100px
+                // For windowed popups, enlargedPopupRect is in screen coordinates,
+                // for overlay popups, its in OverlayLayer coordinates
+
                 if (enlargedPopupRect == null)
                 {
+                    // Only do this once when the Flyout opens & cache the result
                     if (_popup?.Host is PopupRoot root)
                     { 
+                        // Get the popup root bounds and convert to screen coordinates
                         var tmp = root.Bounds.Inflate(100);
                         var scPt = root.PointToScreen(tmp.TopLeft);
                         enlargedPopupRect = new Rect(scPt.X, scPt.Y, tmp.Width, tmp.Height);
                     }
                     else if (_popup?.Host is OverlayPopupHost host)
                     {
-                        // Overlay popups are in Window client coordinates, just use that
+                        // Overlay popups are in OverlayLayer coordinates, just use that
                         enlargedPopupRect = host.Bounds.Inflate(100);
                     }
 
@@ -251,10 +266,15 @@ namespace Avalonia.Controls.Primitives
 
                 if (_popup?.Host is PopupRoot)
                 {
+                    // As long as the pointer stays within the enlargedPopupRect
+                    // the flyout stays open. If it leaves, close it
+                    // Despite working in screen coordinates, leaving the TopLevel
+                    // window will not close this (as pointer events stop), which 
+                    // does match UWP
                     var pt = pArgs.Root.PointToScreen(pArgs.Position);
                     if (!enlargedPopupRect?.Contains(new Point(pt.X, pt.Y)) ?? false)
                     {
-                        Hide(false);
+                        HideCore(false);
                         enlargedPopupRect = null;
                         transientDisposable?.Dispose();
                         transientDisposable = null;
@@ -262,9 +282,11 @@ namespace Avalonia.Controls.Primitives
                 }
                 else if (_popup?.Host is OverlayPopupHost)
                 {
+                    // Same as above here, but just different coordinate space
+                    // so we don't need to translate
                     if (!enlargedPopupRect?.Contains(pArgs.Position) ?? false)
                     {
-                        Hide(false);
+                        HideCore(false);
                         enlargedPopupRect = null;
                         transientDisposable?.Dispose();
                         transientDisposable = null;
@@ -316,7 +338,7 @@ namespace Avalonia.Controls.Primitives
 
         private void OnPopupClosed(object sender, EventArgs e)
         {
-            Hide();
+            HideCore();
         }
 
         private void PositionPopup(bool showAtPointer)
@@ -418,12 +440,6 @@ namespace Avalonia.Controls.Primitives
                     _popup.PlacementAnchor = PopupPositioning.PopupAnchor.BottomLeft;
                     break;
 
-                case FlyoutPlacementMode.Full:
-                    //Not sure how the get this to work
-                    //Popup should display at max size in the middle of the VisualRoot/Window of the Target
-                    throw new NotSupportedException("FlyoutPlacementMode.Full is not supported at this time");
-                //break;
-
                 //includes Auto (not sure what determines that)...
                 default:
                     //This is just FlyoutPlacementMode.Top behavior (above & centered)
@@ -457,6 +473,11 @@ namespace Avalonia.Controls.Primitives
                 {
                     if (c.ContextFlyout != null)
                     {
+                        if (c.ContextMenu != null)
+                        {
+                            Logger.TryGet(LogEventLevel.Verbose, "FlyoutBase")?.Log(c, "ContextMenu and ContextFlyout are both set, defaulting to ContextMenu");
+                            return;
+                        }
                         c.ContextFlyout.ShowAt(c, true);
                     }
                 }
diff --git a/src/Avalonia.Controls/Flyouts/FlyoutPlacementMode.cs b/src/Avalonia.Controls/Flyouts/FlyoutPlacementMode.cs
index 0cde3c7b97..2e77de3b3b 100644
--- a/src/Avalonia.Controls/Flyouts/FlyoutPlacementMode.cs
+++ b/src/Avalonia.Controls/Flyouts/FlyoutPlacementMode.cs
@@ -22,10 +22,11 @@
         /// </summary>
         Right = 3,
 
-        /// <summary>
-        /// Preferred location is centered on the screen
-        /// </summary>
-        Full = 4,
+        //TODO
+        // <summary>
+        // Preferred location is centered on the screen
+        // </summary>
+        //Full = 4,
 
         /// <summary>
         /// Preferred location is above the target element, with the left edge of the flyout

From 65374ed802df661890578eda60ff48f6d2edf382 Mon Sep 17 00:00:00 2001
From: amwx <armccormickwx@gmail.com>
Date: Sun, 21 Mar 2021 19:26:31 -0500
Subject: [PATCH 20/43] Update FlyoutPresenter/MenuFlyoutPresenter

---
 .../Flyouts/FlyoutPresenter.cs                | 29 ++++++++++++++++++-
 .../Flyouts/MenuFlyoutPresenter.cs            | 14 +++++++--
 2 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/src/Avalonia.Controls/Flyouts/FlyoutPresenter.cs b/src/Avalonia.Controls/Flyouts/FlyoutPresenter.cs
index 5b753b20a2..7ea7229da5 100644
--- a/src/Avalonia.Controls/Flyouts/FlyoutPresenter.cs
+++ b/src/Avalonia.Controls/Flyouts/FlyoutPresenter.cs
@@ -1,6 +1,33 @@
-namespace Avalonia.Controls
+using Avalonia.Controls.Primitives;
+using Avalonia.Input;
+using Avalonia.LogicalTree;
+
+namespace Avalonia.Controls
 {
     public class FlyoutPresenter : ContentControl
     {
+        public static readonly StyledProperty<CornerRadius> CornerRadiusProperty =
+            AvaloniaProperty.Register<FlyoutPresenter, CornerRadius>(nameof(CornerRadius));
+
+        public CornerRadius CornerRadius
+        {
+            get => GetValue(CornerRadiusProperty);
+            set => SetValue(CornerRadiusProperty, value);
+        }
+
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            if (e.Key == Key.Escape)
+            {
+                var host = this.FindLogicalAncestorOfType<Popup>();
+                if (host != null)
+                {
+                    host.IsOpen = false;
+                    e.Handled = true;
+                }
+            }
+
+            base.OnKeyDown(e);            
+        }
     }
 }
diff --git a/src/Avalonia.Controls/Flyouts/MenuFlyoutPresenter.cs b/src/Avalonia.Controls/Flyouts/MenuFlyoutPresenter.cs
index 7e59d824fa..3dd37884c0 100644
--- a/src/Avalonia.Controls/Flyouts/MenuFlyoutPresenter.cs
+++ b/src/Avalonia.Controls/Flyouts/MenuFlyoutPresenter.cs
@@ -1,4 +1,5 @@
-using Avalonia.Controls.Generators;
+using System;
+using Avalonia.Controls.Generators;
 using Avalonia.Controls.Platform;
 using Avalonia.Controls.Primitives;
 using Avalonia.LogicalTree;
@@ -7,6 +8,15 @@ namespace Avalonia.Controls
 {
     public class MenuFlyoutPresenter : MenuBase
     {
+        public static readonly StyledProperty<CornerRadius> CornerRadiusProperty =
+            AvaloniaProperty.Register<MenuFlyoutPresenter, CornerRadius>(nameof(CornerRadius));
+
+        public CornerRadius CornerRadius
+        {
+            get => GetValue(CornerRadiusProperty);
+            set => SetValue(CornerRadiusProperty, value);
+        }
+
         public MenuFlyoutPresenter()
             :base(new DefaultMenuInteractionHandler(true))
         {
@@ -25,7 +35,7 @@ namespace Avalonia.Controls
 
         public override void Open()
         {
-            //Ignore
+            throw new NotSupportedException("Use MenuFlyout.ShowAt(Control) instead");
         }
 
         protected override IItemContainerGenerator CreateItemContainerGenerator()

From e60614301ecf66b4d0ec9136e8140fdf453539b0 Mon Sep 17 00:00:00 2001
From: amwx <armccormickwx@gmail.com>
Date: Sun, 21 Mar 2021 19:27:25 -0500
Subject: [PATCH 21/43] DefaultTheme FlyoutPresenter padding

---
 src/Avalonia.Themes.Default/FlyoutPresenter.xaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Avalonia.Themes.Default/FlyoutPresenter.xaml b/src/Avalonia.Themes.Default/FlyoutPresenter.xaml
index 39ee8e5a6e..48f87230e5 100644
--- a/src/Avalonia.Themes.Default/FlyoutPresenter.xaml
+++ b/src/Avalonia.Themes.Default/FlyoutPresenter.xaml
@@ -5,6 +5,7 @@
     <Setter Property="Background" Value="Transparent" />
     <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
     <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="Padding" Value="4" />
     <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
     <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
     <Setter Property="Template">

From dae531f73f2762db4e55baaca430950a6eaab9d8 Mon Sep 17 00:00:00 2001
From: amwx <armccormickwx@gmail.com>
Date: Sun, 21 Mar 2021 19:32:28 -0500
Subject: [PATCH 22/43] Flyout presenter styles use CornerRadius property

---
 src/Avalonia.Themes.Fluent/Controls/FlyoutPresenter.xaml   | 7 +++----
 .../Controls/MenuFlyoutPresenter.xaml                      | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/FlyoutPresenter.xaml b/src/Avalonia.Themes.Fluent/Controls/FlyoutPresenter.xaml
index 3a8df060fa..3c2547ba85 100644
--- a/src/Avalonia.Themes.Fluent/Controls/FlyoutPresenter.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/FlyoutPresenter.xaml
@@ -17,13 +17,15 @@
     <Setter Property="MaxHeight" Value="{DynamicResource FlyoutThemeMaxHeight}" />
     <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
     <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+    <Setter Property="CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />
     <Setter Property="Template">
       <ControlTemplate>
         <Border Name="LayoutRoot"
                 Background="{TemplateBinding Background}"
                 BorderBrush="{TemplateBinding BorderBrush}"
                 BorderThickness="{TemplateBinding BorderThickness}"
-                Padding="{DynamicResource FlyoutBorderThemePadding}">
+                Padding="{DynamicResource FlyoutBorderThemePadding}"
+                CornerRadius="{TemplateBinding CornerRadius}">
           <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
                         VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
             <ContentPresenter Content="{TemplateBinding Content}"
@@ -38,7 +40,4 @@
       </ControlTemplate>
     </Setter>
   </Style>
-  <Style Selector="FlyoutPresenter /template/ Border#LayoutRoot">
-    <Setter Property="CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />
-  </Style>
 </Styles>
diff --git a/src/Avalonia.Themes.Fluent/Controls/MenuFlyoutPresenter.xaml b/src/Avalonia.Themes.Fluent/Controls/MenuFlyoutPresenter.xaml
index 41a6e1cb65..ff50acab5e 100644
--- a/src/Avalonia.Themes.Fluent/Controls/MenuFlyoutPresenter.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/MenuFlyoutPresenter.xaml
@@ -9,13 +9,15 @@
     <Setter Property="MinHeight" Value="{DynamicResource MenuFlyoutThemeMinHeight}" />
     <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
     <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+    <Setter Property="CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />
     <Setter Property="Template">
       <ControlTemplate>
         <Border Name="LayoutRoot"
                 Background="{TemplateBinding Background}"
                 BorderBrush="{TemplateBinding BorderBrush}"
                 BorderThickness="{TemplateBinding BorderThickness}"
-                Padding="{DynamicResource FlyoutBorderThemePadding}">
+                Padding="{DynamicResource FlyoutBorderThemePadding}"
+                CornerRadius="{TemplateBinding CornerRadius}">
           <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
                         VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
             <ItemsPresenter Name="PART_ItemsPresenter"
@@ -30,7 +32,4 @@
       </ControlTemplate>
     </Setter>
   </Style>
-  <Style Selector="MenuFlyoutPresenter /template/ Border#LayoutRoot">
-    <Setter Property="CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />
-  </Style>
 </Styles>

From 0e82bce249b255f83cacad837d161a2866d2ef7f Mon Sep 17 00:00:00 2001
From: amwx <armccormickwx@gmail.com>
Date: Sun, 21 Mar 2021 19:42:04 -0500
Subject: [PATCH 23/43] Button closes Flyout on escape key press

---
 src/Avalonia.Controls/Button.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Avalonia.Controls/Button.cs b/src/Avalonia.Controls/Button.cs
index 4fe385a782..a7ebced0ca 100644
--- a/src/Avalonia.Controls/Button.cs
+++ b/src/Avalonia.Controls/Button.cs
@@ -271,6 +271,11 @@ namespace Avalonia.Controls
                 IsPressed = true;
                 e.Handled = true;
             }
+            else if (e.Key == Key.Escape && Flyout != null)
+            {
+                // If Flyout doesn't have focusable content, close the flyout here
+                Flyout.Hide();
+            }
 
             base.OnKeyDown(e);
         }

From 77c4f7faf95535b75bb56d2babd4d5a5c49f6df4 Mon Sep 17 00:00:00 2001
From: amwx <armccormickwx@gmail.com>
Date: Sun, 21 Mar 2021 19:45:01 -0500
Subject: [PATCH 24/43] Use AddOwner for CornerRadius property

---
 src/Avalonia.Controls/Flyouts/FlyoutPresenter.cs     | 2 +-
 src/Avalonia.Controls/Flyouts/MenuFlyoutPresenter.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Controls/Flyouts/FlyoutPresenter.cs b/src/Avalonia.Controls/Flyouts/FlyoutPresenter.cs
index 7ea7229da5..10f97794d7 100644
--- a/src/Avalonia.Controls/Flyouts/FlyoutPresenter.cs
+++ b/src/Avalonia.Controls/Flyouts/FlyoutPresenter.cs
@@ -7,7 +7,7 @@ namespace Avalonia.Controls
     public class FlyoutPresenter : ContentControl
     {
         public static readonly StyledProperty<CornerRadius> CornerRadiusProperty =
-            AvaloniaProperty.Register<FlyoutPresenter, CornerRadius>(nameof(CornerRadius));
+            Border.CornerRadiusProperty.AddOwner<FlyoutPresenter>();
 
         public CornerRadius CornerRadius
         {
diff --git a/src/Avalonia.Controls/Flyouts/MenuFlyoutPresenter.cs b/src/Avalonia.Controls/Flyouts/MenuFlyoutPresenter.cs
index 3dd37884c0..95a4c7a764 100644
--- a/src/Avalonia.Controls/Flyouts/MenuFlyoutPresenter.cs
+++ b/src/Avalonia.Controls/Flyouts/MenuFlyoutPresenter.cs
@@ -9,7 +9,7 @@ namespace Avalonia.Controls
     public class MenuFlyoutPresenter : MenuBase
     {
         public static readonly StyledProperty<CornerRadius> CornerRadiusProperty =
-            AvaloniaProperty.Register<MenuFlyoutPresenter, CornerRadius>(nameof(CornerRadius));
+            Border.CornerRadiusProperty.AddOwner<FlyoutPresenter>();
 
         public CornerRadius CornerRadius
         {

From 03498f20a35c3119fbd78c5b1a59faf46d309a3e Mon Sep 17 00:00:00 2001
From: amwx <armccormickwx@gmail.com>
Date: Sun, 21 Mar 2021 19:46:02 -0500
Subject: [PATCH 25/43] Default theme corner radius

---
 src/Avalonia.Themes.Default/FlyoutPresenter.xaml     | 3 ++-
 src/Avalonia.Themes.Default/MenuFlyoutPresenter.xaml | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Themes.Default/FlyoutPresenter.xaml b/src/Avalonia.Themes.Default/FlyoutPresenter.xaml
index 48f87230e5..95f48e6c29 100644
--- a/src/Avalonia.Themes.Default/FlyoutPresenter.xaml
+++ b/src/Avalonia.Themes.Default/FlyoutPresenter.xaml
@@ -13,7 +13,8 @@
         <Border Name="LayoutRoot"
                 Background="{TemplateBinding Background}"
                 BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}">
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
           <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
                         VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
             <ContentPresenter Content="{TemplateBinding Content}"
diff --git a/src/Avalonia.Themes.Default/MenuFlyoutPresenter.xaml b/src/Avalonia.Themes.Default/MenuFlyoutPresenter.xaml
index 612203d3d7..0d246ac12c 100644
--- a/src/Avalonia.Themes.Default/MenuFlyoutPresenter.xaml
+++ b/src/Avalonia.Themes.Default/MenuFlyoutPresenter.xaml
@@ -10,7 +10,8 @@
         <Border Name="LayoutRoot"
                 Background="{TemplateBinding Background}"
                 BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}">
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
           <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
                         VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
             <ItemsPresenter Name="PART_ItemsPresenter"

From 1a0d5cf3343369478c193a7883e9cff75afccdda Mon Sep 17 00:00:00 2001
From: amwx <armccormickwx@gmail.com>
Date: Mon, 22 Mar 2021 16:01:32 -0500
Subject: [PATCH 26/43] A few more fixes

---
 src/Avalonia.Controls/Flyouts/Flyout.cs     |  19 +--
 src/Avalonia.Controls/Flyouts/FlyoutBase.cs | 151 +++++++++++---------
 src/Avalonia.Controls/Flyouts/MenuFlyout.cs |  17 +--
 3 files changed, 91 insertions(+), 96 deletions(-)

diff --git a/src/Avalonia.Controls/Flyouts/Flyout.cs b/src/Avalonia.Controls/Flyouts/Flyout.cs
index 865e5a0fd1..974f1418b2 100644
--- a/src/Avalonia.Controls/Flyouts/Flyout.cs
+++ b/src/Avalonia.Controls/Flyouts/Flyout.cs
@@ -14,9 +14,9 @@ namespace Avalonia.Controls
             AvaloniaProperty.Register<Flyout, object>(nameof(Content));
 
         /// <summary>
-        /// Gets the Classes collection to applied to the FlyoutPresenter this Flyout is hosting
+        /// Gets the Classes collection to apply to the FlyoutPresenter this Flyout is hosting
         /// </summary>
-        public Classes? FlyoutPresenterClasses => _classes ??= new Classes();
+        public Classes FlyoutPresenterClasses => _classes ??= new Classes();
 
         private Classes? _classes;
 
@@ -40,20 +40,9 @@ namespace Avalonia.Controls
 
         protected override void OnOpened()
         {
-            if (FlyoutPresenterClasses != null)
+            if (_classes != null)
             {
-                //Remove any classes no longer in use, ignoring any pseudoclasses
-                for (int i = _popup.Child.Classes.Count - 1; i >= 0; i--)
-                {
-                    if (!FlyoutPresenterClasses.Contains(_popup.Child.Classes[i]) && 
-                        !_popup.Child.Classes[i].Contains(":"))
-                    {
-                        _popup.Child.Classes.RemoveAt(i);
-                    }
-                }
-
-                //Add new classes
-                _popup.Child.Classes.AddRange(FlyoutPresenterClasses);
+                SetPresenterClasses(Popup.Child, FlyoutPresenterClasses);
             }
             base.OnOpened();
         }
diff --git a/src/Avalonia.Controls/Flyouts/FlyoutBase.cs b/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
index 3031165c4c..4725d17d65 100644
--- a/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
+++ b/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
@@ -50,10 +50,11 @@ namespace Avalonia.Controls.Primitives
 
         private bool _isOpen;
         private Control? _target;
-        protected Popup? _popup;
         private FlyoutShowMode _showMode = FlyoutShowMode.Standard;
-        Rect? enlargedPopupRect;
-        IDisposable? transientDisposable;
+        private Rect? enlargedPopupRect;
+        private IDisposable? transientDisposable;
+
+        protected Popup? Popup { get; private set; }
 
         /// <summary>
         /// Gets whether this Flyout is currently Open
@@ -159,7 +160,7 @@ namespace Avalonia.Controls.Primitives
             }
 
             IsOpen = false;
-            _popup.IsOpen = false;
+            Popup.IsOpen = false;
 
             // Ensure this isn't active
             transientDisposable?.Dispose();
@@ -173,7 +174,7 @@ namespace Avalonia.Controls.Primitives
             if (placementTarget == null)
                 throw new ArgumentNullException("placementTarget cannot be null");
 
-            if (_popup == null)
+            if (Popup == null)
             {
                 InitPopup();
             }
@@ -190,37 +191,37 @@ namespace Avalonia.Controls.Primitives
                 }
             }
 
-            if (_popup.Parent != null && _popup.Parent != placementTarget)
+            if (Popup.Parent != null && Popup.Parent != placementTarget)
             {
-                ((ISetLogicalParent)_popup).SetParent(null);
+                ((ISetLogicalParent)Popup).SetParent(null);
             }
 
-            if (_popup.PlacementTarget != placementTarget)
+            if (Popup.PlacementTarget != placementTarget)
             {
-                _popup.PlacementTarget = Target = placementTarget;
-                ((ISetLogicalParent)_popup).SetParent(placementTarget);
+                Popup.PlacementTarget = Target = placementTarget;
+                ((ISetLogicalParent)Popup).SetParent(placementTarget);
             }
 
-            if (_popup.Child == null)
+            if (Popup.Child == null)
             {
-                _popup.Child = CreatePresenter();
+                Popup.Child = CreatePresenter();
             }
 
             OnOpening();
             PositionPopup(showAtPointer);
-            IsOpen = _popup.IsOpen = true;            
+            IsOpen = Popup.IsOpen = true;            
             OnOpened();
                         
             if (ShowMode == FlyoutShowMode.Standard)
             {
                 // Try and focus content inside Flyout
-                if (_popup.Child.Focusable)
+                if (Popup.Child.Focusable)
                 {
-                    FocusManager.Instance?.Focus(_popup.Child);
+                    FocusManager.Instance?.Focus(Popup.Child);
                 }
                 else
                 {
-                    var nextFocus = KeyboardNavigationHandler.GetNext(_popup.Child, NavigationDirection.Next);
+                    var nextFocus = KeyboardNavigationHandler.GetNext(Popup.Child, NavigationDirection.Next);
                     if (nextFocus != null)
                     {
                         FocusManager.Instance?.Focus(nextFocus);
@@ -248,14 +249,14 @@ namespace Avalonia.Controls.Primitives
                 if (enlargedPopupRect == null)
                 {
                     // Only do this once when the Flyout opens & cache the result
-                    if (_popup?.Host is PopupRoot root)
+                    if (Popup?.Host is PopupRoot root)
                     { 
                         // Get the popup root bounds and convert to screen coordinates
                         var tmp = root.Bounds.Inflate(100);
                         var scPt = root.PointToScreen(tmp.TopLeft);
                         enlargedPopupRect = new Rect(scPt.X, scPt.Y, tmp.Width, tmp.Height);
                     }
-                    else if (_popup?.Host is OverlayPopupHost host)
+                    else if (Popup?.Host is OverlayPopupHost host)
                     {
                         // Overlay popups are in OverlayLayer coordinates, just use that
                         enlargedPopupRect = host.Bounds.Inflate(100);
@@ -264,7 +265,7 @@ namespace Avalonia.Controls.Primitives
                     return;
                 }
 
-                if (_popup?.Host is PopupRoot)
+                if (Popup?.Host is PopupRoot)
                 {
                     // As long as the pointer stays within the enlargedPopupRect
                     // the flyout stays open. If it leaves, close it
@@ -280,7 +281,7 @@ namespace Avalonia.Controls.Primitives
                         transientDisposable = null;
                     }
                 }
-                else if (_popup?.Host is OverlayPopupHost)
+                else if (Popup?.Host is OverlayPopupHost)
                 {
                     // Same as above here, but just different coordinate space
                     // so we don't need to translate
@@ -323,12 +324,12 @@ namespace Avalonia.Controls.Primitives
 
         private void InitPopup()
         {
-            _popup = new Popup();
-            _popup.WindowManagerAddShadowHint = false;
-            _popup.IsLightDismissEnabled = true;            
+            Popup = new Popup();
+            Popup.WindowManagerAddShadowHint = false;
+            Popup.IsLightDismissEnabled = true;
 
-            _popup.Opened += OnPopupOpened;
-            _popup.Closed += OnPopupClosed;
+            Popup.Opened += OnPopupOpened;
+            Popup.Closed += OnPopupClosed;
         }
 
         private void OnPopupOpened(object sender, EventArgs e)
@@ -344,24 +345,24 @@ namespace Avalonia.Controls.Primitives
         private void PositionPopup(bool showAtPointer)
         {
             Size sz;
-            if(_popup.Child.DesiredSize == Size.Empty)
+            if(Popup.Child.DesiredSize == Size.Empty)
             {
                 // Popup may not have been shown yet. Measure content
-                sz = LayoutHelper.MeasureChild(_popup.Child, Size.Infinity, new Thickness());
+                sz = LayoutHelper.MeasureChild(Popup.Child, Size.Infinity, new Thickness());
             }
             else
             {
-                sz = _popup.Child.DesiredSize;
+                sz = Popup.Child.DesiredSize;
             }
 
             if (showAtPointer)
             {
-                _popup.PlacementMode = PlacementMode.Pointer;
+                Popup.PlacementMode = PlacementMode.Pointer;
             }
             else
             {
-                _popup.PlacementMode = PlacementMode.AnchorAndGravity;
-                _popup.PlacementConstraintAdjustment =
+                Popup.PlacementMode = PlacementMode.AnchorAndGravity;
+                Popup.PlacementConstraintAdjustment =
                     PopupPositioning.PopupPositionerConstraintAdjustment.SlideX |
                     PopupPositioning.PopupPositionerConstraintAdjustment.SlideY;
             }
@@ -371,80 +372,80 @@ namespace Avalonia.Controls.Primitives
             switch (Placement)
             {
                 case FlyoutPlacementMode.Top: //Above & centered
-                    _popup.PlacementRect = new Rect(0, 0, trgtBnds.Width-1, 1);
-                    _popup.PlacementGravity = PopupPositioning.PopupGravity.Top;
-                    _popup.PlacementAnchor = PopupPositioning.PopupAnchor.Top;
+                    Popup.PlacementRect = new Rect(0, 0, trgtBnds.Width-1, 1);
+                    Popup.PlacementGravity = PopupPositioning.PopupGravity.Top;
+                    Popup.PlacementAnchor = PopupPositioning.PopupAnchor.Top;
                     break;
 
                 case FlyoutPlacementMode.TopEdgeAlignedLeft:
-                    _popup.PlacementRect = new Rect(0, 0, 0, 0);
-                    _popup.PlacementGravity = PopupPositioning.PopupGravity.TopRight;                    
+                    Popup.PlacementRect = new Rect(0, 0, 0, 0);
+                    Popup.PlacementGravity = PopupPositioning.PopupGravity.TopRight;                    
                     break;
 
                 case FlyoutPlacementMode.TopEdgeAlignedRight:
-                    _popup.PlacementRect = new Rect(trgtBnds.Width - 1, 0, 10, 1);
-                    _popup.PlacementGravity = PopupPositioning.PopupGravity.TopLeft;                    
+                    Popup.PlacementRect = new Rect(trgtBnds.Width - 1, 0, 10, 1);
+                    Popup.PlacementGravity = PopupPositioning.PopupGravity.TopLeft;                    
                     break;
 
                 case FlyoutPlacementMode.RightEdgeAlignedTop:
-                    _popup.PlacementRect = new Rect(trgtBnds.Width - 1, 0, 1, 1);
-                    _popup.PlacementGravity = PopupPositioning.PopupGravity.BottomRight;
-                    _popup.PlacementAnchor = PopupPositioning.PopupAnchor.Right;
+                    Popup.PlacementRect = new Rect(trgtBnds.Width - 1, 0, 1, 1);
+                    Popup.PlacementGravity = PopupPositioning.PopupGravity.BottomRight;
+                    Popup.PlacementAnchor = PopupPositioning.PopupAnchor.Right;
                     break;
 
                 case FlyoutPlacementMode.Right: //Right & centered
-                    _popup.PlacementRect = new Rect(trgtBnds.Width - 1, 0, 1, trgtBnds.Height);
-                    _popup.PlacementGravity = PopupPositioning.PopupGravity.Right;
-                    _popup.PlacementAnchor = PopupPositioning.PopupAnchor.Right;
+                    Popup.PlacementRect = new Rect(trgtBnds.Width - 1, 0, 1, trgtBnds.Height);
+                    Popup.PlacementGravity = PopupPositioning.PopupGravity.Right;
+                    Popup.PlacementAnchor = PopupPositioning.PopupAnchor.Right;
                     break;
 
                 case FlyoutPlacementMode.RightEdgeAlignedBottom:
-                    _popup.PlacementRect = new Rect(trgtBnds.Width - 1, trgtBnds.Height - 1, 1, 1);
-                    _popup.PlacementGravity = PopupPositioning.PopupGravity.TopRight;
-                    _popup.PlacementAnchor = PopupPositioning.PopupAnchor.Right;
+                    Popup.PlacementRect = new Rect(trgtBnds.Width - 1, trgtBnds.Height - 1, 1, 1);
+                    Popup.PlacementGravity = PopupPositioning.PopupGravity.TopRight;
+                    Popup.PlacementAnchor = PopupPositioning.PopupAnchor.Right;
                     break;
 
                 case FlyoutPlacementMode.Bottom: //Below & centered
-                    _popup.PlacementRect = new Rect(0, trgtBnds.Height - 1, trgtBnds.Width, 1);
-                    _popup.PlacementGravity = PopupPositioning.PopupGravity.Bottom;
-                    _popup.PlacementAnchor = PopupPositioning.PopupAnchor.Bottom;
+                    Popup.PlacementRect = new Rect(0, trgtBnds.Height - 1, trgtBnds.Width, 1);
+                    Popup.PlacementGravity = PopupPositioning.PopupGravity.Bottom;
+                    Popup.PlacementAnchor = PopupPositioning.PopupAnchor.Bottom;
                     break;
 
                 case FlyoutPlacementMode.BottomEdgeAlignedLeft:
-                    _popup.PlacementRect = new Rect(0, trgtBnds.Height - 1, 1, 1);
-                    _popup.PlacementGravity = PopupPositioning.PopupGravity.BottomRight;
-                    _popup.PlacementAnchor = PopupPositioning.PopupAnchor.Bottom;
+                    Popup.PlacementRect = new Rect(0, trgtBnds.Height - 1, 1, 1);
+                    Popup.PlacementGravity = PopupPositioning.PopupGravity.BottomRight;
+                    Popup.PlacementAnchor = PopupPositioning.PopupAnchor.Bottom;
                     break;
 
                 case FlyoutPlacementMode.BottomEdgeAlignedRight:
-                    _popup.PlacementRect = new Rect(trgtBnds.Width - 1, trgtBnds.Height - 1, 1, 1);
-                    _popup.PlacementGravity = PopupPositioning.PopupGravity.BottomLeft;
-                    _popup.PlacementAnchor = PopupPositioning.PopupAnchor.Bottom;
+                    Popup.PlacementRect = new Rect(trgtBnds.Width - 1, trgtBnds.Height - 1, 1, 1);
+                    Popup.PlacementGravity = PopupPositioning.PopupGravity.BottomLeft;
+                    Popup.PlacementAnchor = PopupPositioning.PopupAnchor.Bottom;
                     break;
 
                 case FlyoutPlacementMode.LeftEdgeAlignedTop:
-                    _popup.PlacementRect = new Rect(0, 0, 1, 1);
-                    _popup.PlacementGravity = PopupPositioning.PopupGravity.BottomLeft;
-                    _popup.PlacementAnchor = PopupPositioning.PopupAnchor.Left;
+                    Popup.PlacementRect = new Rect(0, 0, 1, 1);
+                    Popup.PlacementGravity = PopupPositioning.PopupGravity.BottomLeft;
+                    Popup.PlacementAnchor = PopupPositioning.PopupAnchor.Left;
                     break;
 
                 case FlyoutPlacementMode.Left: //Left & centered
-                    _popup.PlacementRect = new Rect(0, 0, 1, trgtBnds.Height);
-                    _popup.PlacementGravity = PopupPositioning.PopupGravity.Left;
-                    _popup.PlacementAnchor = PopupPositioning.PopupAnchor.Left;
+                    Popup.PlacementRect = new Rect(0, 0, 1, trgtBnds.Height);
+                    Popup.PlacementGravity = PopupPositioning.PopupGravity.Left;
+                    Popup.PlacementAnchor = PopupPositioning.PopupAnchor.Left;
                     break;
 
                 case FlyoutPlacementMode.LeftEdgeAlignedBottom:
-                    _popup.PlacementRect = new Rect(0, trgtBnds.Height - 1, 1, 1);
-                    _popup.PlacementGravity = PopupPositioning.PopupGravity.TopLeft;
-                    _popup.PlacementAnchor = PopupPositioning.PopupAnchor.BottomLeft;
+                    Popup.PlacementRect = new Rect(0, trgtBnds.Height - 1, 1, 1);
+                    Popup.PlacementGravity = PopupPositioning.PopupGravity.TopLeft;
+                    Popup.PlacementAnchor = PopupPositioning.PopupAnchor.BottomLeft;
                     break;
 
                 //includes Auto (not sure what determines that)...
                 default:
                     //This is just FlyoutPlacementMode.Top behavior (above & centered)
-                    _popup.PlacementRect = new Rect(-sz.Width / 2, 0, sz.Width, 1);
-                    _popup.PlacementGravity = PopupPositioning.PopupGravity.Top;
+                    Popup.PlacementRect = new Rect(-sz.Width / 2, 0, sz.Width, 1);
+                    Popup.PlacementGravity = PopupPositioning.PopupGravity.Top;
                     break;
             }
         }
@@ -483,5 +484,21 @@ namespace Avalonia.Controls.Primitives
                 }
             }            
         }
+
+        internal static void SetPresenterClasses(IControl presenter, Classes classes)
+        {
+            //Remove any classes no longer in use, ignoring pseudoclasses
+            for (int i = presenter.Classes.Count - 1; i >= 0; i--)
+            {
+                if (!classes.Contains(presenter.Classes[i]) &&
+                    !presenter.Classes[i].Contains(":"))
+                {
+                    presenter.Classes.RemoveAt(i);
+                }
+            }
+
+            //Add new classes
+            presenter.Classes.AddRange(classes);
+        }
     }
 }
diff --git a/src/Avalonia.Controls/Flyouts/MenuFlyout.cs b/src/Avalonia.Controls/Flyouts/MenuFlyout.cs
index 54165cdf6e..5b2e323f4f 100644
--- a/src/Avalonia.Controls/Flyouts/MenuFlyout.cs
+++ b/src/Avalonia.Controls/Flyouts/MenuFlyout.cs
@@ -29,7 +29,7 @@ namespace Avalonia.Controls
             AvaloniaProperty.RegisterDirect<MenuFlyout, IDataTemplate?>(nameof(ItemTemplate),
                 x => x.ItemTemplate, (x, v) => x.ItemTemplate = v);
 
-        public Classes? FlyoutPresenterClasses => _classes ??= new Classes();
+        public Classes FlyoutPresenterClasses => _classes ??= new Classes();
 
         /// <summary>
         /// Gets or sets the items of the MenuFlyout
@@ -65,20 +65,9 @@ namespace Avalonia.Controls
 
         protected override void OnOpened()
         {
-            if (FlyoutPresenterClasses != null)
+            if (_classes != null)
             {
-                //Remove any classes no longer in use, ignoring pseudoclasses
-                for (int i = _popup.Child.Classes.Count - 1; i >= 0; i--)
-                {
-                    if (!FlyoutPresenterClasses.Contains(_popup.Child.Classes[i]) && 
-                        !_popup.Child.Classes[i].Contains(":"))
-                    {
-                        _popup.Child.Classes.RemoveAt(i);
-                    }
-                }
-
-                //Add new classes
-                _popup.Child.Classes.AddRange(FlyoutPresenterClasses);
+                SetPresenterClasses(Popup.Child, FlyoutPresenterClasses);
             }
             base.OnOpened();
         }

From 3e09bdfd093d9695f3ec1a5dea1b8b8c089b062a Mon Sep 17 00:00:00 2001
From: amwx <armccormickwx@gmail.com>
Date: Fri, 26 Mar 2021 15:32:41 -0500
Subject: [PATCH 27/43] Try fix subitems

---
 src/Avalonia.Controls/Flyouts/MenuFlyoutPresenter.cs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Flyouts/MenuFlyoutPresenter.cs b/src/Avalonia.Controls/Flyouts/MenuFlyoutPresenter.cs
index 95a4c7a764..92f414631a 100644
--- a/src/Avalonia.Controls/Flyouts/MenuFlyoutPresenter.cs
+++ b/src/Avalonia.Controls/Flyouts/MenuFlyoutPresenter.cs
@@ -29,7 +29,16 @@ namespace Avalonia.Controls
             var host = this.FindLogicalAncestorOfType<Popup>();
             if (host != null)
             {
-                host.IsOpen = false;
+                for (int i = 0; i < LogicalChildren.Count; i++)
+                {
+                    if (LogicalChildren[i] is MenuItem item)
+                    {
+                        item.IsSubMenuOpen = false;
+                    }
+                }
+
+                SelectedIndex = -1;
+                host.IsOpen = false;                
             }
         }
 

From e6b13b66c50325096bb9ce7fa6fbed787cd5fa2c Mon Sep 17 00:00:00 2001
From: ili <chudinia@gmail.com>
Date: Mon, 5 Apr 2021 20:47:31 +0500
Subject: [PATCH 28/43] Support android InputType

---
 .../ControlCatalog.Android.csproj             |  2 +-
 .../Pages/AutoCompleteBoxPage.xaml            |  3 +-
 samples/ControlCatalog/Pages/TextBoxPage.xaml |  2 +-
 .../Avalonia.Android/AvaloniaActivity.cs      |  6 +-
 src/Android/Avalonia.Android/AvaloniaView.cs  | 26 +++++++
 .../SkiaPlatform/AndroidFramebuffer.cs        |  2 +-
 .../InvalidationAwareSurfaceView.cs           | 67 ++++++++++++++++++-
 .../Platform/SkiaPlatform/TopLevelImpl.cs     | 23 ++++---
 .../Helpers/AndroidKeyboardEventsHelper.cs    | 56 +++++++++++-----
 .../Platform/Specific/IAndroidView.cs         | 10 +++
 src/Avalonia.Controls/TextBox.cs              |  9 ++-
 src/Avalonia.Input/ISoftInputElement.cs       | 11 +++
 src/Avalonia.Input/InputType.cs               | 32 +++++++++
 13 files changed, 214 insertions(+), 35 deletions(-)
 create mode 100644 src/Avalonia.Input/ISoftInputElement.cs
 create mode 100644 src/Avalonia.Input/InputType.cs

diff --git a/samples/ControlCatalog.Android/ControlCatalog.Android.csproj b/samples/ControlCatalog.Android/ControlCatalog.Android.csproj
index 1a68c4d732..9da9627a6f 100644
--- a/samples/ControlCatalog.Android/ControlCatalog.Android.csproj
+++ b/samples/ControlCatalog.Android/ControlCatalog.Android.csproj
@@ -158,4 +158,4 @@
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
   <Import Project="..\..\build\AndroidWorkarounds.props" />
   <Import Project="..\..\build\LegacyProject.targets" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml b/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml
index 1a53217842..363330be86 100644
--- a/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml
+++ b/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml
@@ -14,7 +14,8 @@
         <TextBlock Text="MinimumPrefixLength: 1"/>
         <AutoCompleteBox Width="200"
                          Margin="0,0,0,8"
-                         MinimumPrefixLength="1"/>
+                         MinimumPrefixLength="1"
+                         />
         <TextBlock Text="MinimumPrefixLength: 3"/>
         <AutoCompleteBox Width="200"
                          Margin="0,0,0,8"
diff --git a/samples/ControlCatalog/Pages/TextBoxPage.xaml b/samples/ControlCatalog/Pages/TextBoxPage.xaml
index 2030c6e744..a3ba9d0eb3 100644
--- a/samples/ControlCatalog/Pages/TextBoxPage.xaml
+++ b/samples/ControlCatalog/Pages/TextBoxPage.xaml
@@ -13,7 +13,7 @@
       <StackPanel Orientation="Vertical" Spacing="8">
         <TextBox Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit." Width="200" />
         <TextBox Width="200" Watermark="ReadOnly" IsReadOnly="True" Text="This is read only"/>
-        <TextBox Width="200" Watermark="Watermark" />
+        <TextBox Width="200" Watermark="Watermark" InputType="Numeric" />
         <TextBox Width="200"
                  Watermark="Floating Watermark"
                  UseFloatingWatermark="True"
diff --git a/src/Android/Avalonia.Android/AvaloniaActivity.cs b/src/Android/Avalonia.Android/AvaloniaActivity.cs
index b3a7585520..7e63e2d9fc 100644
--- a/src/Android/Avalonia.Android/AvaloniaActivity.cs
+++ b/src/Android/Avalonia.Android/AvaloniaActivity.cs
@@ -15,7 +15,7 @@ namespace Avalonia.Android
             if (_content != null)
                 View.Content = _content;
             SetContentView(View);
-            TakeKeyEvents(true);
+            //TakeKeyEvents(true);
             base.OnCreate(savedInstanceState);
         }
 
@@ -33,7 +33,7 @@ namespace Avalonia.Android
             }
         }
 
-        public override bool DispatchKeyEvent(KeyEvent e) =>
-            View.DispatchKeyEvent(e) ? true : base.DispatchKeyEvent(e);
+        //public override bool DispatchKeyEvent(KeyEvent e) =>
+        //    View.DispatchKeyEvent(e) ? true : base.DispatchKeyEvent(e);
     }
 }
diff --git a/src/Android/Avalonia.Android/AvaloniaView.cs b/src/Android/Avalonia.Android/AvaloniaView.cs
index 8de3657283..f78f383041 100644
--- a/src/Android/Avalonia.Android/AvaloniaView.cs
+++ b/src/Android/Avalonia.Android/AvaloniaView.cs
@@ -2,6 +2,8 @@ using System;
 using Android.Content;
 using Android.Runtime;
 using Android.Views;
+using Android.Views.Accessibility;
+using Android.Views.InputMethods;
 using Android.Widget;
 using Avalonia.Android.Platform.SkiaPlatform;
 using Avalonia.Controls;
@@ -23,6 +25,9 @@ namespace Avalonia.Android
             AddView(_view.View);
             _root = new EmbeddableControlRoot(_view);
             _root.Prepare();
+
+            Focusable = true;
+            FocusableInTouchMode = true;
         }
 
         public object Content
@@ -89,5 +94,26 @@ namespace Avalonia.Android
             public WindowState WindowState { get; set; }
             public IDisposable ShowDialog() => null;
         }
+
+        public override void OnInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info)
+        {
+            base.OnInitializeAccessibilityNodeInfo(info);
+        }
+
+        public override AccessibilityNodeInfo CreateAccessibilityNodeInfo()
+        {
+            return base.CreateAccessibilityNodeInfo();
+        }
+
+        public override IInputConnection OnCreateInputConnection(EditorInfo outAttrs)
+        {
+            outAttrs.InputType = global::Android.Text.InputTypes.ClassNumber;
+            return base.OnCreateInputConnection(outAttrs);
+        }
+
+        public override bool OnCheckIsTextEditor()
+        {
+            return true;
+        }
     }
 }
diff --git a/src/Android/Avalonia.Android/Platform/SkiaPlatform/AndroidFramebuffer.cs b/src/Android/Avalonia.Android/Platform/SkiaPlatform/AndroidFramebuffer.cs
index b115917622..aabf8160f8 100644
--- a/src/Android/Avalonia.Android/Platform/SkiaPlatform/AndroidFramebuffer.cs
+++ b/src/Android/Avalonia.Android/Platform/SkiaPlatform/AndroidFramebuffer.cs
@@ -32,7 +32,7 @@ namespace Avalonia.Android.Platform.SkiaPlatform
             RowBytes = buffer.stride * (Format == PixelFormat.Rgb565 ? 2 : 4);
             Address = buffer.bits;
 
-            Dpi = scaling * new Vector(96, 96);
+            Dpi = new Vector(96, 96) * scaling;
         }
 
         public void Dispose()
diff --git a/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs b/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs
index 16c5bdae3d..a1c2b2d9fb 100644
--- a/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs
+++ b/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs
@@ -2,23 +2,31 @@ using System;
 using Android.Content;
 using Android.Graphics;
 using Android.OS;
+using Android.Runtime;
 using Android.Util;
 using Android.Views;
+using Android.Views.Accessibility;
+using Android.Views.InputMethods;
+using Avalonia.Android.Platform.Specific;
+using Avalonia.Input;
 using Avalonia.Platform;
 
 namespace Avalonia.Android
 {
-    public abstract class InvalidationAwareSurfaceView : SurfaceView, ISurfaceHolderCallback, IPlatformHandle
+    public abstract class InvalidationAwareSurfaceView : SurfaceView, ISurfaceHolderCallback, IPlatformHandle, IAndroidSoftInput
     {
         bool _invalidateQueued;
+        private ISoftInputElement _softInputElement;
         readonly object _lock = new object();
         private readonly Handler _handler;
-        
 
         public InvalidationAwareSurfaceView(Context context) : base(context)
         {
             Holder.AddCallback(this);
             _handler = new Handler(context.MainLooper);
+
+            Focusable = true;
+            FocusableInTouchMode = true;
         }
 
         public override void Invalidate()
@@ -83,5 +91,60 @@ namespace Avalonia.Android
         }
         protected abstract void Draw();
         public string HandleDescriptor => "SurfaceView";
+
+        public override IInputConnection OnCreateInputConnection(EditorInfo outAttrs)
+        {
+            outAttrs.InputType = _softInputElement.InputType switch
+            {
+                InputType.Numeric => global::Android.Text.InputTypes.ClassNumber,
+                InputType.Phone => global::Android.Text.InputTypes.ClassPhone,
+                _ => global::Android.Text.InputTypes.Null
+            };
+
+            return base.OnCreateInputConnection(outAttrs);
+        }
+
+
+        public override bool CheckInputConnectionProxy(View view)
+        {
+            return base.CheckInputConnectionProxy(view);
+        }
+
+        public override void OnInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info)
+        {
+            base.OnInitializeAccessibilityNodeInfo(info);
+        }
+
+        public override bool OnCheckIsTextEditor()
+        {
+            return true;
+        }
+
+        public void ShowSoftInput(ISoftInputElement softInputElement)
+        {
+            var input = Context.GetSystemService(Context.InputMethodService).JavaCast<InputMethodManager>();
+            var previousSoftInput = _softInputElement;
+            _softInputElement = softInputElement;
+
+            if (_softInputElement.InputType == InputType.None)
+                HideSoftInput();
+            else
+            {
+                RequestFocus();
+
+                if (!ReferenceEquals(_softInputElement, previousSoftInput))
+                {
+                    input.RestartInput(this);
+                }
+
+                input.ToggleSoftInput(ShowFlags.Forced, HideSoftInputFlags.NotAlways);
+            }
+        }
+
+        public void HideSoftInput()
+        {
+            var input = Context.GetSystemService(Context.InputMethodService).JavaCast<InputMethodManager>();
+            input.HideSoftInputFromWindow(WindowToken, HideSoftInputFlags.None);
+        }
     }
 }
diff --git a/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs b/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
index fe237a1719..219dd4cf67 100644
--- a/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
+++ b/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
@@ -19,7 +19,7 @@ using Avalonia.Rendering;
 
 namespace Avalonia.Android.Platform.SkiaPlatform
 {
-    class TopLevelImpl : IAndroidView, ITopLevelImpl, EglGlPlatformSurfaceBase.IEglWindowGlPlatformSurfaceInfo
+    class TopLevelImpl : IAndroidView, ITopLevelImpl, EglGlPlatformSurfaceBase.IEglWindowGlPlatformSurfaceInfo, IAndroidSoftInput
     {
         private readonly IGlPlatformSurface _gl;
         private readonly IFramebufferPlatformSurface _framebuffer;
@@ -43,18 +43,15 @@ namespace Avalonia.Android.Platform.SkiaPlatform
 
             MaxClientSize = new PixelSize(_view.Resources.DisplayMetrics.WidthPixels,
                 _view.Resources.DisplayMetrics.HeightPixels).ToSize(RenderScaling);
+
+            _keyboardHelper.ActivateAutoShowKeyboard();
         }
 
-        private bool _handleEvents;
 
         public bool HandleEvents
         {
-            get { return _handleEvents; }
-            set
-            {
-                _handleEvents = value;
-                _keyboardHelper.HandleEvents = _handleEvents;
-            }
+            get { return _keyboardHelper.HandleEvents; }
+            set { _keyboardHelper.HandleEvents = value; }
         }
 
         public virtual Point GetAvaloniaPointFromEvent(MotionEvent e, int pointerIndex) =>
@@ -213,5 +210,15 @@ namespace Avalonia.Android.Platform.SkiaPlatform
         {
             throw new NotImplementedException();
         }
+
+        void IAndroidSoftInput.ShowSoftInput(ISoftInputElement softInputElement)
+        {
+            _view.ShowSoftInput(softInputElement);
+        }
+
+        void IAndroidSoftInput.HideSoftInput()
+        {
+            _view.HideSoftInput();
+        }
     }
 }
diff --git a/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidKeyboardEventsHelper.cs b/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidKeyboardEventsHelper.cs
index 426b221738..264c9f4cb5 100644
--- a/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidKeyboardEventsHelper.cs
+++ b/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidKeyboardEventsHelper.cs
@@ -1,9 +1,11 @@
 using System;
 using System.ComponentModel;
+using Android.App;
 using Android.Content;
 using Android.Runtime;
 using Android.Views;
 using Android.Views.InputMethods;
+using Android.Widget;
 using Avalonia.Android.Platform.Input;
 using Avalonia.Android.Platform.SkiaPlatform;
 using Avalonia.Controls;
@@ -12,7 +14,7 @@ using Avalonia.Input.Raw;
 
 namespace Avalonia.Android.Platform.Specific.Helpers
 {
-    internal class AndroidKeyboardEventsHelper<TView> : IDisposable where TView : TopLevelImpl, IAndroidView
+    internal class AndroidKeyboardEventsHelper<TView> : IDisposable where TView : TopLevelImpl, IAndroidView, IAndroidSoftInput
     {
         private TView _view;
         private IInputElement _lastFocusedElement;
@@ -36,9 +38,20 @@ namespace Avalonia.Android.Platform.Specific.Helpers
             return DispatchKeyEventInternal(e, out callBase);
         }
 
+        string? UnicodeTextInput(KeyEvent keyEvent)
+        {
+            return keyEvent.Action == KeyEventActions.Multiple
+                && keyEvent.RepeatCount == 0
+                && !string.IsNullOrEmpty(keyEvent?.Characters)
+                ? keyEvent.Characters
+                : null;
+        }
+
         private bool? DispatchKeyEventInternal(KeyEvent e, out bool callBase)
         {
-            if (e.Action == KeyEventActions.Multiple)
+            var unicodeTextInput = UnicodeTextInput(e);
+
+            if (e.Action == KeyEventActions.Multiple && unicodeTextInput == null)
             {
                 callBase = true;
                 return null;
@@ -53,13 +66,14 @@ namespace Avalonia.Android.Platform.Specific.Helpers
 
             _view.Input(rawKeyEvent);
 
-            if (e.Action == KeyEventActions.Down && e.UnicodeChar >= 32)
+            if ((e.Action == KeyEventActions.Down && e.UnicodeChar >= 32)
+                || unicodeTextInput != null)
             {
                 var rawTextEvent = new RawTextInputEventArgs(
                   AndroidKeyboardDevice.Instance,
                   Convert.ToUInt32(e.EventTime),
                   _view.InputRoot,
-                  Convert.ToChar(e.UnicodeChar).ToString()
+                  unicodeTextInput ?? Convert.ToChar(e.UnicodeChar).ToString()
                   );
                 _view.Input(rawTextEvent);
             }
@@ -88,41 +102,49 @@ namespace Avalonia.Android.Platform.Specific.Helpers
         private bool NeedsKeyboard(IInputElement element)
         {
             //may be some other elements
-            return element is TextBox;
+            return element is ISoftInputElement;
         }
 
-        private void TryShowHideKeyboard(IInputElement element, bool value)
+        private void TryShowHideKeyboard(ISoftInputElement element, bool value)
         {
-            var input = _view.View.Context.GetSystemService(Context.InputMethodService).JavaCast<InputMethodManager>();
-
             if (value)
             {
-                //show keyboard
-                //may be in the future different keyboards support e.g. normal, only digits etc.
-                //Android.Text.InputTypes
-                input.ToggleSoftInput(ShowFlags.Forced, HideSoftInputFlags.ImplicitOnly);
+                _view.ShowSoftInput(element);
             }
             else
             {
-                //hide keyboard
-                input.HideSoftInputFromWindow(_view.View.WindowToken, HideSoftInputFlags.None);
+                _view.HideSoftInput();
             }
         }
 
         public void UpdateKeyboardState(IInputElement element)
         {
-            var focusedElement = element;
-            bool oldValue = NeedsKeyboard(_lastFocusedElement);
-            bool newValue = NeedsKeyboard(focusedElement);
+            var focusedElement = element as ISoftInputElement;
+            var lastElement = _lastFocusedElement as ISoftInputElement;
+            
+            bool oldValue = lastElement?.InputType > InputType.None;
+            bool newValue = focusedElement?.InputType > InputType.None;
 
             if (newValue != oldValue || newValue)
             {
+                if (_lastFocusedElement != null)
+                    _lastFocusedElement.PointerReleased -= RestoreSoftKeyboard;
+
                 TryShowHideKeyboard(focusedElement, newValue);
+
+                if (newValue && focusedElement != null)
+                    element.PointerReleased += RestoreSoftKeyboard;
             }
 
             _lastFocusedElement = element;
         }
 
+        private void RestoreSoftKeyboard(object sender, PointerReleasedEventArgs e)
+        {
+            if (_lastFocusedElement is ISoftInputElement softInputElement && softInputElement.InputType != InputType.None)
+                TryShowHideKeyboard(softInputElement, true);
+        }
+
         public void ActivateAutoShowKeyboard()
         {
             var kbDevice = (KeyboardDevice.Instance as INotifyPropertyChanged);
diff --git a/src/Android/Avalonia.Android/Platform/Specific/IAndroidView.cs b/src/Android/Avalonia.Android/Platform/Specific/IAndroidView.cs
index c72de8e197..db65a1335b 100644
--- a/src/Android/Avalonia.Android/Platform/Specific/IAndroidView.cs
+++ b/src/Android/Avalonia.Android/Platform/Specific/IAndroidView.cs
@@ -1,9 +1,19 @@
 using Android.Views;
+using Avalonia.Input;
 
 namespace Avalonia.Android.Platform.Specific
 {
     public interface IAndroidView
     {
         View View { get; }
+
+
+    }
+
+    public interface IAndroidSoftInput
+    {
+        void ShowSoftInput(ISoftInputElement softInputElement);
+
+        void HideSoftInput();
     }
 }
diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index 1d75f08a41..06729fa990 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -18,7 +18,7 @@ using Avalonia.Controls.Metadata;
 namespace Avalonia.Controls
 {
     [PseudoClasses(":empty")]
-    public class TextBox : TemplatedControl, UndoRedoHelper<TextBox.UndoRedoState>.IUndoRedoHost
+    public class TextBox : TemplatedControl, UndoRedoHelper<TextBox.UndoRedoState>.IUndoRedoHost, ISoftInputElement
     {
         public static KeyGesture CutGesture { get; } = AvaloniaLocator.Current
             .GetService<PlatformHotkeyConfiguration>()?.Cut.FirstOrDefault();
@@ -130,6 +130,11 @@ namespace Avalonia.Controls
                         nameof(CanPaste),
                         o => o.CanPaste);
 
+        public static readonly DirectProperty<TextBox, InputType> InputTypeProperty =
+            AvaloniaProperty.RegisterDirect<TextBox, InputType>(
+                    nameof(InputType),
+                    o => o.InputType);
+
         struct UndoRedoState : IEquatable<UndoRedoState>
         {
             public string Text { get; }
@@ -1243,5 +1248,7 @@ namespace Avalonia.Controls
                 ClearSelection();
             }
         }
+
+        public InputType InputType { get; set; } = InputType.Text;
     }
 }
diff --git a/src/Avalonia.Input/ISoftInputElement.cs b/src/Avalonia.Input/ISoftInputElement.cs
new file mode 100644
index 0000000000..ed5e4e59e3
--- /dev/null
+++ b/src/Avalonia.Input/ISoftInputElement.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Avalonia.Input
+{
+    public interface ISoftInputElement
+    {
+        InputType InputType { get; }
+    }
+}
diff --git a/src/Avalonia.Input/InputType.cs b/src/Avalonia.Input/InputType.cs
new file mode 100644
index 0000000000..893f9dcc39
--- /dev/null
+++ b/src/Avalonia.Input/InputType.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Avalonia.Input
+{
+    /// <summary>
+    /// Input type enumeration
+    /// </summary>
+    public enum InputType
+    {
+        /// <summary>
+        /// Do not use input
+        /// </summary>
+        None,
+
+        /// <summary>
+        /// User full text input
+        /// </summary>
+        Text,
+
+        /// <summary>
+        /// Use numeric text input
+        /// </summary>
+        Numeric,
+
+        /// <summary>
+        /// Use phone input
+        /// </summary>
+        Phone
+    }
+}

From 2ca903631e95d73d3b9f76749a4b1db83fc45c84 Mon Sep 17 00:00:00 2001
From: ili <chudinia@gmail.com>
Date: Mon, 5 Apr 2021 21:14:48 +0500
Subject: [PATCH 29/43] Move keyboard logic back to the helper

---
 .../Avalonia.Android/IInitEditorInfo.cs       | 12 +++++
 .../InvalidationAwareSurfaceView.cs           | 48 +++++--------------
 .../Platform/SkiaPlatform/TopLevelImpl.cs     | 14 ++----
 .../Helpers/AndroidKeyboardEventsHelper.cs    | 27 +++++++++--
 .../Platform/Specific/IAndroidView.cs         |  7 ---
 5 files changed, 52 insertions(+), 56 deletions(-)
 create mode 100644 src/Android/Avalonia.Android/IInitEditorInfo.cs

diff --git a/src/Android/Avalonia.Android/IInitEditorInfo.cs b/src/Android/Avalonia.Android/IInitEditorInfo.cs
new file mode 100644
index 0000000000..98fc4eafc1
--- /dev/null
+++ b/src/Android/Avalonia.Android/IInitEditorInfo.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Android.Views.InputMethods;
+
+namespace Avalonia.Android
+{
+    interface IInitEditorInfo
+    {
+        void InitEditorInfo(Action<EditorInfo> init);
+    }
+}
diff --git a/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs b/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs
index a1c2b2d9fb..a43861d4e7 100644
--- a/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs
+++ b/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs
@@ -13,7 +13,7 @@ using Avalonia.Platform;
 
 namespace Avalonia.Android
 {
-    public abstract class InvalidationAwareSurfaceView : SurfaceView, ISurfaceHolderCallback, IPlatformHandle, IAndroidSoftInput
+    public abstract class InvalidationAwareSurfaceView : SurfaceView, ISurfaceHolderCallback, IPlatformHandle, IInitEditorInfo
     {
         bool _invalidateQueued;
         private ISoftInputElement _softInputElement;
@@ -92,14 +92,19 @@ namespace Avalonia.Android
         protected abstract void Draw();
         public string HandleDescriptor => "SurfaceView";
 
-        public override IInputConnection OnCreateInputConnection(EditorInfo outAttrs)
+        private Action<EditorInfo> _initEditorInfo;
+
+        public void InitEditorInfo(Action<EditorInfo> init)
         {
-            outAttrs.InputType = _softInputElement.InputType switch
-            {
-                InputType.Numeric => global::Android.Text.InputTypes.ClassNumber,
-                InputType.Phone => global::Android.Text.InputTypes.ClassPhone,
-                _ => global::Android.Text.InputTypes.Null
-            };
+            _initEditorInfo = init;
+        }
+
+        public sealed override IInputConnection OnCreateInputConnection(EditorInfo outAttrs)
+        {
+            if (_initEditorInfo == null)
+                throw new InvalidOperationException("Call IInitEditorInfo.InitEditorInfo first");
+
+            _initEditorInfo(outAttrs);
 
             return base.OnCreateInputConnection(outAttrs);
         }
@@ -119,32 +124,5 @@ namespace Avalonia.Android
         {
             return true;
         }
-
-        public void ShowSoftInput(ISoftInputElement softInputElement)
-        {
-            var input = Context.GetSystemService(Context.InputMethodService).JavaCast<InputMethodManager>();
-            var previousSoftInput = _softInputElement;
-            _softInputElement = softInputElement;
-
-            if (_softInputElement.InputType == InputType.None)
-                HideSoftInput();
-            else
-            {
-                RequestFocus();
-
-                if (!ReferenceEquals(_softInputElement, previousSoftInput))
-                {
-                    input.RestartInput(this);
-                }
-
-                input.ToggleSoftInput(ShowFlags.Forced, HideSoftInputFlags.NotAlways);
-            }
-        }
-
-        public void HideSoftInput()
-        {
-            var input = Context.GetSystemService(Context.InputMethodService).JavaCast<InputMethodManager>();
-            input.HideSoftInputFromWindow(WindowToken, HideSoftInputFlags.None);
-        }
     }
 }
diff --git a/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs b/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
index 219dd4cf67..bd9a5868c0 100644
--- a/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
+++ b/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
@@ -4,7 +4,7 @@ using Android.Content;
 using Android.Graphics;
 using Android.Runtime;
 using Android.Views;
-
+using Android.Views.InputMethods;
 using Avalonia.Android.OpenGL;
 using Avalonia.Android.Platform.Specific;
 using Avalonia.Android.Platform.Specific.Helpers;
@@ -19,7 +19,7 @@ using Avalonia.Rendering;
 
 namespace Avalonia.Android.Platform.SkiaPlatform
 {
-    class TopLevelImpl : IAndroidView, ITopLevelImpl, EglGlPlatformSurfaceBase.IEglWindowGlPlatformSurfaceInfo, IAndroidSoftInput
+    class TopLevelImpl : IAndroidView, ITopLevelImpl, EglGlPlatformSurfaceBase.IEglWindowGlPlatformSurfaceInfo, IInitEditorInfo
     {
         private readonly IGlPlatformSurface _gl;
         private readonly IFramebufferPlatformSurface _framebuffer;
@@ -210,15 +210,9 @@ namespace Avalonia.Android.Platform.SkiaPlatform
         {
             throw new NotImplementedException();
         }
-
-        void IAndroidSoftInput.ShowSoftInput(ISoftInputElement softInputElement)
-        {
-            _view.ShowSoftInput(softInputElement);
-        }
-
-        void IAndroidSoftInput.HideSoftInput()
+        public void InitEditorInfo(Action<EditorInfo> init)
         {
-            _view.HideSoftInput();
+            _view.InitEditorInfo(init);
         }
     }
 }
diff --git a/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidKeyboardEventsHelper.cs b/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidKeyboardEventsHelper.cs
index 264c9f4cb5..e98a8f183e 100644
--- a/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidKeyboardEventsHelper.cs
+++ b/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidKeyboardEventsHelper.cs
@@ -14,7 +14,7 @@ using Avalonia.Input.Raw;
 
 namespace Avalonia.Android.Platform.Specific.Helpers
 {
-    internal class AndroidKeyboardEventsHelper<TView> : IDisposable where TView : TopLevelImpl, IAndroidView, IAndroidSoftInput
+    internal class AndroidKeyboardEventsHelper<TView> : IDisposable where TView : TopLevelImpl, IAndroidView, IInitEditorInfo
     {
         private TView _view;
         private IInputElement _lastFocusedElement;
@@ -107,13 +107,32 @@ namespace Avalonia.Android.Platform.Specific.Helpers
 
         private void TryShowHideKeyboard(ISoftInputElement element, bool value)
         {
-            if (value)
+            _view.InitEditorInfo((outAttrs) =>
             {
-                _view.ShowSoftInput(element);
+                outAttrs.InputType = element.InputType switch
+                {
+                    InputType.Numeric => global::Android.Text.InputTypes.ClassNumber,
+                    InputType.Phone => global::Android.Text.InputTypes.ClassPhone,
+                    _ => global::Android.Text.InputTypes.Null
+                };
+            });
+
+            var input = _view.View.Context.GetSystemService(Context.InputMethodService).JavaCast<InputMethodManager>();
+
+            if (value && element != null && element.InputType != InputType.None)
+            {
+                _view.View.RequestFocus();
+
+                if (!ReferenceEquals(_lastFocusedElement, element))
+                {
+                    input.RestartInput(_view.View);
+                }
+
+                input.ToggleSoftInput(ShowFlags.Forced, HideSoftInputFlags.NotAlways);
             }
             else
             {
-                _view.HideSoftInput();
+                input.HideSoftInputFromWindow(_view.View.WindowToken, HideSoftInputFlags.None);
             }
         }
 
diff --git a/src/Android/Avalonia.Android/Platform/Specific/IAndroidView.cs b/src/Android/Avalonia.Android/Platform/Specific/IAndroidView.cs
index db65a1335b..1f99051fe6 100644
--- a/src/Android/Avalonia.Android/Platform/Specific/IAndroidView.cs
+++ b/src/Android/Avalonia.Android/Platform/Specific/IAndroidView.cs
@@ -9,11 +9,4 @@ namespace Avalonia.Android.Platform.Specific
 
 
     }
-
-    public interface IAndroidSoftInput
-    {
-        void ShowSoftInput(ISoftInputElement softInputElement);
-
-        void HideSoftInput();
-    }
 }

From 78859b88294897dced36ccda030722f47d09652a Mon Sep 17 00:00:00 2001
From: ili <chudinia@gmail.com>
Date: Wed, 7 Apr 2021 18:54:12 +0500
Subject: [PATCH 30/43] Tech: working on Avalonia.Input support

---
 global.json                                   |  2 +-
 .../Avalonia.Android/AndroidInputMethod.cs    | 50 +++++++++++++++++++
 .../InvalidationAwareSurfaceView.cs           | 20 +-------
 .../Platform/SkiaPlatform/TopLevelImpl.cs     | 35 +++++++++++--
 .../Helpers/AndroidKeyboardEventsHelper.cs    |  3 +-
 5 files changed, 85 insertions(+), 25 deletions(-)
 create mode 100644 src/Android/Avalonia.Android/AndroidInputMethod.cs

diff --git a/global.json b/global.json
index b2b2da7c4f..351c7c7e1e 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
 	"sdk": {
-		"version": "3.1.401"
+		"version": "3.1.407"
 	},
     "msbuild-sdks": {
         "Microsoft.Build.Traversal": "1.0.43",
diff --git a/src/Android/Avalonia.Android/AndroidInputMethod.cs b/src/Android/Avalonia.Android/AndroidInputMethod.cs
new file mode 100644
index 0000000000..fb6f5a0562
--- /dev/null
+++ b/src/Android/Avalonia.Android/AndroidInputMethod.cs
@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Android.Content;
+using Android.Runtime;
+using Android.Views;
+using Android.Views.InputMethods;
+using Avalonia.Input.TextInput;
+
+namespace Avalonia.Android
+{
+    class AndroidInputMethod<TView> : ITextInputMethodImpl
+        where TView: View, IInitEditorInfo
+    {
+        private readonly TView _host;
+        private readonly InputMethodManager _imm;
+
+        public AndroidInputMethod(TView host)
+        {
+            if (host.OnCheckIsTextEditor() == false)
+                throw new InvalidOperationException("Host should return true from OnCheckIsTextEditor()");
+
+            _host = host;
+            _imm = host.Context.GetSystemService(Context.InputMethodService).JavaCast<InputMethodManager>();
+
+            _host.Focusable = true;
+            _host.FocusableInTouchMode = true;
+        }
+
+        public void Reset()
+        {
+            _imm.RestartInput(_host);
+        }
+
+        public void SetActive(bool active)
+        {
+            if (active)
+                _host.RequestFocus();
+        }
+
+        public void SetCursorRect(Rect rect)
+        {
+        }
+
+        public void SetOptions(TextInputOptionsQueryEventArgs options)
+        {
+            //throw new NotImplementedException();
+        }
+    }
+}
diff --git a/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs b/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs
index a43861d4e7..3444193140 100644
--- a/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs
+++ b/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs
@@ -13,7 +13,7 @@ using Avalonia.Platform;
 
 namespace Avalonia.Android
 {
-    public abstract class InvalidationAwareSurfaceView : SurfaceView, ISurfaceHolderCallback, IPlatformHandle, IInitEditorInfo
+    public abstract class InvalidationAwareSurfaceView : SurfaceView, ISurfaceHolderCallback, IPlatformHandle
     {
         bool _invalidateQueued;
         private ISoftInputElement _softInputElement;
@@ -92,24 +92,6 @@ namespace Avalonia.Android
         protected abstract void Draw();
         public string HandleDescriptor => "SurfaceView";
 
-        private Action<EditorInfo> _initEditorInfo;
-
-        public void InitEditorInfo(Action<EditorInfo> init)
-        {
-            _initEditorInfo = init;
-        }
-
-        public sealed override IInputConnection OnCreateInputConnection(EditorInfo outAttrs)
-        {
-            if (_initEditorInfo == null)
-                throw new InvalidOperationException("Call IInitEditorInfo.InitEditorInfo first");
-
-            _initEditorInfo(outAttrs);
-
-            return base.OnCreateInputConnection(outAttrs);
-        }
-
-
         public override bool CheckInputConnectionProxy(View view)
         {
             return base.CheckInputConnectionProxy(view);
diff --git a/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs b/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
index bd9a5868c0..dc9932b38c 100644
--- a/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
+++ b/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
@@ -9,9 +9,11 @@ using Avalonia.Android.OpenGL;
 using Avalonia.Android.Platform.Specific;
 using Avalonia.Android.Platform.Specific.Helpers;
 using Avalonia.Controls;
+using Avalonia.Controls.Platform;
 using Avalonia.Controls.Platform.Surfaces;
 using Avalonia.Input;
 using Avalonia.Input.Raw;
+using Avalonia.Input.TextInput;
 using Avalonia.OpenGL.Egl;
 using Avalonia.OpenGL.Surfaces;
 using Avalonia.Platform;
@@ -19,19 +21,20 @@ using Avalonia.Rendering;
 
 namespace Avalonia.Android.Platform.SkiaPlatform
 {
-    class TopLevelImpl : IAndroidView, ITopLevelImpl, EglGlPlatformSurfaceBase.IEglWindowGlPlatformSurfaceInfo, IInitEditorInfo
+    class TopLevelImpl : IAndroidView, ITopLevelImpl, EglGlPlatformSurfaceBase.IEglWindowGlPlatformSurfaceInfo, ITopLevelImplWithTextInputMethod
     {
         private readonly IGlPlatformSurface _gl;
         private readonly IFramebufferPlatformSurface _framebuffer;
 
         private readonly AndroidKeyboardEventsHelper<TopLevelImpl> _keyboardHelper;
         private readonly AndroidTouchEventsHelper<TopLevelImpl> _touchHelper;
-
+        private readonly ITextInputMethodImpl _textInputMethod;
         private ViewImpl _view;
 
         public TopLevelImpl(Context context, bool placeOnTop = false)
         {
             _view = new ViewImpl(context, this, placeOnTop);
+            _textInputMethod = new AndroidInputMethod<ViewImpl>(_view);
             _keyboardHelper = new AndroidKeyboardEventsHelper<TopLevelImpl>(this);
             _touchHelper = new AndroidTouchEventsHelper<TopLevelImpl>(this, () => InputRoot,
                 GetAvaloniaPointFromEvent);
@@ -47,7 +50,6 @@ namespace Avalonia.Android.Platform.SkiaPlatform
             _keyboardHelper.ActivateAutoShowKeyboard();
         }
 
-
         public bool HandleEvents
         {
             get { return _keyboardHelper.HandleEvents; }
@@ -141,7 +143,7 @@ namespace Avalonia.Android.Platform.SkiaPlatform
             Resized?.Invoke(size);
         }
 
-        class ViewImpl : InvalidationAwareSurfaceView, ISurfaceHolderCallback
+        class ViewImpl : InvalidationAwareSurfaceView, ISurfaceHolderCallback, IInitEditorInfo
         {
             private readonly TopLevelImpl _tl;
             private Size _oldSize;
@@ -188,6 +190,29 @@ namespace Avalonia.Android.Platform.SkiaPlatform
 
                 base.SurfaceChanged(holder, format, width, height);
             }
+
+            public sealed override bool OnCheckIsTextEditor()
+            {
+                return true;
+            }
+
+            private Action<EditorInfo> _initEditorInfo;
+
+            public void InitEditorInfo(Action<EditorInfo> init)
+            {
+                _initEditorInfo = init;
+            }
+
+            public sealed override IInputConnection OnCreateInputConnection(EditorInfo outAttrs)
+            {
+                if (_initEditorInfo == null)
+                    throw new InvalidOperationException("Call IInitEditorInfo.InitEditorInfo first");
+
+                _initEditorInfo(outAttrs);
+
+                return base.OnCreateInputConnection(outAttrs);
+            }
+
         }
 
         public IPopupImpl CreatePopup() => null;
@@ -206,6 +231,8 @@ namespace Avalonia.Android.Platform.SkiaPlatform
 
         public double Scaling => RenderScaling;
 
+        public ITextInputMethodImpl TextInputMethod => _textInputMethod;
+
         public void SetTransparencyLevelHint(WindowTransparencyLevel transparencyLevel)
         {
             throw new NotImplementedException();
diff --git a/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidKeyboardEventsHelper.cs b/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidKeyboardEventsHelper.cs
index e98a8f183e..db864c0ee0 100644
--- a/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidKeyboardEventsHelper.cs
+++ b/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidKeyboardEventsHelper.cs
@@ -9,12 +9,13 @@ using Android.Widget;
 using Avalonia.Android.Platform.Input;
 using Avalonia.Android.Platform.SkiaPlatform;
 using Avalonia.Controls;
+using Avalonia.Controls.Platform;
 using Avalonia.Input;
 using Avalonia.Input.Raw;
 
 namespace Avalonia.Android.Platform.Specific.Helpers
 {
-    internal class AndroidKeyboardEventsHelper<TView> : IDisposable where TView : TopLevelImpl, IAndroidView, IInitEditorInfo
+    internal class AndroidKeyboardEventsHelper<TView> : IDisposable where TView : TopLevelImpl, IAndroidView, ITopLevelImplWithTextInputMethod
     {
         private TView _view;
         private IInputElement _lastFocusedElement;

From 12c2c16d13b73bb419a1585af5df0d6607a4af76 Mon Sep 17 00:00:00 2001
From: ili <chudinia@gmail.com>
Date: Wed, 7 Apr 2021 22:13:57 +0500
Subject: [PATCH 31/43] Android soft input using Avalonia.Input

---
 global.json                                   |  2 +-
 samples/ControlCatalog/Pages/TextBoxPage.xaml |  2 +-
 .../ControlCatalog/Pages/TextBoxPage.xaml.cs  |  6 ++
 .../Avalonia.Android/AndroidInputMethod.cs    | 47 ++++++++++-
 .../InvalidationAwareSurfaceView.cs           |  1 -
 .../Platform/SkiaPlatform/TopLevelImpl.cs     |  6 +-
 .../Helpers/AndroidKeyboardEventsHelper.cs    | 78 ++-----------------
 .../Platform/Specific/IAndroidView.cs         |  2 -
 src/Avalonia.Controls/TextBox.cs              |  9 +--
 src/Avalonia.Input/ISoftInputElement.cs       | 11 ---
 src/Avalonia.Input/InputType.cs               | 32 --------
 11 files changed, 64 insertions(+), 132 deletions(-)
 delete mode 100644 src/Avalonia.Input/ISoftInputElement.cs
 delete mode 100644 src/Avalonia.Input/InputType.cs

diff --git a/global.json b/global.json
index 351c7c7e1e..b2b2da7c4f 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
 	"sdk": {
-		"version": "3.1.407"
+		"version": "3.1.401"
 	},
     "msbuild-sdks": {
         "Microsoft.Build.Traversal": "1.0.43",
diff --git a/samples/ControlCatalog/Pages/TextBoxPage.xaml b/samples/ControlCatalog/Pages/TextBoxPage.xaml
index a3ba9d0eb3..1ac447ea69 100644
--- a/samples/ControlCatalog/Pages/TextBoxPage.xaml
+++ b/samples/ControlCatalog/Pages/TextBoxPage.xaml
@@ -13,7 +13,7 @@
       <StackPanel Orientation="Vertical" Spacing="8">
         <TextBox Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit." Width="200" />
         <TextBox Width="200" Watermark="ReadOnly" IsReadOnly="True" Text="This is read only"/>
-        <TextBox Width="200" Watermark="Watermark" InputType="Numeric" />
+        <TextBox Width="200" Watermark="Numeric Watermark" x:Name="numericWatermark"/>
         <TextBox Width="200"
                  Watermark="Floating Watermark"
                  UseFloatingWatermark="True"
diff --git a/samples/ControlCatalog/Pages/TextBoxPage.xaml.cs b/samples/ControlCatalog/Pages/TextBoxPage.xaml.cs
index cd5f790312..9eeefebb02 100644
--- a/samples/ControlCatalog/Pages/TextBoxPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/TextBoxPage.xaml.cs
@@ -13,6 +13,12 @@ namespace ControlCatalog.Pages
         private void InitializeComponent()
         {
             AvaloniaXamlLoader.Load(this);
+
+            this.Get<TextBox>("numericWatermark")
+                .TextInputOptionsQuery += (s, a) =>
+                {
+                    a.ContentType = Avalonia.Input.TextInput.TextInputContentType.Number;
+                };
         }
     }
 }
diff --git a/src/Android/Avalonia.Android/AndroidInputMethod.cs b/src/Android/Avalonia.Android/AndroidInputMethod.cs
index fb6f5a0562..a3e6b6ee88 100644
--- a/src/Android/Avalonia.Android/AndroidInputMethod.cs
+++ b/src/Android/Avalonia.Android/AndroidInputMethod.cs
@@ -5,6 +5,8 @@ using Android.Content;
 using Android.Runtime;
 using Android.Views;
 using Android.Views.InputMethods;
+using Avalonia.Controls.Platform;
+using Avalonia.Input;
 using Avalonia.Input.TextInput;
 
 namespace Avalonia.Android
@@ -14,6 +16,7 @@ namespace Avalonia.Android
     {
         private readonly TView _host;
         private readonly InputMethodManager _imm;
+        private IInputElement _inputElement;
 
         public AndroidInputMethod(TView host)
         {
@@ -44,7 +47,49 @@ namespace Avalonia.Android
 
         public void SetOptions(TextInputOptionsQueryEventArgs options)
         {
-            //throw new NotImplementedException();
+            if (_inputElement != null)
+            {
+                _inputElement.PointerReleased -= RestoreSoftKeyboard;
+            }
+
+            _inputElement = options.Source as InputElement;
+
+            if (_inputElement == null)
+            {
+                _imm.HideSoftInputFromWindow(_host.WindowToken, HideSoftInputFlags.None);
+            }
+
+            _host.InitEditorInfo((outAttrs) =>
+            {
+                outAttrs.InputType = options.ContentType switch
+                {
+                    TextInputContentType.Email => global::Android.Text.InputTypes.TextVariationEmailAddress,
+                    TextInputContentType.Number => global::Android.Text.InputTypes.ClassNumber,
+                    TextInputContentType.Password => global::Android.Text.InputTypes.TextVariationPassword,
+                    TextInputContentType.Phone => global::Android.Text.InputTypes.ClassPhone,
+                    TextInputContentType.Url => global::Android.Text.InputTypes.TextVariationUri,
+                    _ => global::Android.Text.InputTypes.Null
+                };
+
+                if (options.AutoCapitalization)
+                {
+                    outAttrs.InitialCapsMode = global::Android.Text.CapitalizationMode.Sentences;
+                    outAttrs.InputType |= global::Android.Text.InputTypes.TextFlagCapSentences;
+                }
+
+                if (options.Multiline)
+                    outAttrs.InputType |= global::Android.Text.InputTypes.TextFlagMultiLine;
+            });
+
+            Reset();
+            _inputElement.PointerReleased += RestoreSoftKeyboard;
+            RestoreSoftKeyboard(null, null);
+        }
+
+        private void RestoreSoftKeyboard(object sender, PointerReleasedEventArgs e)
+        {
+            //_imm.ToggleSoftInput(ShowFlags.Implicit, HideSoftInputFlags.NotAlways);
+            _imm.ShowSoftInput(_host, ShowFlags.Implicit);
         }
     }
 }
diff --git a/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs b/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs
index 3444193140..4267082a4f 100644
--- a/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs
+++ b/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs
@@ -16,7 +16,6 @@ namespace Avalonia.Android
     public abstract class InvalidationAwareSurfaceView : SurfaceView, ISurfaceHolderCallback, IPlatformHandle
     {
         bool _invalidateQueued;
-        private ISoftInputElement _softInputElement;
         readonly object _lock = new object();
         private readonly Handler _handler;
 
diff --git a/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs b/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
index dc9932b38c..a4bc8c4b76 100644
--- a/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
+++ b/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
@@ -35,7 +35,7 @@ namespace Avalonia.Android.Platform.SkiaPlatform
         {
             _view = new ViewImpl(context, this, placeOnTop);
             _textInputMethod = new AndroidInputMethod<ViewImpl>(_view);
-            _keyboardHelper = new AndroidKeyboardEventsHelper<TopLevelImpl>(this);
+            _keyboardHelper = new AndroidKeyboardEventsHelper<TopLevelImpl>(this, _textInputMethod);
             _touchHelper = new AndroidTouchEventsHelper<TopLevelImpl>(this, () => InputRoot,
                 GetAvaloniaPointFromEvent);
 
@@ -237,9 +237,5 @@ namespace Avalonia.Android.Platform.SkiaPlatform
         {
             throw new NotImplementedException();
         }
-        public void InitEditorInfo(Action<EditorInfo> init)
-        {
-            _view.InitEditorInfo(init);
-        }
     }
 }
diff --git a/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidKeyboardEventsHelper.cs b/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidKeyboardEventsHelper.cs
index db864c0ee0..d79417a9f1 100644
--- a/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidKeyboardEventsHelper.cs
+++ b/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidKeyboardEventsHelper.cs
@@ -12,19 +12,22 @@ using Avalonia.Controls;
 using Avalonia.Controls.Platform;
 using Avalonia.Input;
 using Avalonia.Input.Raw;
+using Avalonia.Input.TextInput;
 
 namespace Avalonia.Android.Platform.Specific.Helpers
 {
-    internal class AndroidKeyboardEventsHelper<TView> : IDisposable where TView : TopLevelImpl, IAndroidView, ITopLevelImplWithTextInputMethod
+    internal class AndroidKeyboardEventsHelper<TView> : IDisposable where TView : TopLevelImpl, IAndroidView
     {
-        private TView _view;
+        private readonly TView _view;
+        private readonly ITextInputMethodImpl _textInpuMethod;
         private IInputElement _lastFocusedElement;
 
         public bool HandleEvents { get; set; }
 
-        public AndroidKeyboardEventsHelper(TView view)
+        public AndroidKeyboardEventsHelper(TView view, ITextInputMethodImpl androidTextInput)
         {
-            this._view = view;
+            _view = view;
+            _textInpuMethod = androidTextInput;
             HandleEvents = true;
         }
 
@@ -100,71 +103,6 @@ namespace Avalonia.Android.Platform.Specific.Helpers
             return rv;
         }
 
-        private bool NeedsKeyboard(IInputElement element)
-        {
-            //may be some other elements
-            return element is ISoftInputElement;
-        }
-
-        private void TryShowHideKeyboard(ISoftInputElement element, bool value)
-        {
-            _view.InitEditorInfo((outAttrs) =>
-            {
-                outAttrs.InputType = element.InputType switch
-                {
-                    InputType.Numeric => global::Android.Text.InputTypes.ClassNumber,
-                    InputType.Phone => global::Android.Text.InputTypes.ClassPhone,
-                    _ => global::Android.Text.InputTypes.Null
-                };
-            });
-
-            var input = _view.View.Context.GetSystemService(Context.InputMethodService).JavaCast<InputMethodManager>();
-
-            if (value && element != null && element.InputType != InputType.None)
-            {
-                _view.View.RequestFocus();
-
-                if (!ReferenceEquals(_lastFocusedElement, element))
-                {
-                    input.RestartInput(_view.View);
-                }
-
-                input.ToggleSoftInput(ShowFlags.Forced, HideSoftInputFlags.NotAlways);
-            }
-            else
-            {
-                input.HideSoftInputFromWindow(_view.View.WindowToken, HideSoftInputFlags.None);
-            }
-        }
-
-        public void UpdateKeyboardState(IInputElement element)
-        {
-            var focusedElement = element as ISoftInputElement;
-            var lastElement = _lastFocusedElement as ISoftInputElement;
-            
-            bool oldValue = lastElement?.InputType > InputType.None;
-            bool newValue = focusedElement?.InputType > InputType.None;
-
-            if (newValue != oldValue || newValue)
-            {
-                if (_lastFocusedElement != null)
-                    _lastFocusedElement.PointerReleased -= RestoreSoftKeyboard;
-
-                TryShowHideKeyboard(focusedElement, newValue);
-
-                if (newValue && focusedElement != null)
-                    element.PointerReleased += RestoreSoftKeyboard;
-            }
-
-            _lastFocusedElement = element;
-        }
-
-        private void RestoreSoftKeyboard(object sender, PointerReleasedEventArgs e)
-        {
-            if (_lastFocusedElement is ISoftInputElement softInputElement && softInputElement.InputType != InputType.None)
-                TryShowHideKeyboard(softInputElement, true);
-        }
-
         public void ActivateAutoShowKeyboard()
         {
             var kbDevice = (KeyboardDevice.Instance as INotifyPropertyChanged);
@@ -178,7 +116,7 @@ namespace Avalonia.Android.Platform.Specific.Helpers
         {
             if (e.PropertyName == nameof(KeyboardDevice.FocusedElement))
             {
-                UpdateKeyboardState(KeyboardDevice.Instance.FocusedElement);
+                //UpdateKeyboardState(KeyboardDevice.Instance.FocusedElement);
             }
         }
 
diff --git a/src/Android/Avalonia.Android/Platform/Specific/IAndroidView.cs b/src/Android/Avalonia.Android/Platform/Specific/IAndroidView.cs
index 1f99051fe6..662792a4df 100644
--- a/src/Android/Avalonia.Android/Platform/Specific/IAndroidView.cs
+++ b/src/Android/Avalonia.Android/Platform/Specific/IAndroidView.cs
@@ -6,7 +6,5 @@ namespace Avalonia.Android.Platform.Specific
     public interface IAndroidView
     {
         View View { get; }
-
-
     }
 }
diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index 06729fa990..1d75f08a41 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -18,7 +18,7 @@ using Avalonia.Controls.Metadata;
 namespace Avalonia.Controls
 {
     [PseudoClasses(":empty")]
-    public class TextBox : TemplatedControl, UndoRedoHelper<TextBox.UndoRedoState>.IUndoRedoHost, ISoftInputElement
+    public class TextBox : TemplatedControl, UndoRedoHelper<TextBox.UndoRedoState>.IUndoRedoHost
     {
         public static KeyGesture CutGesture { get; } = AvaloniaLocator.Current
             .GetService<PlatformHotkeyConfiguration>()?.Cut.FirstOrDefault();
@@ -130,11 +130,6 @@ namespace Avalonia.Controls
                         nameof(CanPaste),
                         o => o.CanPaste);
 
-        public static readonly DirectProperty<TextBox, InputType> InputTypeProperty =
-            AvaloniaProperty.RegisterDirect<TextBox, InputType>(
-                    nameof(InputType),
-                    o => o.InputType);
-
         struct UndoRedoState : IEquatable<UndoRedoState>
         {
             public string Text { get; }
@@ -1248,7 +1243,5 @@ namespace Avalonia.Controls
                 ClearSelection();
             }
         }
-
-        public InputType InputType { get; set; } = InputType.Text;
     }
 }
diff --git a/src/Avalonia.Input/ISoftInputElement.cs b/src/Avalonia.Input/ISoftInputElement.cs
deleted file mode 100644
index ed5e4e59e3..0000000000
--- a/src/Avalonia.Input/ISoftInputElement.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Avalonia.Input
-{
-    public interface ISoftInputElement
-    {
-        InputType InputType { get; }
-    }
-}
diff --git a/src/Avalonia.Input/InputType.cs b/src/Avalonia.Input/InputType.cs
deleted file mode 100644
index 893f9dcc39..0000000000
--- a/src/Avalonia.Input/InputType.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Avalonia.Input
-{
-    /// <summary>
-    /// Input type enumeration
-    /// </summary>
-    public enum InputType
-    {
-        /// <summary>
-        /// Do not use input
-        /// </summary>
-        None,
-
-        /// <summary>
-        /// User full text input
-        /// </summary>
-        Text,
-
-        /// <summary>
-        /// Use numeric text input
-        /// </summary>
-        Numeric,
-
-        /// <summary>
-        /// Use phone input
-        /// </summary>
-        Phone
-    }
-}

From 42ad65167cceacc193dddfeda3eef4c1bdee59a7 Mon Sep 17 00:00:00 2001
From: ili <chudinia@gmail.com>
Date: Wed, 7 Apr 2021 22:37:04 +0500
Subject: [PATCH 32/43] Cleanup

---
 .../Avalonia.Android/AndroidInputMethod.cs    | 12 +++++-----
 .../Platform/SkiaPlatform/TopLevelImpl.cs     | 10 +--------
 .../Helpers/AndroidKeyboardEventsHelper.cs    | 22 +------------------
 3 files changed, 8 insertions(+), 36 deletions(-)

diff --git a/src/Android/Avalonia.Android/AndroidInputMethod.cs b/src/Android/Avalonia.Android/AndroidInputMethod.cs
index a3e6b6ee88..efb48158bc 100644
--- a/src/Android/Avalonia.Android/AndroidInputMethod.cs
+++ b/src/Android/Avalonia.Android/AndroidInputMethod.cs
@@ -1,11 +1,8 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using Android.Content;
 using Android.Runtime;
 using Android.Views;
 using Android.Views.InputMethods;
-using Avalonia.Controls.Platform;
 using Avalonia.Input;
 using Avalonia.Input.TextInput;
 
@@ -38,7 +35,13 @@ namespace Avalonia.Android
         public void SetActive(bool active)
         {
             if (active)
+            {
                 _host.RequestFocus();
+                Reset();
+                _imm.ShowSoftInput(_host, ShowFlags.Implicit);
+            }
+            else
+                _imm.HideSoftInputFromWindow(_host.WindowToken, HideSoftInputFlags.None);
         }
 
         public void SetCursorRect(Rect rect)
@@ -81,14 +84,11 @@ namespace Avalonia.Android
                     outAttrs.InputType |= global::Android.Text.InputTypes.TextFlagMultiLine;
             });
 
-            Reset();
             _inputElement.PointerReleased += RestoreSoftKeyboard;
-            RestoreSoftKeyboard(null, null);
         }
 
         private void RestoreSoftKeyboard(object sender, PointerReleasedEventArgs e)
         {
-            //_imm.ToggleSoftInput(ShowFlags.Implicit, HideSoftInputFlags.NotAlways);
             _imm.ShowSoftInput(_host, ShowFlags.Implicit);
         }
     }
diff --git a/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs b/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
index a4bc8c4b76..0b6dcba1ef 100644
--- a/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
+++ b/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
@@ -35,7 +35,7 @@ namespace Avalonia.Android.Platform.SkiaPlatform
         {
             _view = new ViewImpl(context, this, placeOnTop);
             _textInputMethod = new AndroidInputMethod<ViewImpl>(_view);
-            _keyboardHelper = new AndroidKeyboardEventsHelper<TopLevelImpl>(this, _textInputMethod);
+            _keyboardHelper = new AndroidKeyboardEventsHelper<TopLevelImpl>(this);
             _touchHelper = new AndroidTouchEventsHelper<TopLevelImpl>(this, () => InputRoot,
                 GetAvaloniaPointFromEvent);
 
@@ -46,14 +46,6 @@ namespace Avalonia.Android.Platform.SkiaPlatform
 
             MaxClientSize = new PixelSize(_view.Resources.DisplayMetrics.WidthPixels,
                 _view.Resources.DisplayMetrics.HeightPixels).ToSize(RenderScaling);
-
-            _keyboardHelper.ActivateAutoShowKeyboard();
-        }
-
-        public bool HandleEvents
-        {
-            get { return _keyboardHelper.HandleEvents; }
-            set { _keyboardHelper.HandleEvents = value; }
         }
 
         public virtual Point GetAvaloniaPointFromEvent(MotionEvent e, int pointerIndex) =>
diff --git a/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidKeyboardEventsHelper.cs b/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidKeyboardEventsHelper.cs
index d79417a9f1..c7821d495e 100644
--- a/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidKeyboardEventsHelper.cs
+++ b/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidKeyboardEventsHelper.cs
@@ -19,15 +19,12 @@ namespace Avalonia.Android.Platform.Specific.Helpers
     internal class AndroidKeyboardEventsHelper<TView> : IDisposable where TView : TopLevelImpl, IAndroidView
     {
         private readonly TView _view;
-        private readonly ITextInputMethodImpl _textInpuMethod;
-        private IInputElement _lastFocusedElement;
 
         public bool HandleEvents { get; set; }
 
-        public AndroidKeyboardEventsHelper(TView view, ITextInputMethodImpl androidTextInput)
+        public AndroidKeyboardEventsHelper(TView view)
         {
             _view = view;
-            _textInpuMethod = androidTextInput;
             HandleEvents = true;
         }
 
@@ -103,23 +100,6 @@ namespace Avalonia.Android.Platform.Specific.Helpers
             return rv;
         }
 
-        public void ActivateAutoShowKeyboard()
-        {
-            var kbDevice = (KeyboardDevice.Instance as INotifyPropertyChanged);
-
-            //just in case we've called more than once the method
-            kbDevice.PropertyChanged -= KeyboardDevice_PropertyChanged;
-            kbDevice.PropertyChanged += KeyboardDevice_PropertyChanged;
-        }
-
-        private void KeyboardDevice_PropertyChanged(object sender, PropertyChangedEventArgs e)
-        {
-            if (e.PropertyName == nameof(KeyboardDevice.FocusedElement))
-            {
-                //UpdateKeyboardState(KeyboardDevice.Instance.FocusedElement);
-            }
-        }
-
         public void Dispose()
         {
             HandleEvents = false;

From 494d3d26cdf671ebbca9a0216471ca47ebd5b61f Mon Sep 17 00:00:00 2001
From: ili <chudinia@gmail.com>
Date: Wed, 7 Apr 2021 22:45:55 +0500
Subject: [PATCH 33/43] Cleanup

---
 .../SkiaPlatform/InvalidationAwareSurfaceView.cs  | 15 ---------------
 .../Platform/Specific/IAndroidView.cs             |  1 -
 2 files changed, 16 deletions(-)

diff --git a/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs b/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs
index 4267082a4f..07f42e7e9f 100644
--- a/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs
+++ b/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs
@@ -90,20 +90,5 @@ namespace Avalonia.Android
         }
         protected abstract void Draw();
         public string HandleDescriptor => "SurfaceView";
-
-        public override bool CheckInputConnectionProxy(View view)
-        {
-            return base.CheckInputConnectionProxy(view);
-        }
-
-        public override void OnInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info)
-        {
-            base.OnInitializeAccessibilityNodeInfo(info);
-        }
-
-        public override bool OnCheckIsTextEditor()
-        {
-            return true;
-        }
     }
 }
diff --git a/src/Android/Avalonia.Android/Platform/Specific/IAndroidView.cs b/src/Android/Avalonia.Android/Platform/Specific/IAndroidView.cs
index 662792a4df..c72de8e197 100644
--- a/src/Android/Avalonia.Android/Platform/Specific/IAndroidView.cs
+++ b/src/Android/Avalonia.Android/Platform/Specific/IAndroidView.cs
@@ -1,5 +1,4 @@
 using Android.Views;
-using Avalonia.Input;
 
 namespace Avalonia.Android.Platform.Specific
 {

From 5f491bc7d6dfc9daa8134e4bd3711c90508a6749 Mon Sep 17 00:00:00 2001
From: ili <chudinia@gmail.com>
Date: Wed, 7 Apr 2021 23:07:32 +0500
Subject: [PATCH 34/43] Cleanup

---
 .../ControlCatalog.Android.csproj             |  2 +-
 .../Pages/AutoCompleteBoxPage.xaml            |  3 +--
 src/Android/Avalonia.Android/AvaloniaView.cs  | 21 -------------------
 3 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/samples/ControlCatalog.Android/ControlCatalog.Android.csproj b/samples/ControlCatalog.Android/ControlCatalog.Android.csproj
index 9da9627a6f..1a68c4d732 100644
--- a/samples/ControlCatalog.Android/ControlCatalog.Android.csproj
+++ b/samples/ControlCatalog.Android/ControlCatalog.Android.csproj
@@ -158,4 +158,4 @@
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
   <Import Project="..\..\build\AndroidWorkarounds.props" />
   <Import Project="..\..\build\LegacyProject.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml b/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml
index 363330be86..1a53217842 100644
--- a/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml
+++ b/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml
@@ -14,8 +14,7 @@
         <TextBlock Text="MinimumPrefixLength: 1"/>
         <AutoCompleteBox Width="200"
                          Margin="0,0,0,8"
-                         MinimumPrefixLength="1"
-                         />
+                         MinimumPrefixLength="1"/>
         <TextBlock Text="MinimumPrefixLength: 3"/>
         <AutoCompleteBox Width="200"
                          Margin="0,0,0,8"
diff --git a/src/Android/Avalonia.Android/AvaloniaView.cs b/src/Android/Avalonia.Android/AvaloniaView.cs
index f78f383041..5be72bb0f4 100644
--- a/src/Android/Avalonia.Android/AvaloniaView.cs
+++ b/src/Android/Avalonia.Android/AvaloniaView.cs
@@ -94,26 +94,5 @@ namespace Avalonia.Android
             public WindowState WindowState { get; set; }
             public IDisposable ShowDialog() => null;
         }
-
-        public override void OnInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info)
-        {
-            base.OnInitializeAccessibilityNodeInfo(info);
-        }
-
-        public override AccessibilityNodeInfo CreateAccessibilityNodeInfo()
-        {
-            return base.CreateAccessibilityNodeInfo();
-        }
-
-        public override IInputConnection OnCreateInputConnection(EditorInfo outAttrs)
-        {
-            outAttrs.InputType = global::Android.Text.InputTypes.ClassNumber;
-            return base.OnCreateInputConnection(outAttrs);
-        }
-
-        public override bool OnCheckIsTextEditor()
-        {
-            return true;
-        }
     }
 }

From 244aaf596f570ce249541f8f3b0c3bb82541aca8 Mon Sep 17 00:00:00 2001
From: ili <chudinia@gmail.com>
Date: Wed, 7 Apr 2021 23:13:38 +0500
Subject: [PATCH 35/43] Cleanup

---
 src/Android/Avalonia.Android/AvaloniaView.cs             | 5 -----
 .../SkiaPlatform/InvalidationAwareSurfaceView.cs         | 8 --------
 .../Specific/Helpers/AndroidKeyboardEventsHelper.cs      | 9 ---------
 3 files changed, 22 deletions(-)

diff --git a/src/Android/Avalonia.Android/AvaloniaView.cs b/src/Android/Avalonia.Android/AvaloniaView.cs
index 5be72bb0f4..8de3657283 100644
--- a/src/Android/Avalonia.Android/AvaloniaView.cs
+++ b/src/Android/Avalonia.Android/AvaloniaView.cs
@@ -2,8 +2,6 @@ using System;
 using Android.Content;
 using Android.Runtime;
 using Android.Views;
-using Android.Views.Accessibility;
-using Android.Views.InputMethods;
 using Android.Widget;
 using Avalonia.Android.Platform.SkiaPlatform;
 using Avalonia.Controls;
@@ -25,9 +23,6 @@ namespace Avalonia.Android
             AddView(_view.View);
             _root = new EmbeddableControlRoot(_view);
             _root.Prepare();
-
-            Focusable = true;
-            FocusableInTouchMode = true;
         }
 
         public object Content
diff --git a/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs b/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs
index 07f42e7e9f..bc62bcde65 100644
--- a/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs
+++ b/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs
@@ -2,13 +2,8 @@ using System;
 using Android.Content;
 using Android.Graphics;
 using Android.OS;
-using Android.Runtime;
 using Android.Util;
 using Android.Views;
-using Android.Views.Accessibility;
-using Android.Views.InputMethods;
-using Avalonia.Android.Platform.Specific;
-using Avalonia.Input;
 using Avalonia.Platform;
 
 namespace Avalonia.Android
@@ -23,9 +18,6 @@ namespace Avalonia.Android
         {
             Holder.AddCallback(this);
             _handler = new Handler(context.MainLooper);
-
-            Focusable = true;
-            FocusableInTouchMode = true;
         }
 
         public override void Invalidate()
diff --git a/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidKeyboardEventsHelper.cs b/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidKeyboardEventsHelper.cs
index c7821d495e..2b2a9dd2b4 100644
--- a/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidKeyboardEventsHelper.cs
+++ b/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidKeyboardEventsHelper.cs
@@ -1,18 +1,9 @@
 using System;
-using System.ComponentModel;
-using Android.App;
-using Android.Content;
-using Android.Runtime;
 using Android.Views;
-using Android.Views.InputMethods;
-using Android.Widget;
 using Avalonia.Android.Platform.Input;
 using Avalonia.Android.Platform.SkiaPlatform;
-using Avalonia.Controls;
-using Avalonia.Controls.Platform;
 using Avalonia.Input;
 using Avalonia.Input.Raw;
-using Avalonia.Input.TextInput;
 
 namespace Avalonia.Android.Platform.Specific.Helpers
 {

From c94da58c094249638fe21670eb09e1e37598cce8 Mon Sep 17 00:00:00 2001
From: ili <chudinia@gmail.com>
Date: Thu, 8 Apr 2021 15:22:54 +0500
Subject: [PATCH 36/43] Cleanup

---
 src/Android/Avalonia.Android/AvaloniaActivity.cs              | 4 ----
 .../Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs     | 1 +
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/Android/Avalonia.Android/AvaloniaActivity.cs b/src/Android/Avalonia.Android/AvaloniaActivity.cs
index 7e63e2d9fc..3c9f373a66 100644
--- a/src/Android/Avalonia.Android/AvaloniaActivity.cs
+++ b/src/Android/Avalonia.Android/AvaloniaActivity.cs
@@ -15,7 +15,6 @@ namespace Avalonia.Android
             if (_content != null)
                 View.Content = _content;
             SetContentView(View);
-            //TakeKeyEvents(true);
             base.OnCreate(savedInstanceState);
         }
 
@@ -32,8 +31,5 @@ namespace Avalonia.Android
                     View.Content = value;
             }
         }
-
-        //public override bool DispatchKeyEvent(KeyEvent e) =>
-        //    View.DispatchKeyEvent(e) ? true : base.DispatchKeyEvent(e);
     }
 }
diff --git a/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs b/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs
index bc62bcde65..4df7befd29 100644
--- a/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs
+++ b/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs
@@ -14,6 +14,7 @@ namespace Avalonia.Android
         readonly object _lock = new object();
         private readonly Handler _handler;
 
+
         public InvalidationAwareSurfaceView(Context context) : base(context)
         {
             Holder.AddCallback(this);

From c37830989437553b43a183288680db1cbb797721 Mon Sep 17 00:00:00 2001
From: ili <chudinia@gmail.com>
Date: Thu, 8 Apr 2021 18:35:11 +0500
Subject: [PATCH 37/43] AndroidTestApplication all content type text boxes

Also do not throw when input not configured
---
 .../InvalidationAwareSurfaceView.cs           |  2 +-
 .../Platform/SkiaPlatform/TopLevelImpl.cs     |  6 ++---
 .../MainActivity.cs                           | 22 ++++++++++++++++++-
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs b/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs
index 4df7befd29..34784612f1 100644
--- a/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs
+++ b/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs
@@ -13,7 +13,7 @@ namespace Avalonia.Android
         bool _invalidateQueued;
         readonly object _lock = new object();
         private readonly Handler _handler;
-
+   
 
         public InvalidationAwareSurfaceView(Context context) : base(context)
         {
diff --git a/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs b/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
index 0b6dcba1ef..60b772a183 100644
--- a/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
+++ b/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
@@ -197,10 +197,8 @@ namespace Avalonia.Android.Platform.SkiaPlatform
 
             public sealed override IInputConnection OnCreateInputConnection(EditorInfo outAttrs)
             {
-                if (_initEditorInfo == null)
-                    throw new InvalidOperationException("Call IInitEditorInfo.InitEditorInfo first");
-
-                _initEditorInfo(outAttrs);
+                if (_initEditorInfo != null)
+                    _initEditorInfo(outAttrs);
 
                 return base.OnCreateInputConnection(outAttrs);
             }
diff --git a/src/Android/Avalonia.AndroidTestApplication/MainActivity.cs b/src/Android/Avalonia.AndroidTestApplication/MainActivity.cs
index 121acb6351..e139185be6 100644
--- a/src/Android/Avalonia.AndroidTestApplication/MainActivity.cs
+++ b/src/Android/Avalonia.AndroidTestApplication/MainActivity.cs
@@ -72,13 +72,33 @@ namespace Avalonia.AndroidTestApplication
                             Height = 40,
                             Background = Brushes.LightGreen,
                             Foreground = Brushes.Black
-                        }
+                        },
 
+                        CreateTextBox(Input.TextInput.TextInputContentType.Normal),
+                        CreateTextBox(Input.TextInput.TextInputContentType.Password),
+                        CreateTextBox(Input.TextInput.TextInputContentType.Email),
+                        CreateTextBox(Input.TextInput.TextInputContentType.Url),
+                        CreateTextBox(Input.TextInput.TextInputContentType.Phone),
+                        CreateTextBox(Input.TextInput.TextInputContentType.Number),
                     }
                 }
             };
 
             return window;
         }
+
+        private static TextBox CreateTextBox(Input.TextInput.TextInputContentType contentType)
+        {
+            var textBox = new TextBox()
+            {
+                Margin = new Thickness(20, 10),
+                Watermark = contentType.ToString(),
+                BorderThickness = new Thickness(3),
+                FontSize = 20
+            };
+            textBox.TextInputOptionsQuery += (s, e) => { e.ContentType = contentType; };
+
+            return textBox;
+        }
     }
 }

From 00b70953dff867b5b325fd49c644fa92ce83f7f8 Mon Sep 17 00:00:00 2001
From: ili <chudinia@gmail.com>
Date: Fri, 9 Apr 2021 19:10:03 +0500
Subject: [PATCH 38/43] Fix default keyboard

InputType.Null does not change soft keyboard type
---
 src/Android/Avalonia.Android/AndroidInputMethod.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Android/Avalonia.Android/AndroidInputMethod.cs b/src/Android/Avalonia.Android/AndroidInputMethod.cs
index efb48158bc..19aaffa37d 100644
--- a/src/Android/Avalonia.Android/AndroidInputMethod.cs
+++ b/src/Android/Avalonia.Android/AndroidInputMethod.cs
@@ -71,7 +71,7 @@ namespace Avalonia.Android
                     TextInputContentType.Password => global::Android.Text.InputTypes.TextVariationPassword,
                     TextInputContentType.Phone => global::Android.Text.InputTypes.ClassPhone,
                     TextInputContentType.Url => global::Android.Text.InputTypes.TextVariationUri,
-                    _ => global::Android.Text.InputTypes.Null
+                    _ => global::Android.Text.InputTypes.ClassText
                 };
 
                 if (options.AutoCapitalization)

From cb22388de721cb467811908dc1cade518a75a2fe Mon Sep 17 00:00:00 2001
From: ili <chudinia@gmail.com>
Date: Sat, 10 Apr 2021 13:35:45 +0500
Subject: [PATCH 39/43] Android: remove input focus on soft keyboard hidden

---
 .../Avalonia.Android/AndroidInputMethod.cs    |  3 +-
 .../Avalonia.Android/SoftKeyboardListner.cs   | 42 +++++++++++++++++++
 .../MainActivity.cs                           |  6 +--
 3 files changed, 47 insertions(+), 4 deletions(-)
 create mode 100644 src/Android/Avalonia.Android/SoftKeyboardListner.cs

diff --git a/src/Android/Avalonia.Android/AndroidInputMethod.cs b/src/Android/Avalonia.Android/AndroidInputMethod.cs
index 19aaffa37d..7e49cb5dfa 100644
--- a/src/Android/Avalonia.Android/AndroidInputMethod.cs
+++ b/src/Android/Avalonia.Android/AndroidInputMethod.cs
@@ -25,6 +25,7 @@ namespace Avalonia.Android
 
             _host.Focusable = true;
             _host.FocusableInTouchMode = true;
+            _host.ViewTreeObserver.AddOnGlobalLayoutListener(new SoftKeyboardListner(_host));
         }
 
         public void Reset()
@@ -84,7 +85,7 @@ namespace Avalonia.Android
                     outAttrs.InputType |= global::Android.Text.InputTypes.TextFlagMultiLine;
             });
 
-            _inputElement.PointerReleased += RestoreSoftKeyboard;
+            //_inputElement.PointerReleased += RestoreSoftKeyboard;
         }
 
         private void RestoreSoftKeyboard(object sender, PointerReleasedEventArgs e)
diff --git a/src/Android/Avalonia.Android/SoftKeyboardListner.cs b/src/Android/Avalonia.Android/SoftKeyboardListner.cs
new file mode 100644
index 0000000000..df658f6314
--- /dev/null
+++ b/src/Android/Avalonia.Android/SoftKeyboardListner.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Android.Content;
+using Android.OS;
+using Android.Util;
+using Android.Views;
+using Avalonia.Input;
+
+namespace Avalonia.Android
+{
+    class SoftKeyboardListner : Java.Lang.Object, ViewTreeObserver.IOnGlobalLayoutListener
+    {
+        private const int DefaultKeyboardHeightDP = 100;
+        private static readonly int EstimatedKeyboardDP = DefaultKeyboardHeightDP + (Build.VERSION.SdkInt >= BuildVersionCodes.Lollipop ? 48 : 0);
+
+        private readonly View _host;
+        private bool _wasKeyboard;
+
+        public SoftKeyboardListner(View view)
+        {
+            _host = view;
+        }
+
+        public void OnGlobalLayout()
+        {
+            int estimatedKeyboardHeight = (int)TypedValue.ApplyDimension(ComplexUnitType.Dip,
+                EstimatedKeyboardDP, _host.Resources.DisplayMetrics);
+
+            var rect = new global::Android.Graphics.Rect();
+            _host.GetWindowVisibleDisplayFrame(rect);
+
+            int heightDiff = _host.RootView.Height - (rect.Bottom - rect.Top);
+            var isKeyboard = heightDiff >= estimatedKeyboardHeight;
+
+            if (_wasKeyboard && !isKeyboard)
+                KeyboardDevice.Instance.SetFocusedElement(null, NavigationMethod.Unspecified, KeyModifiers.None);
+
+            _wasKeyboard = isKeyboard;
+        }
+    }
+}
diff --git a/src/Android/Avalonia.AndroidTestApplication/MainActivity.cs b/src/Android/Avalonia.AndroidTestApplication/MainActivity.cs
index e139185be6..5f33cadf2e 100644
--- a/src/Android/Avalonia.AndroidTestApplication/MainActivity.cs
+++ b/src/Android/Avalonia.AndroidTestApplication/MainActivity.cs
@@ -16,18 +16,18 @@ namespace Avalonia.AndroidTestApplication
         Icon = "@drawable/icon",
         LaunchMode = LaunchMode.SingleInstance/*,
         ScreenOrientation = ScreenOrientation.Landscape*/)]
-    public class MainBaseActivity : Activity
+    public class MainBaseActivity : AvaloniaActivity
     {
         protected override void OnCreate(Bundle savedInstanceState)
         {
-            base.OnCreate(savedInstanceState);
             if (Avalonia.Application.Current == null)
             {
                 AppBuilder.Configure<App>()
                     .UseAndroid()
                     .SetupWithoutStarting();
             }
-            SetContentView(new AvaloniaView(this) { Content = App.CreateSimpleWindow() });
+            base.OnCreate(savedInstanceState);
+            Content = App.CreateSimpleWindow();
         }
     }
 

From b3785cac2c18baed8f5af31d87a6bfa1c796b4eb Mon Sep 17 00:00:00 2001
From: ReeJK <wnezros@gmail.com>
Date: Wed, 14 Apr 2021 00:46:05 +0300
Subject: [PATCH 40/43] Update ProgressBar indicator when Minimum or Maximum
 was changed

---
 src/Avalonia.Controls/ProgressBar.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Avalonia.Controls/ProgressBar.cs b/src/Avalonia.Controls/ProgressBar.cs
index 161f09d9b6..9ab5a73af0 100644
--- a/src/Avalonia.Controls/ProgressBar.cs
+++ b/src/Avalonia.Controls/ProgressBar.cs
@@ -138,6 +138,8 @@ namespace Avalonia.Controls
         static ProgressBar()
         {
             ValueProperty.Changed.AddClassHandler<ProgressBar>((x, e) => x.UpdateIndicatorWhenPropChanged(e));
+            MinimumProperty.Changed.AddClassHandler<ProgressBar>((x, e) => x.UpdateIndicatorWhenPropChanged(e));
+            MaximumProperty.Changed.AddClassHandler<ProgressBar>((x, e) => x.UpdateIndicatorWhenPropChanged(e));
             IsIndeterminateProperty.Changed.AddClassHandler<ProgressBar>((x, e) => x.UpdateIndicatorWhenPropChanged(e));
         }
 

From b37afa4a3d4aaaa3831877b42df90dcd7265bccf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20So=C3=B3s?= <soos.roland93@gmail.com>
Date: Fri, 16 Apr 2021 13:06:00 +0200
Subject: [PATCH 41/43] clear selected item from CollectionView if null

---
 src/Avalonia.Controls.DataGrid/DataGrid.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Avalonia.Controls.DataGrid/DataGrid.cs b/src/Avalonia.Controls.DataGrid/DataGrid.cs
index 8f9b9583cf..2604c7a082 100644
--- a/src/Avalonia.Controls.DataGrid/DataGrid.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGrid.cs
@@ -910,6 +910,11 @@ namespace Avalonia.Controls
 
                     // Clear all row selections
                     ClearRowSelection(resetAnchorSlot: true);
+
+                    if (DataConnection.CollectionView != null)
+                    {
+                        DataConnection.CollectionView.MoveCurrentTo(null);
+                    }
                 }
                 else
                 {

From 2c3f70bd07f0a1fa7d7ff8947a8672a4d34360fb Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 16 Apr 2021 15:22:24 +0200
Subject: [PATCH 42/43] Add more tests for resetting InternalSelectionModel.

Always check that `WriteableSelectedItems` is correct - sometimes it's not it seems.
---
 .../Selection/InternalSelectionModelTests.cs               | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tests/Avalonia.Controls.UnitTests/Selection/InternalSelectionModelTests.cs b/tests/Avalonia.Controls.UnitTests/Selection/InternalSelectionModelTests.cs
index ce3e698cf3..224b89bf85 100644
--- a/tests/Avalonia.Controls.UnitTests/Selection/InternalSelectionModelTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Selection/InternalSelectionModelTests.cs
@@ -97,6 +97,7 @@ namespace Avalonia.Controls.UnitTests.Selection
             target.WritableSelectedItems.Clear();
 
             Assert.Empty(target.SelectedIndexes);
+            Assert.Empty(target.WritableSelectedItems);
         }
 
         [Fact]
@@ -123,6 +124,7 @@ namespace Avalonia.Controls.UnitTests.Selection
             target.WritableSelectedItems = null;
 
             Assert.Empty(target.SelectedIndexes);
+            Assert.Empty(target.WritableSelectedItems);
         }
 
         [Fact]
@@ -182,6 +184,7 @@ namespace Avalonia.Controls.UnitTests.Selection
             target.Source = items;
 
             Assert.Equal(1, target.SelectedIndex);
+            Assert.Equal(new[] { "bar" }, target.WritableSelectedItems);
         }
 
         [Fact]
@@ -203,6 +206,7 @@ namespace Avalonia.Controls.UnitTests.Selection
             items.Reset(new[] { "baz", "foo", "bar" });
 
             Assert.Equal(2, target.SelectedIndex);
+            Assert.Equal(new[] { "bar" }, target.WritableSelectedItems);
         }
 
         [Fact]
@@ -227,6 +231,7 @@ namespace Avalonia.Controls.UnitTests.Selection
 
             Assert.Equal(-1, target.SelectedIndex);
             Assert.Equal(null, target.SelectedItem);
+            Assert.Empty(target.WritableSelectedItems);
 
             Assert.Contains(nameof(target.SelectedIndex), changed);
             Assert.Contains(nameof(target.SelectedItem), changed);
@@ -246,6 +251,7 @@ namespace Avalonia.Controls.UnitTests.Selection
 
             Assert.Equal("foo", target.SelectedItem);
             Assert.Equal(1, target.SelectedIndex);
+            Assert.Equal(new[] { "foo" }, target.WritableSelectedItems);
         }
 
         [Fact]
@@ -257,6 +263,7 @@ namespace Avalonia.Controls.UnitTests.Selection
             target.Source = new[] { "baz", "foo", "bar" };
 
             Assert.Equal(2, target.SelectedIndex);
+            Assert.Equal(new[] { "bar" }, target.WritableSelectedItems);
         }
 
         private static InternalSelectionModel CreateTarget(

From 5c3218ae18b610ef2cb8c1b0e0289fb262785e21 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 16 Apr 2021 15:48:20 +0200
Subject: [PATCH 43/43] Correctly sync SelectedItems on collection reset.

When `InternalSelectionModel`  gets a `Reset` event it tries to restore the selection from `WritableSelectedItems`, however this was causing items to be added twice to `WriteableSelectedItems`:

collection is reset
- Selection is cleared
- `InternalSelectionModel` restores selection on reset from `WritableSelectedItems`
- Which changes the selection
- Which adds the selection back to `WritableSelectedItems`, causing the selected item to appear twice in the collection
---
 .../Selection/InternalSelectionModel.cs       | 50 ++++++++++++++++---
 1 file changed, 43 insertions(+), 7 deletions(-)

diff --git a/src/Avalonia.Controls/Selection/InternalSelectionModel.cs b/src/Avalonia.Controls/Selection/InternalSelectionModel.cs
index fcdaf44166..c9d91b1ae6 100644
--- a/src/Avalonia.Controls/Selection/InternalSelectionModel.cs
+++ b/src/Avalonia.Controls/Selection/InternalSelectionModel.cs
@@ -13,8 +13,9 @@ namespace Avalonia.Controls.Selection
     internal class InternalSelectionModel : SelectionModel<object?>
     {
         private IList? _writableSelectedItems;
-        private bool _ignoreModelChanges;
+        private int _ignoreModelChanges;
         private bool _ignoreSelectedItemsChanges;
+        private bool _isResetting;
 
         public InternalSelectionModel()
         {
@@ -130,17 +131,31 @@ namespace Avalonia.Controls.Selection
 
             try
             {
-                _ignoreModelChanges = true;
+                ++_ignoreModelChanges;
 
                 using (BatchUpdate())
                 {
                     Clear();
-                    Add(_writableSelectedItems);
+
+                    for (var i = 0; i < _writableSelectedItems.Count; ++i)
+                    {
+                        var index = IndexOf(Source, _writableSelectedItems[i]);
+
+                        if (index != -1)
+                        {
+                            Select(index);
+                        }
+                        else
+                        {
+                            _writableSelectedItems.RemoveAt(i);
+                            --i;
+                        }
+                    }
                 }
             }
             finally
             {
-                _ignoreModelChanges = false;
+                --_ignoreModelChanges;
             }
         }
 
@@ -162,7 +177,7 @@ namespace Avalonia.Controls.Selection
 
         private void OnSelectionChanged(object sender, SelectionModelSelectionChangedEventArgs e)
         {
-            if (_ignoreModelChanges)
+            if (_ignoreModelChanges > 0)
             {
                 return;
             }
@@ -191,6 +206,27 @@ namespace Avalonia.Controls.Selection
             }
         }
 
+        private protected override void OnSourceCollectionChanged(NotifyCollectionChangedEventArgs e)
+        {
+            if (e.Action == NotifyCollectionChangedAction.Reset)
+            {
+                ++_ignoreModelChanges;
+                _isResetting = true;
+            }
+
+            base.OnSourceCollectionChanged(e);
+        }
+
+        protected override void OnSourceCollectionChangeFinished()
+        {
+            base.OnSourceCollectionChangeFinished();
+
+            if (_isResetting)
+            {
+                --_ignoreModelChanges;
+            }
+        }
+
         private void OnSourceReset(object sender, EventArgs e) => SyncFromSelectedItems();
 
         private void OnSelectedItemsCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
@@ -222,7 +258,7 @@ namespace Avalonia.Controls.Selection
             {
                 using var operation = BatchUpdate();
 
-                _ignoreModelChanges = true;
+                ++_ignoreModelChanges;
 
                 switch (e.Action)
                 {
@@ -244,7 +280,7 @@ namespace Avalonia.Controls.Selection
             }
             finally
             {
-                _ignoreModelChanges = false;
+                --_ignoreModelChanges;
             }
         }