From f055c4c74226ec06a4a3ed75f76232ebb357051c Mon Sep 17 00:00:00 2001
From: koal44 <random.var.ny@gmail.com>
Date: Tue, 27 Feb 2024 15:38:50 -0800
Subject: [PATCH 1/5] Fix ListView to be compatible when ListView.View is a
 GridView

---
 .../ViewModels/Windows/MainWindowViewModel.cs |   2 +-
 .../Views/Pages/Collections/ListViewPage.xaml |  49 +++-
 .../AutoSuggestBox/AutoSuggestBox.xaml        |   4 +-
 src/Wpf.Ui/Controls/ListView/ListView.cs      |  60 +++++
 src/Wpf.Ui/Controls/ListView/ListView.xaml    | 217 ++++++++++++++----
 .../Controls/ListView/ListViewItem.xaml       | 142 ++++++++----
 6 files changed, 367 insertions(+), 107 deletions(-)
 create mode 100644 src/Wpf.Ui/Controls/ListView/ListView.cs

diff --git a/src/Wpf.Ui.Gallery/ViewModels/Windows/MainWindowViewModel.cs b/src/Wpf.Ui.Gallery/ViewModels/Windows/MainWindowViewModel.cs
index 7e96e95c5..43531e71d 100644
--- a/src/Wpf.Ui.Gallery/ViewModels/Windows/MainWindowViewModel.cs
+++ b/src/Wpf.Ui.Gallery/ViewModels/Windows/MainWindowViewModel.cs
@@ -72,7 +72,7 @@ public partial class MainWindowViewModel : ObservableObject
             {
                 new NavigationViewItem(nameof(System.Windows.Controls.DataGrid), typeof(DataGridPage)),
                 new NavigationViewItem(nameof(ListBox), typeof(ListBoxPage)),
-                new NavigationViewItem(nameof(ListView), typeof(ListViewPage)),
+                new NavigationViewItem(nameof(Ui.Controls.ListView), typeof(ListViewPage)),
                 new NavigationViewItem(nameof(TreeView), typeof(TreeViewPage)),
 #if DEBUG
                 new NavigationViewItem("TreeList", typeof(TreeListPage)),
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/Collections/ListViewPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/Collections/ListViewPage.xaml
index 345d4b568..7ce461c3d 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/Collections/ListViewPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/Collections/ListViewPage.xaml
@@ -12,7 +12,7 @@
     Title="ListViewPage"
     d:DataContext="{d:DesignInstance local:ListViewPage,
                                      IsDesignTimeCreatable=False}"
-    d:DesignHeight="450"
+    d:DesignHeight="750"
     d:DesignWidth="800"
     ui:Design.Background="{DynamicResource ApplicationBackgroundBrush}"
     ui:Design.Foreground="{DynamicResource TextFillColorPrimaryBrush}"
@@ -30,8 +30,9 @@
                 \t&lt;/ListView.ItemTemplate&gt;\n
                 &lt;/ListView&gt;
             </controls:ControlExample.XamlCode>
-            <ListView
-                Height="200"
+            <ui:ListView
+                MaxHeight="200"
+                d:ItemsSource="{d:SampleData ItemCount=2}"
                 ItemsSource="{Binding ViewModel.BasicListViewItems, Mode=TwoWay}"
                 SelectedIndex="2"
                 SelectionMode="Single">
@@ -40,7 +41,7 @@
                         <TextBlock Margin="8,4" Text="{Binding Name, Mode=OneWay}" />
                     </DataTemplate>
                 </ListView.ItemTemplate>
-            </ListView>
+            </ui:ListView>
         </controls:ControlExample>
 
         <controls:ControlExample Margin="0,36,0,0" HeaderText="ListView with Selection Support.">
@@ -58,9 +59,10 @@
                     <ColumnDefinition Width="*" />
                     <ColumnDefinition Width="Auto" />
                 </Grid.ColumnDefinitions>
-                <ListView
+                <ui:ListView
                     Grid.Column="0"
-                    Height="200"
+                    MaxHeight="200"
+                    d:ItemsSource="{d:SampleData ItemCount=2}"
                     ItemsSource="{Binding ViewModel.BasicListViewItems, Mode=TwoWay}"
                     SelectedIndex="1"
                     SelectionMode="{Binding ViewModel.ListViewSelectionMode, Mode=OneWay}">
@@ -99,7 +101,7 @@
                             </Grid>
                         </DataTemplate>
                     </ListView.ItemTemplate>
-                </ListView>
+                </ui:ListView>
                 <StackPanel
                     Grid.Column="1"
                     MinWidth="120"
@@ -114,5 +116,38 @@
                 </StackPanel>
             </Grid>
         </controls:ControlExample>
+
+        <controls:ControlExample Margin="0,36,0,0" HeaderText="ListView with GridView">
+            <controls:ControlExample.XamlCode>
+                &lt;ListView ItemsSource=&quot;{Binding ViewModel.BasicListViewItems}&quot;&gt;\n
+                \t&lt;ListView.View&gt;\n
+                \t\t&lt;GridView&gt;\n
+                \t\t\t&lt;GridViewColumn DisplayMemberBinding=&quot;{Binding FirstName}&quot; Header=&quot;First Name&quot;/&gt;\n
+                \t\t\t&lt;GridViewColumn DisplayMemberBinding=&quot;{Binding LastName}&quot; Header=&quot;Last Name&quot;/&gt;\n
+                \t\t\t&lt;GridViewColumn DisplayMemberBinding=&quot;{Binding Company}&quot; Header=&quot;Company&quot;/&gt;\n
+                \t\t&lt;/GridView&gt;\n
+                \t&lt;/ListView.View&gt;\n
+                &lt;/ListView&gt;
+            </controls:ControlExample.XamlCode>
+            <ui:ListView
+                MaxHeight="200"
+                d:ItemsSource="{d:SampleData ItemCount=3}"
+                BorderThickness="0"
+                ItemsSource="{Binding ViewModel.BasicListViewItems, Mode=TwoWay}">
+                <ListView.View>
+                    <GridView>
+                        <GridViewColumn
+                            Width="100"
+                            DisplayMemberBinding="{Binding FirstName}"
+                            Header="First Name" />
+                        <GridViewColumn
+                            Width="100"
+                            DisplayMemberBinding="{Binding LastName}"
+                            Header="Last Name" />
+                        <GridViewColumn DisplayMemberBinding="{Binding Company}" Header="Company" />
+                    </GridView>
+                </ListView.View>
+            </ui:ListView>
+        </controls:ControlExample>
     </StackPanel>
 </Page>
diff --git a/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBox.xaml b/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBox.xaml
index d6c8aa11a..ec3330535 100644
--- a/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBox.xaml
+++ b/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBox.xaml
@@ -144,7 +144,7 @@
                                 BorderThickness="1"
                                 CornerRadius="8"
                                 SnapsToDevicePixels="True">
-                                <ListView
+                                <controls:ListView
                                     x:Name="PART_SuggestionsList"
                                     MaxHeight="{TemplateBinding MaxSuggestionListHeight}"
                                     DisplayMemberPath="{TemplateBinding DisplayMemberPath}"
@@ -162,7 +162,7 @@
                                                 VirtualizationMode="Recycling" />
                                         </ItemsPanelTemplate>
                                     </ListView.ItemsPanel>
-                                </ListView>
+                                </controls:ListView>
                             </Border>
                         </Popup>
                     </Grid>
