From 200ca0ce162ffc2965df21c3b3fd6ccef29a72a4 Mon Sep 17 00:00:00 2001
From: Edward Miller <symbiogenisis@outlook.com>
Date: Wed, 17 Jan 2024 01:46:39 -0600
Subject: [PATCH 1/2] Make layout sensible

---
 Maui.DataGrid.Sample/MainPage.xaml            | 11 ++-
 .../Resources/Styles/Colors.xaml              |  1 +
 Maui.DataGrid.Sample/SettingsPopup.xaml       |  5 ++
 .../ViewModels/MainViewModel.cs               | 15 ++++
 .../ViewModels/ViewModelBase.cs               |  6 +-
 Maui.DataGrid/DataGrid.xaml                   |  2 +-
 Maui.DataGrid/DataGrid.xaml.cs                | 86 +++++++++---------
 Maui.DataGrid/DataGridCell.cs                 | 55 ++++++++++++
 Maui.DataGrid/DataGridColumn.cs               |  2 +-
 Maui.DataGrid/DataGridRow.cs                  | 89 +++++--------------
 10 files changed, 157 insertions(+), 115 deletions(-)
 create mode 100644 Maui.DataGrid/DataGridCell.cs

diff --git a/Maui.DataGrid.Sample/MainPage.xaml b/Maui.DataGrid.Sample/MainPage.xaml
index 289cf47..af9e6a3 100644
--- a/Maui.DataGrid.Sample/MainPage.xaml
+++ b/Maui.DataGrid.Sample/MainPage.xaml
@@ -14,12 +14,15 @@
             <Button Text="Settings" WidthRequest="100" Clicked="OnSettingsClicked" />
         </Grid>
 
-        <dg:DataGrid Grid.Row="1" ItemsSource="{Binding Teams}" SelectionMode="{Binding SelectionMode}" SelectedItem="{Binding SelectedTeam}"
-                     RowHeight="70" HeaderHeight="50" BorderColor="{StaticResource GridBorderColor}" RowToEdit="{Binding TeamToEdit}"
+        <dg:DataGrid Grid.Row="1" ItemsSource="{Binding Teams}" SelectionMode="{Binding SelectionMode}"
+                     SelectedItem="{Binding SelectedTeam}" RowToEdit="{Binding TeamToEdit}"
+                     BorderColor="{StaticResource GridBorderColor}" BorderThickness="{Binding BorderThickness}"
                      HeaderBackground="{StaticResource GridHeaderBgColor}" HeaderBordersVisible="{Binding HeaderBordersVisible}"
-                     PullToRefreshCommand="{Binding Commands[Refresh]}" IsRefreshing="{Binding IsRefreshing}"
+                     BackgroundColor="{StaticResource GridBgColor}" ActiveRowColor="{StaticResource ActiveRowColor}" 
+                     FooterBackground="{StaticResource GridFooterBgColor}"
                      PaginationEnabled="{Binding PaginationEnabled}" PageSize="{Binding PageSize}"
-                     ActiveRowColor="{StaticResource ActiveRowColor}" FooterBackground="{StaticResource GridFooterBgColor}" x:Name="_dataGrid1">
+                     PullToRefreshCommand="{Binding Commands[Refresh]}" IsRefreshing="{Binding IsRefreshing}"
+                     RowHeight="70" HeaderHeight="50" x:Name="_dataGrid1">
             <dg:DataGrid.Columns>
                 <dg:DataGridColumn Title="Logo" PropertyName="Logo" SortingEnabled="False">
                     <dg:DataGridColumn.CellTemplate>
diff --git a/Maui.DataGrid.Sample/Resources/Styles/Colors.xaml b/Maui.DataGrid.Sample/Resources/Styles/Colors.xaml
index 9f8628d..7bae4d9 100644
--- a/Maui.DataGrid.Sample/Resources/Styles/Colors.xaml
+++ b/Maui.DataGrid.Sample/Resources/Styles/Colors.xaml
@@ -45,4 +45,5 @@
     <Color x:Key="GridHeaderBgColor">#E0E6F8</Color>
     <Color x:Key="GridFooterBgColor">#E0E6F8</Color>
     <Color x:Key="GridBorderColor">#CCCCCC</Color>
+    <Color x:Key="GridBgColor">#CCCCCC</Color>
 </ResourceDictionary>
diff --git a/Maui.DataGrid.Sample/SettingsPopup.xaml b/Maui.DataGrid.Sample/SettingsPopup.xaml
index 2bce45b..f6cc9ce 100644
--- a/Maui.DataGrid.Sample/SettingsPopup.xaml
+++ b/Maui.DataGrid.Sample/SettingsPopup.xaml
@@ -21,6 +21,11 @@
                     <CheckBox IsChecked="{Binding HeaderBordersVisible}" />
                     <Label Text="Header Borders Visible?" TextColor="White" VerticalOptions="Center" />
                 </HorizontalStackLayout>
+                <HorizontalStackLayout Style="{StaticResource SampleContainerStyle}">
+                    <Stepper Minimum="0" Maximum="10" Value="{Binding BorderThicknessNumeric}"
+                             BackgroundColor="{OnPlatform WinUI=Gray}"/>
+                    <Label Text="Border Thickness" TextColor="White" VerticalOptions="Center" />
+                </HorizontalStackLayout>
                 <HorizontalStackLayout Style="{StaticResource SampleContainerStyle}">
                     <CheckBox IsChecked="{Binding WonColumnVisible}" />
                     <Label Text="Won Column" TextColor="White" VerticalOptions="Center" />
diff --git a/Maui.DataGrid.Sample/ViewModels/MainViewModel.cs b/Maui.DataGrid.Sample/ViewModels/MainViewModel.cs
index 7316e93..ccf3e82 100644
--- a/Maui.DataGrid.Sample/ViewModels/MainViewModel.cs
+++ b/Maui.DataGrid.Sample/ViewModels/MainViewModel.cs
@@ -17,6 +17,7 @@ public MainViewModel()
         TeamColumnWidth = 70;
         SelectionMode = SelectionMode.Single;
         PageSize = 6;
+        BorderThicknessNumeric = 1;
 
         Commands.Add("CompleteEdit", new Command(CmdCompleteEdit));
         Commands.Add("Edit", new Command<Team>(CmdEdit));
@@ -57,6 +58,20 @@ public bool WonColumnVisible
         set => SetValue(value);
     }
 
