From 7917d2fbc09cc78de45ee4dbb3542a4595366c65 Mon Sep 17 00:00:00 2001
From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com>
Date: Thu, 2 Feb 2023 20:40:32 +0600
Subject: [PATCH 01/26] Added NewAutoSuggestBox

---
 .../AutoSuggestBox/NewAutoSuggestBox.cs       | 126 ++++++++++++
 .../Styles/Controls/NewAutoSuggestBox.xaml    | 183 ++++++++++++++++++
 src/Wpf.Ui/Styles/Wpf.Ui.xaml                 |   1 +
 3 files changed, 310 insertions(+)
 create mode 100644 src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs
 create mode 100644 src/Wpf.Ui/Styles/Controls/NewAutoSuggestBox.xaml

diff --git a/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs b/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs
new file mode 100644
index 000000000..0ab28ad70
--- /dev/null
+++ b/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs
@@ -0,0 +1,126 @@
+using System.Windows;
+using System;
+using System.Diagnostics;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Input;
+
+namespace Wpf.Ui.Controls;
+
+[TemplatePart(Name = ElementTextBox, Type = typeof(System.Windows.Controls.TextBox))]
+[TemplatePart(Name = ElementSuggestionsPopup, Type = typeof(System.Windows.Controls.Primitives.Popup))]
+[TemplatePart(Name = ElementSuggestionsList, Type = typeof(System.Windows.Controls.ListView))]
+public class NewAutoSuggestBox : System.Windows.Controls.ItemsControl
+{
+    protected const string ElementTextBox = "PART_TextBox";
+    protected const string ElementSuggestionsPopup = "PART_SuggestionsPopup";
+    protected const string ElementSuggestionsList = "PART_SuggestionsList";
+
+    #region Static properties
+
+    /// <summary>
+    /// Property for <see cref="IsSuggestionListOpen"/>.
+    /// </summary>
+    public static readonly DependencyProperty IsSuggestionListOpenProperty = DependencyProperty.Register(nameof(IsSuggestionListOpen),
+        typeof(bool), typeof(NewAutoSuggestBox),
+        new PropertyMetadata(false));
+
+    #endregion
+
+    #region Properties
+
+    /// <summary>
+    /// Gets or sets a Boolean value indicating whether the drop-down portion of the <see cref="AutoSuggestBox"/> is open.
+    /// </summary>
+    public bool IsSuggestionListOpen
+    {
+        get => (bool)GetValue(IsSuggestionListOpenProperty);
+        set => SetValue(IsSuggestionListOpenProperty, value);
+    }
+
+    #endregion
+
+    protected System.Windows.Controls.TextBox TextBox = null!;
+    protected Popup SuggestionsPopup = null!;
+    protected ListView SuggestionsList = null!;
+
+    public NewAutoSuggestBox()
+    {
+        Unloaded += static (sender, _) =>
+        {
+            var self = (NewAutoSuggestBox)sender;
+
+            self.ReleaseTemplateResources();
+        };
+    }
+
+    public override void OnApplyTemplate()
+    {
+        base.OnApplyTemplate();
+
+        TextBox = GetTemplateChild<System.Windows.Controls.TextBox>(ElementTextBox);
+        SuggestionsPopup = GetTemplateChild<Popup>(ElementSuggestionsPopup);
+        SuggestionsList = GetTemplateChild<ListView>(ElementSuggestionsList);
+
+        TextBox.PreviewKeyDown += TextBoxOnPreviewKeyDown;
+        TextBox.TextChanged += TextBoxOnTextChanged;
+
+        SuggestionsList.SelectionChanged += SuggestionsListOnSelectionChanged;
+        SuggestionsList.PreviewKeyDown += SuggestionsListOnPreviewKeyDown;
+        SuggestionsList.LostKeyboardFocus += SuggestionsListOnLostKeyboardFocus;
+    }
+
+    protected T GetTemplateChild<T>(string name) where T : DependencyObject
+    {
+        if (GetTemplateChild(name) is not T dependencyObject)
+            throw new ArgumentNullException(name);
+
+        return dependencyObject;
+    }
+
+    protected virtual void ReleaseTemplateResources()
+    {
+        TextBox.PreviewKeyDown -= TextBoxOnPreviewKeyDown;
+        TextBox.TextChanged -= TextBoxOnTextChanged;
+
+        SuggestionsList.SelectionChanged -= SuggestionsListOnSelectionChanged;
+        SuggestionsList.PreviewKeyDown -= SuggestionsListOnPreviewKeyDown;
+        SuggestionsList.LostKeyboardFocus -= SuggestionsListOnLostKeyboardFocus;
+    }
+
+    private void TextBoxOnPreviewKeyDown(object sender, KeyEventArgs e)
+    {
+        if (e.Key is not Key.Down || !IsSuggestionListOpen)
+            return;
+
+        SuggestionsList.Focus();
+    }
+
+    private void SuggestionsListOnLostKeyboardFocus(object sender, KeyboardFocusChangedEventArgs e)
+    {
+        Debug.WriteLine("Losing focus");
+
+        if (e.NewFocus is ListViewItem)
+            return;
+
+        IsSuggestionListOpen = false;
+    }
+
+    private void TextBoxOnTextChanged(object sender, TextChangedEventArgs e)
+    {
+        IsSuggestionListOpen = true;
+    }
+
+    private void SuggestionsListOnPreviewKeyDown(object sender, KeyEventArgs e)
+    {
+        if (e.Key is not Key.Enter)
+            return;
+
+        var q = SuggestionsList.SelectedItem;
+    }
+
+    private void SuggestionsListOnSelectionChanged(object sender, SelectionChangedEventArgs e)
+    {
+        Debug.WriteLine($"Selected | {e.AddedItems[0]}");
+    }
+}
diff --git a/src/Wpf.Ui/Styles/Controls/NewAutoSuggestBox.xaml b/src/Wpf.Ui/Styles/Controls/NewAutoSuggestBox.xaml
new file mode 100644
index 000000000..2c857352b
--- /dev/null
+++ b/src/Wpf.Ui/Styles/Controls/NewAutoSuggestBox.xaml
@@ -0,0 +1,183 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+    xmlns:system="clr-namespace:System;assembly=mscorlib">
+
+    <Thickness x:Key="AutoSuggestBoxBorderThemeThickness">1,1,1,0</Thickness>
+    <Thickness x:Key="AutoSuggestBoxAccentBorderThemeThickness">0,0,0,1</Thickness>
+    <Thickness x:Key="AutoSuggestBoxLeftIconMargin">10,8,0,0</Thickness>
+    <Thickness x:Key="AutoSuggestBoxRightIconMargin">0,8,10,0</Thickness>
+    <Thickness x:Key="AutoSuggestBoxClearButtonMargin">0,5,4,0</Thickness>
+    <Thickness x:Key="AutoSuggestBoxClearButtonPadding">0,0,0,0</Thickness>
+    <system:Double x:Key="AutoSuggestBoxClearButtonHeight">24</system:Double>
+    <system:Double x:Key="AutoSuggestBoxClearButtonIconSize">14</system:Double>
+
+    <Style x:Key="DefaultAutoSuggestBoxItemContainerStyle" TargetType="{x:Type ListViewItem}">
+        <Setter Property="Foreground">
+            <Setter.Value>
+                <SolidColorBrush Color="{DynamicResource TextFillColorPrimary}" />
+            </Setter.Value>
+        </Setter>
+        <Setter Property="SnapsToDevicePixels" Value="True" />
+        <Setter Property="Margin" Value="0,0,0,2" />
+        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ListBoxItem}">
+                    <Border
+                        x:Name="ContentBorder"
+                        Margin="4,0,4,0"
+                        Padding="6,10"
+                        BorderBrush="Transparent"
+                        BorderThickness="0"
+                        CornerRadius="6">
+                        <Border.Background>
+                            <SolidColorBrush Opacity="0.0" Color="{DynamicResource SubtleFillColorSecondary}" />
+                        </Border.Background>
+                        <ContentPresenter />
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter TargetName="ContentBorder" Property="Background">
+                                <Setter.Value>
+                                    <SolidColorBrush Color="{DynamicResource SubtleFillColorSecondary}" />
+                                </Setter.Value>
+                            </Setter>
+                        </Trigger>
+
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsSelected" Value="False" />
+                                <Condition Property="IsMouseOver" Value="True" />
+                            </MultiTrigger.Conditions>
+
+                            <MultiTrigger.EnterActions>
+                                <BeginStoryboard>
+                                    <Storyboard>
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="ContentBorder"
+                                            Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Opacity)"
+                                            From="0.0"
+                                            To="1.0"
+                                            Duration="00:00:00.167" />
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </MultiTrigger.EnterActions>
+                            <MultiTrigger.ExitActions>
+                                <BeginStoryboard>
+                                    <Storyboard>
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="ContentBorder"
+                                            Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Opacity)"
+                                            From="1.0"
+                                            To="0.0"
+                                            Duration="00:00:00.167" />
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </MultiTrigger.ExitActions>
+                        </MultiTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="DefaultUiNewAutoSuggestBoxStyle" TargetType="{x:Type controls:NewAutoSuggestBox}">
+        <!--  Universal WPF UI focus  -->
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
+        <!--  Universal WPF UI focus  -->
+        <!--  Universal WPF UI ContextMenu  -->
+        <Setter Property="ContextMenu" Value="{DynamicResource DefaultControlContextMenu}" />
+        <!--  Universal WPF UI ContextMenu  -->
+        <Setter Property="Foreground">
+            <Setter.Value>
+                <SolidColorBrush Color="{DynamicResource TextFillColorPrimary}" />
+            </Setter.Value>
+        </Setter>
+        <!--<Setter Property="IconForeground">
+            <Setter.Value>
+                <SolidColorBrush Color="{DynamicResource TextFillColorPrimary}" />
+            </Setter.Value>
+        </Setter>-->
+        <!--<Setter Property="CaretBrush">
+            <Setter.Value>
+                <SolidColorBrush Color="{DynamicResource TextFillColorPrimary}" />
+            </Setter.Value>
+        </Setter>-->
+        <Setter Property="Background">
+            <Setter.Value>
+                <SolidColorBrush Color="{DynamicResource ControlFillColorDefault}" />
+            </Setter.Value>
+        </Setter>
+        <Setter Property="HorizontalAlignment" Value="Stretch" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="VerticalContentAlignment" Value="Top" />
+        <Setter Property="Padding" Value="{DynamicResource TextControlThemePadding}" />
+        <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
+        <Setter Property="BorderThickness" Value="{StaticResource AutoSuggestBoxBorderThemeThickness}" />
+        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <Setter Property="SnapsToDevicePixels" Value="True" />
+        <Setter Property="ItemContainerStyle" Value="{StaticResource DefaultAutoSuggestBoxItemContainerStyle}" />
+        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:NewAutoSuggestBox}">
+                    <Grid>
+
+
+                        <TextBox x:Name="PART_TextBox" Grid.Row="0" />
+
+                        <Popup
+                            x:Name="PART_SuggestionsPopup"
+                            MinWidth="{TemplateBinding ActualWidth}"
+                            Margin="0"
+                            HorizontalAlignment="Stretch"
+                            AllowsTransparency="True"
+                            Focusable="False"
+                            IsOpen="{TemplateBinding IsSuggestionListOpen}"
+                            Placement="Bottom"
+                            PopupAnimation="Slide">
+                            <Border
+                                Margin="0"
+                                Padding="0,6,0,6"
+                                HorizontalAlignment="Stretch"
+                                BorderBrush="{DynamicResource MenuBorderColorDefaultBrush}"
+                                BorderThickness="1"
+                                CornerRadius="8"
+                                SnapsToDevicePixels="True">
+                                <Border.Background>
+                                    <SolidColorBrush Color="{DynamicResource SystemFillColorSolidNeutralBackground}" />
+                                </Border.Background>
+                                <ListView
+                                    x:Name="PART_SuggestionsList"
+                                    MaxHeight="240"
+                                    DisplayMemberPath="{TemplateBinding DisplayMemberPath}"
+                                    ItemContainerStyle="{TemplateBinding ItemContainerStyle}"
+                                    ItemTemplate="{TemplateBinding ItemTemplate}"
+                                    ItemTemplateSelector="{TemplateBinding ItemTemplateSelector}"
+                                    ItemsSource="{TemplateBinding ItemsSource}"
+                                    KeyboardNavigation.DirectionalNavigation="Cycle"
+                                    SelectionMode="Single">
+                                    <ListView.ItemsPanel>
+                                        <ItemsPanelTemplate>
+                                            <VirtualizingStackPanel
+                                                IsItemsHost="True"
+                                                IsVirtualizing="True"
+                                                VirtualizationMode="Recycling" />
+                                        </ItemsPanelTemplate>
+                                    </ListView.ItemsPanel>
+                                </ListView>
+                            </Border>
+                        </Popup>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style BasedOn="{StaticResource DefaultUiNewAutoSuggestBoxStyle}" TargetType="{x:Type controls:NewAutoSuggestBox}" />
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Wpf.Ui/Styles/Wpf.Ui.xaml b/src/Wpf.Ui/Styles/Wpf.Ui.xaml
index d32e6a9dd..a0232522c 100644
--- a/src/Wpf.Ui/Styles/Wpf.Ui.xaml
+++ b/src/Wpf.Ui/Styles/Wpf.Ui.xaml
@@ -41,6 +41,7 @@
         <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Styles/Controls/TextBox.xaml" />
         <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Styles/Controls/NumberBox.xaml" />
         <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Styles/Controls/AutoSuggestBox.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Styles/Controls/NewAutoSuggestBox.xaml" />
         <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Styles/Controls/RatingControl.xaml" />
         <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Styles/Controls/ThumbRate.xaml" />
         <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Styles/Controls/MessageBox.xaml" />

From 542f22f9097bcdd6550f9bf1442f27f6e14960d0 Mon Sep 17 00:00:00 2001
From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com>
Date: Thu, 2 Feb 2023 22:22:41 +0600
Subject: [PATCH 02/26] Added new properties

---
 .../AutoSuggestBox/NewAutoSuggestBox.cs       | 69 +++++++++++++++++--
 .../Styles/Controls/NewAutoSuggestBox.xaml    | 10 +--
 2 files changed, 68 insertions(+), 11 deletions(-)

diff --git a/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs b/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs
index 0ab28ad70..5a483e0cb 100644
--- a/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs
+++ b/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs
@@ -21,9 +21,27 @@ public class NewAutoSuggestBox : System.Windows.Controls.ItemsControl
     /// <summary>
     /// Property for <see cref="IsSuggestionListOpen"/>.
     /// </summary>
-    public static readonly DependencyProperty IsSuggestionListOpenProperty = DependencyProperty.Register(nameof(IsSuggestionListOpen),
-        typeof(bool), typeof(NewAutoSuggestBox),
-        new PropertyMetadata(false));
+    public static readonly DependencyProperty IsSuggestionListOpenProperty =
+        DependencyProperty.Register(nameof(IsSuggestionListOpen), typeof(bool), typeof(NewAutoSuggestBox),
+            new PropertyMetadata(false));
+
+    /// <summary>
+    /// Property for <see cref="Text"/>.
+    /// </summary>
+    public static readonly DependencyProperty TextProperty = DependencyProperty.Register(nameof(Text), typeof(string), typeof(NewAutoSuggestBox),
+        new PropertyMetadata(string.Empty));
+
+    /// <summary>
+    /// Property for <see cref="PlaceholderText"/>.
+    /// </summary>
+    public static readonly DependencyProperty PlaceholderTextProperty = DependencyProperty.Register(nameof(PlaceholderText), typeof(string), typeof(NewAutoSuggestBox),
+        new PropertyMetadata(string.Empty));
+
+    /// <summary>
+    /// Property for <see cref="MaxSuggestionListHeight"/>.
+    /// </summary>
+    public static readonly DependencyProperty MaxSuggestionListHeightProperty = DependencyProperty.Register(nameof(MaxSuggestionListHeight), typeof(double), typeof(NewAutoSuggestBox),
+        new PropertyMetadata(0d));
 
     #endregion
 
@@ -38,6 +56,39 @@ public bool IsSuggestionListOpen
         set => SetValue(IsSuggestionListOpenProperty, value);
     }
 
+    /// <summary>
+    /// Gets or sets the text that is shown in the control
+    /// </summary>
+    /// <remarks>
+    /// This property is not typically set in XAML.
+    /// </remarks>
+    public string Text
+    {
+        get => (string)GetValue(TextProperty);
+        set => SetValue(TextProperty, value);
+    }
+
+    /// <summary>
+    /// Gets or sets the placeholder text to be displayed in the control.
+    /// </summary>
+    /// <remarks>
+    /// The placeholder text to be displayed in the control. The default is an empty string.
+    /// </remarks>
+    public string PlaceholderText
+    {
+        get => (string)GetValue(PlaceholderTextProperty);
+        set => SetValue(PlaceholderTextProperty, value);
+    }
+
+    /// <summary>
+    /// Gets or set the maximum height for the drop-down portion of the <see cref="AutoSuggestBox"/> control.
+    /// </summary>
+    public double MaxSuggestionListHeight
+    {
+        get => (double)GetValue(MaxSuggestionListHeightProperty);
+        set => SetValue(MaxSuggestionListHeightProperty, value);
+    }
+
     #endregion
 
     protected System.Windows.Controls.TextBox TextBox = null!;
@@ -98,8 +149,6 @@ private void TextBoxOnPreviewKeyDown(object sender, KeyEventArgs e)
 
     private void SuggestionsListOnLostKeyboardFocus(object sender, KeyboardFocusChangedEventArgs e)
     {
-        Debug.WriteLine("Losing focus");
-
         if (e.NewFocus is ListViewItem)
             return;
 
@@ -108,6 +157,12 @@ private void SuggestionsListOnLostKeyboardFocus(object sender, KeyboardFocusChan
 
     private void TextBoxOnTextChanged(object sender, TextChangedEventArgs e)
     {
+        if (string.IsNullOrEmpty(TextBox.Text))
+        {
+            IsSuggestionListOpen = false;
+            return;
+        }
+
         IsSuggestionListOpen = true;
     }
 
@@ -116,11 +171,11 @@ private void SuggestionsListOnPreviewKeyDown(object sender, KeyEventArgs e)
         if (e.Key is not Key.Enter)
             return;
 
-        var q = SuggestionsList.SelectedItem;
+        var item = SuggestionsList.SelectedItem;
     }
 
     private void SuggestionsListOnSelectionChanged(object sender, SelectionChangedEventArgs e)
     {
-        Debug.WriteLine($"Selected | {e.AddedItems[0]}");
+        
     }
 }
diff --git a/src/Wpf.Ui/Styles/Controls/NewAutoSuggestBox.xaml b/src/Wpf.Ui/Styles/Controls/NewAutoSuggestBox.xaml
index 2c857352b..dfaedb771 100644
--- a/src/Wpf.Ui/Styles/Controls/NewAutoSuggestBox.xaml
+++ b/src/Wpf.Ui/Styles/Controls/NewAutoSuggestBox.xaml
@@ -110,6 +110,7 @@
                 <SolidColorBrush Color="{DynamicResource ControlFillColorDefault}" />
             </Setter.Value>
         </Setter>
+        <Setter Property="MaxSuggestionListHeight" Value="240" />
         <Setter Property="HorizontalAlignment" Value="Stretch" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
@@ -126,9 +127,10 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:NewAutoSuggestBox}">
                     <Grid>
-
-
-                        <TextBox x:Name="PART_TextBox" Grid.Row="0" />
+                        <controls:TextBox
+                            x:Name="PART_TextBox"
+                            Grid.Row="0"
+                            PlaceholderText="{TemplateBinding PlaceholderText}" />
 
                         <Popup
                             x:Name="PART_SuggestionsPopup"
@@ -153,7 +155,7 @@
                                 </Border.Background>
                                 <ListView
                                     x:Name="PART_SuggestionsList"
-                                    MaxHeight="240"
+                                    MaxHeight="{TemplateBinding MaxSuggestionListHeight}"
                                     DisplayMemberPath="{TemplateBinding DisplayMemberPath}"
                                     ItemContainerStyle="{TemplateBinding ItemContainerStyle}"
                                     ItemTemplate="{TemplateBinding ItemTemplate}"

From aad74a42db32ec40c97fc04876ed7b66d25e8796 Mon Sep 17 00:00:00 2001
From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com>
Date: Fri, 3 Feb 2023 09:53:23 +0600
Subject: [PATCH 03/26] Implemented selection object from suggest list

---
 .../AutoSuggestBox/NewAutoSuggestBox.cs       | 48 +++++++++++++++++--
 .../Styles/Controls/NewAutoSuggestBox.xaml    | 29 ++---------
 2 files changed, 47 insertions(+), 30 deletions(-)

diff --git a/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs b/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs
index 5a483e0cb..bfeaa59fb 100644
--- a/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs
+++ b/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs
@@ -4,6 +4,7 @@
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.Windows.Input;
+using Wpf.Ui.Common;
 
 namespace Wpf.Ui.Controls;
 
@@ -43,6 +44,12 @@ public class NewAutoSuggestBox : System.Windows.Controls.ItemsControl
     public static readonly DependencyProperty MaxSuggestionListHeightProperty = DependencyProperty.Register(nameof(MaxSuggestionListHeight), typeof(double), typeof(NewAutoSuggestBox),
         new PropertyMetadata(0d));
 
+    /// <summary>
+    /// Property for <see cref="Icon"/>.
+    /// </summary>
+    public static readonly DependencyProperty IconProperty = DependencyProperty.Register(nameof(Icon), typeof(SymbolRegular), typeof(NewAutoSuggestBox),
+        new PropertyMetadata(SymbolRegular.Empty));
+
     #endregion
 
     #region Properties
@@ -89,12 +96,23 @@ public double MaxSuggestionListHeight
         set => SetValue(MaxSuggestionListHeightProperty, value);
     }
 
+    /// <summary>
+    /// 
+    /// </summary>
+    public SymbolRegular Icon
+    {
+        get => (SymbolRegular)GetValue(IconProperty);
+        set => SetValue(IconProperty, value);
+    }
+
     #endregion
 
     protected System.Windows.Controls.TextBox TextBox = null!;
     protected Popup SuggestionsPopup = null!;
     protected ListView SuggestionsList = null!;
 
+    private bool _isLostFocus;
+
     public NewAutoSuggestBox()
     {
         Unloaded += static (sender, _) =>
@@ -115,6 +133,7 @@ public override void OnApplyTemplate()
 
         TextBox.PreviewKeyDown += TextBoxOnPreviewKeyDown;
         TextBox.TextChanged += TextBoxOnTextChanged;
+        TextBox.LostKeyboardFocus += TextBoxOnLostKeyboardFocus;
 
         SuggestionsList.SelectionChanged += SuggestionsListOnSelectionChanged;
         SuggestionsList.PreviewKeyDown += SuggestionsListOnPreviewKeyDown;
@@ -133,6 +152,7 @@ protected virtual void ReleaseTemplateResources()
     {
         TextBox.PreviewKeyDown -= TextBoxOnPreviewKeyDown;
         TextBox.TextChanged -= TextBoxOnTextChanged;
+        TextBox.LostKeyboardFocus -= TextBoxOnLostKeyboardFocus;
 
         SuggestionsList.SelectionChanged -= SuggestionsListOnSelectionChanged;
         SuggestionsList.PreviewKeyDown -= SuggestionsListOnPreviewKeyDown;
@@ -147,12 +167,13 @@ private void TextBoxOnPreviewKeyDown(object sender, KeyEventArgs e)
         SuggestionsList.Focus();
     }
 
-    private void SuggestionsListOnLostKeyboardFocus(object sender, KeyboardFocusChangedEventArgs e)
+    private void TextBoxOnLostKeyboardFocus(object sender, KeyboardFocusChangedEventArgs e)
     {
-        if (e.NewFocus is ListViewItem)
+        if (e.NewFocus is ListView)
             return;
 
         IsSuggestionListOpen = false;
+        _isLostFocus = true;
     }
 
     private void TextBoxOnTextChanged(object sender, TextChangedEventArgs e)
@@ -166,16 +187,35 @@ private void TextBoxOnTextChanged(object sender, TextChangedEventArgs e)
         IsSuggestionListOpen = true;
     }
 