diff --git a/src/Wpf.Ui/Controls/ListView/ListView.cs b/src/Wpf.Ui/Controls/ListView/ListView.cs
new file mode 100644
index 000000000..5c7c422f6
--- /dev/null
+++ b/src/Wpf.Ui/Controls/ListView/ListView.cs
@@ -0,0 +1,60 @@
+namespace Wpf.Ui.Controls;
+
+public class ListView : System.Windows.Controls.ListView
+{
+    public string ViewState
+    {
+        get => (string)GetValue(ViewStateProperty);
+        set => SetValue(ViewStateProperty, value);
+    }
+
+    /// <summary>Identifies the <see cref="ViewState"/> dependency property.</summary>
+    public static readonly DependencyProperty ViewStateProperty = DependencyProperty.Register(nameof(ViewState), typeof(string), typeof(ListView), new FrameworkPropertyMetadata("Default", OnViewStateChanged));
+
+    private static void OnViewStateChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is not ListView self)
+        {
+            return;
+        }
+
+        self.OnViewStateChanged(e);
+    }
+
+    protected virtual void OnViewStateChanged(DependencyPropertyChangedEventArgs e)
+    {
+        // derived classes can hook `ViewState` property changes by overriding this method
+    }
+
+    public ListView()
+    {
+        Loaded += OnLoaded;
+    }
+
+    private void OnLoaded(object sender, RoutedEventArgs e)
+    {
+        // immediately unsubscribe to prevent memory leaks
+        Loaded -= OnLoaded;
+
+        // get the descriptor for the `View` property since the framework doesn't provide a public hook for it
+        var descriptor = DependencyPropertyDescriptor.FromProperty(System.Windows.Controls.ListView.ViewProperty, typeof(System.Windows.Controls.ListView));
+        descriptor?.AddValueChanged(this, OnViewPropertyChanged);
+        UpdateViewState(); // set the initial state
+    }
+
+    private void OnViewPropertyChanged(object? sender, EventArgs e)
+    {
+        UpdateViewState();
+    }
+
+    private void UpdateViewState()
+    {
+        var viewState = View is null ? "Default" : "GridView";
+        SetCurrentValue(ViewStateProperty, viewState);
+    }
+
+    static ListView()
+    {
+        DefaultStyleKeyProperty.OverrideMetadata(typeof(ListView), new FrameworkPropertyMetadata(typeof(ListView)));
+    }
+}
diff --git a/src/Wpf.Ui/Controls/ListView/ListView.xaml b/src/Wpf.Ui/Controls/ListView/ListView.xaml
index bef8c8cb2..90c506ac9 100644
--- a/src/Wpf.Ui/Controls/ListView/ListView.xaml
+++ b/src/Wpf.Ui/Controls/ListView/ListView.xaml
@@ -10,63 +10,178 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="clr-namespace:Wpf.Ui.Controls">
 
-    <Style x:Key="DefaultListViewStyle" TargetType="{x:Type ListView}">
-        <Setter Property="Margin" Value="0" />
-        <Setter Property="Padding" Value="0" />
-        <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
-        <Setter Property="ScrollViewer.CanContentScroll" Value="True" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="VirtualizingPanel.IsVirtualizing" Value="True" />
-        <Setter Property="VirtualizingPanel.VirtualizationMode" Value="Standard" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
-        <Setter Property="ItemsPanel">
-            <Setter.Value>
-                <ItemsPanelTemplate>
-                    <VirtualizingStackPanel IsVirtualizing="{TemplateBinding VirtualizingPanel.IsVirtualizing}" VirtualizationMode="{TemplateBinding VirtualizingPanel.VirtualizationMode}" />
-                </ItemsPanelTemplate>
-            </Setter.Value>
-        </Setter>
+    <ControlTemplate x:Key="NullViewTemplate" TargetType="{x:Type controls:ListView}">
+        <Grid>
+            <controls:PassiveScrollViewer
+                x:Name="PART_ContentHost"
+                CanContentScroll="{TemplateBinding ScrollViewer.CanContentScroll}"
+                HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
+                <ItemsPresenter />
+            </controls:PassiveScrollViewer>
+            <Rectangle
+                x:Name="PART_DisabledVisual"
+                Opacity="0"
+                RadiusX="2"
+                RadiusY="2"
+                Stretch="Fill"
+                Stroke="Transparent"
+                StrokeThickness="0"
+                Visibility="Collapsed">
+                <Rectangle.Fill>
+                    <SolidColorBrush Color="{DynamicResource ControlFillColorDefault}" />
+                </Rectangle.Fill>
+            </Rectangle>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsGrouping" Value="True">
+                <Setter Property="ScrollViewer.CanContentScroll" Value="False" />
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter TargetName="PART_DisabledVisual" Property="Visibility" Value="Visible" />
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+
+    <ControlTemplate x:Key="GridViewScrollViewerTemplate" TargetType="ScrollViewer">
+        <Grid Background="Transparent">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <DockPanel Margin="{TemplateBinding Control.Padding}">
+                <ScrollViewer
+                    DockPanel.Dock="Top"
+                    Focusable="False"
+                    HorizontalScrollBarVisibility="Hidden"
+                    VerticalScrollBarVisibility="Hidden">
+                    <GridViewHeaderRowPresenter
+                        Margin="0"
+                        AllowsColumnReorder="{Binding Path=View.AllowsColumnReorder, RelativeSource={RelativeSource AncestorType=ListView}}"
+                        ColumnHeaderContainerStyle="{Binding Path=View.ColumnHeaderContainerStyle, RelativeSource={RelativeSource AncestorType=ListView}}"
+                        ColumnHeaderContextMenu="{Binding Path=View.ColumnHeaderContextMenu, RelativeSource={RelativeSource AncestorType=ListView}}"
+                        ColumnHeaderTemplate="{Binding Path=View.ColumnHeaderTemplate, RelativeSource={RelativeSource AncestorType=ListView}}"
+                        ColumnHeaderToolTip="{Binding Path=View.ColumnHeaderToolTip, RelativeSource={RelativeSource AncestorType=ListView}}"
+                        Columns="{Binding Path=View.Columns, RelativeSource={RelativeSource AncestorType=ListView}}"
+                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                </ScrollViewer>
+                <ScrollContentPresenter
+                    Name="PART_ScrollContentPresenter"
+                    CanContentScroll="{TemplateBinding ScrollViewer.CanContentScroll}"
+                    CanHorizontallyScroll="False"
+                    CanVerticallyScroll="False"
+                    Content="{TemplateBinding ContentControl.Content}"
+                    ContentTemplate="{TemplateBinding ContentControl.ContentTemplate}"
+                    KeyboardNavigation.DirectionalNavigation="Local"
+                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+            </DockPanel>
+            <ScrollBar
+                Name="PART_HorizontalScrollBar"
+                Grid.Row="1"
+                Cursor="Arrow"
+                Maximum="{TemplateBinding ScrollViewer.ScrollableWidth}"
+                Minimum="0"
+                Orientation="Horizontal"
+                Visibility="{TemplateBinding ScrollViewer.ComputedHorizontalScrollBarVisibility}"
+                Value="{Binding Path=HorizontalOffset, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
+            <ScrollBar
+                Name="PART_VerticalScrollBar"
+                Grid.Column="1"
+                Cursor="Arrow"
+                Maximum="{TemplateBinding ScrollViewer.ScrollableHeight}"
+                Minimum="0"
+                Orientation="Vertical"
+                Visibility="{TemplateBinding ScrollViewer.ComputedVerticalScrollBarVisibility}"
+                Value="{Binding Path=VerticalOffset, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
+            <DockPanel
+                Grid.Row="1"
+                Grid.Column="1"
+                LastChildFill="False">
+                <Rectangle
+                    Width="1"
+                    DockPanel.Dock="Left"
+                    Fill="#FFFFFFFF"
+                    Visibility="{TemplateBinding ScrollViewer.ComputedVerticalScrollBarVisibility}" />
+                <Rectangle
+                    Height="1"
+                    DockPanel.Dock="Top"
+                    Fill="#FFFFFFFF"
+                    Visibility="{TemplateBinding ScrollViewer.ComputedHorizontalScrollBarVisibility}" />
+            </DockPanel>
+        </Grid>
+    </ControlTemplate>
+
+    <!--  replaces framework styling for GridView column headers  -->
+    <Style TargetType="GridViewColumnHeader">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Padding" Value="4" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type ListView}">
-                    <Grid>
-                        <controls:PassiveScrollViewer
-                            x:Name="PART_ContentHost"
-                            CanContentScroll="{TemplateBinding ScrollViewer.CanContentScroll}"
-                            HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
-                            VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
-                            <ItemsPresenter />
-                        </controls:PassiveScrollViewer>
-                        <Rectangle
-                            x:Name="PART_DisabledVisual"
-                            Opacity="0"
-                            RadiusX="2"
-                            RadiusY="2"
-                            Stretch="Fill"
-                            Stroke="Transparent"
-                            StrokeThickness="0"
-                            Visibility="Collapsed">
-                            <Rectangle.Fill>
-                                <SolidColorBrush Color="{DynamicResource ControlFillColorDefault}" />
-                            </Rectangle.Fill>
-                        </Rectangle>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsGrouping" Value="True">
-                            <Setter Property="ScrollViewer.CanContentScroll" Value="False" />
-                        </Trigger>
-                        <Trigger Property="IsEnabled" Value="False">
-                            <Setter TargetName="PART_DisabledVisual" Property="Visibility" Value="Visible" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
+                <ControlTemplate TargetType="GridViewColumnHeader">
+                    <!--  margins and padding need some help  -->
+                    <TextBlock
+                        Margin="6,2,0,6"
+                        Padding="4"
+                        FontWeight="Bold"
+                        Foreground="{DynamicResource TextFillColorPrimaryBrush}"
+                        Text="{TemplateBinding Content}" />
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
-    <Style BasedOn="{StaticResource DefaultListViewStyle}" TargetType="{x:Type ListView}" />
+    <ControlTemplate x:Key="GridViewTemplate" TargetType="{x:Type controls:ListView}">
+        <Border
+            Name="Bd"
+            Background="Transparent"
+            BorderBrush="{TemplateBinding Border.BorderBrush}"
+            BorderThickness="{TemplateBinding Border.BorderThickness}">
+            <controls:PassiveScrollViewer
+                Padding="{TemplateBinding Control.Padding}"
+                CanContentScroll="{TemplateBinding ScrollViewer.CanContentScroll}"
+                Focusable="False"
+                Template="{DynamicResource GridViewScrollViewerTemplate}">
+                <ItemsPresenter />
+            </controls:PassiveScrollViewer>
+        </Border>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter TargetName="Bd" Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+
+    <Style x:Key="ListViewStyle" TargetType="{x:Type controls:ListView}">
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+        <Setter Property="ScrollViewer.CanContentScroll" Value="True" />
+        <Setter Property="Control.VerticalContentAlignment" Value="Center" />
+        <Setter Property="Margin" Value="0" />
+        <Setter Property="Padding" Value="0" />
+        <Setter Property="SnapsToDevicePixels" Value="True" />
+        <Setter Property="VirtualizingPanel.IsVirtualizing" Value="True" />
+        <Setter Property="VirtualizingPanel.VirtualizationMode" Value="Standard" />
+        <Style.Triggers>
+            <DataTrigger Binding="{Binding Path=ViewState, RelativeSource={RelativeSource Mode=Self}}" Value="Default">
+                <Setter Property="ItemsPanel">
+                    <Setter.Value>
+                        <ItemsPanelTemplate>
+                            <VirtualizingStackPanel IsVirtualizing="{TemplateBinding VirtualizingPanel.IsVirtualizing}" VirtualizationMode="{TemplateBinding VirtualizingPanel.VirtualizationMode}" />
+                        </ItemsPanelTemplate>
+                    </Setter.Value>
+                </Setter>
+                <Setter Property="Template" Value="{DynamicResource NullViewTemplate}" />
+            </DataTrigger>
+            <DataTrigger Binding="{Binding Path=ViewState, RelativeSource={RelativeSource Mode=Self}}" Value="GridView">
+                <Setter Property="Template" Value="{DynamicResource GridViewTemplate}" />
+            </DataTrigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style BasedOn="{StaticResource ListViewStyle}" TargetType="{x:Type controls:ListView}" />
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/ListView/ListViewItem.xaml b/src/Wpf.Ui/Controls/ListView/ListViewItem.xaml
index 1ccddfa82..670b9f0f9 100644
--- a/src/Wpf.Ui/Controls/ListView/ListViewItem.xaml
+++ b/src/Wpf.Ui/Controls/ListView/ListViewItem.xaml
@@ -4,59 +4,109 @@
     Copyright (C) Leszek Pomianowski and WPF UI Contributors.
     All Rights Reserved.
 -->
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-    <Style x:Key="DefaultListViewItemStyle" TargetType="{x:Type ListViewItem}">
+<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">
+
+    <ControlTemplate x:Key="NullViewItemTemplate" TargetType="{x:Type ListViewItem}">
+        <Border
+            x:Name="Border"
+            Margin="0"
+            Padding="0"
+            Background="Transparent"
+            BorderThickness="1"
+            CornerRadius="{TemplateBinding Border.CornerRadius}">
+            <Grid>
+                <ContentPresenter Margin="{TemplateBinding Padding}" />
+                <Rectangle
+                    x:Name="ActiveRectangle"
+                    Width="3"
+                    Height="18"
+                    Margin="0"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    Fill="{DynamicResource ListViewItemPillFillBrush}"
+                    RadiusX="2"
+                    RadiusY="2"
+                    Visibility="Collapsed" />
+            </Grid>
+        </Border>
+        <ControlTemplate.Triggers>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsEnabled" Value="True" />
+                    <Condition Property="IsMouseOver" Value="True" />
+                </MultiTrigger.Conditions>
+                <Setter TargetName="Border" Property="Background" Value="{DynamicResource ListViewItemBackgroundPointerOver}" />
+            </MultiTrigger>
+            <Trigger Property="IsSelected" Value="True">
+                <Setter TargetName="ActiveRectangle" Property="Visibility" Value="Visible" />
+                <Setter TargetName="Border" Property="Background" Value="{DynamicResource ListViewItemBackgroundPointerOver}" />
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+
+    <ControlTemplate x:Key="GridViewItemTemplate" TargetType="ListViewItem">
+        <Border
+            x:Name="Border"
+            Margin="0"
+            Padding="0"
+            Background="Transparent"
+            BorderBrush="{TemplateBinding Border.BorderBrush}"
+            BorderThickness="{TemplateBinding Border.BorderThickness}"
+            CornerRadius="{TemplateBinding Border.CornerRadius}">
+            <Grid>
+                <GridViewRowPresenter
+                    Margin="{TemplateBinding Padding}"
+                    VerticalAlignment="{TemplateBinding Control.VerticalContentAlignment}"
+                    Columns="{TemplateBinding GridView.ColumnCollection}"
+                    Content="{TemplateBinding ContentControl.Content}" />
+                <Rectangle
+                    x:Name="ActiveRectangle"
+                    Width="3"
+                    Height="18"
+                    Margin="0"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    Fill="{DynamicResource ListViewItemPillFillBrush}"
+                    RadiusX="2"
+                    RadiusY="2"
+                    Visibility="Collapsed" />
+            </Grid>
+        </Border>
+        <ControlTemplate.Triggers>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsEnabled" Value="True" />
+                    <Condition Property="IsMouseOver" Value="True" />
+                </MultiTrigger.Conditions>
+                <Setter TargetName="Border" Property="Background" Value="{DynamicResource ListViewItemBackgroundPointerOver}" />
+            </MultiTrigger>
+            <Trigger Property="IsSelected" Value="True">
+                <Setter TargetName="ActiveRectangle" Property="Visibility" Value="Visible" />
+                <Setter TargetName="Border" Property="Background" Value="{DynamicResource ListViewItemBackgroundPointerOver}" />
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+
+    <Style x:Key="ListViewItemStyle" TargetType="{x:Type ListViewItem}">
         <Setter Property="Foreground" Value="{DynamicResource ListViewItemForeground}" />
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
         <Setter Property="Margin" Value="0,0,0,2" />
         <Setter Property="Padding" Value="4" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type ListBoxItem}">