+    public double BorderThicknessNumeric
+    {
+        get => GetValue<double>();
+        set
+        {
+            if (SetValue(value))
+            {
+                OnPropertyChanged(nameof(BorderThickness));
+            }
+        }
+    }
+
+    public Thickness BorderThickness => new(BorderThicknessNumeric);
+
     public ushort TeamColumnWidth
     {
         get => GetValue<ushort>();
diff --git a/Maui.DataGrid.Sample/ViewModels/ViewModelBase.cs b/Maui.DataGrid.Sample/ViewModels/ViewModelBase.cs
index f381472..db33456 100644
--- a/Maui.DataGrid.Sample/ViewModels/ViewModelBase.cs
+++ b/Maui.DataGrid.Sample/ViewModels/ViewModelBase.cs
@@ -21,15 +21,17 @@ protected ViewModelBase()
         Commands = [];
     }
 
-    protected void SetValue(object value, [CallerMemberName] string propertyName = null)
+    protected bool SetValue(object value, [CallerMemberName] string propertyName = null)
     {
         if (_properties.TryGetValue(propertyName!, out var item) && item == value)
         {
-            return;
+            return false;
         }
 
         _properties[propertyName!] = value;
         OnPropertyChanged(propertyName);
+
+        return true;
     }
 
     protected T GetValue<T>([CallerMemberName] string propertyName = null)
diff --git a/Maui.DataGrid/DataGrid.xaml b/Maui.DataGrid/DataGrid.xaml
index 2fe04ef..4a62221 100644
--- a/Maui.DataGrid/DataGrid.xaml
+++ b/Maui.DataGrid/DataGrid.xaml
@@ -45,7 +45,7 @@
             <CollectionView
                     x:Name="_collectionView"
                     WidthRequest="{Binding WidthRequest, Source={Reference self}}"
-                    BackgroundColor="{Binding BorderColor, Source={Reference self}}"
+                    BackgroundColor="{Binding BackgroundColor, Source={Reference self}}"
                     SelectedItem="{Binding SelectedItem, Source={Reference self}, Mode=TwoWay}"
                     SelectedItems="{Binding SelectedItems, Source={Reference self}, Mode=TwoWay}"
                     ItemSizingStrategy="{Binding ItemSizingStrategy, Source={Reference self}}"
diff --git a/Maui.DataGrid/DataGrid.xaml.cs b/Maui.DataGrid/DataGrid.xaml.cs
index 55cafcf..1abd19b 100644
--- a/Maui.DataGrid/DataGrid.xaml.cs
+++ b/Maui.DataGrid/DataGrid.xaml.cs
@@ -288,9 +288,9 @@ private void SortAndPaginate(SortData? sortData = null)
                 var self = (DataGrid)b;
                 if (o != n && self._headerView != null && !self.HeaderBordersVisible)
                 {
-                    foreach (var child in self._headerView.Children.OfType<View>())
+                    foreach (var cell in self._headerView.Children.OfType<DataGridCell>())
                     {
-                        child.BackgroundColor = n;
+                        cell.UpdateCellColors(n);
                     }
                 }
             });
@@ -306,18 +306,16 @@ private void SortAndPaginate(SortData? sortData = null)
     /// </summary>
     public static readonly BindableProperty BorderColorProperty =
         BindablePropertyExtensions.Create<DataGrid, Color>(Colors.Black,
-            propertyChanged: (b, _, n) =>
+            propertyChanged: (b, _, _) =>
             {
                 var self = (DataGrid)b;
+
                 if (self._headerView != null && self.HeaderBordersVisible)
                 {
-                    self._headerView.BackgroundColor = n;
+                    self.InitHeaderView();
                 }
 
-                if (self.Columns != null && self.ItemsSource != null)
-                {
-                    self.Reload();
-                }
+                self.Reload();
             });
 
     /// <summary>
@@ -685,22 +683,20 @@ private void SortAndPaginate(SortData? sortData = null)
     /// Gets or sets the thickness of the border around the DataGrid.
     /// </summary>
     public static readonly BindableProperty BorderThicknessProperty =
-        BindablePropertyExtensions.Create<DataGrid, Thickness>(new Thickness(1),
-            propertyChanged: (b, o, n) =>
-            {
-                if (o != n && b is DataGrid self && self.IsLoaded)
-                {
-                    self.Reload();
-                }
-            });
+        BindablePropertyExtensions.Create<DataGrid, Thickness>(new Thickness(1), BindingMode.TwoWay);
 
     /// <summary>
     /// Gets or sets a value indicating whether the header borders are visible in the DataGrid.
     /// </summary>
     public static readonly BindableProperty HeaderBordersVisibleProperty =
         BindablePropertyExtensions.Create<DataGrid, bool>(true,
-            propertyChanged: (b, _, n) => ((DataGrid)b)._headerView.BackgroundColor =
-                n ? ((DataGrid)b).BorderColor : ((DataGrid)b).HeaderBackground);
+            propertyChanged: (b, _, _) =>
+            {
+                if (b is DataGrid self)
+                {
+                    self.InitHeaderView();
+                }
+            });
 
     /// <summary>
     /// Gets or sets the index of the sorted column in the DataGrid.
@@ -1080,7 +1076,7 @@ public bool RefreshingEnabled
     }
 
     /// <summary>