+    private void SuggestionsListOnLostKeyboardFocus(object sender, KeyboardFocusChangedEventArgs e)
+    {
+        if (e.NewFocus is ListViewItem)
+            return;
+
+        IsSuggestionListOpen = false;
+    }
+
     private void SuggestionsListOnPreviewKeyDown(object sender, KeyEventArgs e)
     {
         if (e.Key is not Key.Enter)
             return;
 
-        var item = SuggestionsList.SelectedItem;
+        OnSelected(SuggestionsList.SelectedItem);
     }
 
     private void SuggestionsListOnSelectionChanged(object sender, SelectionChangedEventArgs e)
     {
-        
+        if (!_isLostFocus)
+            return;
+
+        OnSelected(e.AddedItems[0]);
+    }
+
+    protected virtual void OnSelected(object selectedObj)
+    {
+        Debug.WriteLine($"Selected element is {selectedObj}");
+
+        _isLostFocus = false;
+        IsSuggestionListOpen = false;
     }
 }
diff --git a/src/Wpf.Ui/Styles/Controls/NewAutoSuggestBox.xaml b/src/Wpf.Ui/Styles/Controls/NewAutoSuggestBox.xaml
index dfaedb771..e47783562 100644
--- a/src/Wpf.Ui/Styles/Controls/NewAutoSuggestBox.xaml
+++ b/src/Wpf.Ui/Styles/Controls/NewAutoSuggestBox.xaml
@@ -84,32 +84,6 @@
     </Style>
 
     <Style x:Key="DefaultUiNewAutoSuggestBoxStyle" TargetType="{x:Type controls:NewAutoSuggestBox}">
-        <!--  Universal WPF UI focus  -->
-        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
-        <!--  Universal WPF UI focus  -->
-        <!--  Universal WPF UI ContextMenu  -->
-        <Setter Property="ContextMenu" Value="{DynamicResource DefaultControlContextMenu}" />
-        <!--  Universal WPF UI ContextMenu  -->
-        <Setter Property="Foreground">
-            <Setter.Value>
-                <SolidColorBrush Color="{DynamicResource TextFillColorPrimary}" />
-            </Setter.Value>
-        </Setter>
-        <!--<Setter Property="IconForeground">
-            <Setter.Value>
-                <SolidColorBrush Color="{DynamicResource TextFillColorPrimary}" />
-            </Setter.Value>
-        </Setter>-->
-        <!--<Setter Property="CaretBrush">
-            <Setter.Value>
-                <SolidColorBrush Color="{DynamicResource TextFillColorPrimary}" />
-            </Setter.Value>
-        </Setter>-->
-        <Setter Property="Background">
-            <Setter.Value>
-                <SolidColorBrush Color="{DynamicResource ControlFillColorDefault}" />
-            </Setter.Value>
-        </Setter>
         <Setter Property="MaxSuggestionListHeight" Value="240" />
         <Setter Property="HorizontalAlignment" Value="Stretch" />
         <Setter Property="VerticalAlignment" Value="Center" />
@@ -123,6 +97,7 @@
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="ItemContainerStyle" Value="{StaticResource DefaultAutoSuggestBoxItemContainerStyle}" />
         <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Icon" Value="Search24" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:NewAutoSuggestBox}">
@@ -130,6 +105,8 @@
                         <controls:TextBox
                             x:Name="PART_TextBox"
                             Grid.Row="0"
+                            Icon="{TemplateBinding Icon}"
+                            IconPlacement="Right"
                             PlaceholderText="{TemplateBinding PlaceholderText}" />
 
                         <Popup

From 2fe9d9225a2f6947852457a218f8a7de252d72e2 Mon Sep 17 00:00:00 2001
From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com>
Date: Fri, 3 Feb 2023 10:26:16 +0600
Subject: [PATCH 04/26] Added events

---
 .../AutoSuggestBoxQuerySubmittedEventArgs.cs  |  21 ++++
 ...AutoSuggestBoxSuggestionChosenEventArgs.cs |  21 ++++
 .../AutoSuggestBoxTextChangedEventArgs.cs     |  21 ++++
 .../AutoSuggestionBoxTextChangeReason.cs      |  24 ++++
 .../AutoSuggestBox/NewAutoSuggestBox.cs       | 114 +++++++++++++++++-
 5 files changed, 197 insertions(+), 4 deletions(-)
 create mode 100644 src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBoxQuerySubmittedEventArgs.cs
 create mode 100644 src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBoxSuggestionChosenEventArgs.cs
 create mode 100644 src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBoxTextChangedEventArgs.cs
 create mode 100644 src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestionBoxTextChangeReason.cs

diff --git a/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBoxQuerySubmittedEventArgs.cs b/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBoxQuerySubmittedEventArgs.cs
new file mode 100644
index 000000000..7ce519156
--- /dev/null
+++ b/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBoxQuerySubmittedEventArgs.cs
@@ -0,0 +1,21 @@
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
+// Copyright (C) Leszek Pomianowski and WPF UI Contributors.
+// All Rights Reserved.
+
+using System.Windows;
+
+namespace Wpf.Ui.Controls;
+
+/// <summary>
+/// Provides event data for the <see cref="NewAutoSuggestBox.QuerySubmitted"/> event.
+/// </summary>
+public sealed class AutoSuggestBoxQuerySubmittedEventArgs : RoutedEventArgs
+{
+    public AutoSuggestBoxQuerySubmittedEventArgs(RoutedEvent eventArgs, object sender) : base(eventArgs, sender)
+    {
+
+    }
+
+    public required string QueryText { get; init; }
+}
diff --git a/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBoxSuggestionChosenEventArgs.cs b/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBoxSuggestionChosenEventArgs.cs
new file mode 100644
index 000000000..87aca82ba
--- /dev/null
+++ b/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBoxSuggestionChosenEventArgs.cs
@@ -0,0 +1,21 @@
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
+// Copyright (C) Leszek Pomianowski and WPF UI Contributors.
+// All Rights Reserved.
+
+using System.Windows;
+
+namespace Wpf.Ui.Controls;
+
+/// <summary>
+/// Provides data for the <see cref="NewAutoSuggestBox.SuggestionChosen"/> event.
+/// </summary>
+public sealed class AutoSuggestBoxSuggestionChosenEventArgs : RoutedEventArgs
+{
+    public AutoSuggestBoxSuggestionChosenEventArgs(RoutedEvent eventArgs, object sender) : base(eventArgs, sender)
+    {
+
+    }
+
+    public required object SelectedItem { get; init; }
+}
diff --git a/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBoxTextChangedEventArgs.cs b/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBoxTextChangedEventArgs.cs
new file mode 100644
index 000000000..b29fd16a0
--- /dev/null
+++ b/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBoxTextChangedEventArgs.cs
@@ -0,0 +1,21 @@
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
+// Copyright (C) Leszek Pomianowski and WPF UI Contributors.
+// All Rights Reserved.
+
+using System.Windows;
+
+namespace Wpf.Ui.Controls;
+
+/// <summary>
+/// Provides data for the <see cref="NewAutoSuggestBox.TextChanged"/> event.
+/// </summary>
+public sealed class AutoSuggestBoxTextChangedEventArgs : RoutedEventArgs
+{
+    public AutoSuggestBoxTextChangedEventArgs(RoutedEvent eventArgs, object sender) : base(eventArgs, sender)
+    {
+
+    }
+
+    public required AutoSuggestionBoxTextChangeReason Reason { get; init; }
+}
diff --git a/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestionBoxTextChangeReason.cs b/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestionBoxTextChangeReason.cs
new file mode 100644
index 000000000..4ec7bc75b
--- /dev/null
+++ b/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestionBoxTextChangeReason.cs
@@ -0,0 +1,24 @@
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
+// Copyright (C) Leszek Pomianowski and WPF UI Contributors.
+// All Rights Reserved.
+
+namespace Wpf.Ui.Controls;
+
+public enum AutoSuggestionBoxTextChangeReason
+{
+    /// <summary>
+    /// The user edited the text.
+    /// </summary>
+    UserInput = 0,
+
+    /// <summary>
+    /// The text was changed via code.
+    /// </summary>
+    ProgrammaticChange = 1,
+
+    /// <summary>
+    /// The user selected one of the items in the auto-suggestion box.
+    /// </summary>
+    SuggestionChosen = 2,
+}
diff --git a/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs b/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs
index bfeaa59fb..3f982e224 100644
--- a/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs
+++ b/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs
@@ -1,4 +1,9 @@
-using System.Windows;
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
+// Copyright (C) Leszek Pomianowski and WPF UI Contributors.
+// All Rights Reserved.
+
+using System.Windows;
 using System;
 using System.Diagnostics;
 using System.Windows.Controls;
@@ -107,6 +112,55 @@ public SymbolRegular Icon
 
     #endregion
 
+    #region Events
+
+    /// <summary>
+    /// Routed event for <see cref="QuerySubmitted"/>.
+    /// </summary>
+    public static readonly RoutedEvent QuerySubmittedEvent = EventManager.RegisterRoutedEvent(
+        nameof(QuerySubmitted), RoutingStrategy.Bubble, typeof(TypedEventHandler<NewAutoSuggestBox, AutoSuggestBoxQuerySubmittedEventArgs>), typeof(NewAutoSuggestBox));
+
+    /// <summary>
+    /// Routed event for <see cref="SuggestionChosen"/>.
+    /// </summary>
+    public static readonly RoutedEvent SuggestionChosenEvent = EventManager.RegisterRoutedEvent(
+        nameof(SuggestionChosen), RoutingStrategy.Bubble, typeof(TypedEventHandler<NewAutoSuggestBox, AutoSuggestBoxSuggestionChosenEventArgs>), typeof(NewAutoSuggestBox));
+
+    /// <summary>
+    /// Routed event for <see cref="TextChanged"/>.
+    /// </summary>
+    public static readonly RoutedEvent TextChangedEvent = EventManager.RegisterRoutedEvent(
+        nameof(TextChanged), RoutingStrategy.Bubble, typeof(TypedEventHandler<NewAutoSuggestBox, AutoSuggestBoxTextChangedEventArgs>), typeof(NewAutoSuggestBox));
+
+    /// <summary>
+    /// Occurs when the user submits a search query.
+    /// </summary>
+    public event TypedEventHandler<NewAutoSuggestBox, AutoSuggestBoxQuerySubmittedEventArgs> QuerySubmitted
+    {
+        add => AddHandler(QuerySubmittedEvent, value);
+        remove => RemoveHandler(QuerySubmittedEvent, value);
+    }
+
+    /// <summary>
+    /// Event occurs when the user selects an item from the recommended ones.
+    /// </summary>
+    public event TypedEventHandler<NewAutoSuggestBox, AutoSuggestBoxSuggestionChosenEventArgs> SuggestionChosen
+    {
+        add => AddHandler(SuggestionChosenEvent, value);
+        remove => RemoveHandler(SuggestionChosenEvent, value);
+    }
+
+    /// <summary>
+    /// Raised after the text content of the editable control component is updated.
+    /// </summary>
+    public event TypedEventHandler<NewAutoSuggestBox, AutoSuggestBoxTextChangedEventArgs> TextChanged
+    {
+        add => AddHandler(TextChangedEvent, value);
+        remove => RemoveHandler(TextChangedEvent, value);
+    }
+
+    #endregion
+
     protected System.Windows.Controls.TextBox TextBox = null!;
     protected Popup SuggestionsPopup = null!;
     protected ListView SuggestionsList = null!;
@@ -159,8 +213,60 @@ protected virtual void ReleaseTemplateResources()
         SuggestionsList.LostKeyboardFocus -= SuggestionsListOnLostKeyboardFocus;
     }
 
+    #region Events raisers
+
+    /// <summary>
+    /// Method for <see cref="QuerySubmitted"/>.
+    /// </summary>
+    /// <param name="queryText"></param>
+    protected virtual void OnQuerySubmitted(string queryText)
+    {
+        var args = new AutoSuggestBoxQuerySubmittedEventArgs(QuerySubmittedEvent, this)
+        {
+            QueryText = queryText
+        };
+
+        RaiseEvent(args);
+    }
+
+    /// <summary>
+    /// Method for <see cref="SuggestionChosen"/>.
+    /// </summary>
+    /// <param name="selectedItem"></param>
+    protected virtual void OnSuggestionChosen(object selectedItem)
+    {
+        var args = new AutoSuggestBoxSuggestionChosenEventArgs(QuerySubmittedEvent, this)
+        {
+            SelectedItem = selectedItem
+        };
+
+        RaiseEvent(args);
+    }
+
+    /// <summary>
+    /// Method for <see cref="TextChanged"/>.
+    /// </summary>
+    /// <param name="reason"></param>
+    protected virtual void OnTextChanged(AutoSuggestionBoxTextChangeReason reason)
+    {
+        var args = new AutoSuggestBoxTextChangedEventArgs(QuerySubmittedEvent, this)
+        {
+            Reason = reason
+        };
+
+        RaiseEvent(args);
+    }
+
+    #endregion
+
     private void TextBoxOnPreviewKeyDown(object sender, KeyEventArgs e)
     {
+        if (e.Key is Key.Enter)
+        {
+            OnQuerySubmitted(TextBox.Text);
+            return;
+        }
+
         if (e.Key is not Key.Down || !IsSuggestionListOpen)
             return;
 
@@ -200,7 +306,7 @@ private void SuggestionsListOnPreviewKeyDown(object sender, KeyEventArgs e)
         if (e.Key is not Key.Enter)
             return;
 
-        OnSelected(SuggestionsList.SelectedItem);
+        OnSelectedChanged(SuggestionsList.SelectedItem);
     }
 
     private void SuggestionsListOnSelectionChanged(object sender, SelectionChangedEventArgs e)
@@ -208,10 +314,10 @@ private void SuggestionsListOnSelectionChanged(object sender, SelectionChangedEv
         if (!_isLostFocus)
             return;
 
-        OnSelected(e.AddedItems[0]);
+        OnSelectedChanged(e.AddedItems[0]);
     }
 
-    protected virtual void OnSelected(object selectedObj)
+    protected virtual void OnSelectedChanged(object selectedObj)
     {
         Debug.WriteLine($"Selected element is {selectedObj}");
 

From 9705c6f0ed7baaed89b7c29cb7271e9017423a6d Mon Sep 17 00:00:00 2001
From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com>
Date: Fri, 3 Feb 2023 11:12:10 +0600
Subject: [PATCH 05/26] Implemented UpdateTextOnSelect

---
 .../AutoSuggestBox/NewAutoSuggestBox.cs       | 73 ++++++++++++++++---
 .../Styles/Controls/NewAutoSuggestBox.xaml    |  3 +-
 2 files changed, 66 insertions(+), 10 deletions(-)

diff --git a/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs b/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs
index 3f982e224..b1132fc31 100644
--- a/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs
+++ b/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs
@@ -43,6 +43,12 @@ public class NewAutoSuggestBox : System.Windows.Controls.ItemsControl
     public static readonly DependencyProperty PlaceholderTextProperty = DependencyProperty.Register(nameof(PlaceholderText), typeof(string), typeof(NewAutoSuggestBox),
         new PropertyMetadata(string.Empty));
 
+    /// <summary>
+    /// Property for <see cref="UpdateTextOnSelect"/>.
+    /// </summary>
+    public static readonly DependencyProperty UpdateTextOnSelectProperty = DependencyProperty.Register(nameof(UpdateTextOnSelect), typeof(bool), typeof(NewAutoSuggestBox),
+        new PropertyMetadata(true));
+
     /// <summary>
     /// Property for <see cref="MaxSuggestionListHeight"/>.
     /// </summary>
@@ -101,6 +107,15 @@ public double MaxSuggestionListHeight
         set => SetValue(MaxSuggestionListHeightProperty, value);
     }
 
+    /// <summary>
+    /// Gets or sets a value indicating whether items in the view will trigger an update of the editable text part of the <see cref="NewAutoSuggestBox"/> when clicked.
+    /// </summary>
+    public bool UpdateTextOnSelect
+    {
+        get => (bool)GetValue(UpdateTextOnSelectProperty);
+        set => SetValue(UpdateTextOnSelectProperty, value);
+    }
+
     /// <summary>
     /// 
     /// </summary>
@@ -144,6 +159,9 @@ public event TypedEventHandler<NewAutoSuggestBox, AutoSuggestBoxQuerySubmittedEv
     /// <summary>
     /// Event occurs when the user selects an item from the recommended ones.
     /// </summary>
+    /// <remarks>
+    /// Raised before the text content of the editable control component is updated.
+    /// </remarks>
     public event TypedEventHandler<NewAutoSuggestBox, AutoSuggestBoxSuggestionChosenEventArgs> SuggestionChosen
     {
         add => AddHandler(SuggestionChosenEvent, value);
@@ -166,6 +184,7 @@ public event TypedEventHandler<NewAutoSuggestBox, AutoSuggestBoxTextChangedEvent
     protected ListView SuggestionsList = null!;
 
     private bool _isLostFocus;
+    private bool _changingTextAfterSuggestionChosen;
 
     public NewAutoSuggestBox()
     {
@@ -241,6 +260,9 @@ protected virtual void OnSuggestionChosen(object selectedItem)
         };
 
         RaiseEvent(args);
+
+        if (UpdateTextOnSelect)
+            UpdateTexBoxTextAfterSelection(selectedItem);
     }
 
     /// <summary>
@@ -259,11 +281,21 @@ protected virtual void OnTextChanged(AutoSuggestionBoxTextChangeReason reason)
 
     #endregion
 
+    protected virtual void OnSelectedChanged(object selectedObj)
+    {
+        OnSuggestionChosen(selectedObj);
+
+        Debug.WriteLine($"Selected element is {selectedObj}");
+
+        _isLostFocus = false;
+    }
+
     private void TextBoxOnPreviewKeyDown(object sender, KeyEventArgs e)
     {
         if (e.Key is Key.Enter)
         {
             OnQuerySubmitted(TextBox.Text);
+            IsSuggestionListOpen = false;
             return;
         }
 
@@ -276,7 +308,9 @@ private void TextBoxOnPreviewKeyDown(object sender, KeyEventArgs e)
     private void TextBoxOnLostKeyboardFocus(object sender, KeyboardFocusChangedEventArgs e)
     {
         if (e.NewFocus is ListView)
+        {
             return;
+        }
 
         IsSuggestionListOpen = false;
         _isLostFocus = true;
@@ -284,13 +318,30 @@ private void TextBoxOnLostKeyboardFocus(object sender, KeyboardFocusChangedEvent
 
     private void TextBoxOnTextChanged(object sender, TextChangedEventArgs e)
     {
-        if (string.IsNullOrEmpty(TextBox.Text))
+        var changeReason = AutoSuggestionBoxTextChangeReason.UserInput;
+
+        if (_changingTextAfterSuggestionChosen)
+        {
+            changeReason = AutoSuggestionBoxTextChangeReason.SuggestionChosen;
+            _changingTextAfterSuggestionChosen = false;
+        }
+
+        Debug.WriteLine($"{nameof(TextBoxOnTextChanged)} | {changeReason} | {Text}");
+
+        SuggestionsList.SelectedItem = null;
+
+        if (_isLostFocus)
         {
+            _isLostFocus = false;
             IsSuggestionListOpen = false;
-            return;
+        }
+        else
+        {
+            IsSuggestionListOpen = true;
         }
 
-        IsSuggestionListOpen = true;
+        
+        OnTextChanged(changeReason);
     }
 
     private void SuggestionsListOnLostKeyboardFocus(object sender, KeyboardFocusChangedEventArgs e)
@@ -307,21 +358,25 @@ private void SuggestionsListOnPreviewKeyDown(object sender, KeyEventArgs e)
             return;
 
         OnSelectedChanged(SuggestionsList.SelectedItem);
+        IsSuggestionListOpen = false;
     }
 
     private void SuggestionsListOnSelectionChanged(object sender, SelectionChangedEventArgs e)
     {
-        if (!_isLostFocus)
+        if (SuggestionsList.SelectedItem is null)
             return;
 
-        OnSelectedChanged(e.AddedItems[0]);
+        Debug.WriteLine($"{nameof(SuggestionsListOnSelectionChanged)} | {e.AddedItems[0]}");
+
+        OnSelectedChanged(SuggestionsList.SelectedItem);
     }
 
-    protected virtual void OnSelectedChanged(object selectedObj)
+    private void UpdateTexBoxTextAfterSelection(object selectedObj)
     {
-        Debug.WriteLine($"Selected element is {selectedObj}");
+        _changingTextAfterSuggestionChosen = true;
 
-        _isLostFocus = false;
-        IsSuggestionListOpen = false;
+        string selectedObjText = selectedObj as string ?? selectedObj.ToString();
+
+        Text = selectedObjText;
     }
 }
diff --git a/src/Wpf.Ui/Styles/Controls/NewAutoSuggestBox.xaml b/src/Wpf.Ui/Styles/Controls/NewAutoSuggestBox.xaml
index e47783562..5671f1912 100644
--- a/src/Wpf.Ui/Styles/Controls/NewAutoSuggestBox.xaml
+++ b/src/Wpf.Ui/Styles/Controls/NewAutoSuggestBox.xaml
@@ -107,7 +107,8 @@
                             Grid.Row="0"
                             Icon="{TemplateBinding Icon}"
                             IconPlacement="Right"
-                            PlaceholderText="{TemplateBinding PlaceholderText}" />
+                            PlaceholderText="{TemplateBinding PlaceholderText}"
+                            Text="{TemplateBinding Text}" />
 
                         <Popup
                             x:Name="PART_SuggestionsPopup"

From 203ae86750da507854a4b56be7016e38dbb061be Mon Sep 17 00:00:00 2001
From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com>
Date: Fri, 3 Feb 2023 11:27:19 +0600
Subject: [PATCH 06/26] Closing SuggestionsList after selecting an item with
 the left mouse button

---
 .../AutoSuggestBox/NewAutoSuggestBox.cs       | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs b/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs
index b1132fc31..536138a1e 100644
--- a/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs
+++ b/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs
@@ -183,7 +183,7 @@ public event TypedEventHandler<NewAutoSuggestBox, AutoSuggestBoxTextChangedEvent
     protected Popup SuggestionsPopup = null!;
     protected ListView SuggestionsList = null!;
 
-    private bool _isLostFocus;
+    private bool _isTextBoxLostFocus;
     private bool _changingTextAfterSuggestionChosen;
 
     public NewAutoSuggestBox()
@@ -211,6 +211,7 @@ public override void OnApplyTemplate()
         SuggestionsList.SelectionChanged += SuggestionsListOnSelectionChanged;
         SuggestionsList.PreviewKeyDown += SuggestionsListOnPreviewKeyDown;
         SuggestionsList.LostKeyboardFocus += SuggestionsListOnLostKeyboardFocus;
+        SuggestionsList.PreviewMouseLeftButtonUp += SuggestionsListOnPreviewMouseLeftButtonUp;
     }
 
     protected T GetTemplateChild<T>(string name) where T : DependencyObject
@@ -230,6 +231,7 @@ protected virtual void ReleaseTemplateResources()
         SuggestionsList.SelectionChanged -= SuggestionsListOnSelectionChanged;
         SuggestionsList.PreviewKeyDown -= SuggestionsListOnPreviewKeyDown;
         SuggestionsList.LostKeyboardFocus -= SuggestionsListOnLostKeyboardFocus;
+        SuggestionsList.PreviewMouseLeftButtonUp -= SuggestionsListOnPreviewMouseLeftButtonUp;
     }
 
     #region Events raisers
@@ -287,7 +289,7 @@ protected virtual void OnSelectedChanged(object selectedObj)
 
         Debug.WriteLine($"Selected element is {selectedObj}");
 
-        _isLostFocus = false;
+        _isTextBoxLostFocus = false;
     }
 
     private void TextBoxOnPreviewKeyDown(object sender, KeyEventArgs e)
@@ -308,12 +310,10 @@ private void TextBoxOnPreviewKeyDown(object sender, KeyEventArgs e)
     private void TextBoxOnLostKeyboardFocus(object sender, KeyboardFocusChangedEventArgs e)
     {
         if (e.NewFocus is ListView)
-        {
             return;
-        }
 
         IsSuggestionListOpen = false;
-        _isLostFocus = true;
+        _isTextBoxLostFocus = true;
     }
 
     private void TextBoxOnTextChanged(object sender, TextChangedEventArgs e)
@@ -330,9 +330,9 @@ private void TextBoxOnTextChanged(object sender, TextChangedEventArgs e)
 
         SuggestionsList.SelectedItem = null;
 
-        if (_isLostFocus)
+        if (_isTextBoxLostFocus)
         {
-            _isLostFocus = false;
+            _isTextBoxLostFocus = false;
             IsSuggestionListOpen = false;
         }
         else