-                    <Border
-                        x:Name="Border"
-                        Margin="0"
-                        Padding="0"
-                        Background="Transparent"
-                        BorderThickness="1"
-                        CornerRadius="{TemplateBinding Border.CornerRadius}">
-                        <Grid>
-                            <ContentPresenter Margin="{TemplateBinding Padding}" />
-                            <Rectangle
-                                x:Name="ActiveRectangle"
-                                Width="3"
-                                Height="18"
-                                Margin="0"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Center"
-                                Fill="{DynamicResource ListViewItemPillFillBrush}"
-                                RadiusX="2"
-                                RadiusY="2"
-                                Visibility="Collapsed" />
-                        </Grid>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="IsEnabled" Value="True" />
-                                <Condition Property="IsMouseOver" Value="True" />
-                            </MultiTrigger.Conditions>
-                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource ListViewItemBackgroundPointerOver}" />
-
-                        </MultiTrigger>
-                        <Trigger Property="IsSelected" Value="True">
-                            <Setter TargetName="ActiveRectangle" Property="Visibility" Value="Visible" />
-                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource ListViewItemBackgroundPointerOver}" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
+        <Style.Triggers>
+            <DataTrigger Binding="{Binding Path=ViewState, RelativeSource={RelativeSource AncestorType={x:Type ListView}}}" Value="Default">
+                <Setter Property="Template" Value="{DynamicResource NullViewItemTemplate}" />
+            </DataTrigger>
+            <DataTrigger Binding="{Binding Path=ViewState, RelativeSource={RelativeSource AncestorType={x:Type ListView}}}" Value="GridView">
+                <Setter Property="Template" Value="{DynamicResource GridViewItemTemplate}" />
+            </DataTrigger>
+        </Style.Triggers>
     </Style>
 
-    <Style BasedOn="{StaticResource DefaultListViewItemStyle}" TargetType="{x:Type ListViewItem}" />
+    <Style BasedOn="{StaticResource ListViewItemStyle}" TargetType="{x:Type ListViewItem}" />
 
 </ResourceDictionary>