-    /// Border thickness for header &amp; each cell
+    /// Border thickness for cells
     /// </summary>
     public Thickness BorderThickness
     {
@@ -1349,30 +1345,32 @@ internal void Reload()
 
     #region Header Creation Methods
 
-    private View GetHeaderViewForColumn(DataGridColumn column)
+    private DataGridCell CreateHeaderCell(DataGridColumn column)
     {
+        View cellContent;
+
         column.HeaderLabel.Style = column.HeaderLabelStyle ?? HeaderLabelStyle ?? _defaultHeaderStyle;
 
         if (!IsSortable || !column.SortingEnabled || !column.IsSortable())
         {
-            return new ContentView
+            cellContent = new ContentView
             {
                 Content = column.HeaderLabel
             };
         }
-
-        var sortIconSize = HeaderHeight * 0.3;
-        column.SortingIconContainer.HeightRequest = sortIconSize;
-        column.SortingIconContainer.WidthRequest = sortIconSize;
-        column.SortingIcon.Style = SortIconStyle ?? _defaultSortIconStyle;
-
-        var grid = new Grid
+        else
         {
-            ColumnSpacing = 0,
-            Padding = new(0, 0, 4, 0),
-            ColumnDefinitions = HeaderColumnDefinitions,
-            Children = { column.HeaderLabel, column.SortingIconContainer },
-            GestureRecognizers =
+            var sortIconSize = HeaderHeight * 0.3;
+            column.SortingIconContainer.HeightRequest = sortIconSize;
+            column.SortingIconContainer.WidthRequest = sortIconSize;
+            column.SortingIcon.Style = SortIconStyle ?? _defaultSortIconStyle;
+
+            cellContent = new Grid
+            {
+                Padding = new(0, 0, 4, 0),
+                ColumnDefinitions = HeaderColumnDefinitions,
+                Children = { column.HeaderLabel, column.SortingIconContainer },
+                GestureRecognizers =
                 {
                     new TapGestureRecognizer
                     {
@@ -1392,22 +1390,26 @@ private View GetHeaderViewForColumn(DataGridColumn column)
                         CommandParameter = column
                     }
                 }
-        };
+            };
+
+            Grid.SetColumn(column.SortingIconContainer, 1);
+        }
 
-        Grid.SetColumn(column.SortingIconContainer, 1);
-        return grid;
+        return new DataGridCell(cellContent, HeaderBackground);
     }
 
     private void InitHeaderView()
     {
+        if (_headerView == null)
+        {
+            return;
+        }
+
         SetColumnsBindingContext();
 
         _headerView.Children.Clear();
 
-        _headerView.Padding = new(BorderThickness.Left, BorderThickness.Top, BorderThickness.Right, 0);
-        _headerView.ColumnSpacing = BorderThickness.HorizontalThickness;
-
-        if (Columns == null || Columns.Count == 0)
+        if (Columns == null)
         {
             _headerView.ColumnDefinitions.Clear();
             return;
@@ -1438,9 +1440,9 @@ private void InitHeaderView()
                 continue;
             }
 
-            col.HeaderView ??= GetHeaderViewForColumn(col);
+            col.HeaderView ??= CreateHeaderCell(col);
 
-            col.HeaderView.SetBinding(BackgroundColorProperty, new Binding(nameof(HeaderBackground), source: this));
+            col.HeaderView.UpdateBindings(this, HeaderBordersVisible);
 
             Grid.SetColumn(col.HeaderView, i);
             _headerView.Children.Add(col.HeaderView);
diff --git a/Maui.DataGrid/DataGridCell.cs b/Maui.DataGrid/DataGridCell.cs
new file mode 100644
index 0000000..7446090
--- /dev/null
+++ b/Maui.DataGrid/DataGridCell.cs
@@ -0,0 +1,55 @@
+namespace Maui.DataGrid;
+
+using Microsoft.Maui.Controls;
+
+/// <summary>
+/// Specifies each cell of the DataGrid.
+/// </summary>
+internal sealed class DataGridCell : Grid
+{
+    internal DataGridCell(View cellContent, Color? backgroundColor)
+    {
+        var colorfulCellContent = new ContentView
+        {
+            BackgroundColor = backgroundColor,
+            Content = cellContent,
+        };
+
+        Children.Add(colorfulCellContent);
+    }
+
+    internal void UpdateBindings(DataGrid dataGrid, bool bordersVisible = true)
+    {
+        // The DataGridCell is a grid, and the padding constitutes the cell's border
+        // And the Background constitutes the border color of the cell.
+
+        if (bordersVisible)
+        {
+            BackgroundColor = dataGrid.BorderColor;
+            Padding = dataGrid.BorderThickness;
+
+            SetBinding(BackgroundColorProperty, new Binding(nameof(DataGrid.BorderColor), source: dataGrid));
+            SetBinding(PaddingProperty, new Binding(nameof(DataGrid.BorderThickness), source: dataGrid));
+        }
+        else
+        {
+            Padding = 0;
+
+            RemoveBinding(BackgroundColorProperty);
+            RemoveBinding(PaddingProperty);
+        }
+    }
+
+    internal void UpdateCellColors(Color? bgColor, Color? textColor = null)
+    {
+        foreach (var cellContent in Children.OfType<ContentView>())
+        {
+            cellContent.BackgroundColor = bgColor;
+
+            if (cellContent.Content is Label label && textColor != null)
+            {
+                label.TextColor = textColor;
+            }
+        }
+    }
+}
diff --git a/Maui.DataGrid/DataGridColumn.cs b/Maui.DataGrid/DataGridColumn.cs
index 630a10c..874cbc1 100644
--- a/Maui.DataGrid/DataGridColumn.cs
+++ b/Maui.DataGrid/DataGridColumn.cs
@@ -199,7 +199,7 @@ internal ColumnDefinition? ColumnDefinition
         set => _columnDefinition = value;
     }
 
-    internal View? HeaderView { get; set; }
+    internal DataGridCell? HeaderView { get; set; }
 
     internal TextAlignment VerticalTextAlignment => _verticalTextAlignment ??= VerticalContentAlignment.ToTextAlignment();
 
diff --git a/Maui.DataGrid/DataGridRow.cs b/Maui.DataGrid/DataGridRow.cs
index 68a0c86..3ae088f 100644
--- a/Maui.DataGrid/DataGridRow.cs
+++ b/Maui.DataGrid/DataGridRow.cs
@@ -85,7 +85,7 @@ private void CreateView()
     {
         Children.Clear();
 
-        SetStyling();
+        UpdateColors();
 
         if (DataGrid.Columns == null || DataGrid.Columns.Count == 0)
         {
@@ -110,12 +110,16 @@ private void CreateView()
             if (!col.IsVisible)
             {
                 continue;
-            }
+            }
 
-            var cell = CreateCell(col);
+            var cellContent = CreateCell(col);
+
+            var dataGridCell = new DataGridCell(cellContent, _bgColor);
+
+            dataGridCell.UpdateBindings(DataGrid);
 
-            SetColumn((BindableObject)cell, i);
-            Children.Add(cell);
+            SetColumn((BindableObject)dataGridCell, i);
+            Children.Add(dataGridCell);
         }
 
         // Remove extra columns
@@ -125,20 +129,6 @@ private void CreateView()
         }
     }
 