@@ -340,7 +340,6 @@ private void TextBoxOnTextChanged(object sender, TextChangedEventArgs e)
             IsSuggestionListOpen = true;
         }
 
-        
         OnTextChanged(changeReason);
     }
 
@@ -361,6 +360,14 @@ private void SuggestionsListOnPreviewKeyDown(object sender, KeyEventArgs e)
         IsSuggestionListOpen = false;
     }
 
+    private void SuggestionsListOnPreviewMouseLeftButtonUp(object sender, MouseButtonEventArgs e)
+    {
+        if (SuggestionsList.SelectedItem is not null)
+            return;
+
+        IsSuggestionListOpen = false;
+    }
+
     private void SuggestionsListOnSelectionChanged(object sender, SelectionChangedEventArgs e)
     {
         if (SuggestionsList.SelectedItem is null)
@@ -376,7 +383,6 @@ private void UpdateTexBoxTextAfterSelection(object selectedObj)
         _changingTextAfterSuggestionChosen = true;
 
         string selectedObjText = selectedObj as string ?? selectedObj.ToString();
-
         Text = selectedObjText;
     }
 }

From 0569ce720974a7c1d6bc7ad316412de607419ad2 Mon Sep 17 00:00:00 2001
From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com>
Date: Fri, 3 Feb 2023 12:19:11 +0600
Subject: [PATCH 07/26] Clean up

---
 .../Controls/AutoSuggestBox/NewAutoSuggestBox.cs  | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs b/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs
index 536138a1e..9e0d6d60e 100644
--- a/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs
+++ b/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs
@@ -117,7 +117,7 @@ public bool UpdateTextOnSelect
     }
 
     /// <summary>
-    /// 
+    /// Gets or sets displayed <see cref="Common.SymbolRegular"/>.
     /// </summary>
     public SymbolRegular Icon
     {
@@ -279,6 +279,7 @@ protected virtual void OnTextChanged(AutoSuggestionBoxTextChangeReason reason)
         };
 
         RaiseEvent(args);
+
     }
 
     #endregion
@@ -287,11 +288,11 @@ protected virtual void OnSelectedChanged(object selectedObj)
     {
         OnSuggestionChosen(selectedObj);
 
-        Debug.WriteLine($"Selected element is {selectedObj}");
-
         _isTextBoxLostFocus = false;
     }
 
+    #region TextBox events
+
     private void TextBoxOnPreviewKeyDown(object sender, KeyEventArgs e)
     {
         if (e.Key is Key.Enter)
@@ -326,8 +327,6 @@ private void TextBoxOnTextChanged(object sender, TextChangedEventArgs e)
             _changingTextAfterSuggestionChosen = false;
         }
 
-        Debug.WriteLine($"{nameof(TextBoxOnTextChanged)} | {changeReason} | {Text}");
-
         SuggestionsList.SelectedItem = null;
 
         if (_isTextBoxLostFocus)
@@ -343,6 +342,10 @@ private void TextBoxOnTextChanged(object sender, TextChangedEventArgs e)
         OnTextChanged(changeReason);
     }
 
+    #endregion
+
+    #region SuggestionsList events
+
     private void SuggestionsListOnLostKeyboardFocus(object sender, KeyboardFocusChangedEventArgs e)
     {
         if (e.NewFocus is ListViewItem)
@@ -378,6 +381,8 @@ private void SuggestionsListOnSelectionChanged(object sender, SelectionChangedEv
         OnSelectedChanged(SuggestionsList.SelectedItem);
     }
 
+    #endregion
+
     private void UpdateTexBoxTextAfterSelection(object selectedObj)
     {
         _changingTextAfterSuggestionChosen = true;

From 7d57da5cdf4815f784715e0bb1380f23c26a4d7c Mon Sep 17 00:00:00 2001
From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com>
Date: Fri, 3 Feb 2023 13:04:46 +0600
Subject: [PATCH 08/26] Addde control to the gallery

---
 .../Views/Pages/Text/AutoSuggestBoxPage.xaml  |  49 ++++---
 .../Pages/Text/AutoSuggestBoxPage.xaml.cs     | 138 +++++++++++++++++-
 .../AutoSuggestBoxTextChangedEventArgs.cs     |   1 +
 .../AutoSuggestBox/NewAutoSuggestBox.cs       |  21 +--
 4 files changed, 174 insertions(+), 35 deletions(-)

diff --git a/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml
index d1b93c99b..2d02b29a9 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml
@@ -27,28 +27,41 @@
             x:Name="PageScrollViewer"
             HorizontalAlignment="Stretch"
             VerticalAlignment="Stretch">
+
             <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="280" />
-                </Grid.ColumnDefinitions>
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="280" />
+                    </Grid.ColumnDefinitions>
+
+                    <Grid Grid.Column="0" Margin="42">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        <controls:GalleryControlPresenter
+                            Grid.Row="0"
+                            Margin="0"
+                            CodeText="&lt;ui:AutoSuggestBox PlaceholderText=&quot;Search...&quot; /&gt;"
+                            HeaderText="WPF UI AutoSuggestBox.">
+                            <controls:GalleryControlPresenter.Content>
+                                <StackPanel>
+                                    <ui:NewAutoSuggestBox
+                                        PlaceholderText="Search..."
+                                        SuggestionChosen="AutoSuggestBox_OnSuggestionChosen"
+                                        TextChanged="AutoSuggestBox_OnTextChanged" />
+
+                                    <TextBlock x:Name="SuggestionOutput" />
+                                </StackPanel>
 
-                <Grid Grid.Column="0" Margin="42">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <controls:GalleryControlPresenter
-                        Grid.Row="0"
-                        Margin="0"
-                        CodeText="&lt;ui:AutoSuggestBox PlaceholderText=&quot;Search...&quot; /&gt;"
-                        HeaderText="WPF UI AutoSuggestBox.">
-                        <controls:GalleryControlPresenter.Content>
-                            <ui:AutoSuggestBox ItemsSource="{Binding ViewModel.AutoSuggestBoxSuggestions, Mode=OneWay}" PlaceholderText="Search..." />
-                        </controls:GalleryControlPresenter.Content>
-                    </controls:GalleryControlPresenter>
+                            </controls:GalleryControlPresenter.Content>
+                        </controls:GalleryControlPresenter>
+                    </Grid>
                 </Grid>
             </Grid>
+
+
         </ui:DynamicScrollViewer>
         <controls:ControlDocumentationSummary CsharpUrl="{StaticResource PageCsharpUrl}" XamlUrl="{StaticResource PageXamlUrl}" />
     </Grid>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml.cs b/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml.cs
index 9e7d1fce0..ab87dae8b 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml.cs
+++ b/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml.cs
@@ -4,20 +4,142 @@
 // All Rights Reserved.
 
 
-using Wpf.Ui.Controls.Navigation;
-using Wpf.Ui.Gallery.ViewModels.Pages.Text;
+using Wpf.Ui.Controls;
 
 namespace Wpf.Ui.Gallery.Views.Pages.Text;
 
-public partial class AutoSuggestBoxPage : INavigableView<AutoSuggestBoxViewModel>
+public partial class AutoSuggestBoxPage
 {
-    public AutoSuggestBoxViewModel ViewModel { get; }
+    public AutoSuggestBoxPage()
+    {
+        InitializeComponent();
+    }
 
-    public AutoSuggestBoxPage(AutoSuggestBoxViewModel viewModel)
+    private readonly List<string> _cats = new()
     {
-        ViewModel = viewModel;
-        DataContext = this;
+        "Abyssinian",
+        "Aegean",
+        "American Bobtail",
+        "American Curl",
+        "American Ringtail",
+        "American Shorthair",
+        "American Wirehair",
+        "Aphrodite Giant",
+        "Arabian Mau",
+        "Asian cat",
+        "Asian Semi-longhair",
+        "Australian Mist",
+        "Balinese",
+        "Bambino",
+        "Bengal",
+        "Birman",
+        "Brazilian Shorthair",
+        "British Longhair",
+        "British Shorthair",
+        "Burmese",
+        "Burmilla",
+        "California Spangled",
+        "Chantilly-Tiffany",
+        "Chartreux",
+        "Chausie",
+        "Colorpoint Shorthair",
+        "Cornish Rex",
+        "Cymric",
+        "Cyprus",
+        "Devon Rex",
+        "Donskoy",
+        "Dragon Li",
+        "Dwelf",
+        "Egyptian Mau",
+        "European Shorthair",
+        "Exotic Shorthair",
+        "Foldex",
+        "German Rex",
+        "Havana Brown",
+        "Highlander",
+        "Himalayan",
+        "Japanese Bobtail",
+        "Javanese",
+        "Kanaani",
+        "Khao Manee",
+        "Kinkalow",
+        "Korat",
+        "Korean Bobtail",
+        "Korn Ja",
+        "Kurilian Bobtail",
+        "Lambkin",
+        "LaPerm",
+        "Lykoi",
+        "Maine Coon",
+        "Manx",
+        "Mekong Bobtail",
+        "Minskin",
+        "Napoleon",
+        "Munchkin",
+        "Nebelung",
+        "Norwegian Forest Cat",
+        "Ocicat",
+        "Ojos Azules",
+        "Oregon Rex",
+        "Persian (modern)",
+        "Persian (traditional)",
+        "Peterbald",
+        "Pixie-bob",
+        "Ragamuffin",
+        "Ragdoll",
+        "Raas",
+        "Russian Blue",
+        "Russian White",
+        "Sam Sawet",
+        "Savannah",
+        "Scottish Fold",
+        "Selkirk Rex",
+        "Serengeti",
+        "Serrade Petit",
+        "Siamese",
+        "Siberian or´Siberian Forest Cat",
+        "Singapura",
+        "Snowshoe",
+        "Sokoke",
+        "Somali",
+        "Sphynx",
+        "Suphalak",
+        "Thai",
+        "Thai Lilac",
+        "Tonkinese",
+        "Toyger",
+        "Turkish Angora",
+        "Turkish Van",
+        "Turkish Vankedisi",
+        "Ukrainian Levkoy",
+        "Wila Krungthep",
+        "York Chocolate"
+    };
 
-        InitializeComponent();
+    private void AutoSuggestBox_OnTextChanged(NewAutoSuggestBox sender, AutoSuggestBoxTextChangedEventArgs args)
+    {
+        if (args.Reason is not AutoSuggestionBoxTextChangeReason.UserInput)
+            return;
+
+        var suitableItems = new List<string>();
+        var splitText = args.Text.ToLower().Split(" ");
+
+        foreach (var cat in _cats)
+        {
+            var found = splitText.All(key=> cat.ToLower().Contains(key));
+
+            if(found)
+                suitableItems.Add(cat);
+        }
+
+        if (suitableItems.Count == 0)
+            suitableItems.Add("No results found");
+
+        sender.ItemsSource = suitableItems;
+    }
+
+    private void AutoSuggestBox_OnSuggestionChosen(NewAutoSuggestBox sender, AutoSuggestBoxSuggestionChosenEventArgs args)
+    {
+        SuggestionOutput.Text = (string)args.SelectedItem;
     }
 }
diff --git a/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBoxTextChangedEventArgs.cs b/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBoxTextChangedEventArgs.cs
index b29fd16a0..f72f5ccbd 100644
--- a/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBoxTextChangedEventArgs.cs
+++ b/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBoxTextChangedEventArgs.cs
@@ -17,5 +17,6 @@ public AutoSuggestBoxTextChangedEventArgs(RoutedEvent eventArgs, object sender)
 
     }
 
+    public required string Text { get; init; }
     public required AutoSuggestionBoxTextChangeReason Reason { get; init; }
 }
diff --git a/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs b/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs
index 9e0d6d60e..d41afd905 100644
--- a/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs
+++ b/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs
@@ -256,7 +256,7 @@ protected virtual void OnQuerySubmitted(string queryText)
     /// <param name="selectedItem"></param>
     protected virtual void OnSuggestionChosen(object selectedItem)
     {
-        var args = new AutoSuggestBoxSuggestionChosenEventArgs(QuerySubmittedEvent, this)
+        var args = new AutoSuggestBoxSuggestionChosenEventArgs(SuggestionChosenEvent, this)
         {
             SelectedItem = selectedItem
         };
@@ -271,11 +271,13 @@ protected virtual void OnSuggestionChosen(object selectedItem)
     /// Method for <see cref="TextChanged"/>.
     /// </summary>
     /// <param name="reason"></param>
-    protected virtual void OnTextChanged(AutoSuggestionBoxTextChangeReason reason)
+    /// <param name="text"></param>
+    protected virtual void OnTextChanged(AutoSuggestionBoxTextChangeReason reason, string text)
     {
-        var args = new AutoSuggestBoxTextChangedEventArgs(QuerySubmittedEvent, this)
+        var args = new AutoSuggestBoxTextChangedEventArgs(TextChangedEvent, this)
         {
-            Reason = reason
+            Reason = reason,
+            Text = text
         };
 
         RaiseEvent(args);
@@ -327,9 +329,12 @@ private void TextBoxOnTextChanged(object sender, TextChangedEventArgs e)
             _changingTextAfterSuggestionChosen = false;
         }
 
+        OnTextChanged(changeReason, TextBox.Text);
+
         SuggestionsList.SelectedItem = null;
+        IsSuggestionListOpen = true;
 
-        if (_isTextBoxLostFocus)
+        /*if (_isTextBoxLostFocus)
         {
             _isTextBoxLostFocus = false;
             IsSuggestionListOpen = false;
@@ -337,9 +342,7 @@ private void TextBoxOnTextChanged(object sender, TextChangedEventArgs e)
         else
         {
             IsSuggestionListOpen = true;
-        }
-
-        OnTextChanged(changeReason);
+        }*/
     }
 
     #endregion
@@ -387,7 +390,7 @@ private void UpdateTexBoxTextAfterSelection(object selectedObj)
     {
         _changingTextAfterSuggestionChosen = true;
 
-        string selectedObjText = selectedObj as string ?? selectedObj.ToString();
+        string selectedObjText = selectedObj as string ?? selectedObj.ToString() ?? string.Empty;
         Text = selectedObjText;
     }
 }

From 616c9afa6c9ab2fdd851685f7d92fe0796727815 Mon Sep 17 00:00:00 2001
From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com>
Date: Fri, 3 Feb 2023 13:11:35 +0600
Subject: [PATCH 09/26] Clean up

---
 .../Controls/AutoSuggestBox/NewAutoSuggestBox.cs       | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs b/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs
index d41afd905..b3f6082db 100644
--- a/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs
+++ b/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs
@@ -5,7 +5,6 @@
 
 using System.Windows;
 using System;
-using System.Diagnostics;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.Windows.Input;
@@ -332,9 +331,8 @@ private void TextBoxOnTextChanged(object sender, TextChangedEventArgs e)
         OnTextChanged(changeReason, TextBox.Text);
 
         SuggestionsList.SelectedItem = null;
-        IsSuggestionListOpen = true;
 
-        /*if (_isTextBoxLostFocus)
+        if (_isTextBoxLostFocus)
         {
             _isTextBoxLostFocus = false;
             IsSuggestionListOpen = false;
@@ -342,7 +340,7 @@ private void TextBoxOnTextChanged(object sender, TextChangedEventArgs e)
         else
         {
             IsSuggestionListOpen = true;
-        }*/
+        }
     }
 
     #endregion
@@ -379,8 +377,6 @@ private void SuggestionsListOnSelectionChanged(object sender, SelectionChangedEv
         if (SuggestionsList.SelectedItem is null)
             return;
 
-        Debug.WriteLine($"{nameof(SuggestionsListOnSelectionChanged)} | {e.AddedItems[0]}");
-
         OnSelectedChanged(SuggestionsList.SelectedItem);
     }
 
@@ -390,7 +386,7 @@ private void UpdateTexBoxTextAfterSelection(object selectedObj)
     {
         _changingTextAfterSuggestionChosen = true;
 
-        string selectedObjText = selectedObj as string ?? selectedObj.ToString() ?? string.Empty;
+        string selectedObjText = selectedObj as string ?? selectedObj.ToString();
         Text = selectedObjText;
     }
 }

From 6b3063a52fddd58367285aabb10fc0d395c9377a Mon Sep 17 00:00:00 2001
From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com>
Date: Fri, 3 Feb 2023 18:14:01 +0600
Subject: [PATCH 10/26] Implemented
 AutoSuggestionBoxTextChangeReason.ProgrammaticChange

---
 .../AutoSuggestBox/NewAutoSuggestBox.cs       | 48 ++++++++++++-------
 .../Styles/Controls/NewAutoSuggestBox.xaml    |  2 +-
 2 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs b/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs
index b3f6082db..a7267c29f 100644
--- a/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs
+++ b/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs
@@ -34,7 +34,7 @@ public class NewAutoSuggestBox : System.Windows.Controls.ItemsControl
     /// Property for <see cref="Text"/>.
     /// </summary>
     public static readonly DependencyProperty TextProperty = DependencyProperty.Register(nameof(Text), typeof(string), typeof(NewAutoSuggestBox),
-        new PropertyMetadata(string.Empty));
+        new PropertyMetadata(string.Empty, TextPropertyChangedCallback));
 
     /// <summary>
     /// Property for <see cref="PlaceholderText"/>.
@@ -158,9 +158,6 @@ public event TypedEventHandler<NewAutoSuggestBox, AutoSuggestBoxQuerySubmittedEv
     /// <summary>
     /// Event occurs when the user selects an item from the recommended ones.
     /// </summary>
-    /// <remarks>
-    /// Raised before the text content of the editable control component is updated.
-    /// </remarks>
     public event TypedEventHandler<NewAutoSuggestBox, AutoSuggestBoxSuggestionChosenEventArgs> SuggestionChosen
     {
         add => AddHandler(SuggestionChosenEvent, value);
@@ -184,6 +181,7 @@ public event TypedEventHandler<NewAutoSuggestBox, AutoSuggestBoxTextChangedEvent
 
     private bool _isTextBoxLostFocus;
     private bool _changingTextAfterSuggestionChosen;
+    private bool _isUserChangedText;
 
     public NewAutoSuggestBox()
     {
@@ -233,7 +231,7 @@ protected virtual void ReleaseTemplateResources()
         SuggestionsList.PreviewMouseLeftButtonUp -= SuggestionsListOnPreviewMouseLeftButtonUp;
     }
 
-    #region Events raisers
+    #region Events
 
     /// <summary>
     /// Method for <see cref="QuerySubmitted"/>.
@@ -262,7 +260,7 @@ protected virtual void OnSuggestionChosen(object selectedItem)
 
         RaiseEvent(args);
 
-        if (UpdateTextOnSelect)
+        if (UpdateTextOnSelect && !args.Handled)
             UpdateTexBoxTextAfterSelection(selectedItem);
     }
 
@@ -280,18 +278,10 @@ protected virtual void OnTextChanged(AutoSuggestionBoxTextChangeReason reason, s
         };
 
         RaiseEvent(args);
-
     }
 
     #endregion
 
-    protected virtual void OnSelectedChanged(object selectedObj)
-    {
-        OnSuggestionChosen(selectedObj);
-
-        _isTextBoxLostFocus = false;
-    }
-
     #region TextBox events
 
     private void TextBoxOnPreviewKeyDown(object sender, KeyEventArgs e)
@@ -323,10 +313,10 @@ private void TextBoxOnTextChanged(object sender, TextChangedEventArgs e)
         var changeReason = AutoSuggestionBoxTextChangeReason.UserInput;
 
         if (_changingTextAfterSuggestionChosen)
-        {
             changeReason = AutoSuggestionBoxTextChangeReason.SuggestionChosen;
-            _changingTextAfterSuggestionChosen = false;
-        }
+
+        if (_isUserChangedText)
+            changeReason = AutoSuggestionBoxTextChangeReason.ProgrammaticChange;
 
         OnTextChanged(changeReason, TextBox.Text);
 
@@ -382,11 +372,33 @@ private void SuggestionsListOnSelectionChanged(object sender, SelectionChangedEv
 
     #endregion
 
+    private void OnSelectedChanged(object selectedObj)
+    {
+        OnSuggestionChosen(selectedObj);
+
+        _isTextBoxLostFocus = false;
+    }
+
     private void UpdateTexBoxTextAfterSelection(object selectedObj)
     {
         _changingTextAfterSuggestionChosen = true;
 
         string selectedObjText = selectedObj as string ?? selectedObj.ToString();
-        Text = selectedObjText;
+        TextBox.Text = selectedObjText;
+
+        _changingTextAfterSuggestionChosen = false;
+    }
+
+    private static void TextPropertyChangedCallback(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var self = (NewAutoSuggestBox)d;
+        var newText = (string)e.NewValue;
+
+        if (self.TextBox.Text == newText)
+            return;
+
+        self._isUserChangedText = true;
+        self.TextBox.Text = newText;
+        self._isUserChangedText = false;
     }
 }
diff --git a/src/Wpf.Ui/Styles/Controls/NewAutoSuggestBox.xaml b/src/Wpf.Ui/Styles/Controls/NewAutoSuggestBox.xaml
index 5671f1912..dd5771749 100644
--- a/src/Wpf.Ui/Styles/Controls/NewAutoSuggestBox.xaml
+++ b/src/Wpf.Ui/Styles/Controls/NewAutoSuggestBox.xaml
@@ -108,7 +108,7 @@
                             Icon="{TemplateBinding Icon}"
                             IconPlacement="Right"
                             PlaceholderText="{TemplateBinding PlaceholderText}"
-                            Text="{TemplateBinding Text}" />
+                            Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Text, Mode=OneWayToSource}" />
 
                         <Popup
                             x:Name="PART_SuggestionsPopup"

From 134fd21bbc0b387e2844c064a880b596719cbba3 Mon Sep 17 00:00:00 2001
From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com>
Date: Fri, 3 Feb 2023 18:36:27 +0600
Subject: [PATCH 11/26] AutoSuggestBoxPage update

---
 .../Views/Pages/Text/AutoSuggestBoxPage.xaml  | 52 +++++++++----------
 .../Pages/Text/AutoSuggestBoxPage.xaml.cs     |  3 ++
 .../Styles/Controls/NewAutoSuggestBox.xaml    |  2 +-
 3 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml
index 2d02b29a9..5b8d35e68 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml
@@ -29,35 +29,35 @@
             VerticalAlignment="Stretch">
 
             <Grid>
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="280" />
-                    </Grid.ColumnDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="280" />
+                </Grid.ColumnDefinitions>
 
-                    <Grid Grid.Column="0" Margin="42">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                        </Grid.RowDefinitions>
-                        <controls:GalleryControlPresenter
-                            Grid.Row="0"
-                            Margin="0"
-                            CodeText="&lt;ui:AutoSuggestBox PlaceholderText=&quot;Search...&quot; /&gt;"
-                            HeaderText="WPF UI AutoSuggestBox.">
-                            <controls:GalleryControlPresenter.Content>
-                                <StackPanel>
-                                    <ui:NewAutoSuggestBox
-                                        PlaceholderText="Search..."
-                                        SuggestionChosen="AutoSuggestBox_OnSuggestionChosen"
-                                        TextChanged="AutoSuggestBox_OnTextChanged" />
+                <Grid Grid.Column="0" Margin="42">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
 
-                                    <TextBlock x:Name="SuggestionOutput" />
-                                </StackPanel>
+                    <controls:GalleryControlPresenter
+                        Grid.Row="0"
+                        Margin="0"
+                        CodeText="&lt;ui:AutoSuggestBox PlaceholderText=&quot;Search...&quot; /&gt;"
+                        HeaderText="WPF UI AutoSuggestBox.">
+                        <controls:GalleryControlPresenter.Content>
+                            <StackPanel>
+                                <ui:NewAutoSuggestBox
+                                    PlaceholderText="Search..."
+                                    SuggestionChosen="AutoSuggestBox_OnSuggestionChosen"
+                                    TextChanged="AutoSuggestBox_OnTextChanged"
+                                    UpdateTextOnSelect="False" />
 
-                            </controls:GalleryControlPresenter.Content>
-                        </controls:GalleryControlPresenter>
-                    </Grid>
+                                <TextBlock x:Name="SuggestionOutput" />
+                            </StackPanel>
+
+                        </controls:GalleryControlPresenter.Content>
+                    </controls:GalleryControlPresenter>
                 </Grid>
             </Grid>
 
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml.cs b/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml.cs
index ab87dae8b..a8271e006 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml.cs
+++ b/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml.cs
@@ -4,6 +4,7 @@
 // All Rights Reserved.
 
 