From 0271f7a00c1c673b0ad70b0614864fac3572be1e Mon Sep 17 00:00:00 2001
From: koal44 <random.var.ny@gmail.com>
Date: Thu, 14 Mar 2024 02:13:20 -0700
Subject: [PATCH 2/5] Change ViewState's type from a string to an enum of two
 states: Default and GridView

---
 src/Wpf.Ui.SyntaxHighlight/SyntaxHighlight.xaml   |  2 +-
 src/Wpf.Ui/Controls/ListView/ListView.cs          | 13 +++++++++----
 src/Wpf.Ui/Controls/ListView/ListView.xaml        |  4 ++--
 src/Wpf.Ui/Controls/ListView/ListViewItem.xaml    |  5 +----
 src/Wpf.Ui/Controls/ListView/ListViewViewState.cs | 12 ++++++++++++
 5 files changed, 25 insertions(+), 11 deletions(-)
 create mode 100644 src/Wpf.Ui/Controls/ListView/ListViewViewState.cs

diff --git a/src/Wpf.Ui.SyntaxHighlight/SyntaxHighlight.xaml b/src/Wpf.Ui.SyntaxHighlight/SyntaxHighlight.xaml
index 279e1d3ef..88d284dcf 100644
--- a/src/Wpf.Ui.SyntaxHighlight/SyntaxHighlight.xaml
+++ b/src/Wpf.Ui.SyntaxHighlight/SyntaxHighlight.xaml
@@ -8,7 +8,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <!--  https://github.com/tonsky/FiraCode  -->
-    <FontFamily x:Key="FiraCode">pack://application:,,,/Wpf.Ui;component/Fonts/#Fira Code</FontFamily>
+    <FontFamily x:Key="FiraCode">pack://application:,,,/Wpf.Ui.SyntaxHighlight;component/Fonts/#Fira Code</FontFamily>
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="pack://application:,,,/Wpf.Ui.SyntaxHighlight;component/Controls/CodeBlock.xaml" />
diff --git a/src/Wpf.Ui/Controls/ListView/ListView.cs b/src/Wpf.Ui/Controls/ListView/ListView.cs
index 5c7c422f6..44efcd2a9 100644
--- a/src/Wpf.Ui/Controls/ListView/ListView.cs
+++ b/src/Wpf.Ui/Controls/ListView/ListView.cs
@@ -2,14 +2,14 @@ namespace Wpf.Ui.Controls;
 
 public class ListView : System.Windows.Controls.ListView
 {
-    public string ViewState
+    public ListViewViewState ViewState
     {
-        get => (string)GetValue(ViewStateProperty);
+        get => (ListViewViewState)GetValue(ViewStateProperty);
         set => SetValue(ViewStateProperty, value);
     }
 
     /// <summary>Identifies the <see cref="ViewState"/> dependency property.</summary>
-    public static readonly DependencyProperty ViewStateProperty = DependencyProperty.Register(nameof(ViewState), typeof(string), typeof(ListView), new FrameworkPropertyMetadata("Default", OnViewStateChanged));
+    public static readonly DependencyProperty ViewStateProperty = DependencyProperty.Register(nameof(ViewState), typeof(ListViewViewState), typeof(ListView), new FrameworkPropertyMetadata(ListViewViewState.Default, OnViewStateChanged));
 
     private static void OnViewStateChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
@@ -49,7 +49,12 @@ private void OnViewPropertyChanged(object? sender, EventArgs e)
 
     private void UpdateViewState()
     {
-        var viewState = View is null ? "Default" : "GridView";
+        ListViewViewState viewState = View switch
+        {
+            System.Windows.Controls.GridView => ListViewViewState.GridView,
+            null => ListViewViewState.Default,
+            _ => ListViewViewState.Default
+        };
         SetCurrentValue(ViewStateProperty, viewState);
     }
 
diff --git a/src/Wpf.Ui/Controls/ListView/ListView.xaml b/src/Wpf.Ui/Controls/ListView/ListView.xaml
index 90c506ac9..238a25c9c 100644
--- a/src/Wpf.Ui/Controls/ListView/ListView.xaml
+++ b/src/Wpf.Ui/Controls/ListView/ListView.xaml
@@ -166,7 +166,7 @@
         <Setter Property="VirtualizingPanel.IsVirtualizing" Value="True" />
         <Setter Property="VirtualizingPanel.VirtualizationMode" Value="Standard" />
         <Style.Triggers>
-            <DataTrigger Binding="{Binding Path=ViewState, RelativeSource={RelativeSource Mode=Self}}" Value="Default">
+            <DataTrigger Binding="{Binding Path=ViewState, RelativeSource={RelativeSource Mode=Self}}" Value="{x:Static controls:ListViewViewState.Default}">
                 <Setter Property="ItemsPanel">
                     <Setter.Value>
                         <ItemsPanelTemplate>
@@ -176,7 +176,7 @@
                 </Setter>
                 <Setter Property="Template" Value="{DynamicResource NullViewTemplate}" />
             </DataTrigger>
-            <DataTrigger Binding="{Binding Path=ViewState, RelativeSource={RelativeSource Mode=Self}}" Value="GridView">
+            <DataTrigger Binding="{Binding Path=ViewState, RelativeSource={RelativeSource Mode=Self}}" Value="{x:Static controls:ListViewViewState.GridView}">
                 <Setter Property="Template" Value="{DynamicResource GridViewTemplate}" />
             </DataTrigger>
         </Style.Triggers>
diff --git a/src/Wpf.Ui/Controls/ListView/ListViewItem.xaml b/src/Wpf.Ui/Controls/ListView/ListViewItem.xaml
index 670b9f0f9..8b0e66ef9 100644
--- a/src/Wpf.Ui/Controls/ListView/ListViewItem.xaml
+++ b/src/Wpf.Ui/Controls/ListView/ListViewItem.xaml
@@ -5,10 +5,7 @@
     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">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <ControlTemplate x:Key="NullViewItemTemplate" TargetType="{x:Type ListViewItem}">
         <Border
diff --git a/src/Wpf.Ui/Controls/ListView/ListViewViewState.cs b/src/Wpf.Ui/Controls/ListView/ListViewViewState.cs
new file mode 100644
index 000000000..92e3d4766
--- /dev/null
+++ b/src/Wpf.Ui/Controls/ListView/ListViewViewState.cs
@@ -0,0 +1,12 @@
+// 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 ListViewViewState
+{
+    Default,
+    GridView,
+}

From 96d10c09cc79d56cddd711f232a97ca4d910f172 Mon Sep 17 00:00:00 2001
From: koal44 <random.var.ny@gmail.com>
Date: Thu, 14 Mar 2024 04:45:44 -0700
Subject: [PATCH 3/5] Implement the GridView feature by binding directly to the
 View property.

Removed the custom class ui:ListView as its purpose was to expose the ViewState, which can be simplified by directly binding to ListView.View with a ValueConverter.
---
 .../ViewModels/Windows/MainWindowViewModel.cs |  2 +-
 .../Views/Pages/Collections/ListViewPage.xaml | 12 ++--
 .../SyntaxHighlight.xaml                      |  2 +-
 .../AutoSuggestBox/AutoSuggestBox.xaml        |  4 +-
 src/Wpf.Ui/Controls/ListView/ListView.cs      | 65 -------------------
 src/Wpf.Ui/Controls/ListView/ListView.xaml    | 25 +++----
 .../Controls/ListView/ListViewItem.xaml       | 12 +++-
 .../ViewToListViewViewStateConverter.cs       | 28 ++++++++
 8 files changed, 61 insertions(+), 89 deletions(-)
 delete mode 100644 src/Wpf.Ui/Controls/ListView/ListView.cs
 create mode 100644 src/Wpf.Ui/Converters/ViewToListViewViewStateConverter.cs

diff --git a/src/Wpf.Ui.Gallery/ViewModels/Windows/MainWindowViewModel.cs b/src/Wpf.Ui.Gallery/ViewModels/Windows/MainWindowViewModel.cs
index 43531e71d..7e96e95c5 100644
--- a/src/Wpf.Ui.Gallery/ViewModels/Windows/MainWindowViewModel.cs
+++ b/src/Wpf.Ui.Gallery/ViewModels/Windows/MainWindowViewModel.cs
@@ -72,7 +72,7 @@ public partial class MainWindowViewModel : ObservableObject
             {
                 new NavigationViewItem(nameof(System.Windows.Controls.DataGrid), typeof(DataGridPage)),
                 new NavigationViewItem(nameof(ListBox), typeof(ListBoxPage)),
-                new NavigationViewItem(nameof(Ui.Controls.ListView), typeof(ListViewPage)),
+                new NavigationViewItem(nameof(ListView), typeof(ListViewPage)),
                 new NavigationViewItem(nameof(TreeView), typeof(TreeViewPage)),
 #if DEBUG
                 new NavigationViewItem("TreeList", typeof(TreeListPage)),
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/Collections/ListViewPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/Collections/ListViewPage.xaml
index 7ce461c3d..a9a6f6e48 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/Collections/ListViewPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/Collections/ListViewPage.xaml
@@ -30,7 +30,7 @@
                 \t&lt;/ListView.ItemTemplate&gt;\n
                 &lt;/ListView&gt;
             </controls:ControlExample.XamlCode>
-            <ui:ListView
+            <ListView
                 MaxHeight="200"
                 d:ItemsSource="{d:SampleData ItemCount=2}"
                 ItemsSource="{Binding ViewModel.BasicListViewItems, Mode=TwoWay}"
@@ -41,7 +41,7 @@
                         <TextBlock Margin="8,4" Text="{Binding Name, Mode=OneWay}" />
                     </DataTemplate>
                 </ListView.ItemTemplate>
-            </ui:ListView>
+            </ListView>
         </controls:ControlExample>
 
         <controls:ControlExample Margin="0,36,0,0" HeaderText="ListView with Selection Support.">
@@ -59,7 +59,7 @@
                     <ColumnDefinition Width="*" />
                     <ColumnDefinition Width="Auto" />
                 </Grid.ColumnDefinitions>
-                <ui:ListView
+                <ListView
                     Grid.Column="0"
                     MaxHeight="200"
                     d:ItemsSource="{d:SampleData ItemCount=2}"
@@ -101,7 +101,7 @@
                             </Grid>
                         </DataTemplate>
                     </ListView.ItemTemplate>
-                </ui:ListView>
+                </ListView>
                 <StackPanel
                     Grid.Column="1"
                     MinWidth="120"
@@ -129,7 +129,7 @@
                 \t&lt;/ListView.View&gt;\n
                 &lt;/ListView&gt;
             </controls:ControlExample.XamlCode>
-            <ui:ListView
+            <ListView
                 MaxHeight="200"
                 d:ItemsSource="{d:SampleData ItemCount=3}"
                 BorderThickness="0"
@@ -147,7 +147,7 @@
                         <GridViewColumn DisplayMemberBinding="{Binding Company}" Header="Company" />
                     </GridView>
                 </ListView.View>
-            </ui:ListView>
+            </ListView>
         </controls:ControlExample>
     </StackPanel>
 </Page>
diff --git a/src/Wpf.Ui.SyntaxHighlight/SyntaxHighlight.xaml b/src/Wpf.Ui.SyntaxHighlight/SyntaxHighlight.xaml
index 88d284dcf..279e1d3ef 100644
--- a/src/Wpf.Ui.SyntaxHighlight/SyntaxHighlight.xaml
+++ b/src/Wpf.Ui.SyntaxHighlight/SyntaxHighlight.xaml
@@ -8,7 +8,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <!--  https://github.com/tonsky/FiraCode  -->
-    <FontFamily x:Key="FiraCode">pack://application:,,,/Wpf.Ui.SyntaxHighlight;component/Fonts/#Fira Code</FontFamily>
+    <FontFamily x:Key="FiraCode">pack://application:,,,/Wpf.Ui;component/Fonts/#Fira Code</FontFamily>
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="pack://application:,,,/Wpf.Ui.SyntaxHighlight;component/Controls/CodeBlock.xaml" />
diff --git a/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBox.xaml b/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBox.xaml
index ec3330535..d6c8aa11a 100644
--- a/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBox.xaml
+++ b/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBox.xaml
@@ -144,7 +144,7 @@
                                 BorderThickness="1"
                                 CornerRadius="8"
                                 SnapsToDevicePixels="True">
-                                <controls:ListView
+                                <ListView
                                     x:Name="PART_SuggestionsList"
                                     MaxHeight="{TemplateBinding MaxSuggestionListHeight}"
                                     DisplayMemberPath="{TemplateBinding DisplayMemberPath}"
@@ -162,7 +162,7 @@
                                                 VirtualizationMode="Recycling" />
                                         </ItemsPanelTemplate>
                                     </ListView.ItemsPanel>
-                                </controls:ListView>
+                                </ListView>
                             </Border>
                         </Popup>
                     </Grid>
diff --git a/src/Wpf.Ui/Controls/ListView/ListView.cs b/src/Wpf.Ui/Controls/ListView/ListView.cs
deleted file mode 100644
index 44efcd2a9..000000000
--- a/src/Wpf.Ui/Controls/ListView/ListView.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-namespace Wpf.Ui.Controls;
-
-public class ListView : System.Windows.Controls.ListView
-{
-    public ListViewViewState ViewState
-    {
-        get => (ListViewViewState)GetValue(ViewStateProperty);
-        set => SetValue(ViewStateProperty, value);
-    }
-
-    /// <summary>Identifies the <see cref="ViewState"/> dependency property.</summary>
-    public static readonly DependencyProperty ViewStateProperty = DependencyProperty.Register(nameof(ViewState), typeof(ListViewViewState), typeof(ListView), new FrameworkPropertyMetadata(ListViewViewState.Default, OnViewStateChanged));
-
-    private static void OnViewStateChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-    {
-        if (d is not ListView self)
-        {
-            return;
-        }
-
-        self.OnViewStateChanged(e);
-    }
-
-    protected virtual void OnViewStateChanged(DependencyPropertyChangedEventArgs e)
-    {
-        // derived classes can hook `ViewState` property changes by overriding this method
-    }
-
-    public ListView()
-    {
-        Loaded += OnLoaded;
-    }
-
-    private void OnLoaded(object sender, RoutedEventArgs e)
-    {
-        // immediately unsubscribe to prevent memory leaks
-        Loaded -= OnLoaded;
-
-        // get the descriptor for the `View` property since the framework doesn't provide a public hook for it
-        var descriptor = DependencyPropertyDescriptor.FromProperty(System.Windows.Controls.ListView.ViewProperty, typeof(System.Windows.Controls.ListView));
-        descriptor?.AddValueChanged(this, OnViewPropertyChanged);
-        UpdateViewState(); // set the initial state
-    }
-
-    private void OnViewPropertyChanged(object? sender, EventArgs e)
-    {
-        UpdateViewState();
-    }
-
-    private void UpdateViewState()
-    {
-        ListViewViewState viewState = View switch
-        {
-            System.Windows.Controls.GridView => ListViewViewState.GridView,
-            null => ListViewViewState.Default,
-            _ => ListViewViewState.Default
-        };
-        SetCurrentValue(ViewStateProperty, viewState);
-    }
-
-    static ListView()
-    {
-        DefaultStyleKeyProperty.OverrideMetadata(typeof(ListView), new FrameworkPropertyMetadata(typeof(ListView)));
-    }
-}
diff --git a/src/Wpf.Ui/Controls/ListView/ListView.xaml b/src/Wpf.Ui/Controls/ListView/ListView.xaml
index 238a25c9c..3cc76c08d 100644
--- a/src/Wpf.Ui/Controls/ListView/ListView.xaml
+++ b/src/Wpf.Ui/Controls/ListView/ListView.xaml
@@ -8,9 +8,12 @@
 <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:controls="clr-namespace:Wpf.Ui.Controls"
+    xmlns:converters="clr-namespace:Wpf.Ui.Converters">
 
-    <ControlTemplate x:Key="NullViewTemplate" TargetType="{x:Type controls:ListView}">
+    <converters:ViewToListViewViewStateConverter x:Key="ViewToListViewViewStateConverter" />
+
+    <ControlTemplate x:Key="NullViewTemplate" TargetType="{x:Type ListView}">
         <Grid>
             <controls:PassiveScrollViewer
                 x:Name="PART_ContentHost"
@@ -134,7 +137,7 @@
         </Setter>
     </Style>
 
-    <ControlTemplate x:Key="GridViewTemplate" TargetType="{x:Type controls:ListView}">
+    <ControlTemplate x:Key="GridViewTemplate" TargetType="{x:Type ListView}">
         <Border
             Name="Bd"
             Background="Transparent"
@@ -155,18 +158,18 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <Style x:Key="ListViewStyle" TargetType="{x:Type controls:ListView}">
+    <Style x:Key="ListViewStyle" TargetType="{x:Type ListView}">
+        <Setter Property="Margin" Value="0" />
+        <Setter Property="Padding" Value="0" />
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
         <Setter Property="ScrollViewer.CanContentScroll" Value="True" />
-        <Setter Property="Control.VerticalContentAlignment" Value="Center" />
-        <Setter Property="Margin" Value="0" />
-        <Setter Property="Padding" Value="0" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="VirtualizingPanel.IsVirtualizing" Value="True" />
         <Setter Property="VirtualizingPanel.VirtualizationMode" Value="Standard" />
+        <Setter Property="SnapsToDevicePixels" Value="True" />
         <Style.Triggers>
-            <DataTrigger Binding="{Binding Path=ViewState, RelativeSource={RelativeSource Mode=Self}}" Value="{x:Static controls:ListViewViewState.Default}">
+            <DataTrigger Binding="{Binding Path=View, RelativeSource={RelativeSource Mode=Self}, Converter={StaticResource ViewToListViewViewStateConverter}}" Value="{x:Static controls:ListViewViewState.Default}">
                 <Setter Property="ItemsPanel">
                     <Setter.Value>
                         <ItemsPanelTemplate>
@@ -176,12 +179,12 @@
                 </Setter>
                 <Setter Property="Template" Value="{DynamicResource NullViewTemplate}" />
             </DataTrigger>
-            <DataTrigger Binding="{Binding Path=ViewState, RelativeSource={RelativeSource Mode=Self}}" Value="{x:Static controls:ListViewViewState.GridView}">
+            <DataTrigger Binding="{Binding Path=View, RelativeSource={RelativeSource Mode=Self}, Converter={StaticResource ViewToListViewViewStateConverter}}" Value="{x:Static controls:ListViewViewState.GridView}">
                 <Setter Property="Template" Value="{DynamicResource GridViewTemplate}" />
             </DataTrigger>
         </Style.Triggers>
     </Style>
 
-    <Style BasedOn="{StaticResource ListViewStyle}" TargetType="{x:Type controls:ListView}" />
+    <Style BasedOn="{StaticResource ListViewStyle}" TargetType="{x:Type ListView}" />
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/ListView/ListViewItem.xaml b/src/Wpf.Ui/Controls/ListView/ListViewItem.xaml
index 8b0e66ef9..30a8d7d68 100644
--- a/src/Wpf.Ui/Controls/ListView/ListViewItem.xaml
+++ b/src/Wpf.Ui/Controls/ListView/ListViewItem.xaml
@@ -5,7 +5,13 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<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:converters="clr-namespace:Wpf.Ui.Converters">
+
+    <converters:ViewToListViewViewStateConverter x:Key="ViewToListViewViewStateConverter" />
 
     <ControlTemplate x:Key="NullViewItemTemplate" TargetType="{x:Type ListViewItem}">
         <Border
@@ -95,10 +101,10 @@
         <Setter Property="Margin" Value="0,0,0,2" />
         <Setter Property="Padding" Value="4" />
         <Style.Triggers>
-            <DataTrigger Binding="{Binding Path=ViewState, RelativeSource={RelativeSource AncestorType={x:Type ListView}}}" Value="Default">
+            <DataTrigger Binding="{Binding Path=View, RelativeSource={RelativeSource AncestorType={x:Type ListView}}, Converter={StaticResource ViewToListViewViewStateConverter}}" Value="{x:Static controls:ListViewViewState.Default}">
                 <Setter Property="Template" Value="{DynamicResource NullViewItemTemplate}" />
             </DataTrigger>
-            <DataTrigger Binding="{Binding Path=ViewState, RelativeSource={RelativeSource AncestorType={x:Type ListView}}}" Value="GridView">
+            <DataTrigger Binding="{Binding Path=View, RelativeSource={RelativeSource AncestorType={x:Type ListView}}, Converter={StaticResource ViewToListViewViewStateConverter}}" Value="{x:Static controls:ListViewViewState.GridView}">
                 <Setter Property="Template" Value="{DynamicResource GridViewItemTemplate}" />
             </DataTrigger>
         </Style.Triggers>
diff --git a/src/Wpf.Ui/Converters/ViewToListViewViewStateConverter.cs b/src/Wpf.Ui/Converters/ViewToListViewViewStateConverter.cs
new file mode 100644
index 000000000..88a8bc429
--- /dev/null
+++ b/src/Wpf.Ui/Converters/ViewToListViewViewStateConverter.cs
@@ -0,0 +1,28 @@
+// 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.Controls;
+using System.Windows.Data;
+using Wpf.Ui.Controls;
+
+namespace Wpf.Ui.Converters;
+
+internal class ViewToListViewViewStateConverter : IValueConverter
+{
+    public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        return value switch
+        {
+            GridView => ListViewViewState.GridView,
+            null => ListViewViewState.Default,
+            _ => ListViewViewState.Default
+        };
+    }
+
+    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        throw new NotSupportedException("Converting from ListViewViewState to View is not supported.");
+    }
+}