-    private void SetStyling()
-    {
-        UpdateColors();
-
-        // We are using the spacing between rows to generate visible borders, and thus the background color is the border color.
-        BackgroundColor = DataGrid.BorderColor;
-
-        var borderThickness = DataGrid.BorderThickness;
-
-        Padding = new(borderThickness.Left, borderThickness.Top, borderThickness.Right, 0);
-        ColumnSpacing = borderThickness.HorizontalThickness;
-        Margin = new Thickness(0, 0, 0, borderThickness.Bottom); // Row Spacing
-    }
-
     private View CreateCell(DataGridColumn col)
     {
         if (RowToEdit == BindingContext)
@@ -155,11 +145,7 @@ private View CreateViewCell(DataGridColumn col)
 
         if (col.CellTemplate != null)
         {
-            cell = new ContentView
-            {
-                BackgroundColor = _bgColor,
-                Content = col.CellTemplate.CreateContent() as View
-            };
+            cell = (View)col.CellTemplate.CreateContent();
 
             if (!string.IsNullOrWhiteSpace(col.PropertyName))
             {
@@ -172,7 +158,6 @@ private View CreateViewCell(DataGridColumn col)
             cell = new Label
             {
                 TextColor = _textColor,
-                BackgroundColor = _bgColor,
                 VerticalTextAlignment = col.VerticalTextAlignment,
                 HorizontalTextAlignment = col.HorizontalTextAlignment,
                 LineBreakMode = col.LineBreakMode,
@@ -214,22 +199,18 @@ private View CreateDefaultEditCell(DataGridColumn col)
             TypeCode.UInt32 => GenerateNumericEditCell(col, v => uint.TryParse(v, out _)),
             TypeCode.UInt64 => GenerateNumericEditCell(col, v => ulong.TryParse(v, out _)),
             TypeCode.DateTime => GenerateDateTimeEditCell(col),
-            _ => new TemplatedView { BackgroundColor = _bgColor },
+            _ => new TemplatedView(),
         };
     }
 
-    private ContentView? GenerateTemplatedEditCell(DataGridColumn col)
+    private View? GenerateTemplatedEditCell(DataGridColumn col)
     {
         if (col.EditCellTemplate == null)
         {
             return null;
         }
 
-        var cell = new ContentView
-        {
-            BackgroundColor = _bgColor,
-            Content = col.EditCellTemplate.CreateContent() as View
-        };
+        var cell = (View)col.EditCellTemplate.CreateContent();
 
         if (!string.IsNullOrWhiteSpace(col.PropertyName))
         {
@@ -240,12 +221,11 @@ private View CreateDefaultEditCell(DataGridColumn col)
         return cell;
     }
 
-    private Grid GenerateTextEditCell(DataGridColumn col)
+    private Entry GenerateTextEditCell(DataGridColumn col)
     {
         var entry = new Entry
         {
             TextColor = _textColor,
-            BackgroundColor = _bgColor,
             VerticalTextAlignment = col.VerticalTextAlignment,
             HorizontalTextAlignment = col.HorizontalTextAlignment,
             FontSize = DataGrid.FontSize,
@@ -258,10 +238,10 @@ private Grid GenerateTextEditCell(DataGridColumn col)
                 new Binding(col.PropertyName, BindingMode.TwoWay, stringFormat: col.StringFormat, source: BindingContext));
         }
 
-        return WrapViewInGrid(entry);
+        return entry;
     }
 
-    private Grid GenerateBooleanEditCell(DataGridColumn col)
+    private CheckBox GenerateBooleanEditCell(DataGridColumn col)
     {
         var checkBox = new CheckBox
         {
@@ -275,15 +255,14 @@ private Grid GenerateBooleanEditCell(DataGridColumn col)
                 new Binding(col.PropertyName, BindingMode.TwoWay, source: BindingContext));
         }
 
-        return WrapViewInGrid(checkBox);
+        return checkBox;
     }
 
-    private Grid GenerateNumericEditCell(DataGridColumn col, ParserDelegate parserDelegate)
+    private Entry GenerateNumericEditCell(DataGridColumn col, ParserDelegate parserDelegate)
     {
         var entry = new Entry
         {
             TextColor = _textColor,
-            BackgroundColor = _bgColor,
             VerticalTextAlignment = col.VerticalTextAlignment,
             HorizontalTextAlignment = col.HorizontalTextAlignment,
             FontSize = DataGrid.FontSize,
@@ -305,10 +284,10 @@ private Grid GenerateNumericEditCell(DataGridColumn col, ParserDelegate parserDe
                 new Binding(col.PropertyName, BindingMode.TwoWay, source: BindingContext));
         }
 
-        return WrapViewInGrid(entry);
+        return entry;
     }
 
-    private Grid GenerateDateTimeEditCell(DataGridColumn col)
+    private DatePicker GenerateDateTimeEditCell(DataGridColumn col)
     {
         var datePicker = new DatePicker
         {
@@ -321,19 +300,7 @@ private Grid GenerateDateTimeEditCell(DataGridColumn col)
                 new Binding(col.PropertyName, BindingMode.TwoWay, source: BindingContext));
         }
 
-        return WrapViewInGrid(datePicker);
-    }
-
-    private Grid WrapViewInGrid(View view)
-    {
-        var grid = new Grid
-        {
-            BackgroundColor = _bgColor,
-        };
-
-        grid.Add(view);
-
-        return grid;
+        return datePicker;
     }
 
     private void UpdateColors()
@@ -351,17 +318,9 @@ private void UpdateColors()
                 : DataGrid.RowsBackgroundColorPalette.GetColor(rowIndex, BindingContext);
         _textColor = DataGrid.RowsTextColorPalette.GetColor(rowIndex, BindingContext);
 
-        foreach (var v in Children)
-        {
-            if (v is View view)
-            {
-                view.BackgroundColor = _bgColor;
-
-                if (view is Label label)
-                {
-                    label.TextColor = _textColor;
-                }
-            }
+        foreach (var cell in Children.OfType<DataGridCell>())
+        {
+            cell.UpdateCellColors(_bgColor, _textColor);
         }
     }
 

From af6cc33a6dc2c09374ace7a24f07b265ae2774bd Mon Sep 17 00:00:00 2001
From: Edward Miller <symbiogenisis@outlook.com>
Date: Tue, 23 Jan 2024 00:55:55 -0600
Subject: [PATCH 2/2] make column reordering and regenerating fast

---
 Maui.DataGrid/DataGrid.xaml.cs             |  28 +-
 Maui.DataGrid/DataGridCell.cs              |  13 +-
 Maui.DataGrid/DataGridColumn.cs            |   2 +-
 Maui.DataGrid/DataGridRow.cs               | 711 +++++++++++----------
 Maui.DataGrid/Extensions/ListExtensions.cs |  18 +
 5 files changed, 422 insertions(+), 350 deletions(-)
 create mode 100644 Maui.DataGrid/Extensions/ListExtensions.cs

diff --git a/Maui.DataGrid/DataGrid.xaml.cs b/Maui.DataGrid/DataGrid.xaml.cs
index 1abd19b..e5f61be 100644
--- a/Maui.DataGrid/DataGrid.xaml.cs
+++ b/Maui.DataGrid/DataGrid.xaml.cs
@@ -1395,7 +1395,7 @@ private DataGridCell CreateHeaderCell(DataGridColumn column)
             Grid.SetColumn(column.SortingIconContainer, 1);
         }
 