+using System.Diagnostics;
 using Wpf.Ui.Controls;
 
 namespace Wpf.Ui.Gallery.Views.Pages.Text;
@@ -141,5 +142,7 @@ private void AutoSuggestBox_OnTextChanged(NewAutoSuggestBox sender, AutoSuggestB
     private void AutoSuggestBox_OnSuggestionChosen(NewAutoSuggestBox sender, AutoSuggestBoxSuggestionChosenEventArgs args)
     {
         SuggestionOutput.Text = (string)args.SelectedItem;
+
+        sender.Text = (string)args.SelectedItem;
     }
 }
diff --git a/src/Wpf.Ui/Styles/Controls/NewAutoSuggestBox.xaml b/src/Wpf.Ui/Styles/Controls/NewAutoSuggestBox.xaml
index dd5771749..c5d5dfbdf 100644
--- a/src/Wpf.Ui/Styles/Controls/NewAutoSuggestBox.xaml
+++ b/src/Wpf.Ui/Styles/Controls/NewAutoSuggestBox.xaml
@@ -108,7 +108,7 @@
                             Icon="{TemplateBinding Icon}"
                             IconPlacement="Right"
                             PlaceholderText="{TemplateBinding PlaceholderText}"
-                            Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Text, Mode=OneWayToSource}" />
+                            Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Text, Mode=OneWayToSource, UpdateSourceTrigger=PropertyChanged}" />
 
                         <Popup
                             x:Name="PART_SuggestionsPopup"

From ef92d1251f4c2f3d124a677908df8090e89b43fb Mon Sep 17 00:00:00 2001
From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com>
Date: Sat, 4 Feb 2023 08:28:34 +0600
Subject: [PATCH 12/26] The popup closes when the focus is lost

---
 .../AutoSuggestBox/NewAutoSuggestBox.cs       | 28 +++++++++++++++----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs b/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs
index a7267c29f..908111fc3 100644
--- a/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs
+++ b/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs
@@ -9,12 +9,14 @@
 using System.Windows.Controls.Primitives;
 using System.Windows.Input;
 using Wpf.Ui.Common;
+using System.Windows.Interop;
+using Wpf.Ui.Interop;
 
 namespace Wpf.Ui.Controls;
 
-[TemplatePart(Name = ElementTextBox, Type = typeof(System.Windows.Controls.TextBox))]
-[TemplatePart(Name = ElementSuggestionsPopup, Type = typeof(System.Windows.Controls.Primitives.Popup))]
-[TemplatePart(Name = ElementSuggestionsList, Type = typeof(System.Windows.Controls.ListView))]
+[TemplatePart(Name = ElementTextBox, Type = typeof(TextBox))]
+[TemplatePart(Name = ElementSuggestionsPopup, Type = typeof(Popup))]
+[TemplatePart(Name = ElementSuggestionsList, Type = typeof(ListView))]
 public class NewAutoSuggestBox : System.Windows.Controls.ItemsControl
 {
     protected const string ElementTextBox = "PART_TextBox";
@@ -175,7 +177,7 @@ public event TypedEventHandler<NewAutoSuggestBox, AutoSuggestBoxTextChangedEvent
 
     #endregion
 
-    protected System.Windows.Controls.TextBox TextBox = null!;
+    protected TextBox TextBox = null!;
     protected Popup SuggestionsPopup = null!;
     protected ListView SuggestionsList = null!;
 
@@ -197,7 +199,7 @@ public override void OnApplyTemplate()
     {
         base.OnApplyTemplate();
 
-        TextBox = GetTemplateChild<System.Windows.Controls.TextBox>(ElementTextBox);
+        TextBox = GetTemplateChild<TextBox>(ElementTextBox);
         SuggestionsPopup = GetTemplateChild<Popup>(ElementSuggestionsPopup);
         SuggestionsList = GetTemplateChild<ListView>(ElementSuggestionsList);
 
@@ -209,6 +211,9 @@ public override void OnApplyTemplate()
         SuggestionsList.PreviewKeyDown += SuggestionsListOnPreviewKeyDown;
         SuggestionsList.LostKeyboardFocus += SuggestionsListOnLostKeyboardFocus;
         SuggestionsList.PreviewMouseLeftButtonUp += SuggestionsListOnPreviewMouseLeftButtonUp;
+
+        var hwnd = (HwndSource)PresentationSource.FromVisual(this)!;
+        hwnd.AddHook(Hook);
     }
 
     protected T GetTemplateChild<T>(string name) where T : DependencyObject
@@ -229,6 +234,9 @@ protected virtual void ReleaseTemplateResources()
         SuggestionsList.PreviewKeyDown -= SuggestionsListOnPreviewKeyDown;
         SuggestionsList.LostKeyboardFocus -= SuggestionsListOnLostKeyboardFocus;
         SuggestionsList.PreviewMouseLeftButtonUp -= SuggestionsListOnPreviewMouseLeftButtonUp;
+
+        var hwnd = (HwndSource)PresentationSource.FromVisual(this)!;
+        hwnd.RemoveHook(Hook);
     }
 
     #region Events