From 9c2391a8d21abbbeb1a1922f2b1d7a1c8afc0bff Mon Sep 17 00:00:00 2001
From: koal44 <random.var.ny@gmail.com>
Date: Tue, 19 Mar 2024 07:55:51 -0700
Subject: [PATCH 4/5] Re-implement custom ui:ListView class and remove the
 ListViewViewStateConverter

---
 .../ViewModels/Windows/MainWindowViewModel.cs |  2 +-
 .../Views/Pages/Collections/ListViewPage.xaml | 24 +++----
 .../AutoSuggestBox/AutoSuggestBox.xaml        |  8 +--
 src/Wpf.Ui/Controls/ListView/ListView.cs      | 65 +++++++++++++++++++
 src/Wpf.Ui/Controls/ListView/ListView.xaml    | 17 ++---
 .../Controls/ListView/ListViewItem.xaml       | 12 +---
 .../ViewToListViewViewStateConverter.cs       | 28 --------
 7 files changed, 92 insertions(+), 64 deletions(-)
 create mode 100644 src/Wpf.Ui/Controls/ListView/ListView.cs
 delete mode 100644 src/Wpf.Ui/Converters/ViewToListViewViewStateConverter.cs

diff --git a/src/Wpf.Ui.Gallery/ViewModels/Windows/MainWindowViewModel.cs b/src/Wpf.Ui.Gallery/ViewModels/Windows/MainWindowViewModel.cs
index 7e96e95c5..43531e71d 100644
--- a/src/Wpf.Ui.Gallery/ViewModels/Windows/MainWindowViewModel.cs
+++ b/src/Wpf.Ui.Gallery/ViewModels/Windows/MainWindowViewModel.cs
@@ -72,7 +72,7 @@ public partial class MainWindowViewModel : ObservableObject
             {
                 new NavigationViewItem(nameof(System.Windows.Controls.DataGrid), typeof(DataGridPage)),
                 new NavigationViewItem(nameof(ListBox), typeof(ListBoxPage)),
-                new NavigationViewItem(nameof(ListView), typeof(ListViewPage)),
+                new NavigationViewItem(nameof(Ui.Controls.ListView), typeof(ListViewPage)),
                 new NavigationViewItem(nameof(TreeView), typeof(TreeViewPage)),
 #if DEBUG
                 new NavigationViewItem("TreeList", typeof(TreeListPage)),
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/Collections/ListViewPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/Collections/ListViewPage.xaml
index a9a6f6e48..35cdf639c 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/Collections/ListViewPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/Collections/ListViewPage.xaml
@@ -30,18 +30,18 @@
                 \t&lt;/ListView.ItemTemplate&gt;\n
                 &lt;/ListView&gt;
             </controls:ControlExample.XamlCode>
-            <ListView
+            <ui:ListView
                 MaxHeight="200"
                 d:ItemsSource="{d:SampleData ItemCount=2}"
                 ItemsSource="{Binding ViewModel.BasicListViewItems, Mode=TwoWay}"
                 SelectedIndex="2"
                 SelectionMode="Single">
-                <ListView.ItemTemplate>
+                <ui:ListView.ItemTemplate>
                     <DataTemplate DataType="{x:Type models:Person}">
                         <TextBlock Margin="8,4" Text="{Binding Name, Mode=OneWay}" />
                     </DataTemplate>
-                </ListView.ItemTemplate>
-            </ListView>
+                </ui:ListView.ItemTemplate>
+            </ui:ListView>
         </controls:ControlExample>
 
         <controls:ControlExample Margin="0,36,0,0" HeaderText="ListView with Selection Support.">
@@ -59,14 +59,14 @@
                     <ColumnDefinition Width="*" />
                     <ColumnDefinition Width="Auto" />
                 </Grid.ColumnDefinitions>
-                <ListView
+                <ui:ListView
                     Grid.Column="0"
                     MaxHeight="200"
                     d:ItemsSource="{d:SampleData ItemCount=2}"
                     ItemsSource="{Binding ViewModel.BasicListViewItems, Mode=TwoWay}"
                     SelectedIndex="1"
                     SelectionMode="{Binding ViewModel.ListViewSelectionMode, Mode=OneWay}">
-                    <ListView.ItemTemplate>
+                    <ui:ListView.ItemTemplate>
                         <DataTemplate DataType="{x:Type models:Person}">
                             <Grid Margin="8,0">
                                 <Grid.RowDefinitions>
@@ -100,8 +100,8 @@
                                     Text="{Binding Company, Mode=OneWay}" />
                             </Grid>
                         </DataTemplate>
-                    </ListView.ItemTemplate>
-                </ListView>
+                    </ui:ListView.ItemTemplate>
+                </ui:ListView>
                 <StackPanel
                     Grid.Column="1"
                     MinWidth="120"
@@ -129,12 +129,12 @@
                 \t&lt;/ListView.View&gt;\n
                 &lt;/ListView&gt;
             </controls:ControlExample.XamlCode>
-            <ListView
+            <ui:ListView
                 MaxHeight="200"
                 d:ItemsSource="{d:SampleData ItemCount=3}"
                 BorderThickness="0"
                 ItemsSource="{Binding ViewModel.BasicListViewItems, Mode=TwoWay}">
-                <ListView.View>
+                <ui:ListView.View>
                     <GridView>
                         <GridViewColumn
                             Width="100"
@@ -146,8 +146,8 @@
                             Header="Last Name" />
                         <GridViewColumn DisplayMemberBinding="{Binding Company}" Header="Company" />
                     </GridView>
-                </ListView.View>
-            </ListView>
+                </ui:ListView.View>
+            </ui:ListView>
         </controls:ControlExample>
     </StackPanel>
 </Page>
diff --git a/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBox.xaml b/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBox.xaml
index d6c8aa11a..389daa086 100644
--- a/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBox.xaml
+++ b/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBox.xaml
@@ -144,7 +144,7 @@
                                 BorderThickness="1"
                                 CornerRadius="8"
                                 SnapsToDevicePixels="True">
-                                <ListView
+                                <controls:ListView
                                     x:Name="PART_SuggestionsList"
                                     MaxHeight="{TemplateBinding MaxSuggestionListHeight}"
                                     DisplayMemberPath="{TemplateBinding DisplayMemberPath}"
@@ -154,15 +154,15 @@
                                     ItemsSource="{TemplateBinding ItemsSource}"
                                     KeyboardNavigation.DirectionalNavigation="Cycle"
                                     SelectionMode="Single">
-                                    <ListView.ItemsPanel>
+                                    <controls:ListView.ItemsPanel>
                                         <ItemsPanelTemplate>
                                             <VirtualizingStackPanel
                                                 IsItemsHost="True"
                                                 IsVirtualizing="True"
                                                 VirtualizationMode="Recycling" />
                                         </ItemsPanelTemplate>
-                                    </ListView.ItemsPanel>
-                                </ListView>
+                                    </controls:ListView.ItemsPanel>
+                                </controls:ListView>
                             </Border>
                         </Popup>
                     </Grid>
diff --git a/src/Wpf.Ui/Controls/ListView/ListView.cs b/src/Wpf.Ui/Controls/ListView/ListView.cs
new file mode 100644
index 000000000..44efcd2a9
--- /dev/null
+++ b/src/Wpf.Ui/Controls/ListView/ListView.cs
@@ -0,0 +1,65 @@
+namespace Wpf.Ui.Controls;
+
+public class ListView : System.Windows.Controls.ListView
+{
+    public ListViewViewState ViewState
+    {
+        get => (ListViewViewState)GetValue(ViewStateProperty);
+        set => SetValue(ViewStateProperty, value);
+    }
+
+    /// <summary>Identifies the <see cref="ViewState"/> dependency property.</summary>
+    public static readonly DependencyProperty ViewStateProperty = DependencyProperty.Register(nameof(ViewState), typeof(ListViewViewState), typeof(ListView), new FrameworkPropertyMetadata(ListViewViewState.Default, OnViewStateChanged));
+
+    private static void OnViewStateChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is not ListView self)
+        {
+            return;
+        }
+
+        self.OnViewStateChanged(e);
+    }
+
+    protected virtual void OnViewStateChanged(DependencyPropertyChangedEventArgs e)
+    {
+        // derived classes can hook `ViewState` property changes by overriding this method
+    }
+
+    public ListView()
+    {
+        Loaded += OnLoaded;
+    }
+
+    private void OnLoaded(object sender, RoutedEventArgs e)
+    {
+        // immediately unsubscribe to prevent memory leaks
+        Loaded -= OnLoaded;
+
+        // get the descriptor for the `View` property since the framework doesn't provide a public hook for it
+        var descriptor = DependencyPropertyDescriptor.FromProperty(System.Windows.Controls.ListView.ViewProperty, typeof(System.Windows.Controls.ListView));
+        descriptor?.AddValueChanged(this, OnViewPropertyChanged);
+        UpdateViewState(); // set the initial state
+    }
+
+    private void OnViewPropertyChanged(object? sender, EventArgs e)
+    {
+        UpdateViewState();
+    }
+
+    private void UpdateViewState()
+    {
+        ListViewViewState viewState = View switch
+        {
+            System.Windows.Controls.GridView => ListViewViewState.GridView,
+            null => ListViewViewState.Default,
+            _ => ListViewViewState.Default
+        };
+        SetCurrentValue(ViewStateProperty, viewState);
+    }
+
+    static ListView()
+    {
+        DefaultStyleKeyProperty.OverrideMetadata(typeof(ListView), new FrameworkPropertyMetadata(typeof(ListView)));
+    }
+}
diff --git a/src/Wpf.Ui/Controls/ListView/ListView.xaml b/src/Wpf.Ui/Controls/ListView/ListView.xaml
index 3cc76c08d..1af21cff0 100644
--- a/src/Wpf.Ui/Controls/ListView/ListView.xaml
+++ b/src/Wpf.Ui/Controls/ListView/ListView.xaml
@@ -8,12 +8,9 @@
 <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:converters="clr-namespace:Wpf.Ui.Converters">