-        return new DataGridCell(cellContent, HeaderBackground);
+        return new DataGridCell(cellContent, HeaderBackground, column, false);
     }
 
     private void InitHeaderView()
@@ -1407,8 +1407,6 @@ private void InitHeaderView()
 
         SetColumnsBindingContext();
 
-        _headerView.Children.Clear();
-
         if (Columns == null)
         {
             _headerView.ColumnDefinitions.Clear();
@@ -1440,12 +1438,28 @@ private void InitHeaderView()
                 continue;
             }
 
-            col.HeaderView ??= CreateHeaderCell(col);
+            col.HeaderCell ??= CreateHeaderCell(col);
+
+            col.HeaderCell.UpdateBindings(this, HeaderBordersVisible);
+
+            if (_headerView.Children.TryGetItem(i, out var existingCell))
+            {
+                if (existingCell is not DataGridCell cell)
+                {
+                    throw new InvalidDataException($"{nameof(DataGridRow)} should only contain {nameof(DataGridCell)}s");
+                }
 
-            col.HeaderView.UpdateBindings(this, HeaderBordersVisible);
+                if (cell.Column != col)
+                {
+                    Grid.SetColumn(col.HeaderCell, i);
+                }
+            }
+            else
+            {
+                Grid.SetColumn(col.HeaderCell, i);
+                _headerView.Children.Add(col.HeaderCell);
+            }
 
-            Grid.SetColumn(col.HeaderView, i);
-            _headerView.Children.Add(col.HeaderView);
         }
 
         // Remove extra columns