@@ -372,6 +380,16 @@ private void SuggestionsListOnSelectionChanged(object sender, SelectionChangedEv
 
     #endregion
 
+    private IntPtr Hook(IntPtr hwnd, int msg, IntPtr wparam, IntPtr lparam, ref bool handled)
+    {
+        var message = (User32.WM)msg;
+
+        if (message is User32.WM.NCACTIVATE or User32.WM.WINDOWPOSCHANGED)
+            IsSuggestionListOpen = false;
+
+        return IntPtr.Zero;
+    }
+
     private void OnSelectedChanged(object selectedObj)
     {
         OnSuggestionChosen(selectedObj);

From f1e8310627d823efb1b8834c1943a2d4f20a898d Mon Sep 17 00:00:00 2001
From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com>
Date: Sat, 4 Feb 2023 09:18:52 +0600
Subject: [PATCH 13/26] Started using DisplayMemberPath

---
 .../Views/Pages/Text/AutoSuggestBoxPage.xaml  |  3 +-
 .../Pages/Text/AutoSuggestBoxPage.xaml.cs     | 15 ++++----
 .../AutoSuggestBox/NewAutoSuggestBox.cs       | 36 +++++++++++++++++--
 3 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml
index 5b8d35e68..4245405b0 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml
@@ -50,8 +50,7 @@
                                 <ui:NewAutoSuggestBox
                                     PlaceholderText="Search..."
                                     SuggestionChosen="AutoSuggestBox_OnSuggestionChosen"
-                                    TextChanged="AutoSuggestBox_OnTextChanged"
-                                    UpdateTextOnSelect="False" />
+                                    TextChanged="AutoSuggestBox_OnTextChanged" />
 
                                 <TextBlock x:Name="SuggestionOutput" />
                             </StackPanel>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml.cs b/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml.cs
index a8271e006..d3999c4a2 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml.cs
+++ b/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml.cs
@@ -9,6 +9,11 @@
 
 namespace Wpf.Ui.Gallery.Views.Pages.Text;
 
+public record TestMode(string Text)
+{
+    public static implicit operator TestMode(string text) => new TestMode(text);
+}
+
 public partial class AutoSuggestBoxPage
 {
     public AutoSuggestBoxPage()
@@ -16,7 +21,7 @@ public AutoSuggestBoxPage()
         InitializeComponent();
     }
 
-    private readonly List<string> _cats = new()
+    private readonly List<TestMode> _cats = new()
     {
         "Abyssinian",
         "Aegean",
@@ -122,12 +127,12 @@ private void AutoSuggestBox_OnTextChanged(NewAutoSuggestBox sender, AutoSuggestB
         if (args.Reason is not AutoSuggestionBoxTextChangeReason.UserInput)
             return;
 
-        var suitableItems = new List<string>();
+        var suitableItems = new List<TestMode>();
         var splitText = args.Text.ToLower().Split(" ");
 
         foreach (var cat in _cats)
         {
-            var found = splitText.All(key=> cat.ToLower().Contains(key));
+            var found = splitText.All(key=> cat.Text.ToLower().Contains(key));
 
             if(found)
                 suitableItems.Add(cat);
@@ -141,8 +146,6 @@ private void AutoSuggestBox_OnTextChanged(NewAutoSuggestBox sender, AutoSuggestB
 
     private void AutoSuggestBox_OnSuggestionChosen(NewAutoSuggestBox sender, AutoSuggestBoxSuggestionChosenEventArgs args)
     {
-        SuggestionOutput.Text = (string)args.SelectedItem;
-
-        sender.Text = (string)args.SelectedItem;
+        SuggestionOutput.Text = ((TestMode)args.SelectedItem).Text;
     }
 }
diff --git a/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs b/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs
index 908111fc3..be407fce5 100644
--- a/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs
+++ b/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs
@@ -5,6 +5,7 @@
 
 using System.Windows;
 using System;
+using System.Collections;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.Windows.Input;
@@ -25,6 +26,13 @@ public class NewAutoSuggestBox : System.Windows.Controls.ItemsControl
 
     #region Static properties
 
+    /// <summary>
+    /// Property for <see cref="OriginalItemsSource"/>.
+    /// </summary>
+    public static readonly DependencyProperty OriginalItemsSourceProperty =
+        DependencyProperty.Register(nameof(OriginalItemsSource), typeof(IList), typeof(NewAutoSuggestBox),
+            new PropertyMetadata(Array.Empty<object>()));
+
     /// <summary>
     /// Property for <see cref="IsSuggestionListOpen"/>.
     /// </summary>
@@ -66,6 +74,15 @@ public class NewAutoSuggestBox : System.Windows.Controls.ItemsControl
 
     #region Properties
 
+    /// <summary>
+    /// 
+    /// </summary>
+    public IList OriginalItemsSource
+    {
+        get => (IList)GetValue(OriginalItemsSourceProperty);
+        set => SetValue(OriginalItemsSourceProperty, value);
+    }
+
     /// <summary>
     /// Gets or sets a Boolean value indicating whether the drop-down portion of the <see cref="AutoSuggestBox"/> is open.
     /// </summary>
@@ -265,7 +282,7 @@ protected virtual void OnSuggestionChosen(object selectedItem)
         {
             SelectedItem = selectedItem
         };
-
+        
         RaiseEvent(args);
 
         if (UpdateTextOnSelect && !args.Handled)
@@ -382,6 +399,9 @@ private void SuggestionsListOnSelectionChanged(object sender, SelectionChangedEv
 
     private IntPtr Hook(IntPtr hwnd, int msg, IntPtr wparam, IntPtr lparam, ref bool handled)
     {
+        if (!IsSuggestionListOpen)
+            return IntPtr.Zero;
+
         var message = (User32.WM)msg;
 
         if (message is User32.WM.NCACTIVATE or User32.WM.WINDOWPOSCHANGED)
@@ -401,9 +421,19 @@ private void UpdateTexBoxTextAfterSelection(object selectedObj)
     {
         _changingTextAfterSuggestionChosen = true;
 
-        string selectedObjText = selectedObj as string ?? selectedObj.ToString();
-        TextBox.Text = selectedObjText;
+        string text = string.Empty;
+
+        if (!string.IsNullOrEmpty(DisplayMemberPath))
+        {
+            //Maybe it needs some optimization?
+            if (selectedObj.GetType().GetProperty(DisplayMemberPath)?.GetValue(selectedObj) is string value)
+                text = value;
+        }
+
+        if (string.IsNullOrEmpty(text))
+            text = selectedObj as string ?? selectedObj.ToString();
 
+        TextBox.Text = text;
         _changingTextAfterSuggestionChosen = false;
     }
 

From 31e10e50890b8e5a52e8009b7816d71f3ba30c30 Mon Sep 17 00:00:00 2001
From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com>
Date: Sat, 4 Feb 2023 09:54:25 +0600
Subject: [PATCH 14/26] Implemented default filtering

---
 .../Views/Pages/Text/AutoSuggestBoxPage.xaml  |  5 +-
 .../Pages/Text/AutoSuggestBoxPage.xaml.cs     |  1 +
 .../AutoSuggestBox/NewAutoSuggestBox.cs       | 56 ++++++++++++++++---
 3 files changed, 51 insertions(+), 11 deletions(-)

diff --git a/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml
index 4245405b0..db90d3383 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml
@@ -48,9 +48,10 @@
                         <controls:GalleryControlPresenter.Content>
                             <StackPanel>
                                 <ui:NewAutoSuggestBox
+                                    x:Name="AutoSuggestBox"
+                                    DisplayMemberPath="Text"
                                     PlaceholderText="Search..."
-                                    SuggestionChosen="AutoSuggestBox_OnSuggestionChosen"
-                                    TextChanged="AutoSuggestBox_OnTextChanged" />
+                                    SuggestionChosen="AutoSuggestBox_OnSuggestionChosen" />
 
                                 <TextBlock x:Name="SuggestionOutput" />
                             </StackPanel>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml.cs b/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml.cs
index d3999c4a2..937009834 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml.cs
+++ b/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml.cs
@@ -19,6 +19,7 @@ public partial class AutoSuggestBoxPage
     public AutoSuggestBoxPage()
     {
         InitializeComponent();
+        AutoSuggestBox.OriginalItemsSource = _cats;
     }
 
     private readonly List<TestMode> _cats = new()
diff --git a/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs b/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs
index be407fce5..fe91cc71b 100644
--- a/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs
+++ b/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs
@@ -12,6 +12,9 @@
 using Wpf.Ui.Common;
 using System.Windows.Interop;
 using Wpf.Ui.Interop;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
 
 namespace Wpf.Ui.Controls;
 
@@ -75,7 +78,7 @@ public class NewAutoSuggestBox : System.Windows.Controls.ItemsControl
     #region Properties
 
     /// <summary>
-    /// 
+    /// Set your items here if you want to use the default filtering
     /// </summary>
     public IList OriginalItemsSource
     {
@@ -303,6 +306,9 @@ protected virtual void OnTextChanged(AutoSuggestionBoxTextChangeReason reason, s
         };
 
         RaiseEvent(args);
+
+        if (args is { Handled: false, Reason: AutoSuggestionBoxTextChangeReason.UserInput })
+            DefaultFiltering(text);
     }
 
     #endregion
@@ -351,11 +357,13 @@ private void TextBoxOnTextChanged(object sender, TextChangedEventArgs e)
         {
             _isTextBoxLostFocus = false;
             IsSuggestionListOpen = false;
+            return;
         }
-        else
-        {
-            IsSuggestionListOpen = true;
-        }
+
+        if (changeReason is not AutoSuggestionBoxTextChangeReason.UserInput)
+            return;
+
+        IsSuggestionListOpen = true;
     }
 
     #endregion
@@ -421,20 +429,50 @@ private void UpdateTexBoxTextAfterSelection(object selectedObj)
     {
         _changingTextAfterSuggestionChosen = true;
 
+        TextBox.Text = GetStringFromObj(selectedObj);
+        _changingTextAfterSuggestionChosen = false;
+    }
+
+    private void DefaultFiltering(string text)
+    {
+        if (string.IsNullOrEmpty(text))
+        {
+            ItemsSource = OriginalItemsSource;
+            return;
+        }
+
+        var suitableItems = new List<object>();
+        var splitText = text.ToLower().Split(' ');
+
+        for (var i = 0; i < OriginalItemsSource.Count; i++)
+        {
+            var item = OriginalItemsSource[i];
+            var itemText = GetStringFromObj(item);
+
+            var found = splitText.All(key=> itemText.ToLower().Contains(key));
+
+            if (found)
+                suitableItems.Add(item);
+        }
+
+        ItemsSource = suitableItems;
+    }
+
+    private string GetStringFromObj(object obj)
+    {
         string text = string.Empty;
 
         if (!string.IsNullOrEmpty(DisplayMemberPath))
         {
             //Maybe it needs some optimization?
-            if (selectedObj.GetType().GetProperty(DisplayMemberPath)?.GetValue(selectedObj) is string value)
+            if (obj.GetType().GetProperty(DisplayMemberPath)?.GetValue(obj) is string value)
                 text = value;
         }
 
         if (string.IsNullOrEmpty(text))
-            text = selectedObj as string ?? selectedObj.ToString();
+            text = obj as string ?? obj.ToString();
 
-        TextBox.Text = text;
-        _changingTextAfterSuggestionChosen = false;
+        return text;
     }
 
     private static void TextPropertyChangedCallback(DependencyObject d, DependencyPropertyChangedEventArgs e)

From 1ad3b8e75d874c8ca4803113d6436101262279f9 Mon Sep 17 00:00:00 2001
From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com>
Date: Sat, 4 Feb 2023 10:38:25 +0600
Subject: [PATCH 15/26] Added SuggestionsPopupClosed event

---
 .../AutoSuggestBox/NewAutoSuggestBox.cs       | 30 +++++++++++++++++--
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs b/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs
index fe91cc71b..1af8f8efd 100644
--- a/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs
+++ b/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs
@@ -13,7 +13,6 @@
 using System.Windows.Interop;
 using Wpf.Ui.Interop;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 
 namespace Wpf.Ui.Controls;
@@ -168,6 +167,12 @@ public SymbolRegular Icon
     public static readonly RoutedEvent TextChangedEvent = EventManager.RegisterRoutedEvent(
         nameof(TextChanged), RoutingStrategy.Bubble, typeof(TypedEventHandler<NewAutoSuggestBox, AutoSuggestBoxTextChangedEventArgs>), typeof(NewAutoSuggestBox));
 
+    /// <summary>
+    /// Routed event for <see cref="SuggestionsPopupClosed"/>.
+    /// </summary>
+    public static readonly RoutedEvent SuggestionsPopupClosedEvent = EventManager.RegisterRoutedEvent(
+        nameof(SuggestionsPopupClosed), RoutingStrategy.Bubble, typeof(TypedEventHandler<NewAutoSuggestBox, RoutedEventArgs>), typeof(NewAutoSuggestBox));
+
     /// <summary>
     /// Occurs when the user submits a search query.
     /// </summary>
@@ -195,6 +200,15 @@ public event TypedEventHandler<NewAutoSuggestBox, AutoSuggestBoxTextChangedEvent
         remove => RemoveHandler(TextChangedEvent, value);
     }
 
+    /// <summary>
+    /// Raised after the popup is closed.
+    /// </summary>
+    public event TypedEventHandler<NewAutoSuggestBox, RoutedEventArgs> SuggestionsPopupClosed
+    {
+        add => AddHandler(SuggestionsPopupClosedEvent, value);
+        remove => RemoveHandler(SuggestionsPopupClosedEvent, value);
+    }
+
     #endregion
 
     protected TextBox TextBox = null!;
@@ -227,6 +241,8 @@ public override void OnApplyTemplate()
         TextBox.TextChanged += TextBoxOnTextChanged;
         TextBox.LostKeyboardFocus += TextBoxOnLostKeyboardFocus;
 
+        SuggestionsPopup.Closed += (_, _) => OnSuggestionsPopupClosed();
+
         SuggestionsList.SelectionChanged += SuggestionsListOnSelectionChanged;
         SuggestionsList.PreviewKeyDown += SuggestionsListOnPreviewKeyDown;
         SuggestionsList.LostKeyboardFocus += SuggestionsListOnLostKeyboardFocus;
@@ -311,6 +327,14 @@ protected virtual void OnTextChanged(AutoSuggestionBoxTextChangeReason reason, s
             DefaultFiltering(text);
     }
 
+    /// <summary>
+    /// 
+    /// </summary>
+    protected virtual void OnSuggestionsPopupClosed()
+    {
+        RaiseEvent(new RoutedEventArgs(SuggestionsPopupClosedEvent, this));
+    }
+
     #endregion
 
     #region TextBox events
@@ -319,8 +343,8 @@ private void TextBoxOnPreviewKeyDown(object sender, KeyEventArgs e)
     {
         if (e.Key is Key.Enter)
         {
-            OnQuerySubmitted(TextBox.Text);
             IsSuggestionListOpen = false;
+            OnQuerySubmitted(TextBox.Text);
             return;
         }
 
@@ -383,8 +407,8 @@ private void SuggestionsListOnPreviewKeyDown(object sender, KeyEventArgs e)
         if (e.Key is not Key.Enter)
             return;
 
-        OnSelectedChanged(SuggestionsList.SelectedItem);
         IsSuggestionListOpen = false;
+        OnSelectedChanged(SuggestionsList.SelectedItem);
     }
 
     private void SuggestionsListOnPreviewMouseLeftButtonUp(object sender, MouseButtonEventArgs e)

From 73c517bc095219e1e7479b25e854dacdbf98ad39 Mon Sep 17 00:00:00 2001
From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com>
Date: Sat, 4 Feb 2023 10:51:06 +0600
Subject: [PATCH 16/26] AutoSuggestBoxPage cleanup

---
 .../Views/Pages/Text/AutoSuggestBoxPage.xaml  |  15 +-
 .../Pages/Text/AutoSuggestBoxPage.xaml.cs     | 146 +-----------------
 2 files changed, 11 insertions(+), 150 deletions(-)

diff --git a/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml
index db90d3383..4f9d3141c 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml
@@ -4,12 +4,12 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="clr-namespace:Wpf.Ui.Gallery.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:Wpf.Ui.Gallery.Views.Pages.Text"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:system="clr-namespace:System;assembly=System.Runtime"
+    xmlns:text="clr-namespace:Wpf.Ui.Gallery.ViewModels.Pages.Text"
     xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
     Title="AutoSuggestBoxPage"
-    d:DataContext="{d:DesignInstance local:AutoSuggestBoxPage,
+    d:DataContext="{d:DesignInstance text:AutoSuggestBoxViewModel,
                                      IsDesignTimeCreatable=False}"
     d:DesignHeight="450"
     d:DesignWidth="800"
@@ -46,16 +46,7 @@
                         CodeText="&lt;ui:AutoSuggestBox PlaceholderText=&quot;Search...&quot; /&gt;"
                         HeaderText="WPF UI AutoSuggestBox.">
                         <controls:GalleryControlPresenter.Content>
-                            <StackPanel>
-                                <ui:NewAutoSuggestBox
-                                    x:Name="AutoSuggestBox"
-                                    DisplayMemberPath="Text"
-                                    PlaceholderText="Search..."
-                                    SuggestionChosen="AutoSuggestBox_OnSuggestionChosen" />
-
-                                <TextBlock x:Name="SuggestionOutput" />
-                            </StackPanel>
-
+                            <ui:NewAutoSuggestBox OriginalItemsSource="{Binding AutoSuggestBoxSuggestions, Mode=OneWay}" PlaceholderText="Search..." />
                         </controls:GalleryControlPresenter.Content>
                     </controls:GalleryControlPresenter>
                 </Grid>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml.cs b/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml.cs
index 937009834..88a5320d5 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml.cs
+++ b/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml.cs
@@ -3,150 +3,20 @@
 // Copyright (C) Leszek Pomianowski and WPF UI Contributors.
 // All Rights Reserved.
 
-
-using System.Diagnostics;
-using Wpf.Ui.Controls;
+using Wpf.Ui.Controls.Navigation;
+using Wpf.Ui.Gallery.ViewModels.Pages.Text;
 
 namespace Wpf.Ui.Gallery.Views.Pages.Text;
 
-public record TestMode(string Text)
+public partial class AutoSuggestBoxPage : INavigableView<AutoSuggestBoxViewModel>
 {
-    public static implicit operator TestMode(string text) => new TestMode(text);
-}
-
-public partial class AutoSuggestBoxPage
-{
-    public AutoSuggestBoxPage()
-    {
-        InitializeComponent();
-        AutoSuggestBox.OriginalItemsSource = _cats;
-    }
-
-    private readonly List<TestMode> _cats = new()
-    {
-        "Abyssinian",
-        "Aegean",
-        "American Bobtail",
-        "American Curl",
-        "American Ringtail",
-        "American Shorthair",
-        "American Wirehair",
-        "Aphrodite Giant",
-        "Arabian Mau",
-        "Asian cat",
-        "Asian Semi-longhair",
-        "Australian Mist",
-        "Balinese",
-        "Bambino",
-        "Bengal",
-        "Birman",
-        "Brazilian Shorthair",
-        "British Longhair",
-        "British Shorthair",
-        "Burmese",
-        "Burmilla",
-        "California Spangled",
-        "Chantilly-Tiffany",
-        "Chartreux",
-        "Chausie",
-        "Colorpoint Shorthair",
-        "Cornish Rex",
-        "Cymric",
-        "Cyprus",
-        "Devon Rex",
-        "Donskoy",
-        "Dragon Li",
-        "Dwelf",
-        "Egyptian Mau",
-        "European Shorthair",
-        "Exotic Shorthair",
-        "Foldex",
-        "German Rex",
-        "Havana Brown",
-        "Highlander",
-        "Himalayan",
-        "Japanese Bobtail",
-        "Javanese",
-        "Kanaani",
-        "Khao Manee",
-        "Kinkalow",
-        "Korat",
-        "Korean Bobtail",
-        "Korn Ja",
-        "Kurilian Bobtail",
-        "Lambkin",
-        "LaPerm",
-        "Lykoi",
-        "Maine Coon",
-        "Manx",
-        "Mekong Bobtail",
-        "Minskin",
-        "Napoleon",
-        "Munchkin",
-        "Nebelung",
-        "Norwegian Forest Cat",
-        "Ocicat",
-        "Ojos Azules",
-        "Oregon Rex",
-        "Persian (modern)",
-        "Persian (traditional)",
-        "Peterbald",
-        "Pixie-bob",
-        "Ragamuffin",
-        "Ragdoll",
-        "Raas",
-        "Russian Blue",
-        "Russian White",
-        "Sam Sawet",
-        "Savannah",
-        "Scottish Fold",
-        "Selkirk Rex",
-        "Serengeti",
-        "Serrade Petit",
-        "Siamese",
-        "Siberian or´Siberian Forest Cat",
-        "Singapura",
-        "Snowshoe",
-        "Sokoke",
-        "Somali",
-        "Sphynx",
-        "Suphalak",
-        "Thai",
-        "Thai Lilac",
-        "Tonkinese",
-        "Toyger",
-        "Turkish Angora",
-        "Turkish Van",
-        "Turkish Vankedisi",
-        "Ukrainian Levkoy",
-        "Wila Krungthep",
-        "York Chocolate"
-    };
+    public AutoSuggestBoxViewModel ViewModel { get; }
 
-    private void AutoSuggestBox_OnTextChanged(NewAutoSuggestBox sender, AutoSuggestBoxTextChangedEventArgs args)
+    public AutoSuggestBoxPage(AutoSuggestBoxViewModel viewModel)
     {
-        if (args.Reason is not AutoSuggestionBoxTextChangeReason.UserInput)
-            return;
+        ViewModel = viewModel;
+        DataContext = viewModel;
 
-        var suitableItems = new List<TestMode>();
-        var splitText = args.Text.ToLower().Split(" ");
-
-        foreach (var cat in _cats)
-        {
-            var found = splitText.All(key=> cat.Text.ToLower().Contains(key));
-
-            if(found)
-                suitableItems.Add(cat);
-        }
-
-        if (suitableItems.Count == 0)
-            suitableItems.Add("No results found");
-
-        sender.ItemsSource = suitableItems;
-    }
-
-    private void AutoSuggestBox_OnSuggestionChosen(NewAutoSuggestBox sender, AutoSuggestBoxSuggestionChosenEventArgs args)
-    {
-        SuggestionOutput.Text = ((TestMode)args.SelectedItem).Text;
+        InitializeComponent();
     }
 }

From eeb5316b3e60dd61f853d91e9efc2b12e14a9b46 Mon Sep 17 00:00:00 2001
From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com>
Date: Sat, 4 Feb 2023 11:21:02 +0600
Subject: [PATCH 17/26] Deleted original AutoSuggestBox

---
 .../Views/Pages/Text/AutoSuggestBoxPage.xaml  |   2 +-
 .../Views/Windows/MainWindow.xaml             |   6 +-
 src/Wpf.Ui/Controls/AutoSuggestBox.cs         | 353 -----------------
 .../{ => AutoSuggestBox}/AutoSuggestBox.bmp   | Bin
 ...NewAutoSuggestBox.cs => AutoSuggestBox.cs} |  48 +--
 .../AutoSuggestBoxQuerySubmittedEventArgs.cs  |   2 +-
 ...AutoSuggestBoxSuggestionChosenEventArgs.cs |   2 +-
 .../AutoSuggestBoxTextChangedEventArgs.cs     |   2 +-
 .../Navigation/NavigationView.Base.cs         |  56 ++-
 .../Styles/Controls/AutoSuggestBox.xaml       | 354 ------------------
 .../Styles/Controls/NewAutoSuggestBox.xaml    |   6 +-
 src/Wpf.Ui/Styles/Wpf.Ui.xaml                 |   1 -
 src/Wpf.Ui/Wpf.Ui.csproj                      |   2 +-
 13 files changed, 85 insertions(+), 749 deletions(-)
 delete mode 100644 src/Wpf.Ui/Controls/AutoSuggestBox.cs
 rename src/Wpf.Ui/Controls/{ => AutoSuggestBox}/AutoSuggestBox.bmp (100%)
 rename src/Wpf.Ui/Controls/AutoSuggestBox/{NewAutoSuggestBox.cs => AutoSuggestBox.cs} (90%)
 delete mode 100644 src/Wpf.Ui/Styles/Controls/AutoSuggestBox.xaml

diff --git a/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml
index 4f9d3141c..9aea4aac5 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml
@@ -46,7 +46,7 @@
                         CodeText="&lt;ui:AutoSuggestBox PlaceholderText=&quot;Search...&quot; /&gt;"
                         HeaderText="WPF UI AutoSuggestBox.">
                         <controls:GalleryControlPresenter.Content>
-                            <ui:NewAutoSuggestBox OriginalItemsSource="{Binding AutoSuggestBoxSuggestions, Mode=OneWay}" PlaceholderText="Search..." />
+                            <ui:AutoSuggestBox OriginalItemsSource="{Binding AutoSuggestBoxSuggestions, Mode=OneWay}" PlaceholderText="Search..." />
                         </controls:GalleryControlPresenter.Content>
                     </controls:GalleryControlPresenter>
                 </Grid>
diff --git a/src/Wpf.Ui.Gallery/Views/Windows/MainWindow.xaml b/src/Wpf.Ui.Gallery/Views/Windows/MainWindow.xaml
index 18434e032..830618f42 100644
--- a/src/Wpf.Ui.Gallery/Views/Windows/MainWindow.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Windows/MainWindow.xaml
@@ -39,11 +39,7 @@
                 <ui:BreadcrumbBar Margin="42,32,0,0" />
             </ui:NavigationView.Header>
             <ui:NavigationView.AutoSuggestBox>
-                <ui:AutoSuggestBox
-                    Margin="8,8,8,16"
-                    IconPlacement="Right"
-                    PlaceholderEnabled="True"
-                    PlaceholderText="Search" />
+                <ui:AutoSuggestBox Margin="8,8,8,16" PlaceholderText="Search" />
             </ui:NavigationView.AutoSuggestBox>
             <ui:NavigationView.ContentOverlay>
                 <Grid>
diff --git a/src/Wpf.Ui/Controls/AutoSuggestBox.cs b/src/Wpf.Ui/Controls/AutoSuggestBox.cs
deleted file mode 100644
index 4357fe099..000000000
--- a/src/Wpf.Ui/Controls/AutoSuggestBox.cs
+++ /dev/null
@@ -1,353 +0,0 @@
-// This Source Code Form is subject to the terms of the MIT License.
-// If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
-// Copyright (C) Leszek Pomianowski and WPF UI Contributors.
-// All Rights Reserved.
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Input;
-
-namespace Wpf.Ui.Controls;
-
-// TODO: Fix closing and loosing focus
-
-/// <summary>
-/// Represents a text control that makes suggestions to users as they enter text using a keyboard.
-/// </summary>
-[ToolboxItem(true)]
-[ToolboxBitmap(typeof(AutoSuggestBox), "AutoSuggestBox.bmp")]
-[TemplatePart(Name = "PART_Popup", Type = typeof(System.Windows.Controls.Primitives.Popup))]
-[TemplatePart(Name = "PART_SuggestionsPresenter", Type = typeof(System.Windows.Controls.ListView))]
-public class AutoSuggestBox : Wpf.Ui.Controls.TextBox
-{
-    /// <summary>
-    /// The current text in <see cref="System.Windows.Controls.TextBox.Text"/> used for validation purposes.
-    /// </summary>
-    private string _currentText = String.Empty;
-
-    /// <summary>
-    /// Template element represented by the <c>PART_Popup</c> name.
-    /// </summary>
-    private const string ElementPopup = "PART_Popup";
-
-    /// <summary>
-    /// Template element represented by the <c>PART_SuggestionsPresenter</c> name.
-    /// </summary>
-    private const string ElementSuggestionsPresenter = "PART_SuggestionsPresenter";
-
-    /// <summary>
-    /// Popup with suggestions.
-    /// </summary>
-    protected Popup? Popup { get; private set; }
-
-    /// <summary>
-    /// List of suggestions inside <see cref="Popup"/>.
-    /// </summary>
-    protected ListView? SuggestionsPresenter { get; private set; }
-
-    /// <summary>
-    /// Property for <see cref="ItemsSource"/>.
-    /// </summary>
-    public static readonly DependencyProperty ItemsSourceProperty = DependencyProperty.Register(nameof(ItemsSource),
-        typeof(object), typeof(AutoSuggestBox),
-        new PropertyMetadata(null!, OnItemsSourceChanged));
-
-    /// <summary>
-    /// Property for <see cref="FilteredItemsSource"/>.
-    /// </summary>
-    public static readonly DependencyProperty FilteredItemsSourceProperty = DependencyProperty.Register(nameof(FilteredItemsSource),
-        typeof(object), typeof(AutoSuggestBox),
-        new PropertyMetadata(null!));
-
-    /// <summary>
-    /// Property for <see cref="IsSuggestionListOpen"/>.
-    /// </summary>
-    public static readonly DependencyProperty IsSuggestionListOpenProperty = DependencyProperty.Register(nameof(IsSuggestionListOpen),
-        typeof(bool), typeof(AutoSuggestBox),
-        new PropertyMetadata(false));
-
-    /// <summary>
-    /// Property for <see cref="MaxDropDownHeight"/>.
-    /// </summary>
-    public static readonly DependencyProperty MaxDropDownHeightProperty = DependencyProperty.Register(nameof(MaxDropDownHeight),
-        typeof(double), typeof(AutoSuggestBox),
-        new PropertyMetadata(240d));
-
-    /// <summary>
-    /// Routed event for <see cref="QuerySubmitted"/>.
-    /// </summary>
-    public static readonly RoutedEvent QuerySubmittedEvent = EventManager.RegisterRoutedEvent(
-        nameof(QuerySubmitted), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(AutoSuggestBox));
-
-    /// <summary>
-    /// Routed event for <see cref="SuggestionChosen"/>.
-    /// </summary>
-    public static readonly RoutedEvent SuggestionChosenEvent = EventManager.RegisterRoutedEvent(
-        nameof(SuggestionChosen), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(AutoSuggestBox));
-
-    /// <summary>
-    /// <see cref="AutoSuggestBox"/> does no accept returns.
-    /// </summary>
-    public new bool AcceptsReturn
-    {
-        get => false;
-        set => throw new NotImplementedException($"{typeof(AutoSuggestBox)} does not accept returns.");
-    }
-
-    /// <summary>
-    /// <see cref="AutoSuggestBox"/> does not accept changes to the number of lines.
-    /// </summary>
-    public new int MaxLines
-    {
-        get => 1;
-        set => throw new NotImplementedException($"{typeof(AutoSuggestBox)} does not accept changes to the number of lines.");
-    }
-
-    /// <summary>
-    /// <see cref="AutoSuggestBox"/> does not accept changes to the number of lines.
-    /// </summary>
-    public new int MinLines
-    {
-        get => 1;
-        set => throw new NotImplementedException($"{typeof(AutoSuggestBox)} does not accept changes to the number of lines.");
-    }
-
-    /// <summary>
-    /// ItemsSource specifies a collection used to generate the list of suggestions
-    /// for <see cref="AutoSuggestBox"/>.
-    /// </summary>
-    [Bindable(true)]
-    public object ItemsSource
-    {
-        get => GetValue(ItemsSourceProperty);
-        set
-        {
-            if (value == null)
-                ClearValue(ItemsSourceProperty);
-            else
-                SetValue(ItemsSourceProperty, value);
-        }
-    }
-
-    /// <summary>
-    /// Filtered <see cref="ItemsSource"/> based on provided text.
-    /// </summary>
-    public object FilteredItemsSource
-    {
-        get => GetValue(FilteredItemsSourceProperty);
-        private set
-        {
-            if (value == null)
-                ClearValue(FilteredItemsSourceProperty);
-            else
-                SetValue(FilteredItemsSourceProperty, value);
-        }
-    }
-
-    /// <summary>
-    /// Gets or sets a value representing whether the suggestion list should be opened.
-    /// </summary>
-    public bool IsSuggestionListOpen
-    {
-        get => (bool)GetValue(IsSuggestionListOpenProperty);
-        set => SetValue(IsSuggestionListOpenProperty, value);
-    }
-
-    /// <summary>
-    /// Gets or sets the maximum height of the drop-down list with suggestions.
-    /// </summary>
-    public double MaxDropDownHeight
-    {
-        get => (double)GetValue(MaxDropDownHeightProperty);
-        set => SetValue(MaxDropDownHeightProperty, value);
-    }
-
-    /// <summary>
-    /// Event occurs when a user commits a query string.
-    /// </summary>
-    public event RoutedEventHandler QuerySubmitted
-    {
-        add => AddHandler(QuerySubmittedEvent, value);
-        remove => RemoveHandler(QuerySubmittedEvent, value);
-    }
-
-    /// <summary>
-    /// Event occurs when the user selects an item from the recommended ones.
-    /// </summary>
-    public event RoutedEventHandler SuggestionChosen
-    {
-        add => AddHandler(SuggestionChosenEvent, value);
-        remove => RemoveHandler(SuggestionChosenEvent, value);
-    }
-
-    /// <summary>
-    /// Gets the suggested result that the user chose.
-    /// </summary>
-    public object? ChosenSuggestion { get; protected set; } = null;
-
-    /// <summary>
-    /// Invoked whenever application code or an internal process,
-    /// such as a rebuilding layout pass, calls the ApplyTemplate method.
-    /// </summary>
-    public override void OnApplyTemplate()
-    {
-        base.OnApplyTemplate();
-
-        if (GetTemplateChild(ElementPopup) is Popup popup)
-            Popup = popup;
-
-        if (GetTemplateChild(ElementSuggestionsPresenter) is ListView listView)
-            SuggestionsPresenter = listView;
-
-        if (SuggestionsPresenter == null!)
-            return;
-
-        SuggestionsPresenter.SelectionChanged += OnSuggestionsPresenterSelectionChanged;
-        SuggestionsPresenter.LostFocus += OnSuggestionsPresenterLostFocus;
-    }
-
-    /// <inheritdoc />
-    protected override void OnTextChanged(TextChangedEventArgs e)
-    {
-        base.OnTextChanged(e);
-
-        if (ItemsSource is not ICollection itemsSourceCollection)
-            return;
-
-        var newText = Text;
-
-        if (_currentText == newText)
-            return;
-
-        _currentText = newText;
-
-        if (String.IsNullOrEmpty(newText))
-        {
-            FilteredItemsSource = ItemsSource;
-        }
-        else
-        {
-            var formattedNewText = newText.ToLower();
-
-            var filteredCollection = new List<object>();
-
-            foreach (var collectionItem in itemsSourceCollection)
-                if ((collectionItem?.ToString()?.ToLower() ?? String.Empty).Contains(formattedNewText) && collectionItem != null)
-                    filteredCollection.Add(collectionItem);
-
-            FilteredItemsSource = filteredCollection;
-        }
-
-        OnQuerySubmitted();
-
-        IsSuggestionListOpen = true;
-    }
-
-    /// <inheritdoc />
-    protected override void OnKeyDown(KeyEventArgs e)
-    {
-        if (e.Key == Key.Down && Popup != null && SuggestionsPresenter != null && Popup.IsOpen)
-        {
-            SuggestionsPresenter.Focus();
-
-            e.Handled = true;
-
-            return;
-        }
-
-        base.OnKeyDown(e);
-    }
-
-    /// <inheritdoc />
-    protected override void OnLostFocus(RoutedEventArgs e)
-    {
-        IsSuggestionListOpen = false;
-
-        base.OnLostFocus(e);
-    }
-
-    /// <inheritdoc />
-    protected override void OnClearButtonClick()
-    {
-        base.OnClearButtonClick();
-
-        // TODO: Fix clearing search results
-        FilteredItemsSource = ItemsSource;
-        ChosenSuggestion = null;
-    }
-
-    /// <summary>
-    /// This virtual method is called after presenter containing suggestion loses focus.
-    /// </summary>
-    protected virtual void OnSuggestionsPresenterLostFocus(object sender, RoutedEventArgs e)
-    {
-        if (!IsFocused)
-            IsSuggestionListOpen = false;
-    }
-
-    /// <summary>
-    /// This virtual method is called after one of the suggestion is selected.
-    /// </summary>
-    protected virtual void OnSuggestionsPresenterSelectionChanged(object sender, SelectionChangedEventArgs e)
-    {
-        if (sender is not ListView listView)
-            return;
-
-        var selected = listView.SelectedItem;
-
-        listView.UnselectAll();
-
-        ChosenSuggestion = selected ?? null;
-        var chosenSuggestionString = selected?.ToString() ?? String.Empty;
-
-        Text = chosenSuggestionString;
-        CaretIndex = chosenSuggestionString.Length;
-        IsSuggestionListOpen = false;
-
-        Focus();
-
-        OnSuggestionChosen();
-    }
-
-    /// <summary>
-    /// This virtual method is called after submitting a query.
-    /// </summary>
-    protected virtual void OnQuerySubmitted()
-    {
-        var newEvent = new RoutedEventArgs(QuerySubmittedEvent, this);
-        RaiseEvent(newEvent);
-    }
-
-    /// <summary>
-    /// This virtual method is called after selecting a suggestion.
-    /// </summary>
-    protected virtual void OnSuggestionChosen()
-    {
-        var newEvent = new RoutedEventArgs(SuggestionChosenEvent, this);
-        RaiseEvent(newEvent);
-    }
-
-    /// <summary>
-    /// This virtual method is called after <see cref="ItemsSource"/> is changed.
-    /// </summary>
-    protected virtual void OnItemsSourceChanged(IEnumerable<string> itemsSource)
-    {
-        FilteredItemsSource = itemsSource;
-    }
-
-    private static void OnItemsSourceChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-    {
-        if (d is not AutoSuggestBox autoSuggestBox)
-            return;
-
-        if (e.NewValue is IEnumerable<string> itemSource)
-            autoSuggestBox.OnItemsSourceChanged(itemSource);
-    }
-}
-
diff --git a/src/Wpf.Ui/Controls/AutoSuggestBox.bmp b/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBox.bmp
similarity index 100%
rename from src/Wpf.Ui/Controls/AutoSuggestBox.bmp
rename to src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBox.bmp
diff --git a/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs b/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBox.cs
similarity index 90%
rename from src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs
rename to src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBox.cs
index 1af8f8efd..0b0184bec 100644
--- a/src/Wpf.Ui/Controls/AutoSuggestBox/NewAutoSuggestBox.cs
+++ b/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBox.cs
@@ -14,13 +14,17 @@
 using Wpf.Ui.Interop;
 using System.Collections.Generic;
 using System.Linq;
+using System.ComponentModel;
+using System.Drawing;
 
 namespace Wpf.Ui.Controls;
 
+[ToolboxItem(true)]
+[ToolboxBitmap(typeof(AutoSuggestBox), "AutoSuggestBox.bmp")]
 [TemplatePart(Name = ElementTextBox, Type = typeof(TextBox))]
 [TemplatePart(Name = ElementSuggestionsPopup, Type = typeof(Popup))]
 [TemplatePart(Name = ElementSuggestionsList, Type = typeof(ListView))]
-public class NewAutoSuggestBox : System.Windows.Controls.ItemsControl
+public class AutoSuggestBox : System.Windows.Controls.ItemsControl
 {
     protected const string ElementTextBox = "PART_TextBox";
     protected const string ElementSuggestionsPopup = "PART_SuggestionsPopup";
@@ -32,44 +36,44 @@ public class NewAutoSuggestBox : System.Windows.Controls.ItemsControl
     /// Property for <see cref="OriginalItemsSource"/>.
     /// </summary>
     public static readonly DependencyProperty OriginalItemsSourceProperty =
-        DependencyProperty.Register(nameof(OriginalItemsSource), typeof(IList), typeof(NewAutoSuggestBox),
+        DependencyProperty.Register(nameof(OriginalItemsSource), typeof(IList), typeof(AutoSuggestBox),
             new PropertyMetadata(Array.Empty<object>()));
 
     /// <summary>
     /// Property for <see cref="IsSuggestionListOpen"/>.
     /// </summary>
     public static readonly DependencyProperty IsSuggestionListOpenProperty =
-        DependencyProperty.Register(nameof(IsSuggestionListOpen), typeof(bool), typeof(NewAutoSuggestBox),
+        DependencyProperty.Register(nameof(IsSuggestionListOpen), typeof(bool), typeof(AutoSuggestBox),
             new PropertyMetadata(false));
 
     /// <summary>
     /// Property for <see cref="Text"/>.
     /// </summary>
-    public static readonly DependencyProperty TextProperty = DependencyProperty.Register(nameof(Text), typeof(string), typeof(NewAutoSuggestBox),
+    public static readonly DependencyProperty TextProperty = DependencyProperty.Register(nameof(Text), typeof(string), typeof(AutoSuggestBox),
         new PropertyMetadata(string.Empty, TextPropertyChangedCallback));
 
     /// <summary>
     /// Property for <see cref="PlaceholderText"/>.
     /// </summary>
-    public static readonly DependencyProperty PlaceholderTextProperty = DependencyProperty.Register(nameof(PlaceholderText), typeof(string), typeof(NewAutoSuggestBox),
+    public static readonly DependencyProperty PlaceholderTextProperty = DependencyProperty.Register(nameof(PlaceholderText), typeof(string), typeof(AutoSuggestBox),
         new PropertyMetadata(string.Empty));
 
     /// <summary>
     /// Property for <see cref="UpdateTextOnSelect"/>.
     /// </summary>
-    public static readonly DependencyProperty UpdateTextOnSelectProperty = DependencyProperty.Register(nameof(UpdateTextOnSelect), typeof(bool), typeof(NewAutoSuggestBox),
+    public static readonly DependencyProperty UpdateTextOnSelectProperty = DependencyProperty.Register(nameof(UpdateTextOnSelect), typeof(bool), typeof(AutoSuggestBox),
         new PropertyMetadata(true));
 
     /// <summary>
     /// Property for <see cref="MaxSuggestionListHeight"/>.
     /// </summary>
-    public static readonly DependencyProperty MaxSuggestionListHeightProperty = DependencyProperty.Register(nameof(MaxSuggestionListHeight), typeof(double), typeof(NewAutoSuggestBox),
+    public static readonly DependencyProperty MaxSuggestionListHeightProperty = DependencyProperty.Register(nameof(MaxSuggestionListHeight), typeof(double), typeof(AutoSuggestBox),
         new PropertyMetadata(0d));
 
     /// <summary>
     /// Property for <see cref="Icon"/>.
     /// </summary>
-    public static readonly DependencyProperty IconProperty = DependencyProperty.Register(nameof(Icon), typeof(SymbolRegular), typeof(NewAutoSuggestBox),
+    public static readonly DependencyProperty IconProperty = DependencyProperty.Register(nameof(Icon), typeof(SymbolRegular), typeof(AutoSuggestBox),
         new PropertyMetadata(SymbolRegular.Empty));
 
     #endregion
@@ -128,7 +132,7 @@ public double MaxSuggestionListHeight
     }
 
     /// <summary>
-    /// Gets or sets a value indicating whether items in the view will trigger an update of the editable text part of the <see cref="NewAutoSuggestBox"/> when clicked.
+    /// Gets or sets a value indicating whether items in the view will trigger an update of the editable text part of the <see cref="AutoSuggestBox"/> when clicked.
     /// </summary>
     public bool UpdateTextOnSelect
     {
@@ -153,30 +157,30 @@ public SymbolRegular Icon
     /// Routed event for <see cref="QuerySubmitted"/>.
     /// </summary>
     public static readonly RoutedEvent QuerySubmittedEvent = EventManager.RegisterRoutedEvent(
-        nameof(QuerySubmitted), RoutingStrategy.Bubble, typeof(TypedEventHandler<NewAutoSuggestBox, AutoSuggestBoxQuerySubmittedEventArgs>), typeof(NewAutoSuggestBox));
+        nameof(QuerySubmitted), RoutingStrategy.Bubble, typeof(TypedEventHandler<AutoSuggestBox, AutoSuggestBoxQuerySubmittedEventArgs>), typeof(AutoSuggestBox));
 
     /// <summary>
     /// Routed event for <see cref="SuggestionChosen"/>.
     /// </summary>
     public static readonly RoutedEvent SuggestionChosenEvent = EventManager.RegisterRoutedEvent(
-        nameof(SuggestionChosen), RoutingStrategy.Bubble, typeof(TypedEventHandler<NewAutoSuggestBox, AutoSuggestBoxSuggestionChosenEventArgs>), typeof(NewAutoSuggestBox));
+        nameof(SuggestionChosen), RoutingStrategy.Bubble, typeof(TypedEventHandler<AutoSuggestBox, AutoSuggestBoxSuggestionChosenEventArgs>), typeof(AutoSuggestBox));
 
     /// <summary>
     /// Routed event for <see cref="TextChanged"/>.
     /// </summary>
     public static readonly RoutedEvent TextChangedEvent = EventManager.RegisterRoutedEvent(
-        nameof(TextChanged), RoutingStrategy.Bubble, typeof(TypedEventHandler<NewAutoSuggestBox, AutoSuggestBoxTextChangedEventArgs>), typeof(NewAutoSuggestBox));
+        nameof(TextChanged), RoutingStrategy.Bubble, typeof(TypedEventHandler<AutoSuggestBox, AutoSuggestBoxTextChangedEventArgs>), typeof(AutoSuggestBox));
 
     /// <summary>
     /// Routed event for <see cref="SuggestionsPopupClosed"/>.
     /// </summary>
     public static readonly RoutedEvent SuggestionsPopupClosedEvent = EventManager.RegisterRoutedEvent(
-        nameof(SuggestionsPopupClosed), RoutingStrategy.Bubble, typeof(TypedEventHandler<NewAutoSuggestBox, RoutedEventArgs>), typeof(NewAutoSuggestBox));
+        nameof(SuggestionsPopupClosed), RoutingStrategy.Bubble, typeof(TypedEventHandler<AutoSuggestBox, RoutedEventArgs>), typeof(AutoSuggestBox));
 
     /// <summary>
     /// Occurs when the user submits a search query.
     /// </summary>
-    public event TypedEventHandler<NewAutoSuggestBox, AutoSuggestBoxQuerySubmittedEventArgs> QuerySubmitted
+    public event TypedEventHandler<AutoSuggestBox, AutoSuggestBoxQuerySubmittedEventArgs> QuerySubmitted
     {
         add => AddHandler(QuerySubmittedEvent, value);
         remove => RemoveHandler(QuerySubmittedEvent, value);
@@ -185,7 +189,7 @@ public event TypedEventHandler<NewAutoSuggestBox, AutoSuggestBoxQuerySubmittedEv
     /// <summary>
     /// Event occurs when the user selects an item from the recommended ones.
     /// </summary>
-    public event TypedEventHandler<NewAutoSuggestBox, AutoSuggestBoxSuggestionChosenEventArgs> SuggestionChosen
+    public event TypedEventHandler<AutoSuggestBox, AutoSuggestBoxSuggestionChosenEventArgs> SuggestionChosen
     {
         add => AddHandler(SuggestionChosenEvent, value);
         remove => RemoveHandler(SuggestionChosenEvent, value);
@@ -194,7 +198,7 @@ public event TypedEventHandler<NewAutoSuggestBox, AutoSuggestBoxSuggestionChosen
     /// <summary>
     /// Raised after the text content of the editable control component is updated.
     /// </summary>
-    public event TypedEventHandler<NewAutoSuggestBox, AutoSuggestBoxTextChangedEventArgs> TextChanged
+    public event TypedEventHandler<AutoSuggestBox, AutoSuggestBoxTextChangedEventArgs> TextChanged
     {
         add => AddHandler(TextChangedEvent, value);
         remove => RemoveHandler(TextChangedEvent, value);
@@ -203,7 +207,7 @@ public event TypedEventHandler<NewAutoSuggestBox, AutoSuggestBoxTextChangedEvent
     /// <summary>
     /// Raised after the popup is closed.
     /// </summary>
-    public event TypedEventHandler<NewAutoSuggestBox, RoutedEventArgs> SuggestionsPopupClosed
+    public event TypedEventHandler<AutoSuggestBox, RoutedEventArgs> SuggestionsPopupClosed
     {
         add => AddHandler(SuggestionsPopupClosedEvent, value);
         remove => RemoveHandler(SuggestionsPopupClosedEvent, value);
@@ -219,11 +223,11 @@ public event TypedEventHandler<NewAutoSuggestBox, RoutedEventArgs> SuggestionsPo
     private bool _changingTextAfterSuggestionChosen;
     private bool _isUserChangedText;
 
-    public NewAutoSuggestBox()
+    public AutoSuggestBox()
     {
         Unloaded += static (sender, _) =>
         {
-            var self = (NewAutoSuggestBox)sender;
+            var self = (AutoSuggestBox)sender;
 
             self.ReleaseTemplateResources();
         };
@@ -271,8 +275,8 @@ protected virtual void ReleaseTemplateResources()
         SuggestionsList.LostKeyboardFocus -= SuggestionsListOnLostKeyboardFocus;
         SuggestionsList.PreviewMouseLeftButtonUp -= SuggestionsListOnPreviewMouseLeftButtonUp;
 
-        var hwnd = (HwndSource)PresentationSource.FromVisual(this)!;
-        hwnd.RemoveHook(Hook);
+        if (PresentationSource.FromVisual(this) is HwndSource source)
+            source.RemoveHook(Hook);
     }
 
     #region Events
@@ -501,7 +505,7 @@ private string GetStringFromObj(object obj)
 
     private static void TextPropertyChangedCallback(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
-        var self = (NewAutoSuggestBox)d;
+        var self = (AutoSuggestBox)d;
         var newText = (string)e.NewValue;
 
         if (self.TextBox.Text == newText)
diff --git a/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBoxQuerySubmittedEventArgs.cs b/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBoxQuerySubmittedEventArgs.cs
index 7ce519156..09888dae9 100644
--- a/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBoxQuerySubmittedEventArgs.cs
+++ b/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBoxQuerySubmittedEventArgs.cs
@@ -8,7 +8,7 @@
 namespace Wpf.Ui.Controls;
 
 /// <summary>
-/// Provides event data for the <see cref="NewAutoSuggestBox.QuerySubmitted"/> event.
+/// Provides event data for the <see cref="AutoSuggestBox.QuerySubmitted"/> event.
 /// </summary>
 public sealed class AutoSuggestBoxQuerySubmittedEventArgs : RoutedEventArgs
 {
diff --git a/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBoxSuggestionChosenEventArgs.cs b/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBoxSuggestionChosenEventArgs.cs
index 87aca82ba..f539d2b9f 100644
--- a/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBoxSuggestionChosenEventArgs.cs
+++ b/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBoxSuggestionChosenEventArgs.cs
@@ -8,7 +8,7 @@
 namespace Wpf.Ui.Controls;
 
 /// <summary>
-/// Provides data for the <see cref="NewAutoSuggestBox.SuggestionChosen"/> event.
+/// Provides data for the <see cref="AutoSuggestBox.SuggestionChosen"/> event.
 /// </summary>
 public sealed class AutoSuggestBoxSuggestionChosenEventArgs : RoutedEventArgs
 {
diff --git a/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBoxTextChangedEventArgs.cs b/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBoxTextChangedEventArgs.cs
index f72f5ccbd..2977f1fe9 100644
--- a/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBoxTextChangedEventArgs.cs
+++ b/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBoxTextChangedEventArgs.cs
@@ -8,7 +8,7 @@
 namespace Wpf.Ui.Controls;
 
 /// <summary>
-/// Provides data for the <see cref="NewAutoSuggestBox.TextChanged"/> event.
+/// Provides data for the <see cref="AutoSuggestBox.TextChanged"/> event.
 /// </summary>
 public sealed class AutoSuggestBoxTextChangedEventArgs : RoutedEventArgs
 {
diff --git a/src/Wpf.Ui/Controls/Navigation/NavigationView.Base.cs b/src/Wpf.Ui/Controls/Navigation/NavigationView.Base.cs
index 9ac3ae058..62fae38f2 100644
--- a/src/Wpf.Ui/Controls/Navigation/NavigationView.Base.cs
+++ b/src/Wpf.Ui/Controls/Navigation/NavigationView.Base.cs
@@ -13,6 +13,7 @@
 using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Diagnostics;
+using System.Linq;
 using System.Windows;
 using Wpf.Ui.Common;
 
@@ -30,6 +31,8 @@ public partial class NavigationView : System.Windows.Controls.Control, INavigati
     private readonly ObservableCollection<string> _autoSuggestBoxItems = new();
     private readonly ObservableCollection<NavigationViewBreadcrumbItem> _breadcrumbBarItems = new();
 
+    private string _selectedAutoSuggestBoxItem = string.Empty;
+
     protected Dictionary<string, INavigationViewItem> PageIdOrTargetTagNavigationViewsDictionary = new();
     protected Dictionary<Type, INavigationViewItem> PageTypeNavigationViewsDictionary = new();
 
@@ -70,8 +73,10 @@ protected override void OnInitialized(EventArgs e)
 
         if (AutoSuggestBox is not null)
         {
-            AutoSuggestBox.ItemsSource = _autoSuggestBoxItems;
+            AutoSuggestBox.OriginalItemsSource = _autoSuggestBoxItems;
             AutoSuggestBox.SuggestionChosen += AutoSuggestBoxOnSuggestionChosen;
+            AutoSuggestBox.SuggestionsPopupClosed += AutoSuggestBoxOnSuggestionsPopupClosed;
+            AutoSuggestBox.QuerySubmitted += AutoSuggestBoxOnQuerySubmitted;
         }
 
         InvalidateArrange();
@@ -107,7 +112,11 @@ protected virtual void OnUnloaded(object sender, RoutedEventArgs e)
         ClearJournal();
 
         if (AutoSuggestBox is not null)
+        {
             AutoSuggestBox.SuggestionChosen -= AutoSuggestBoxOnSuggestionChosen;
+            AutoSuggestBox.SuggestionsPopupClosed -= AutoSuggestBoxOnSuggestionsPopupClosed;
+            AutoSuggestBox.QuerySubmitted -= AutoSuggestBoxOnQuerySubmitted;
+        }
 
         if (Header is BreadcrumbBar breadcrumbBar)
         {
@@ -190,21 +199,56 @@ private void UpdateAutoSuggestBoxSuggestions()
         AddItemsToAutoSuggestBoxItems();
     }
 
+    private void AutoSuggestBoxOnSuggestionChosen(AutoSuggestBox sender, AutoSuggestBoxSuggestionChosenEventArgs args)
+    {
+        if (args.SelectedItem is not string selectedSuggestBoxItem)
+            return;
+
+        _selectedAutoSuggestBoxItem = selectedSuggestBoxItem;
+    }
+
     /// <summary>
     /// Navigate to the page after its name is selected in <see cref="AutoSuggestBox"/>.
     /// </summary>
-    private void AutoSuggestBoxOnSuggestionChosen(object sender, RoutedEventArgs e)
+    private void AutoSuggestBoxOnSuggestionsPopupClosed(AutoSuggestBox sender, RoutedEventArgs args)
     {
-        if (sender is not AutoSuggestBox { ChosenSuggestion: string selectedSuggestBoxItem })
+        if (string.IsNullOrEmpty(_selectedAutoSuggestBoxItem))
             return;
 
-        if (string.IsNullOrEmpty(selectedSuggestBoxItem))
+        if (NavigateToMenuItemFromAutoSuggestBox(MenuItems, _selectedAutoSuggestBoxItem))
+            return;
+
+        NavigateToMenuItemFromAutoSuggestBox(FooterMenuItems, _selectedAutoSuggestBoxItem);
+    }
+
+    private void AutoSuggestBoxOnQuerySubmitted(AutoSuggestBox sender, AutoSuggestBoxQuerySubmittedEventArgs args)
+    {
+        var suggestions = new List<string>();
+        var querySplit = args.QueryText.Split(' ');
+
+        foreach (var item in _autoSuggestBoxItems)
+        {
+            bool isMatch = true;
+
+            foreach (string queryToken in querySplit)
+            {
+                if (item.IndexOf(queryToken, StringComparison.CurrentCultureIgnoreCase) < 0)
+                    isMatch = false;
+            }
+
+            if (isMatch)
+                suggestions.Add(item);
+        }
+
+        if (suggestions.Count <= 0)
             return;
 
-        if (NavigateToMenuItemFromAutoSuggestBox(MenuItems, selectedSuggestBoxItem))
+        var element = suggestions.First();
+
+        if (NavigateToMenuItemFromAutoSuggestBox(MenuItems, element))
             return;
 
-        NavigateToMenuItemFromAutoSuggestBox(FooterMenuItems, selectedSuggestBoxItem);
+        NavigateToMenuItemFromAutoSuggestBox(FooterMenuItems, element);
     }
 
     protected virtual void AddItemsToDictionaries(IList list)
diff --git a/src/Wpf.Ui/Styles/Controls/AutoSuggestBox.xaml b/src/Wpf.Ui/Styles/Controls/AutoSuggestBox.xaml
deleted file mode 100644
index 2b342ba61..000000000
--- a/src/Wpf.Ui/Styles/Controls/AutoSuggestBox.xaml
+++ /dev/null
@@ -1,354 +0,0 @@
-<!--
-    This Source Code Form is subject to the terms of the MIT License.
-    If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
-    Copyright (C) Leszek Pomianowski and WPF UI Contributors.
-    All Rights Reserved.
-    
-    Based on Microsoft XAML for Win UI
-    Copyright (c) Microsoft Corporation. All Rights Reserved.
--->
-
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
-    xmlns:system="clr-namespace:System;assembly=mscorlib">
-
-    <Thickness x:Key="AutoSuggestBoxBorderThemeThickness">1,1,1,0</Thickness>
-    <Thickness x:Key="AutoSuggestBoxAccentBorderThemeThickness">0,0,0,1</Thickness>
-    <Thickness x:Key="AutoSuggestBoxLeftIconMargin">10,8,0,0</Thickness>
-    <Thickness x:Key="AutoSuggestBoxRightIconMargin">0,8,10,0</Thickness>
-    <Thickness x:Key="AutoSuggestBoxClearButtonMargin">0,5,4,0</Thickness>
-    <Thickness x:Key="AutoSuggestBoxClearButtonPadding">0,0,0,0</Thickness>
-    <system:Double x:Key="AutoSuggestBoxClearButtonHeight">24</system:Double>
-    <system:Double x:Key="AutoSuggestBoxClearButtonIconSize">14</system:Double>
-
-    <Style x:Key="DefaultUiAutoSuggestBoxItemStyle" TargetType="{x:Type ListViewItem}">
-        <Setter Property="Foreground">
-            <Setter.Value>
-                <SolidColorBrush Color="{DynamicResource TextFillColorPrimary}" />
-            </Setter.Value>
-        </Setter>
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type ListBoxItem}">
-                    <Border
-                        x:Name="ContentBorder"
-                        Margin="4,0,4,0"
-                        Padding="6,10"
-                        BorderBrush="Transparent"
-                        BorderThickness="0"
-                        CornerRadius="6">
-                        <Border.Background>
-                            <SolidColorBrush Opacity="0.0" Color="{DynamicResource SubtleFillColorSecondary}" />
-                        </Border.Background>
-                        <ContentPresenter />
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Trigger.EnterActions>
-                                <BeginStoryboard>
-                                    <Storyboard>
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="ContentBorder"
-                                            Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Opacity)"
-                                            From="0.0"
-                                            To="1.0"
-                                            Duration="00:00:00.167" />
-                                    </Storyboard>
-                                </BeginStoryboard>
-                            </Trigger.EnterActions>
-                            <Trigger.ExitActions>
-                                <BeginStoryboard>
-                                    <Storyboard>
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="ContentBorder"
-                                            Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Opacity)"
-                                            From="1.0"
-                                            To="0.0"
-                                            Duration="00:00:00.167" />
-                                    </Storyboard>
-                                </BeginStoryboard>
-                            </Trigger.ExitActions>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="DefaultUiAutoSuggestBoxStyle" TargetType="{x:Type controls:AutoSuggestBox}">
-        <!--  Universal WPF UI focus  -->
-        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
-        <!--  Universal WPF UI focus  -->
-        <!--  Universal WPF UI ContextMenu  -->
-        <Setter Property="ContextMenu" Value="{DynamicResource DefaultControlContextMenu}" />
-        <!--  Universal WPF UI ContextMenu  -->
-        <Setter Property="Foreground">
-            <Setter.Value>
-                <SolidColorBrush Color="{DynamicResource TextFillColorPrimary}" />
-            </Setter.Value>
-        </Setter>
-        <Setter Property="IconForeground">
-            <Setter.Value>
-                <SolidColorBrush Color="{DynamicResource TextFillColorPrimary}" />
-            </Setter.Value>
-        </Setter>
-        <Setter Property="CaretBrush">
-            <Setter.Value>
-                <SolidColorBrush Color="{DynamicResource TextFillColorPrimary}" />
-            </Setter.Value>
-        </Setter>
-        <Setter Property="Background">
-            <Setter.Value>
-                <SolidColorBrush Color="{DynamicResource ControlFillColorDefault}" />
-            </Setter.Value>
-        </Setter>
-        <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
-        <Setter Property="BorderThickness" Value="{StaticResource AutoSuggestBoxBorderThemeThickness}" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-        <Setter Property="HorizontalAlignment" Value="Stretch" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-        <Setter Property="VerticalContentAlignment" Value="Top" />
-        <Setter Property="MinHeight" Value="{DynamicResource TextControlThemeMinHeight}" />
-        <Setter Property="MinWidth" Value="{DynamicResource TextControlThemeMinWidth}" />
-        <Setter Property="Padding" Value="{DynamicResource TextControlThemePadding}" />
-        <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-        <Setter Property="ClearButtonEnabled" Value="True" />
-        <Setter Property="Icon" Value="Search24" />
-        <Setter Property="IconFilled" Value="False" />
-        <Setter Property="IconPlacement" Value="Right" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type controls:AutoSuggestBox}">
-                    <Grid>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="*" />
-                            <RowDefinition Height="Auto" />
-                        </Grid.RowDefinitions>
-                        <Grid
-                            Grid.Row="0"
-                            HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                            VerticalAlignment="{TemplateBinding VerticalAlignment}">
-                            <Border
-                                x:Name="ContentBorder"
-                                MinWidth="{TemplateBinding MinWidth}"
-                                MinHeight="{TemplateBinding MinHeight}"
-                                Padding="0"
-                                HorizontalAlignment="Stretch"
-                                VerticalAlignment="Stretch"
-                                Background="{TemplateBinding Background}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="{TemplateBinding Border.CornerRadius}">
-                                <Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="Auto" />
-                                        <ColumnDefinition Width="*" />
-                                        <ColumnDefinition Width="Auto" />
-                                        <ColumnDefinition Width="Auto" />
-                                    </Grid.ColumnDefinitions>
-                                    <controls:SymbolIcon
-                                        x:Name="ControlIconLeft"
-                                        Grid.Column="0"
-                                        Margin="{StaticResource AutoSuggestBoxLeftIconMargin}"
-                                        Padding="0"
-                                        VerticalAlignment="Top"
-                                        Filled="{TemplateBinding IconFilled}"
-                                        FontSize="16"
-                                        Foreground="{TemplateBinding IconForeground}"
-                                        Symbol="{TemplateBinding Icon}" />
-                                    <Grid Grid.Column="1" Margin="{TemplateBinding Padding}">
-                                        <Decorator
-                                            x:Name="PART_ContentHost"
-                                            Margin="0"
-                                            VerticalAlignment="Center"
-                                            TextElement.Foreground="{TemplateBinding Foreground}" />
-                                        <TextBlock
-                                            x:Name="PlaceholderTextBox"
-                                            Margin="0"
-                                            Padding="1,0"
-                                            VerticalAlignment="Top"
-                                            Text="{TemplateBinding PlaceholderText}">
-                                            <TextBlock.Foreground>
-                                                <SolidColorBrush Color="{DynamicResource TextPlaceholderColor}" />
-                                            </TextBlock.Foreground>
-                                        </TextBlock>
-                                    </Grid>
-                                    <!--  Buttons and Icons have no padding from the main element to allow absolute positions if height is larger than the text entry zone  -->
-                                    <controls:Button
-                                        x:Name="ClearButton"
-                                        Grid.Column="2"
-                                        Width="{StaticResource AutoSuggestBoxClearButtonHeight}"
-                                        Height="{StaticResource AutoSuggestBoxClearButtonHeight}"
-                                        Margin="{StaticResource AutoSuggestBoxClearButtonMargin}"
-                                        Padding="{StaticResource AutoSuggestBoxClearButtonPadding}"
-                                        HorizontalAlignment="Center"
-                                        VerticalAlignment="Top"
-                                        HorizontalContentAlignment="Center"
-                                        VerticalContentAlignment="Center"
-                                        Appearance="Secondary"
-                                        Background="Transparent"
-                                        BorderBrush="Transparent"
-                                        Command="{Binding Path=TemplateButtonCommand, RelativeSource={RelativeSource TemplatedParent}}"
-                                        CommandParameter="clear"
-                                        Cursor="Arrow"
-                                        FontSize="{StaticResource AutoSuggestBoxClearButtonIconSize}"
-                                        Icon="Dismiss24">
-                                        <controls:Button.Foreground>
-                                            <SolidColorBrush Color="{DynamicResource TextFillColorTertiary}" />
-                                        </controls:Button.Foreground>
-                                    </controls:Button>
-                                    <controls:SymbolIcon
-                                        x:Name="ControlIconRight"
-                                        Grid.Column="3"
-                                        Margin="{StaticResource AutoSuggestBoxRightIconMargin}"
-                                        Padding="0"
-                                        VerticalAlignment="Top"
-                                        Filled="{TemplateBinding IconFilled}"
-                                        FontSize="16"
-                                        Foreground="{TemplateBinding IconForeground}"
-                                        Symbol="{TemplateBinding Icon}" />
-                                </Grid>
-                            </Border>
-                            <!--  The Accent Border is a separate element so that changes to the border thickness do not affect the position of the element  -->
-                            <Border
-                                x:Name="AccentBorder"
-                                HorizontalAlignment="Stretch"
-                                VerticalAlignment="Stretch"
-                                BorderThickness="{StaticResource AutoSuggestBoxAccentBorderThemeThickness}"
-                                CornerRadius="{TemplateBinding Border.CornerRadius}">
-                                <Border.BorderBrush>
-                                    <SolidColorBrush Color="{DynamicResource ControlStrongStrokeColorDefault}" />
-                                </Border.BorderBrush>
-                            </Border>
-                        </Grid>
-                        <Popup
-                            x:Name="PART_Popup"
-                            Grid.Row="1"
-                            MinWidth="{TemplateBinding ActualWidth}"
-                            Margin="0"
-                            HorizontalAlignment="Stretch"
-                            VerticalAlignment="Top"
-                            AllowsTransparency="True"
-                            Focusable="False"
-                            IsOpen="{TemplateBinding IsSuggestionListOpen}"
-                            Placement="Bottom"
-                            PopupAnimation="Slide">
-                            <Border
-                                Margin="0"
-                                Padding="0,6,0,6"
-                                BorderBrush="{DynamicResource MenuBorderColorDefaultBrush}"
-                                BorderThickness="1"
-                                CornerRadius="8"
-                                SnapsToDevicePixels="True">
-                                <Border.Background>
-                                    <SolidColorBrush Color="{DynamicResource SystemFillColorSolidNeutralBackground}" />
-                                </Border.Background>
-                                <ListView
-                                    x:Name="PART_SuggestionsPresenter"
-                                    MaxHeight="{TemplateBinding MaxDropDownHeight}"
-                                    Margin="0"
-                                    Padding="0"
-                                    ItemsSource="{TemplateBinding FilteredItemsSource}"
-                                    KeyboardNavigation.DirectionalNavigation="Contained"
-                                    ScrollViewer.HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
-                                    ScrollViewer.VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}"
-                                    SelectionMode="Single">
-                                    <ListView.ItemsPanel>
-                                        <ItemsPanelTemplate>
-                                            <VirtualizingStackPanel
-                                                IsItemsHost="True"
-                                                IsVirtualizing="True"
-                                                VirtualizationMode="Recycling" />
-                                        </ItemsPanelTemplate>
-                                    </ListView.ItemsPanel>
-                                </ListView>
-                            </Border>
-                        </Popup>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="PlaceholderEnabled" Value="False">
-                            <Setter TargetName="PlaceholderTextBox" Property="Visibility" Value="Collapsed" />
-                        </Trigger>
-                        <Trigger Property="ShowClearButton" Value="False">
-                            <Setter TargetName="ClearButton" Property="Visibility" Value="Collapsed" />
-                            <Setter TargetName="ClearButton" Property="Margin" Value="0" />
-                        </Trigger>
-                        <Trigger Property="ClearButtonEnabled" Value="False">
-                            <Setter TargetName="ClearButton" Property="Visibility" Value="Collapsed" />
-                            <Setter TargetName="ClearButton" Property="Margin" Value="0" />
-                        </Trigger>
-                        <Trigger Property="IconPlacement" Value="Left">
-                            <Setter TargetName="ControlIconRight" Property="Visibility" Value="Collapsed" />
-                            <Setter TargetName="ControlIconRight" Property="Margin" Value="0" />
-                        </Trigger>
-                        <Trigger Property="IconPlacement" Value="Right">
-                            <Setter TargetName="ControlIconLeft" Property="Visibility" Value="Collapsed" />
-                            <Setter TargetName="ControlIconLeft" Property="Margin" Value="0" />
-                        </Trigger>
-                        <Trigger Property="Icon" Value="Empty">
-                            <Setter TargetName="ControlIconRight" Property="Visibility" Value="Collapsed" />
-                            <Setter TargetName="ControlIconRight" Property="Margin" Value="0" />
-                            <Setter TargetName="ControlIconLeft" Property="Visibility" Value="Collapsed" />
-                            <Setter TargetName="ControlIconLeft" Property="Margin" Value="0" />
-                        </Trigger>
-                        <Trigger Property="IsFocused" Value="True">
-                            <Setter TargetName="AccentBorder" Property="BorderThickness" Value="0,0,0,2" />
-                            <Setter TargetName="AccentBorder" Property="BorderBrush">
-                                <Setter.Value>
-                                    <SolidColorBrush Color="{DynamicResource SystemAccentColorSecondary}" />
-                                </Setter.Value>
-                            </Setter>
-                            <Setter TargetName="ContentBorder" Property="Background">
-                                <Setter.Value>
-                                    <SolidColorBrush Color="{DynamicResource ControlFillColorInputActive}" />
-                                </Setter.Value>
-                            </Setter>
-                        </Trigger>
-                        <MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="IsEnabled" Value="True" />
-                                <Condition Property="IsMouseOver" Value="True" />
-                                <Condition Property="IsFocused" Value="False" />
-                            </MultiTrigger.Conditions>
-                            <Setter TargetName="ContentBorder" Property="Background">
-                                <Setter.Value>
-                                    <SolidColorBrush Color="{DynamicResource ControlFillColorSecondary}" />
-                                </Setter.Value>
-                            </Setter>
-                        </MultiTrigger>
-                        <Trigger Property="IsReadOnly" Value="True">
-                            <Setter TargetName="ClearButton" Property="Visibility" Value="Collapsed" />
-                            <Setter TargetName="ClearButton" Property="Margin" Value="0" />
-                        </Trigger>
-                        <Trigger Property="IsEnabled" Value="True">
-                            <Setter Property="Cursor" Value="IBeam" />
-                        </Trigger>
-                        <Trigger Property="IsEnabled" Value="False">
-                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource ControlFillColorDisabledBrush}" />
-                            <Setter TargetName="ContentBorder" Property="BorderBrush" Value="{DynamicResource ControlStrokeColorDefaultBrush}" />
-                            <Setter TargetName="AccentBorder" Property="BorderBrush" Value="{DynamicResource ControlStrokeColorDefaultBrush}" />
-                            <Setter TargetName="ControlIconLeft" Property="Foreground" Value="{DynamicResource TextFillColorDisabledBrush}" />
-                            <Setter TargetName="ControlIconRight" Property="Foreground" Value="{DynamicResource TextFillColorDisabledBrush}" />
-                            <Setter TargetName="PlaceholderTextBox" Property="Foreground" Value="{DynamicResource TextFillColorDisabledBrush}" />
-                            <Setter Property="Foreground" Value="{DynamicResource TextFillColorDisabledBrush}" />
-                            <Setter Property="ClearButtonEnabled" Value="False" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        <Style.Resources>
-            <Style BasedOn="{StaticResource DefaultUiAutoSuggestBoxItemStyle}" TargetType="{x:Type ListViewItem}" />
-        </Style.Resources>
-    </Style>
-
-    <Style BasedOn="{StaticResource DefaultUiAutoSuggestBoxStyle}" TargetType="{x:Type controls:AutoSuggestBox}" />
-
-</ResourceDictionary>
diff --git a/src/Wpf.Ui/Styles/Controls/NewAutoSuggestBox.xaml b/src/Wpf.Ui/Styles/Controls/NewAutoSuggestBox.xaml
index c5d5dfbdf..30750c3e8 100644
--- a/src/Wpf.Ui/Styles/Controls/NewAutoSuggestBox.xaml
+++ b/src/Wpf.Ui/Styles/Controls/NewAutoSuggestBox.xaml
@@ -83,7 +83,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="DefaultUiNewAutoSuggestBoxStyle" TargetType="{x:Type controls:NewAutoSuggestBox}">
+    <Style x:Key="DefaultUiNewAutoSuggestBoxStyle" TargetType="{x:Type controls:AutoSuggestBox}">
         <Setter Property="MaxSuggestionListHeight" Value="240" />
         <Setter Property="HorizontalAlignment" Value="Stretch" />
         <Setter Property="VerticalAlignment" Value="Center" />
@@ -100,7 +100,7 @@
         <Setter Property="Icon" Value="Search24" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type controls:NewAutoSuggestBox}">
+                <ControlTemplate TargetType="{x:Type controls:AutoSuggestBox}">
                     <Grid>
                         <controls:TextBox
                             x:Name="PART_TextBox"
@@ -158,6 +158,6 @@
         </Setter>
     </Style>
 
-    <Style BasedOn="{StaticResource DefaultUiNewAutoSuggestBoxStyle}" TargetType="{x:Type controls:NewAutoSuggestBox}" />
+    <Style BasedOn="{StaticResource DefaultUiNewAutoSuggestBoxStyle}" TargetType="{x:Type controls:AutoSuggestBox}" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Wpf.Ui/Styles/Wpf.Ui.xaml b/src/Wpf.Ui/Styles/Wpf.Ui.xaml
index a0232522c..a8c8390e3 100644
--- a/src/Wpf.Ui/Styles/Wpf.Ui.xaml
+++ b/src/Wpf.Ui/Styles/Wpf.Ui.xaml
@@ -40,7 +40,6 @@
         <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Styles/Controls/ProgressRing.xaml" />
         <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Styles/Controls/TextBox.xaml" />
         <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Styles/Controls/NumberBox.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Styles/Controls/AutoSuggestBox.xaml" />
         <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Styles/Controls/NewAutoSuggestBox.xaml" />
         <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Styles/Controls/RatingControl.xaml" />
         <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Styles/Controls/ThumbRate.xaml" />
diff --git a/src/Wpf.Ui/Wpf.Ui.csproj b/src/Wpf.Ui/Wpf.Ui.csproj
index 385ce3c3e..9b9c5f75d 100644
--- a/src/Wpf.Ui/Wpf.Ui.csproj
+++ b/src/Wpf.Ui/Wpf.Ui.csproj
@@ -96,7 +96,7 @@
   <ItemGroup>
     <EmbeddedResource Include="Controls\Anchor.bmp" />
     <EmbeddedResource Include="Controls\Arc.bmp" />
-    <EmbeddedResource Include="Controls\AutoSuggestBox.bmp" />
+    <EmbeddedResource Include="Controls\AutoSuggestBox\AutoSuggestBox.bmp" />
     <EmbeddedResource Include="Controls\Badge.bmp" />
     <EmbeddedResource Include="Controls\CardExpander.bmp" />
     <EmbeddedResource Include="Controls\CardAction.bmp" />

From 63ac0006376b6b1a6d108975dd3cdc9df84d938a Mon Sep 17 00:00:00 2001
From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com>
Date: Sat, 4 Feb 2023 11:26:07 +0600
Subject: [PATCH 18/26] Renamed style

---
 .../Controls/{NewAutoSuggestBox.xaml => AutoSuggestBox.xaml}  | 4 ++--
 src/Wpf.Ui/Styles/Wpf.Ui.xaml                                 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename src/Wpf.Ui/Styles/Controls/{NewAutoSuggestBox.xaml => AutoSuggestBox.xaml} (97%)

diff --git a/src/Wpf.Ui/Styles/Controls/NewAutoSuggestBox.xaml b/src/Wpf.Ui/Styles/Controls/AutoSuggestBox.xaml
similarity index 97%
rename from src/Wpf.Ui/Styles/Controls/NewAutoSuggestBox.xaml
rename to src/Wpf.Ui/Styles/Controls/AutoSuggestBox.xaml
index 30750c3e8..8632791a5 100644
--- a/src/Wpf.Ui/Styles/Controls/NewAutoSuggestBox.xaml
+++ b/src/Wpf.Ui/Styles/Controls/AutoSuggestBox.xaml
@@ -83,7 +83,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="DefaultUiNewAutoSuggestBoxStyle" TargetType="{x:Type controls:AutoSuggestBox}">
+    <Style x:Key="DefaultUiAutoSuggestBoxStyle" TargetType="{x:Type controls:AutoSuggestBox}">
         <Setter Property="MaxSuggestionListHeight" Value="240" />
         <Setter Property="HorizontalAlignment" Value="Stretch" />
         <Setter Property="VerticalAlignment" Value="Center" />
@@ -158,6 +158,6 @@
         </Setter>
     </Style>
 
-    <Style BasedOn="{StaticResource DefaultUiNewAutoSuggestBoxStyle}" TargetType="{x:Type controls:AutoSuggestBox}" />
+    <Style BasedOn="{StaticResource DefaultUiAutoSuggestBoxStyle}" TargetType="{x:Type controls:AutoSuggestBox}" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Wpf.Ui/Styles/Wpf.Ui.xaml b/src/Wpf.Ui/Styles/Wpf.Ui.xaml
index a8c8390e3..d32e6a9dd 100644
--- a/src/Wpf.Ui/Styles/Wpf.Ui.xaml
+++ b/src/Wpf.Ui/Styles/Wpf.Ui.xaml
@@ -40,7 +40,7 @@
         <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Styles/Controls/ProgressRing.xaml" />
         <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Styles/Controls/TextBox.xaml" />
         <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Styles/Controls/NumberBox.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Styles/Controls/NewAutoSuggestBox.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Styles/Controls/AutoSuggestBox.xaml" />
         <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Styles/Controls/RatingControl.xaml" />
         <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Styles/Controls/ThumbRate.xaml" />
         <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Styles/Controls/MessageBox.xaml" />

From 9e4be77d56e8307c5c2fd7c8e7523986c51da89b Mon Sep 17 00:00:00 2001
From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com>
Date: Sat, 4 Feb 2023 11:51:19 +0600
Subject: [PATCH 19/26] Implemented closing AutoSuggestBox with escape key

---
 src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBox.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBox.cs b/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBox.cs
index 0b0184bec..b05698fd8 100644
--- a/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBox.cs
+++ b/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBox.cs
@@ -345,6 +345,12 @@ protected virtual void OnSuggestionsPopupClosed()
 
     private void TextBoxOnPreviewKeyDown(object sender, KeyEventArgs e)
     {
+        if (e.Key is Key.Escape)
+        {
+            IsSuggestionListOpen = false;
+            return;
+        }
+
         if (e.Key is Key.Enter)
         {
             IsSuggestionListOpen = false;

From 6cce8d6a878cca72af8504e12ad550a64ed0c921 Mon Sep 17 00:00:00 2001
From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com>
Date: Sat, 4 Feb 2023 12:55:11 +0600
Subject: [PATCH 20/26] Deleted SuggestionsPopupClosed event

---
 .../Controls/AutoSuggestBox/AutoSuggestBox.cs | 42 ++++++++-----------
 .../Navigation/NavigationView.Base.cs         | 21 ++++------
 2 files changed, 25 insertions(+), 38 deletions(-)

diff --git a/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBox.cs b/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBox.cs
index b05698fd8..1dec77229 100644
--- a/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBox.cs
+++ b/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBox.cs
@@ -171,12 +171,6 @@ public SymbolRegular Icon
     public static readonly RoutedEvent TextChangedEvent = EventManager.RegisterRoutedEvent(
         nameof(TextChanged), RoutingStrategy.Bubble, typeof(TypedEventHandler<AutoSuggestBox, AutoSuggestBoxTextChangedEventArgs>), typeof(AutoSuggestBox));
 
-    /// <summary>
-    /// Routed event for <see cref="SuggestionsPopupClosed"/>.
-    /// </summary>
-    public static readonly RoutedEvent SuggestionsPopupClosedEvent = EventManager.RegisterRoutedEvent(
-        nameof(SuggestionsPopupClosed), RoutingStrategy.Bubble, typeof(TypedEventHandler<AutoSuggestBox, RoutedEventArgs>), typeof(AutoSuggestBox));
-
     /// <summary>
     /// Occurs when the user submits a search query.
     /// </summary>
@@ -204,15 +198,6 @@ public event TypedEventHandler<AutoSuggestBox, AutoSuggestBoxTextChangedEventArg
         remove => RemoveHandler(TextChangedEvent, value);
     }
 
-    /// <summary>
-    /// Raised after the popup is closed.
-    /// </summary>
-    public event TypedEventHandler<AutoSuggestBox, RoutedEventArgs> SuggestionsPopupClosed
-    {
-        add => AddHandler(SuggestionsPopupClosedEvent, value);
-        remove => RemoveHandler(SuggestionsPopupClosedEvent, value);
-    }
-
     #endregion
 
     protected TextBox TextBox = null!;
@@ -222,6 +207,8 @@ public event TypedEventHandler<AutoSuggestBox, RoutedEventArgs> SuggestionsPopup
     private bool _isTextBoxLostFocus;
     private bool _changingTextAfterSuggestionChosen;
     private bool _isUserChangedText;
+    
+    private object? _selectedItem;
 
     public AutoSuggestBox()
     {
@@ -245,7 +232,7 @@ public override void OnApplyTemplate()
         TextBox.TextChanged += TextBoxOnTextChanged;
         TextBox.LostKeyboardFocus += TextBoxOnLostKeyboardFocus;
 
-        SuggestionsPopup.Closed += (_, _) => OnSuggestionsPopupClosed();
+        SuggestionsPopup.Closed += SuggestionsPopupOnClosed;
 
         SuggestionsList.SelectionChanged += SuggestionsListOnSelectionChanged;
         SuggestionsList.PreviewKeyDown += SuggestionsListOnPreviewKeyDown;
@@ -270,6 +257,8 @@ protected virtual void ReleaseTemplateResources()
         TextBox.TextChanged -= TextBoxOnTextChanged;
         TextBox.LostKeyboardFocus -= TextBoxOnLostKeyboardFocus;
 
+        SuggestionsPopup.Closed -= SuggestionsPopupOnClosed;
+
         SuggestionsList.SelectionChanged -= SuggestionsListOnSelectionChanged;
         SuggestionsList.PreviewKeyDown -= SuggestionsListOnPreviewKeyDown;
         SuggestionsList.LostKeyboardFocus -= SuggestionsListOnLostKeyboardFocus;
@@ -331,14 +320,6 @@ protected virtual void OnTextChanged(AutoSuggestionBoxTextChangeReason reason, s
             DefaultFiltering(text);
     }
 
-    /// <summary>
-    /// 
-    /// </summary>
-    protected virtual void OnSuggestionsPopupClosed()
-    {
-        RaiseEvent(new RoutedEventArgs(SuggestionsPopupClosedEvent, this));
-    }
-
     #endregion
 
     #region TextBox events
@@ -439,6 +420,18 @@ private void SuggestionsListOnSelectionChanged(object sender, SelectionChangedEv
 
     #endregion
 
+    #region SuggestionsPopup events
+
+    private void SuggestionsPopupOnClosed(object? sender, EventArgs e)
+    {
+        if (_selectedItem is null)
+            return;
+
+        OnSuggestionChosen(_selectedItem);
+    }
+
+    #endregion
+
     private IntPtr Hook(IntPtr hwnd, int msg, IntPtr wparam, IntPtr lparam, ref bool handled)
     {
         if (!IsSuggestionListOpen)
@@ -456,6 +449,7 @@ private void OnSelectedChanged(object selectedObj)
     {
         OnSuggestionChosen(selectedObj);
 
+        _selectedItem = selectedObj;
         _isTextBoxLostFocus = false;
     }
 
diff --git a/src/Wpf.Ui/Controls/Navigation/NavigationView.Base.cs b/src/Wpf.Ui/Controls/Navigation/NavigationView.Base.cs
index 62fae38f2..98e272bcf 100644
--- a/src/Wpf.Ui/Controls/Navigation/NavigationView.Base.cs
+++ b/src/Wpf.Ui/Controls/Navigation/NavigationView.Base.cs
@@ -75,7 +75,6 @@ protected override void OnInitialized(EventArgs e)
         {
             AutoSuggestBox.OriginalItemsSource = _autoSuggestBoxItems;
             AutoSuggestBox.SuggestionChosen += AutoSuggestBoxOnSuggestionChosen;
-            AutoSuggestBox.SuggestionsPopupClosed += AutoSuggestBoxOnSuggestionsPopupClosed;
             AutoSuggestBox.QuerySubmitted += AutoSuggestBoxOnQuerySubmitted;
         }
 
@@ -114,7 +113,6 @@ protected virtual void OnUnloaded(object sender, RoutedEventArgs e)
         if (AutoSuggestBox is not null)
         {
             AutoSuggestBox.SuggestionChosen -= AutoSuggestBoxOnSuggestionChosen;
-            AutoSuggestBox.SuggestionsPopupClosed -= AutoSuggestBoxOnSuggestionsPopupClosed;
             AutoSuggestBox.QuerySubmitted -= AutoSuggestBoxOnQuerySubmitted;
         }
 
@@ -199,26 +197,21 @@ private void UpdateAutoSuggestBoxSuggestions()
         AddItemsToAutoSuggestBoxItems();
     }
 
-    private void AutoSuggestBoxOnSuggestionChosen(AutoSuggestBox sender, AutoSuggestBoxSuggestionChosenEventArgs args)
-    {
-        if (args.SelectedItem is not string selectedSuggestBoxItem)
-            return;
-
-        _selectedAutoSuggestBoxItem = selectedSuggestBoxItem;
-    }
-
     /// <summary>
     /// Navigate to the page after its name is selected in <see cref="AutoSuggestBox"/>.
     /// </summary>
-    private void AutoSuggestBoxOnSuggestionsPopupClosed(AutoSuggestBox sender, RoutedEventArgs args)
+    private void AutoSuggestBoxOnSuggestionChosen(AutoSuggestBox sender, AutoSuggestBoxSuggestionChosenEventArgs args)
     {
-        if (string.IsNullOrEmpty(_selectedAutoSuggestBoxItem))
+        if (sender.IsSuggestionListOpen)
+            return;
+
+        if (args.SelectedItem is not string selectedSuggestBoxItem)
             return;
 
-        if (NavigateToMenuItemFromAutoSuggestBox(MenuItems, _selectedAutoSuggestBoxItem))
+        if (NavigateToMenuItemFromAutoSuggestBox(MenuItems, selectedSuggestBoxItem))
             return;
 
-        NavigateToMenuItemFromAutoSuggestBox(FooterMenuItems, _selectedAutoSuggestBoxItem);
+        NavigateToMenuItemFromAutoSuggestBox(FooterMenuItems, selectedSuggestBoxItem);
     }
 
     private void AutoSuggestBoxOnQuerySubmitted(AutoSuggestBox sender, AutoSuggestBoxQuerySubmittedEventArgs args)

From a2a6f70932e958567c77974efd5d2cddd06b0a7c Mon Sep 17 00:00:00 2001
From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com>
Date: Sat, 4 Feb 2023 13:45:19 +0600
Subject: [PATCH 21/26] Update AutoSuggestBox.cs

---
 .../Controls/AutoSuggestBox/AutoSuggestBox.cs | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBox.cs b/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBox.cs
index 1dec77229..4b26533b7 100644
--- a/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBox.cs
+++ b/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBox.cs
@@ -232,8 +232,6 @@ public override void OnApplyTemplate()
         TextBox.TextChanged += TextBoxOnTextChanged;
         TextBox.LostKeyboardFocus += TextBoxOnLostKeyboardFocus;
 
-        SuggestionsPopup.Closed += SuggestionsPopupOnClosed;
-
         SuggestionsList.SelectionChanged += SuggestionsListOnSelectionChanged;
         SuggestionsList.PreviewKeyDown += SuggestionsListOnPreviewKeyDown;
         SuggestionsList.LostKeyboardFocus += SuggestionsListOnLostKeyboardFocus;
@@ -257,8 +255,6 @@ protected virtual void ReleaseTemplateResources()
         TextBox.TextChanged -= TextBoxOnTextChanged;
         TextBox.LostKeyboardFocus -= TextBoxOnLostKeyboardFocus;
 
-        SuggestionsPopup.Closed -= SuggestionsPopupOnClosed;
-
         SuggestionsList.SelectionChanged -= SuggestionsListOnSelectionChanged;
         SuggestionsList.PreviewKeyDown -= SuggestionsListOnPreviewKeyDown;
         SuggestionsList.LostKeyboardFocus -= SuggestionsListOnLostKeyboardFocus;
@@ -408,6 +404,9 @@ private void SuggestionsListOnPreviewMouseLeftButtonUp(object sender, MouseButto
             return;
 
         IsSuggestionListOpen = false;
+
+        if (_selectedItem is not null)
+            OnSuggestionChosen(_selectedItem);
     }
 
     private void SuggestionsListOnSelectionChanged(object sender, SelectionChangedEventArgs e)
@@ -420,18 +419,6 @@ private void SuggestionsListOnSelectionChanged(object sender, SelectionChangedEv
 
     #endregion
 
-    #region SuggestionsPopup events
-
-    private void SuggestionsPopupOnClosed(object? sender, EventArgs e)
-    {
-        if (_selectedItem is null)
-            return;
-
-        OnSuggestionChosen(_selectedItem);
-    }
-
-    #endregion
-
     private IntPtr Hook(IntPtr hwnd, int msg, IntPtr wparam, IntPtr lparam, ref bool handled)
     {
         if (!IsSuggestionListOpen)

From 5f6b37d01f4db7c8fcdacac365cc800e913484f1 Mon Sep 17 00:00:00 2001
From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com>
Date: Sun, 5 Feb 2023 20:28:40 +0600
Subject: [PATCH 22/26] Fixed bug

---
 .../Controls/AutoSuggestBox/AutoSuggestBox.cs  | 18 ++++--------------
 .../AutoSuggestionBoxTextChangeReason.cs       |  3 +++
 .../Controls/Navigation/NavigationView.Base.cs |  2 --
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBox.cs b/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBox.cs
index 4b26533b7..7db8ed632 100644
--- a/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBox.cs
+++ b/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBox.cs
@@ -204,9 +204,8 @@ public event TypedEventHandler<AutoSuggestBox, AutoSuggestBoxTextChangedEventArg
     protected Popup SuggestionsPopup = null!;
     protected ListView SuggestionsList = null!;
 
-    private bool _isTextBoxLostFocus;
     private bool _changingTextAfterSuggestionChosen;
-    private bool _isUserChangedText;
+    private bool _isChangedTextOutSideOfTextBox;
     
     private object? _selectedItem;
 
@@ -347,7 +346,6 @@ private void TextBoxOnLostKeyboardFocus(object sender, KeyboardFocusChangedEvent
             return;
 
         IsSuggestionListOpen = false;
-        _isTextBoxLostFocus = true;
     }
 
     private void TextBoxOnTextChanged(object sender, TextChangedEventArgs e)
@@ -357,20 +355,13 @@ private void TextBoxOnTextChanged(object sender, TextChangedEventArgs e)
         if (_changingTextAfterSuggestionChosen)
             changeReason = AutoSuggestionBoxTextChangeReason.SuggestionChosen;
 
-        if (_isUserChangedText)
+        if (_isChangedTextOutSideOfTextBox)
             changeReason = AutoSuggestionBoxTextChangeReason.ProgrammaticChange;
 
         OnTextChanged(changeReason, TextBox.Text);
 
         SuggestionsList.SelectedItem = null;
 
-        if (_isTextBoxLostFocus)
-        {
-            _isTextBoxLostFocus = false;
-            IsSuggestionListOpen = false;
-            return;
-        }
-
         if (changeReason is not AutoSuggestionBoxTextChangeReason.UserInput)
             return;
 
@@ -437,7 +428,6 @@ private void OnSelectedChanged(object selectedObj)
         OnSuggestionChosen(selectedObj);
 
         _selectedItem = selectedObj;
-        _isTextBoxLostFocus = false;
     }
 
     private void UpdateTexBoxTextAfterSelection(object selectedObj)
@@ -498,8 +488,8 @@ private static void TextPropertyChangedCallback(DependencyObject d, DependencyPr
         if (self.TextBox.Text == newText)
             return;
 
-        self._isUserChangedText = true;
+        self._isChangedTextOutSideOfTextBox = true;
         self.TextBox.Text = newText;
-        self._isUserChangedText = false;
+        self._isChangedTextOutSideOfTextBox = false;
     }
 }
diff --git a/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestionBoxTextChangeReason.cs b/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestionBoxTextChangeReason.cs
index 4ec7bc75b..afb0e6c66 100644
--- a/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestionBoxTextChangeReason.cs
+++ b/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestionBoxTextChangeReason.cs
@@ -5,6 +5,9 @@
 
 namespace Wpf.Ui.Controls;
 
+/// <summary>
+/// Provides data for the <see cref="AutoSuggestBox.TextChanged"/> event.
+/// </summary>
 public enum AutoSuggestionBoxTextChangeReason
 {
     /// <summary>
diff --git a/src/Wpf.Ui/Controls/Navigation/NavigationView.Base.cs b/src/Wpf.Ui/Controls/Navigation/NavigationView.Base.cs
index 98e272bcf..aa60d8a06 100644
--- a/src/Wpf.Ui/Controls/Navigation/NavigationView.Base.cs
+++ b/src/Wpf.Ui/Controls/Navigation/NavigationView.Base.cs
@@ -31,8 +31,6 @@ public partial class NavigationView : System.Windows.Controls.Control, INavigati
     private readonly ObservableCollection<string> _autoSuggestBoxItems = new();
     private readonly ObservableCollection<NavigationViewBreadcrumbItem> _breadcrumbBarItems = new();
 
-    private string _selectedAutoSuggestBoxItem = string.Empty;
-
     protected Dictionary<string, INavigationViewItem> PageIdOrTargetTagNavigationViewsDictionary = new();
     protected Dictionary<Type, INavigationViewItem> PageTypeNavigationViewsDictionary = new();
 

From 49bb5bfe06cc547d2287b81fcfeeb17ca932d273 Mon Sep 17 00:00:00 2001
From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com>
Date: Sun, 5 Feb 2023 20:44:09 +0600
Subject: [PATCH 23/26] Changed namespace

---
 .../Views/Pages/Text/AutoSuggestBoxPage.xaml      |   5 +++--
 .../Views/Pages/Text/AutoSuggestBoxPage.xaml.cs   |   2 +-
 .../AutoSuggestBox.bmp                            | Bin
 .../AutoSuggestBox.cs                             |  14 +++++++-------
 .../AutoSuggestBoxQuerySubmittedEventArgs.cs      |   2 +-
 .../AutoSuggestBoxSuggestionChosenEventArgs.cs    |   2 +-
 .../AutoSuggestBoxTextChangedEventArgs.cs         |   2 +-
 .../AutoSuggestionBoxTextChangeReason.cs          |   2 +-
 src/Wpf.Ui/Controls/Navigation/INavigationView.cs |   1 +
 .../Controls/Navigation/NavigationView.Base.cs    |   1 +
 .../Navigation/NavigationView.Properties.cs       |   1 +
 src/Wpf.Ui/Properties/AssemblyInfo.cs             |   1 +
 src/Wpf.Ui/Styles/Controls/AutoSuggestBox.xaml    |   7 ++++---
 src/Wpf.Ui/Wpf.Ui.csproj                          |   2 +-
 14 files changed, 24 insertions(+), 18 deletions(-)
 rename src/Wpf.Ui/Controls/{AutoSuggestBox => AutoSuggestBoxControl}/AutoSuggestBox.bmp (100%)
 rename src/Wpf.Ui/Controls/{AutoSuggestBox => AutoSuggestBoxControl}/AutoSuggestBox.cs (99%)
 rename src/Wpf.Ui/Controls/{AutoSuggestBox => AutoSuggestBoxControl}/AutoSuggestBoxQuerySubmittedEventArgs.cs (93%)
 rename src/Wpf.Ui/Controls/{AutoSuggestBox => AutoSuggestBoxControl}/AutoSuggestBoxSuggestionChosenEventArgs.cs (93%)
 rename src/Wpf.Ui/Controls/{AutoSuggestBox => AutoSuggestBoxControl}/AutoSuggestBoxTextChangedEventArgs.cs (93%)
 rename src/Wpf.Ui/Controls/{AutoSuggestBox => AutoSuggestBoxControl}/AutoSuggestionBoxTextChangeReason.cs (93%)

diff --git a/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml
index 9aea4aac5..94c89335c 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml
@@ -7,9 +7,10 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:system="clr-namespace:System;assembly=System.Runtime"
     xmlns:text="clr-namespace:Wpf.Ui.Gallery.ViewModels.Pages.Text"
+    xmlns:text1="clr-namespace:Wpf.Ui.Gallery.Views.Pages.Text"
     xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
     Title="AutoSuggestBoxPage"
-    d:DataContext="{d:DesignInstance text:AutoSuggestBoxViewModel,
+    d:DataContext="{d:DesignInstance text1:AutoSuggestBoxPage,
                                      IsDesignTimeCreatable=False}"
     d:DesignHeight="450"
     d:DesignWidth="800"
@@ -46,7 +47,7 @@
                         CodeText="&lt;ui:AutoSuggestBox PlaceholderText=&quot;Search...&quot; /&gt;"
                         HeaderText="WPF UI AutoSuggestBox.">
                         <controls:GalleryControlPresenter.Content>
-                            <ui:AutoSuggestBox OriginalItemsSource="{Binding AutoSuggestBoxSuggestions, Mode=OneWay}" PlaceholderText="Search..." />
+                            <ui:AutoSuggestBox OriginalItemsSource="{Binding ViewModel.AutoSuggestBoxSuggestions, Mode=OneWay}" PlaceholderText="Search..." />
                         </controls:GalleryControlPresenter.Content>
                     </controls:GalleryControlPresenter>
                 </Grid>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml.cs b/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml.cs
index 88a5320d5..36a12c926 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml.cs
+++ b/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml.cs
@@ -15,7 +15,7 @@ public partial class AutoSuggestBoxPage : INavigableView<AutoSuggestBoxViewModel
     public AutoSuggestBoxPage(AutoSuggestBoxViewModel viewModel)
     {
         ViewModel = viewModel;
-        DataContext = viewModel;
+        DataContext = this;
 
         InitializeComponent();
     }
diff --git a/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBox.bmp b/src/Wpf.Ui/Controls/AutoSuggestBoxControl/AutoSuggestBox.bmp
similarity index 100%
rename from src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBox.bmp
rename to src/Wpf.Ui/Controls/AutoSuggestBoxControl/AutoSuggestBox.bmp
diff --git a/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBox.cs b/src/Wpf.Ui/Controls/AutoSuggestBoxControl/AutoSuggestBox.cs
similarity index 99%
rename from src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBox.cs
rename to src/Wpf.Ui/Controls/AutoSuggestBoxControl/AutoSuggestBox.cs
index 7db8ed632..e20123d5d 100644
--- a/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBox.cs
+++ b/src/Wpf.Ui/Controls/AutoSuggestBoxControl/AutoSuggestBox.cs
@@ -3,21 +3,21 @@
 // Copyright (C) Leszek Pomianowski and WPF UI Contributors.
 // All Rights Reserved.
 
-using System.Windows;
 using System;
 using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Linq;
+using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.Windows.Input;
-using Wpf.Ui.Common;
 using System.Windows.Interop;
+using Wpf.Ui.Common;
 using Wpf.Ui.Interop;
-using System.Collections.Generic;
-using System.Linq;
-using System.ComponentModel;
-using System.Drawing;
 
-namespace Wpf.Ui.Controls;
+namespace Wpf.Ui.Controls.AutoSuggestBoxControl;
 
 [ToolboxItem(true)]
 [ToolboxBitmap(typeof(AutoSuggestBox), "AutoSuggestBox.bmp")]
diff --git a/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBoxQuerySubmittedEventArgs.cs b/src/Wpf.Ui/Controls/AutoSuggestBoxControl/AutoSuggestBoxQuerySubmittedEventArgs.cs
similarity index 93%
rename from src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBoxQuerySubmittedEventArgs.cs
rename to src/Wpf.Ui/Controls/AutoSuggestBoxControl/AutoSuggestBoxQuerySubmittedEventArgs.cs
index 09888dae9..f1d13361e 100644
--- a/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBoxQuerySubmittedEventArgs.cs
+++ b/src/Wpf.Ui/Controls/AutoSuggestBoxControl/AutoSuggestBoxQuerySubmittedEventArgs.cs
@@ -5,7 +5,7 @@
 
 using System.Windows;
 
-namespace Wpf.Ui.Controls;
+namespace Wpf.Ui.Controls.AutoSuggestBoxControl;
 
 /// <summary>
 /// Provides event data for the <see cref="AutoSuggestBox.QuerySubmitted"/> event.
diff --git a/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBoxSuggestionChosenEventArgs.cs b/src/Wpf.Ui/Controls/AutoSuggestBoxControl/AutoSuggestBoxSuggestionChosenEventArgs.cs
similarity index 93%
rename from src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBoxSuggestionChosenEventArgs.cs
rename to src/Wpf.Ui/Controls/AutoSuggestBoxControl/AutoSuggestBoxSuggestionChosenEventArgs.cs
index f539d2b9f..dc42443e8 100644
--- a/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBoxSuggestionChosenEventArgs.cs
+++ b/src/Wpf.Ui/Controls/AutoSuggestBoxControl/AutoSuggestBoxSuggestionChosenEventArgs.cs
@@ -5,7 +5,7 @@
 
 using System.Windows;
 
-namespace Wpf.Ui.Controls;
+namespace Wpf.Ui.Controls.AutoSuggestBoxControl;
 
 /// <summary>
 /// Provides data for the <see cref="AutoSuggestBox.SuggestionChosen"/> event.
diff --git a/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBoxTextChangedEventArgs.cs b/src/Wpf.Ui/Controls/AutoSuggestBoxControl/AutoSuggestBoxTextChangedEventArgs.cs
similarity index 93%
rename from src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBoxTextChangedEventArgs.cs
rename to src/Wpf.Ui/Controls/AutoSuggestBoxControl/AutoSuggestBoxTextChangedEventArgs.cs
index 2977f1fe9..437ee42a6 100644
--- a/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBoxTextChangedEventArgs.cs
+++ b/src/Wpf.Ui/Controls/AutoSuggestBoxControl/AutoSuggestBoxTextChangedEventArgs.cs
@@ -5,7 +5,7 @@
 
 using System.Windows;
 
-namespace Wpf.Ui.Controls;
+namespace Wpf.Ui.Controls.AutoSuggestBoxControl;
 
 /// <summary>
 /// Provides data for the <see cref="AutoSuggestBox.TextChanged"/> event.
diff --git a/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestionBoxTextChangeReason.cs b/src/Wpf.Ui/Controls/AutoSuggestBoxControl/AutoSuggestionBoxTextChangeReason.cs
similarity index 93%
rename from src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestionBoxTextChangeReason.cs
rename to src/Wpf.Ui/Controls/AutoSuggestBoxControl/AutoSuggestionBoxTextChangeReason.cs
index afb0e6c66..772a32653 100644
--- a/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestionBoxTextChangeReason.cs
+++ b/src/Wpf.Ui/Controls/AutoSuggestBoxControl/AutoSuggestionBoxTextChangeReason.cs
@@ -3,7 +3,7 @@
 // Copyright (C) Leszek Pomianowski and WPF UI Contributors.
 // All Rights Reserved.
 
-namespace Wpf.Ui.Controls;
+namespace Wpf.Ui.Controls.AutoSuggestBoxControl;
 
 /// <summary>
 /// Provides data for the <see cref="AutoSuggestBox.TextChanged"/> event.
diff --git a/src/Wpf.Ui/Controls/Navigation/INavigationView.cs b/src/Wpf.Ui/Controls/Navigation/INavigationView.cs
index f1eea75ce..dd60f8636 100644
--- a/src/Wpf.Ui/Controls/Navigation/INavigationView.cs
+++ b/src/Wpf.Ui/Controls/Navigation/INavigationView.cs
@@ -13,6 +13,7 @@
 using Wpf.Ui.Animations;
 using Wpf.Ui.Common;
 using Wpf.Ui.Contracts;
+using Wpf.Ui.Controls.AutoSuggestBoxControl;
 
 namespace Wpf.Ui.Controls.Navigation;
 
diff --git a/src/Wpf.Ui/Controls/Navigation/NavigationView.Base.cs b/src/Wpf.Ui/Controls/Navigation/NavigationView.Base.cs
index aa60d8a06..4acc33576 100644
--- a/src/Wpf.Ui/Controls/Navigation/NavigationView.Base.cs
+++ b/src/Wpf.Ui/Controls/Navigation/NavigationView.Base.cs
@@ -16,6 +16,7 @@
 using System.Linq;
 using System.Windows;
 using Wpf.Ui.Common;
+using Wpf.Ui.Controls.AutoSuggestBoxControl;
 
 namespace Wpf.Ui.Controls.Navigation;
 
diff --git a/src/Wpf.Ui/Controls/Navigation/NavigationView.Properties.cs b/src/Wpf.Ui/Controls/Navigation/NavigationView.Properties.cs
index 007a06bea..b18f64124 100644
--- a/src/Wpf.Ui/Controls/Navigation/NavigationView.Properties.cs
+++ b/src/Wpf.Ui/Controls/Navigation/NavigationView.Properties.cs
@@ -12,6 +12,7 @@
 using System.Windows;
 using System.Windows.Controls;
 using Wpf.Ui.Animations;
+using Wpf.Ui.Controls.AutoSuggestBoxControl;
 
 namespace Wpf.Ui.Controls.Navigation;
 
diff --git a/src/Wpf.Ui/Properties/AssemblyInfo.cs b/src/Wpf.Ui/Properties/AssemblyInfo.cs
index ca9e3900c..8e0d41e4f 100644
--- a/src/Wpf.Ui/Properties/AssemblyInfo.cs
+++ b/src/Wpf.Ui/Properties/AssemblyInfo.cs
@@ -18,3 +18,4 @@
 [assembly: XmlnsDefinition("http://schemas.lepo.co/wpfui/2022/xaml", "Wpf.Ui.Converters")]
 [assembly: XmlnsDefinition("http://schemas.lepo.co/wpfui/2022/xaml", "Wpf.Ui.Controls.Navigation")]
 [assembly: XmlnsDefinition("http://schemas.lepo.co/wpfui/2022/xaml", "Wpf.Ui.Controls.Window")]
+[assembly: XmlnsDefinition("http://schemas.lepo.co/wpfui/2022/xaml", "Wpf.Ui.Controls.AutoSuggestBoxControl")]
diff --git a/src/Wpf.Ui/Styles/Controls/AutoSuggestBox.xaml b/src/Wpf.Ui/Styles/Controls/AutoSuggestBox.xaml
index 8632791a5..055695314 100644
--- a/src/Wpf.Ui/Styles/Controls/AutoSuggestBox.xaml
+++ b/src/Wpf.Ui/Styles/Controls/AutoSuggestBox.xaml
@@ -1,6 +1,7 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:autoSuggestBoxControl="clr-namespace:Wpf.Ui.Controls.AutoSuggestBoxControl"
     xmlns:controls="clr-namespace:Wpf.Ui.Controls"
     xmlns:system="clr-namespace:System;assembly=mscorlib">
 
@@ -83,7 +84,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="DefaultUiAutoSuggestBoxStyle" TargetType="{x:Type controls:AutoSuggestBox}">
+    <Style x:Key="DefaultUiAutoSuggestBoxStyle" TargetType="{x:Type autoSuggestBoxControl:AutoSuggestBox}">
         <Setter Property="MaxSuggestionListHeight" Value="240" />
         <Setter Property="HorizontalAlignment" Value="Stretch" />
         <Setter Property="VerticalAlignment" Value="Center" />
@@ -100,7 +101,7 @@
         <Setter Property="Icon" Value="Search24" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type controls:AutoSuggestBox}">
+                <ControlTemplate TargetType="{x:Type autoSuggestBoxControl:AutoSuggestBox}">
                     <Grid>
                         <controls:TextBox
                             x:Name="PART_TextBox"
@@ -158,6 +159,6 @@
         </Setter>
     </Style>
 
-    <Style BasedOn="{StaticResource DefaultUiAutoSuggestBoxStyle}" TargetType="{x:Type controls:AutoSuggestBox}" />
+    <Style BasedOn="{StaticResource DefaultUiAutoSuggestBoxStyle}" TargetType="{x:Type autoSuggestBoxControl:AutoSuggestBox}" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Wpf.Ui/Wpf.Ui.csproj b/src/Wpf.Ui/Wpf.Ui.csproj
index 9b9c5f75d..b308395e2 100644
--- a/src/Wpf.Ui/Wpf.Ui.csproj
+++ b/src/Wpf.Ui/Wpf.Ui.csproj
@@ -96,7 +96,7 @@
   <ItemGroup>
     <EmbeddedResource Include="Controls\Anchor.bmp" />
     <EmbeddedResource Include="Controls\Arc.bmp" />
-    <EmbeddedResource Include="Controls\AutoSuggestBox\AutoSuggestBox.bmp" />
+    <EmbeddedResource Include="Controls\AutoSuggestBoxControl\AutoSuggestBox.bmp" />
     <EmbeddedResource Include="Controls\Badge.bmp" />
     <EmbeddedResource Include="Controls\CardExpander.bmp" />
     <EmbeddedResource Include="Controls\CardAction.bmp" />

From b311314bd6feaae4c8d6bece55c780196f0e7a2c Mon Sep 17 00:00:00 2001
From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com>
Date: Sun, 5 Feb 2023 22:15:41 +0600
Subject: [PATCH 24/26] Update VisualStudioToolsManifest.xml

---
 src/Wpf.Ui/VisualStudioToolsManifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Wpf.Ui/VisualStudioToolsManifest.xml b/src/Wpf.Ui/VisualStudioToolsManifest.xml
index b199f28ca..27a18002c 100644
--- a/src/Wpf.Ui/VisualStudioToolsManifest.xml
+++ b/src/Wpf.Ui/VisualStudioToolsManifest.xml
@@ -3,7 +3,7 @@
         <ToolboxItems UIFramework="WPF" VSCategory="WPF UI" BlendCategory="WPF UI">
             <Item Type="Wpf.Ui.Controls.Anchor" />
             <Item Type="Wpf.Ui.Controls.Arc" />
-            <Item Type="Wpf.Ui.Controls.AutoSuggestBox" />
+            <Item Type="Wpf.Ui.Controls.AutoSuggestBoxControl.AutoSuggestBox" />
             <Item Type="Wpf.Ui.Controls.Badge" />
             <Item Type="Wpf.Ui.Controls.Button" />
             <Item Type="Wpf.Ui.Controls.BreadcrumbBar" />

From bb958799c18a08be0e8f34fda9cf7af00f26da33 Mon Sep 17 00:00:00 2001
From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com>
Date: Mon, 6 Feb 2023 15:14:39 +0600
Subject: [PATCH 25/26] Added keyboard shortcut for AutoSuggestBox

---
 .../Views/Windows/MainWindow.xaml             | 13 +++++++++++-
 .../AutoSuggestBoxControl/AutoSuggestBox.cs   | 20 +++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/src/Wpf.Ui.Gallery/Views/Windows/MainWindow.xaml b/src/Wpf.Ui.Gallery/Views/Windows/MainWindow.xaml
index 830618f42..2a8300328 100644
--- a/src/Wpf.Ui.Gallery/Views/Windows/MainWindow.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Windows/MainWindow.xaml
@@ -20,6 +20,14 @@
     WindowCornerPreference="Default"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
+
+    <ui:FluentWindow.InputBindings>
+        <KeyBinding
+            Key="F"
+            Command="{Binding ElementName=AutoSuggestBox, Path=FocusCommand}"
+            Modifiers="Control" />
+    </ui:FluentWindow.InputBindings>
+
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
@@ -39,7 +47,10 @@
                 <ui:BreadcrumbBar Margin="42,32,0,0" />
             </ui:NavigationView.Header>
             <ui:NavigationView.AutoSuggestBox>
-                <ui:AutoSuggestBox Margin="8,8,8,16" PlaceholderText="Search" />
+                <ui:AutoSuggestBox
+                    x:Name="AutoSuggestBox"
+                    Margin="8,8,8,16"
+                    PlaceholderText="Search" />
             </ui:NavigationView.AutoSuggestBox>
             <ui:NavigationView.ContentOverlay>
                 <Grid>
diff --git a/src/Wpf.Ui/Controls/AutoSuggestBoxControl/AutoSuggestBox.cs b/src/Wpf.Ui/Controls/AutoSuggestBoxControl/AutoSuggestBox.cs
index e20123d5d..6a48856ec 100644
--- a/src/Wpf.Ui/Controls/AutoSuggestBoxControl/AutoSuggestBox.cs
+++ b/src/Wpf.Ui/Controls/AutoSuggestBoxControl/AutoSuggestBox.cs
@@ -76,6 +76,13 @@ public class AutoSuggestBox : System.Windows.Controls.ItemsControl
     public static readonly DependencyProperty IconProperty = DependencyProperty.Register(nameof(Icon), typeof(SymbolRegular), typeof(AutoSuggestBox),
         new PropertyMetadata(SymbolRegular.Empty));
 
+    /// <summary>
+    /// Property for <see cref="FocusCommand"/>.
+    /// </summary>
+    public static readonly DependencyProperty FocusCommandProperty =
+        DependencyProperty.Register(nameof(FocusCommand), typeof(ICommand), typeof(AutoSuggestBox),
+            new PropertyMetadata(null));
+
     #endregion
 
     #region Properties
@@ -149,6 +156,11 @@ public SymbolRegular Icon
         set => SetValue(IconProperty, value);
     }
 
+    /// <summary>
+    /// Used for focusing control
+    /// </summary>
+    public ICommand FocusCommand => (ICommand)GetValue(FocusCommandProperty);
+
     #endregion
 
     #region Events
@@ -217,6 +229,8 @@ public AutoSuggestBox()
 
             self.ReleaseTemplateResources();
         };
+
+        SetValue(FocusCommandProperty, new RelayCommand<object>(_ => Focus()));
     }
 
     public override void OnApplyTemplate()
@@ -240,6 +254,12 @@ public override void OnApplyTemplate()
         hwnd.AddHook(Hook);
     }
 
+    /// <inheritdoc cref="UIElement.Focus" />
+    public new void Focus()
+    {
+        TextBox.Focus();
+    }
+
     protected T GetTemplateChild<T>(string name) where T : DependencyObject
     {
         if (GetTemplateChild(name) is not T dependencyObject)

From 3f17f96c372133163d3e325184528420e9b6a101 Mon Sep 17 00:00:00 2001
From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com>
Date: Wed, 8 Feb 2023 21:58:28 +0600
Subject: [PATCH 26/26] Update NavigationView.Base.cs

---
 src/Wpf.Ui/Controls/Navigation/NavigationView.Base.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Wpf.Ui/Controls/Navigation/NavigationView.Base.cs b/src/Wpf.Ui/Controls/Navigation/NavigationView.Base.cs
index 8dc18e49b..53ec73c4f 100644
--- a/src/Wpf.Ui/Controls/Navigation/NavigationView.Base.cs
+++ b/src/Wpf.Ui/Controls/Navigation/NavigationView.Base.cs
@@ -13,6 +13,7 @@
 using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Diagnostics;
+using System.Linq;
 using System.Windows;
 using System.Windows.Input;
 using Wpf.Ui.Common;