+    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
 
-    <converters:ViewToListViewViewStateConverter x:Key="ViewToListViewViewStateConverter" />
-
-    <ControlTemplate x:Key="NullViewTemplate" TargetType="{x:Type ListView}">
+    <ControlTemplate x:Key="NullViewTemplate" TargetType="{x:Type controls:ListView}">
         <Grid>
             <controls:PassiveScrollViewer
                 x:Name="PART_ContentHost"
@@ -137,7 +134,7 @@
         </Setter>
     </Style>
 
-    <ControlTemplate x:Key="GridViewTemplate" TargetType="{x:Type ListView}">
+    <ControlTemplate x:Key="GridViewTemplate" TargetType="{x:Type controls:ListView}">
         <Border
             Name="Bd"
             Background="Transparent"
@@ -158,7 +155,7 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <Style x:Key="ListViewStyle" TargetType="{x:Type ListView}">
+    <Style x:Key="ListViewStyle" TargetType="{x:Type controls:ListView}">
         <Setter Property="Margin" Value="0" />
         <Setter Property="Padding" Value="0" />
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
@@ -169,7 +166,7 @@
         <Setter Property="VirtualizingPanel.VirtualizationMode" Value="Standard" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Style.Triggers>
-            <DataTrigger Binding="{Binding Path=View, RelativeSource={RelativeSource Mode=Self}, Converter={StaticResource ViewToListViewViewStateConverter}}" Value="{x:Static controls:ListViewViewState.Default}">
+            <DataTrigger Binding="{Binding Path=ViewState, RelativeSource={RelativeSource Mode=Self}}" Value="{x:Static controls:ListViewViewState.Default}">
                 <Setter Property="ItemsPanel">
                     <Setter.Value>
                         <ItemsPanelTemplate>
