Merge pull request #153 from w-ahmad/template_column_fix

fixed template column template selector issues

Author: w-ahmad

src/Columns/TableViewColumn.cs

@@ -34,9 +34,9 @@ public abstract partial class TableViewColumn : DependencyObject
     /// <summary>
     /// Refreshes the display element for the cell.
     /// </summary>
-    /// <param name="tableViewCell">The cell for which the element is refreshed.</param>
+    /// <param name="cell">The cell for which the element is refreshed.</param>
     /// <param name="dataItem">The data item associated with the cell.</param>
-    public virtual void RefreshElement(TableViewCell tableViewCell, object? dataItem) { }
+    public virtual void RefreshElement(TableViewCell cell, object? dataItem) { }
 
     /// <summary>
     /// Updates the state of the element for the cell.

src/Columns/TableViewTemplateColumn.cs

@@ -22,13 +22,8 @@ public TableViewTemplateColumn()
     /// <returns>A ContentControl element.</returns>
     public override FrameworkElement GenerateElement(TableViewCell cell, object? dataItem)
     {
-        var contentControl = new ContentControl
-        {
-            ContentTemplate = CellTemplate,
-            ContentTemplateSelector = CellTemplateSelector
-        };
-
-        return contentControl;
+        var template = CellTemplateSelector?.SelectTemplate(dataItem) ?? CellTemplate;
+        return (template?.LoadContent() as FrameworkElement)!;
     }
 
     /// <summary>
@@ -42,18 +37,18 @@ public override FrameworkElement GenerateEditingElement(TableViewCell cell, obje
     {
         if (EditingTemplate is not null || EditingTemplateSelector is not null)
         {
-            var contentControl = new ContentControl
-            {
-                ContentTemplate = EditingTemplate,
-                ContentTemplateSelector = EditingTemplateSelector
-            };
-
-            return contentControl;
+            var template = EditingTemplateSelector?.SelectTemplate(dataItem) ?? EditingTemplate;
+            return (template?.LoadContent() as FrameworkElement)!;
         }
 
         return GenerateElement(cell, dataItem);
     }
 
+    public override void RefreshElement(TableViewCell cell, object? dataItem)
+    {
+        cell.Content = GenerateElement(cell, dataItem);
+    }
+
     /// <summary>
     /// Gets or sets the DataTemplate for the cell content.
     /// </summary>

src/TableViewCell.cs

@@ -310,7 +310,7 @@ internal async void PrepareForEdit()
 
         await Task.Delay(20);
 
-        if ((Content ?? ContentTemplateRoot) is UIElement editingElement)
+        if (Content is UIElement { IsHitTestVisible: true } editingElement)
         {
             editingElement.Focus(FocusState.Pointer);
         }
@@ -368,7 +368,7 @@ private void SetEditingElement()
     /// </summary>
     internal void RefreshElement()
     {
-        Column?.RefreshElement(this, Content);
+        Column?.RefreshElement(this, Row?.Content);
     }
 
     /// <summary>
@@ -383,18 +383,19 @@ internal void ApplySelectionState()
     /// <summary>
     /// Applies the current cell state to the cell.
     /// </summary>
-    internal void ApplyCurrentCellState()
+    internal async void ApplyCurrentCellState()
     {
         var stateName = IsCurrent ? VisualStates.StateCurrent : VisualStates.StateRegular;
         VisualStates.GoToState(this, false, stateName);
 
         if (IsCurrent)
         {
-            Focus(FocusState.Programmatic);
+            Focus(FocusState.Pointer);
 
-            if ((Content ?? ContentTemplateRoot) is UIElement { IsHitTestVisible: true, IsTabStop: true } element)
+            await Task.Delay(20);
+            if (Content is UIElement { IsHitTestVisible: true } element)
             {
-                element.Focus(FocusState.Programmatic);
+                element.Focus(FocusState.Pointer);
             }
         }
     }