diff --git a/Maui.DataGrid/DataGridCell.cs b/Maui.DataGrid/DataGridCell.cs
index 7446090..3725760 100644
--- a/Maui.DataGrid/DataGridCell.cs
+++ b/Maui.DataGrid/DataGridCell.cs
@@ -7,7 +7,8 @@ namespace Maui.DataGrid;
 /// </summary>
 internal sealed class DataGridCell : Grid
 {
-    internal DataGridCell(View cellContent, Color? backgroundColor)
+    internal DataGridCell(View cellContent, Color? backgroundColor, DataGridColumn column, bool isEditing)
+
     {
         var colorfulCellContent = new ContentView
         {
@@ -15,9 +16,19 @@ internal DataGridCell(View cellContent, Color? backgroundColor)
             Content = cellContent,
         };
 
+        Content = cellContent;
+        Column = column;
+        IsEditing = isEditing;
+
         Children.Add(colorfulCellContent);
     }
 
+    public View Content { get; }
+
+    public DataGridColumn Column { get; }
+    public bool IsEditing { get; }
+
+
     internal void UpdateBindings(DataGrid dataGrid, bool bordersVisible = true)
     {
         // The DataGridCell is a grid, and the padding constitutes the cell's border
diff --git a/Maui.DataGrid/DataGridColumn.cs b/Maui.DataGrid/DataGridColumn.cs
index 874cbc1..dceb696 100644
--- a/Maui.DataGrid/DataGridColumn.cs
+++ b/Maui.DataGrid/DataGridColumn.cs
@@ -199,7 +199,7 @@ internal ColumnDefinition? ColumnDefinition
         set => _columnDefinition = value;
     }
 
-    internal DataGridCell? HeaderView { get; set; }
+    internal DataGridCell? HeaderCell { get; set; }
 
     internal TextAlignment VerticalTextAlignment => _verticalTextAlignment ??= VerticalContentAlignment.ToTextAlignment();
 
diff --git a/Maui.DataGrid/DataGridRow.cs b/Maui.DataGrid/DataGridRow.cs
index 3ae088f..d193b52 100644
--- a/Maui.DataGrid/DataGridRow.cs
+++ b/Maui.DataGrid/DataGridRow.cs
@@ -1,184 +1,213 @@
-namespace Maui.DataGrid;
-
-using Extensions;
-using Microsoft.Maui.Controls;
-
-internal sealed class DataGridRow : Grid
-{
-    private delegate bool ParserDelegate(string value);
-
-    #region Fields
-
-    private Color? _bgColor;
-    private Color? _textColor;
-    private bool _hasSelected;
-
-    #endregion Fields
-
-    #region Properties
-
-    public DataGrid DataGrid
-    {
-        get => (DataGrid)GetValue(DataGridProperty);
-        set => SetValue(DataGridProperty, value);
-    }
-
-    public object RowToEdit
-    {
-        get => GetValue(RowToEditProperty);
-        set => SetValue(RowToEditProperty, value);
-    }
-
-    #endregion Properties
-
+namespace Maui.DataGrid;
+
+using Extensions;
+using Microsoft.Maui.Controls;
+
+internal sealed class DataGridRow : Grid
+{
+    private delegate bool ParserDelegate(string value);
+
+    #region Fields
+
+    private Color? _bgColor;
+    private Color? _textColor;
+    private bool _hasSelected;
+
+    #endregion Fields
+
+    #region Properties
+
+    public DataGrid DataGrid
+    {
+        get => (DataGrid)GetValue(DataGridProperty);
+        set => SetValue(DataGridProperty, value);
+    }
+
+    public object RowToEdit
+    {
+        get => GetValue(RowToEditProperty);
+        set => SetValue(RowToEditProperty, value);
+    }
+
+    #endregion Properties
+
     #region Bindable Properties
-
-    public static readonly BindableProperty DataGridProperty =
-        BindablePropertyExtensions.Create<DataGridRow, DataGrid>(null, BindingMode.OneTime,
-            propertyChanged: (b, o, n) =>
-            {
-                var self = (DataGridRow)b;
-
-                if (o is DataGrid oldDataGrid)
-                {
-                    oldDataGrid.ItemSelected -= self.DataGrid_ItemSelected;
-                    oldDataGrid.Columns.CollectionChanged -= self.OnColumnsChanged;
-
-                    foreach (var column in oldDataGrid.Columns)
-                    {
-                        column.VisibilityChanged -= self.OnVisibilityChanged;
-                    }
-                }
-
-                if (n is DataGrid newDataGrid)
-                {
-                    newDataGrid.ItemSelected += self.DataGrid_ItemSelected;
-                    newDataGrid.Columns.CollectionChanged += self.OnColumnsChanged;
-
-                    foreach (var column in newDataGrid.Columns)
-                    {
-                        column.VisibilityChanged += self.OnVisibilityChanged;
-                    }
-                }
-            });
-
-    public static readonly BindableProperty RowToEditProperty =
-        BindablePropertyExtensions.Create<DataGridRow, object>(null, BindingMode.OneWay,
-            propertyChanged: (b, o, n) =>
-            {
-                if (o == n || b is not DataGridRow row)
-                {
-                    return;
-                }
-
-                if (o == row.BindingContext || n == row.BindingContext)
-                {
-                    row.CreateView();
-                }
+
+    public static readonly BindableProperty DataGridProperty =
+        BindablePropertyExtensions.Create<DataGridRow, DataGrid>(null, BindingMode.OneTime,
+            propertyChanged: (b, o, n) =>
+            {
+                var self = (DataGridRow)b;
+
+                if (o is DataGrid oldDataGrid)
+                {
+                    oldDataGrid.ItemSelected -= self.DataGrid_ItemSelected;
+                    oldDataGrid.Columns.CollectionChanged -= self.OnColumnsChanged;
+
+                    foreach (var column in oldDataGrid.Columns)
+                    {
+                        column.VisibilityChanged -= self.OnVisibilityChanged;
+                    }
+                }
+
+                if (n is DataGrid newDataGrid)
+                {
+                    newDataGrid.ItemSelected += self.DataGrid_ItemSelected;
+                    newDataGrid.Columns.CollectionChanged += self.OnColumnsChanged;
+
+                    foreach (var column in newDataGrid.Columns)
+                    {
+                        column.VisibilityChanged += self.OnVisibilityChanged;
+                    }
+                }
             });
-
-    #endregion Bindable Properties
-
-    #region Methods
-
-    private void CreateView()
-    {
-        Children.Clear();
-
-        UpdateColors();
-
-        if (DataGrid.Columns == null || DataGrid.Columns.Count == 0)
-        {
-            ColumnDefinitions.Clear();
-            return;
-        }
-
-        for (var i = 0; i < DataGrid.Columns.Count; i++)
-        {
-            var col = DataGrid.Columns[i];
-
-            // Add or update columns as needed
-            if (i > ColumnDefinitions.Count - 1)
-            {
-                ColumnDefinitions.Add(col.ColumnDefinition);
-            }
-            else if (ColumnDefinitions[i] != col.ColumnDefinition)
-            {
-                ColumnDefinitions[i] = col.ColumnDefinition;
-            }
-
-            if (!col.IsVisible)
-            {
-                continue;
+
+    public static readonly BindableProperty RowToEditProperty =
+        BindablePropertyExtensions.Create<DataGridRow, object>(null, BindingMode.OneWay,
+            propertyChanged: (b, o, n) =>
+            {
+                if (o == n || b is not DataGridRow row)
+                {
+                    return;
+                }
+
+                if (o == row.BindingContext || n == row.BindingContext)
+                {
+                    row.CreateView();
+                }
+            });
+
+    #endregion Bindable Properties
+
+    #region Methods
+
+    private void CreateView()
+    {
+        UpdateColors();
+
+        if (DataGrid.Columns == null || DataGrid.Columns.Count == 0)
+        {
+            ColumnDefinitions.Clear();
+            return;
+        }
+
+        for (var i = 0; i < DataGrid.Columns.Count; i++)
+        {
+            var col = DataGrid.Columns[i];
+
+            // Add or update columns as needed
+            if (i > ColumnDefinitions.Count - 1)
+            {
+                ColumnDefinitions.Add(col.ColumnDefinition);
+            }
+            else if (ColumnDefinitions[i] != col.ColumnDefinition)
+            {
+                ColumnDefinitions[i] = col.ColumnDefinition;
             }
-
-            var cellContent = CreateCell(col);
-
-            var dataGridCell = new DataGridCell(cellContent, _bgColor);
-
-            dataGridCell.UpdateBindings(DataGrid);
-
-            SetColumn((BindableObject)dataGridCell, i);
-            Children.Add(dataGridCell);
-        }
-
-        // Remove extra columns
-        for (var i = ColumnDefinitions.Count - 1; i > DataGrid.Columns.Count - 1; i--)
-        {
-            ColumnDefinitions.RemoveAt(i);
-        }
-    }
-
-    private View CreateCell(DataGridColumn col)
-    {
-        if (RowToEdit == BindingContext)
-        {
-            return CreateEditCell(col);
-        }
-
-        return CreateViewCell(col);
-    }
-
-    private View CreateViewCell(DataGridColumn col)
-    {
-        View cell;
-
-        if (col.CellTemplate != null)
-        {
-            cell = (View)col.CellTemplate.CreateContent();
-
-            if (!string.IsNullOrWhiteSpace(col.PropertyName))
-            {
-                cell.SetBinding(BindingContextProperty,
-                    new Binding(col.PropertyName, source: BindingContext));
-            }
-        }
-        else
-        {
-            cell = new Label
-            {
-                TextColor = _textColor,
-                VerticalTextAlignment = col.VerticalTextAlignment,
-                HorizontalTextAlignment = col.HorizontalTextAlignment,
-                LineBreakMode = col.LineBreakMode,
-                FontSize = DataGrid.FontSize,
-                FontFamily = DataGrid.FontFamily
-            };
-
-            if (!string.IsNullOrWhiteSpace(col.PropertyName))
-            {
-                cell.SetBinding(Label.TextProperty,
-                    new Binding(col.PropertyName, stringFormat: col.StringFormat, source: BindingContext));
-            }
-        }
-
-        return cell;
-    }
-
-    private View CreateEditCell(DataGridColumn col)
-    {
-        var cell = GenerateTemplatedEditCell(col);
-
+
+            if (!col.IsVisible)
+            {
+                continue;
+            }
+
+            if (Children.TryGetItem(i, out var existingChild))
+            {
+                if (existingChild is not DataGridCell existingCell)
+                {
+                    throw new InvalidDataException($"{nameof(DataGridRow)} should only contain {nameof(DataGridCell)}s");
+                }
+
+                var isEditing = RowToEdit == BindingContext;
+
+                if (existingCell.Column != col || existingCell.IsEditing != isEditing)
+                {
+                    Children[i] = GenerateCellForColumn(col, i);
+                }
+            }
+            else
+            {
+                var newCell = GenerateCellForColumn(col, i);
+                Children.Add(newCell);
+            }
+        }
+
+        // Remove extra columns
+        for (var i = ColumnDefinitions.Count - 1; i > DataGrid.Columns.Count - 1; i--)
+        {
+            ColumnDefinitions.RemoveAt(i);
+        }
+    }
+
+    private DataGridCell GenerateCellForColumn(DataGridColumn col, int columnIndex)
+    {
+        var dataGridCell = CreateCell(col);
+
+        dataGridCell.UpdateBindings(DataGrid);
+
+        SetColumn((BindableObject)dataGridCell, columnIndex);
+
+        return dataGridCell;
+    }
+
+    private DataGridCell CreateCell(DataGridColumn col)
+    {
+        View cellContent;
+
+        var isEditing = RowToEdit == BindingContext;
+
+        if (isEditing)
+        {
+            cellContent = CreateEditCell(col);
+        }
+        else
+        {
+            cellContent = CreateViewCell(col);
+
+        }
+
+        return new DataGridCell(cellContent, _bgColor, col, isEditing);
+    }
+
+    private View CreateViewCell(DataGridColumn col)
+    {
+        View cell;
+
+        if (col.CellTemplate != null)
+        {
+            cell = (View)col.CellTemplate.CreateContent();
+
+            if (!string.IsNullOrWhiteSpace(col.PropertyName))
+            {
+                cell.SetBinding(BindingContextProperty,
+                    new Binding(col.PropertyName, source: BindingContext));
+            }
+        }
+        else
+        {
+            cell = new Label
+            {
+                TextColor = _textColor,
+                VerticalTextAlignment = col.VerticalTextAlignment,
+                HorizontalTextAlignment = col.HorizontalTextAlignment,
+                LineBreakMode = col.LineBreakMode,
+                FontSize = DataGrid.FontSize,
+                FontFamily = DataGrid.FontFamily
+            };
+
+            if (!string.IsNullOrWhiteSpace(col.PropertyName))
+            {
+                cell.SetBinding(Label.TextProperty,
+                    new Binding(col.PropertyName, stringFormat: col.StringFormat, source: BindingContext));
+            }
+        }
+
+        return cell;
+    }
+
+    private View CreateEditCell(DataGridColumn col)
+    {
+        var cell = GenerateTemplatedEditCell(col);
+
         return cell ?? CreateDefaultEditCell(col);
     }
 
@@ -203,168 +232,168 @@ private View CreateDefaultEditCell(DataGridColumn col)
         };
     }
 
-    private View? GenerateTemplatedEditCell(DataGridColumn col)
-    {
-        if (col.EditCellTemplate == null)
-        {
-            return null;
-        }
-
-        var cell = (View)col.EditCellTemplate.CreateContent();
-
-        if (!string.IsNullOrWhiteSpace(col.PropertyName))
-        {
-            cell.SetBinding(BindingContextProperty,
-                new Binding(col.PropertyName, source: BindingContext));
-        }
-
-        return cell;
-    }
-
-    private Entry GenerateTextEditCell(DataGridColumn col)
-    {
-        var entry = new Entry
-        {
-            TextColor = _textColor,
-            VerticalTextAlignment = col.VerticalTextAlignment,
-            HorizontalTextAlignment = col.HorizontalTextAlignment,
-            FontSize = DataGrid.FontSize,
-            FontFamily = DataGrid.FontFamily
-        };
-
-        if (!string.IsNullOrWhiteSpace(col.PropertyName))
-        {
-            entry.SetBinding(Entry.TextProperty,
-                new Binding(col.PropertyName, BindingMode.TwoWay, stringFormat: col.StringFormat, source: BindingContext));
-        }
-
-        return entry;
-    }
-
-    private CheckBox GenerateBooleanEditCell(DataGridColumn col)
-    {
-        var checkBox = new CheckBox
-        {
-            Color = _textColor,
-            BackgroundColor = _bgColor,
-        };
-
-        if (!string.IsNullOrWhiteSpace(col.PropertyName))
-        {
-            checkBox.SetBinding(CheckBox.IsCheckedProperty,
-                new Binding(col.PropertyName, BindingMode.TwoWay, source: BindingContext));
-        }
-
-        return checkBox;
-    }
-
-    private Entry GenerateNumericEditCell(DataGridColumn col, ParserDelegate parserDelegate)
-    {
-        var entry = new Entry
-        {
-            TextColor = _textColor,
-            VerticalTextAlignment = col.VerticalTextAlignment,
-            HorizontalTextAlignment = col.HorizontalTextAlignment,
-            FontSize = DataGrid.FontSize,
+    private View? GenerateTemplatedEditCell(DataGridColumn col)
+    {
+        if (col.EditCellTemplate == null)
+        {
+            return null;
+        }
+
+        var cell = (View)col.EditCellTemplate.CreateContent();
+
+        if (!string.IsNullOrWhiteSpace(col.PropertyName))
+        {
+            cell.SetBinding(BindingContextProperty,
+                new Binding(col.PropertyName, source: BindingContext));
+        }
+
+        return cell;
+    }
+
+    private Entry GenerateTextEditCell(DataGridColumn col)
+    {
+        var entry = new Entry
+        {
+            TextColor = _textColor,
+            VerticalTextAlignment = col.VerticalTextAlignment,
+            HorizontalTextAlignment = col.HorizontalTextAlignment,
+            FontSize = DataGrid.FontSize,
+            FontFamily = DataGrid.FontFamily
+        };
+
+        if (!string.IsNullOrWhiteSpace(col.PropertyName))
+        {
+            entry.SetBinding(Entry.TextProperty,
+                new Binding(col.PropertyName, BindingMode.TwoWay, stringFormat: col.StringFormat, source: BindingContext));
+        }
+
+        return entry;
+    }
+
+    private CheckBox GenerateBooleanEditCell(DataGridColumn col)
+    {
+        var checkBox = new CheckBox
+        {
+            Color = _textColor,
+            BackgroundColor = _bgColor,
+        };
+
+        if (!string.IsNullOrWhiteSpace(col.PropertyName))
+        {
+            checkBox.SetBinding(CheckBox.IsCheckedProperty,
+                new Binding(col.PropertyName, BindingMode.TwoWay, source: BindingContext));
+        }
+
+        return checkBox;
+    }
+
+    private Entry GenerateNumericEditCell(DataGridColumn col, ParserDelegate parserDelegate)
+    {
+        var entry = new Entry
+        {
+            TextColor = _textColor,
+            VerticalTextAlignment = col.VerticalTextAlignment,
+            HorizontalTextAlignment = col.HorizontalTextAlignment,
+            FontSize = DataGrid.FontSize,
             FontFamily = DataGrid.FontFamily,
-            Keyboard = Keyboard.Numeric
-        };
-
-        entry.TextChanged += (s, e) =>
-        {
-            if (!string.IsNullOrEmpty(e.NewTextValue) && !parserDelegate(e.NewTextValue))
-            {
-                ((Entry)s!).Text = e.OldTextValue;
-            }
-        };
-
-        if (!string.IsNullOrWhiteSpace(col.PropertyName))
-        {
-            entry.SetBinding(Entry.TextProperty,
-                new Binding(col.PropertyName, BindingMode.TwoWay, source: BindingContext));
-        }
-
-        return entry;
-    }
-
-    private DatePicker GenerateDateTimeEditCell(DataGridColumn col)
-    {
-        var datePicker = new DatePicker
-        {
-            TextColor = _textColor,
-        };
-
-        if (!string.IsNullOrWhiteSpace(col.PropertyName))
-        {
-            datePicker.SetBinding(DatePicker.DateProperty,
-                new Binding(col.PropertyName, BindingMode.TwoWay, source: BindingContext));
-        }
-
-        return datePicker;
-    }
-
-    private void UpdateColors()
-    {
-        _hasSelected = DataGrid.SelectedItem == BindingContext || DataGrid.SelectedItems.Contains(BindingContext);
-        var rowIndex = DataGrid.InternalItems?.IndexOf(BindingContext) ?? -1;
-
-        if (rowIndex < 0)
-        {
-            return;
-        }
-
-        _bgColor = DataGrid.SelectionMode != SelectionMode.None && _hasSelected
-                ? DataGrid.ActiveRowColor
-                : DataGrid.RowsBackgroundColorPalette.GetColor(rowIndex, BindingContext);
-        _textColor = DataGrid.RowsTextColorPalette.GetColor(rowIndex, BindingContext);
-
-        foreach (var cell in Children.OfType<DataGridCell>())
+            Keyboard = Keyboard.Numeric
+        };
+
+        entry.TextChanged += (s, e) =>
+        {
+            if (!string.IsNullOrEmpty(e.NewTextValue) && !parserDelegate(e.NewTextValue))
+            {
+                ((Entry)s!).Text = e.OldTextValue;
+            }
+        };
+
+        if (!string.IsNullOrWhiteSpace(col.PropertyName))
         {
-            cell.UpdateCellColors(_bgColor, _textColor);
-        }
-    }
-
-    /// <inheritdoc/>
-    protected override void OnBindingContextChanged()
-    {
-        base.OnBindingContextChanged();
-        CreateView();
-    }
-
-    /// <inheritdoc/>
-    protected override void OnParentSet()
-    {
-        base.OnParentSet();
-
-        if (Parent == null)
-        {
-            DataGrid.ItemSelected -= DataGrid_ItemSelected;
-            DataGrid.Columns.CollectionChanged -= OnColumnsChanged;
-
-            foreach (var column in DataGrid.Columns)
-            {
-                column.VisibilityChanged -= OnVisibilityChanged;
-            }
-        }
-    }
-
-    private void OnColumnsChanged(object? sender, EventArgs e)
-    {
-        CreateView();
-    }
-
-    private void OnVisibilityChanged(object? sender, EventArgs e)
-    {
-        CreateView();
-    }
-
-    private void DataGrid_ItemSelected(object? sender, SelectionChangedEventArgs e)
-    {
-        if (_hasSelected || (e.CurrentSelection.Count > 0 && e.CurrentSelection.Any(s => s == BindingContext)))
-        {
-            UpdateColors();
-        }
-    }
-
-    #endregion Methods
-}
+            entry.SetBinding(Entry.TextProperty,
+                new Binding(col.PropertyName, BindingMode.TwoWay, source: BindingContext));
+        }
+
+        return entry;
+    }
+
+    private DatePicker GenerateDateTimeEditCell(DataGridColumn col)
+    {
+        var datePicker = new DatePicker
+        {
+            TextColor = _textColor,
+        };
+
+        if (!string.IsNullOrWhiteSpace(col.PropertyName))
+        {
+            datePicker.SetBinding(DatePicker.DateProperty,
+                new Binding(col.PropertyName, BindingMode.TwoWay, source: BindingContext));
+        }
+
+        return datePicker;
+    }
+
+    private void UpdateColors()
+    {
+        _hasSelected = DataGrid.SelectedItem == BindingContext || DataGrid.SelectedItems.Contains(BindingContext);
+        var rowIndex = DataGrid.InternalItems?.IndexOf(BindingContext) ?? -1;
+
+        if (rowIndex < 0)
+        {
+            return;
+        }
+
+        _bgColor = DataGrid.SelectionMode != SelectionMode.None && _hasSelected
+                ? DataGrid.ActiveRowColor
+                : DataGrid.RowsBackgroundColorPalette.GetColor(rowIndex, BindingContext);
+        _textColor = DataGrid.RowsTextColorPalette.GetColor(rowIndex, BindingContext);
+
+        foreach (var cell in Children.OfType<DataGridCell>())
+        {
+            cell.UpdateCellColors(_bgColor, _textColor);
+        }
+    }
+
+    /// <inheritdoc/>
+    protected override void OnBindingContextChanged()
+    {
+        base.OnBindingContextChanged();
+        CreateView();
+    }
+
+    /// <inheritdoc/>
+    protected override void OnParentSet()
+    {
+        base.OnParentSet();
+
+        if (Parent == null)
+        {
+            DataGrid.ItemSelected -= DataGrid_ItemSelected;
+            DataGrid.Columns.CollectionChanged -= OnColumnsChanged;
+
+            foreach (var column in DataGrid.Columns)
+            {
+                column.VisibilityChanged -= OnVisibilityChanged;
+            }
+        }
+    }
+
+    private void OnColumnsChanged(object? sender, EventArgs e)
+    {
+        CreateView();
+    }
+
+    private void OnVisibilityChanged(object? sender, EventArgs e)
+    {
+        CreateView();
+    }
+
+    private void DataGrid_ItemSelected(object? sender, SelectionChangedEventArgs e)
+    {
+        if (_hasSelected || (e.CurrentSelection.Count > 0 && e.CurrentSelection.Any(s => s == BindingContext)))
+        {
+            UpdateColors();
+        }
+    }
+
+    #endregion Methods
+}
diff --git a/Maui.DataGrid/Extensions/ListExtensions.cs b/Maui.DataGrid/Extensions/ListExtensions.cs
new file mode 100644
index 0000000..94ff55b
--- /dev/null
+++ b/Maui.DataGrid/Extensions/ListExtensions.cs
@@ -0,0 +1,18 @@
+namespace Maui.DataGrid.Extensions;
+
+internal static class ListExtensions
+{
+    public static bool TryGetItem<T>(this IList<T> list, int index, out T? item)
+    {
+        if (index >= 0 && index < list.Count)
+        {
+            item = list[index];
+            return true;
+        }
+        else
+        {
+            item = default;
+            return false;
+        }
+    }
+}