@@ -179,12 +176,12 @@
                 </Setter>
                 <Setter Property="Template" Value="{DynamicResource NullViewTemplate}" />
             </DataTrigger>
-            <DataTrigger Binding="{Binding Path=View, RelativeSource={RelativeSource Mode=Self}, Converter={StaticResource ViewToListViewViewStateConverter}}" Value="{x:Static controls:ListViewViewState.GridView}">
+            <DataTrigger Binding="{Binding Path=ViewState, RelativeSource={RelativeSource Mode=Self}}" Value="{x:Static controls:ListViewViewState.GridView}">
                 <Setter Property="Template" Value="{DynamicResource GridViewTemplate}" />
             </DataTrigger>
         </Style.Triggers>
     </Style>
 
-    <Style BasedOn="{StaticResource ListViewStyle}" TargetType="{x:Type ListView}" />
+    <Style BasedOn="{StaticResource ListViewStyle}" TargetType="{x:Type controls:ListView}" />
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/ListView/ListViewItem.xaml b/src/Wpf.Ui/Controls/ListView/ListViewItem.xaml
index 30a8d7d68..8b0e66ef9 100644
--- a/src/Wpf.Ui/Controls/ListView/ListViewItem.xaml
+++ b/src/Wpf.Ui/Controls/ListView/ListViewItem.xaml
@@ -5,13 +5,7 @@
     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:converters="clr-namespace:Wpf.Ui.Converters">
-
-    <converters:ViewToListViewViewStateConverter x:Key="ViewToListViewViewStateConverter" />
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <ControlTemplate x:Key="NullViewItemTemplate" TargetType="{x:Type ListViewItem}">
         <Border
@@ -101,10 +95,10 @@
         <Setter Property="Margin" Value="0,0,0,2" />
         <Setter Property="Padding" Value="4" />
         <Style.Triggers>
-            <DataTrigger Binding="{Binding Path=View, RelativeSource={RelativeSource AncestorType={x:Type ListView}}, Converter={StaticResource ViewToListViewViewStateConverter}}" Value="{x:Static controls:ListViewViewState.Default}">
+            <DataTrigger Binding="{Binding Path=ViewState, RelativeSource={RelativeSource AncestorType={x:Type ListView}}}" Value="Default">
                 <Setter Property="Template" Value="{DynamicResource NullViewItemTemplate}" />
             </DataTrigger>
-            <DataTrigger Binding="{Binding Path=View, RelativeSource={RelativeSource AncestorType={x:Type ListView}}, Converter={StaticResource ViewToListViewViewStateConverter}}" Value="{x:Static controls:ListViewViewState.GridView}">
+            <DataTrigger Binding="{Binding Path=ViewState, RelativeSource={RelativeSource AncestorType={x:Type ListView}}}" Value="GridView">
                 <Setter Property="Template" Value="{DynamicResource GridViewItemTemplate}" />
             </DataTrigger>
         </Style.Triggers>
diff --git a/src/Wpf.Ui/Converters/ViewToListViewViewStateConverter.cs b/src/Wpf.Ui/Converters/ViewToListViewViewStateConverter.cs
deleted file mode 100644
index 88a8bc429..000000000
--- a/src/Wpf.Ui/Converters/ViewToListViewViewStateConverter.cs
+++ /dev/null
@@ -1,28 +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.Windows.Controls;
-using System.Windows.Data;
-using Wpf.Ui.Controls;
-
-namespace Wpf.Ui.Converters;
-
-internal class ViewToListViewViewStateConverter : IValueConverter
-{
-    public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-    {
-        return value switch
-        {
-            GridView => ListViewViewState.GridView,
-            null => ListViewViewState.Default,
-            _ => ListViewViewState.Default
-        };
-    }
-
-    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-    {
-        throw new NotSupportedException("Converting from ListViewViewState to View is not supported.");
-    }
-}

From 16c9d1058731c431db63fa4bc6e0de6af86e755a Mon Sep 17 00:00:00 2001
From: koal44 <random.var.ny@gmail.com>
Date: Tue, 19 Mar 2024 08:25:22 -0700
Subject: [PATCH 5/5] Addd documentation and tool to the VS tools manifest

---
 src/Wpf.Ui/Controls/ListView/ListView.cs | 37 +++++++++++++++++++-----
 src/Wpf.Ui/VisualStudioToolsManifest.xml |  1 +
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/src/Wpf.Ui/Controls/ListView/ListView.cs b/src/Wpf.Ui/Controls/ListView/ListView.cs
index 44efcd2a9..8520cd916 100644
--- a/src/Wpf.Ui/Controls/ListView/ListView.cs
+++ b/src/Wpf.Ui/Controls/ListView/ListView.cs
@@ -1,16 +1,39 @@
 namespace Wpf.Ui.Controls;
 
+/// <summary>
+/// Extends <see cref="System.Windows.Controls.ListView"/>, and adds customized support <see cref="ListViewViewState.GridView"/> or <see cref="ListViewViewState.Default"/>.
+/// </summary>
+/// <example>
+/// <code lang="xml">
+/// &lt;ui:ListView ItemsSource="{Binding ...}" &gt;
+///     &lt;ui:ListView.View&gt;
+///         &lt;GridView&gt;
+///             &lt;GridViewColumn
+///                 DisplayMemberBinding="{Binding FirstName}"
+///                 Header="First Name" /&gt;
+///             &lt;GridViewColumn
+///                 DisplayMemberBinding="{Binding LastName}"
+///                 Header="Last Name" /&gt;
+///         &lt;/GridView&gt;
+///     &lt;/ui:ListView.View&gt;
+/// &lt;/ui:ListView&gt;
+/// </code>
+/// </example>
 public class ListView : System.Windows.Controls.ListView
 {
+    /// <summary>Identifies the <see cref="ViewState"/> dependency property.</summary>
+    public static readonly DependencyProperty ViewStateProperty = DependencyProperty.Register(nameof(ViewState), typeof(ListViewViewState), typeof(ListView), new FrameworkPropertyMetadata(ListViewViewState.Default, OnViewStateChanged));
+
+    /// <summary>
+    /// Gets or sets the view state of the <see cref="ListView"/>, enabling custom logic based on the current view.
+    /// </summary>
+    /// <value>The current view state of the <see cref="ListView"/>.</value>
     public ListViewViewState ViewState
     {
         get => (ListViewViewState)GetValue(ViewStateProperty);
         set => SetValue(ViewStateProperty, value);
     }
 
-    /// <summary>Identifies the <see cref="ViewState"/> dependency property.</summary>
-    public static readonly DependencyProperty ViewStateProperty = DependencyProperty.Register(nameof(ViewState), typeof(ListViewViewState), typeof(ListView), new FrameworkPropertyMetadata(ListViewViewState.Default, OnViewStateChanged));
-
     private static void OnViewStateChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
         if (d is not ListView self)
@@ -23,7 +46,7 @@ private static void OnViewStateChanged(DependencyObject d, DependencyPropertyCha
 
     protected virtual void OnViewStateChanged(DependencyPropertyChangedEventArgs e)
     {
-        // derived classes can hook `ViewState` property changes by overriding this method
+        // Hook for derived classes to react to ViewState property changes
     }
 
     public ListView()
@@ -33,10 +56,9 @@ public ListView()
 
     private void OnLoaded(object sender, RoutedEventArgs e)
     {
-        // immediately unsubscribe to prevent memory leaks
-        Loaded -= OnLoaded;
+        Loaded -= OnLoaded; // prevent memory leaks
 
-        // get the descriptor for the `View` property since the framework doesn't provide a public hook for it
+        // Setup initial ViewState and hook into View property changes
         var descriptor = DependencyPropertyDescriptor.FromProperty(System.Windows.Controls.ListView.ViewProperty, typeof(System.Windows.Controls.ListView));
         descriptor?.AddValueChanged(this, OnViewPropertyChanged);
         UpdateViewState(); // set the initial state
@@ -55,6 +77,7 @@ private void UpdateViewState()
             null => ListViewViewState.Default,
             _ => ListViewViewState.Default
         };
+
         SetCurrentValue(ViewStateProperty, viewState);
     }
 
diff --git a/src/Wpf.Ui/VisualStudioToolsManifest.xml b/src/Wpf.Ui/VisualStudioToolsManifest.xml
index ed61cc8c5..7444460fc 100644
--- a/src/Wpf.Ui/VisualStudioToolsManifest.xml
+++ b/src/Wpf.Ui/VisualStudioToolsManifest.xml
@@ -27,6 +27,7 @@
       <Item Type="Wpf.Ui.Controls.ImageIcon" />
       <Item Type="Wpf.Ui.Controls.InfoBar" />
       <Item Type="Wpf.Ui.Controls.InfoBadge" />
+      <Item Type="Wpf.Ui.Controls.ListView" />
       <Item Type="Wpf.Ui.Controls.MenuItem" />
       <Item Type="Wpf.Ui.Controls.MessageBox" />
       <Item Type="Wpf.Ui.Controls.NavigationView" />