Merge pull request #249 from AlexanderBlackman/experiment

Limited selection checkbox movement to VisibleWhenSelected.

Author: w-ahmad

src/TableView.Properties.cs

@@ -1,4 +1,4 @@
-using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Controls.Primitives;
 using Microsoft.UI.Xaml.Data;

src/TableView.cs

@@ -1,4 +1,4 @@
-using CommunityToolkit.WinUI;
+using CommunityToolkit.WinUI;
 using Microsoft.UI;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;

src/TableViewRow.cs

@@ -11,6 +11,7 @@
 using System.Collections.Specialized;
 using System.Data;
 using System.Linq;
+using System.Threading.Tasks;
 using Windows.Foundation;
 using WinUI.TableView.Helpers;
 
@@ -506,39 +507,6 @@ internal void EnsureLayout()
             selectionIndicator = fontIcon?.Parent as Border;
         }
 
-        if (selectionIndicator is not null)
-        {
-            if (IsSelected)
-            {
-                // Assign a TranslateTransform for animation
-                var translateTransform = new TranslateTransform();
-                selectionIndicator.RenderTransform = translateTransform;
-
-                var toValue = Math.Round(-detailsHeight / 2); // move up or down
-
-                var animation = new DoubleAnimation
-                {
-                    To = toValue,
-                    Duration = new Duration(TimeSpan.Zero)
-                };
-
-                var storyboard = new Storyboard();
-                Storyboard.SetTarget(animation, translateTransform);
-                Storyboard.SetTargetProperty(animation, "Y"); // vertical movement
-                storyboard.Children.Add(animation);
-
-                storyboard.Begin();
-            }
-            else
-            {
-                // Row is not selected → reset any previous offset
-                if (selectionIndicator.RenderTransform is TranslateTransform tt)
-                    tt.Y = 0;
-                else
-                    selectionIndicator.RenderTransform = null;
-            }
-        }
-
 
         _selectionBackground ??= _itemPresenter?.FindDescendants()
                                                 .OfType<Border>()
@@ -550,6 +518,7 @@ internal void EnsureLayout()
             _focusVisualMargin.Right,
             _focusVisualMargin.Bottom + GetHorizontalGridlineHeight());
 
+        EnsureSelectionIndicatorPosition(detailsHeight, selectionIndicator);
 #endif
         if (_selectionBackground is not null)
         {
@@ -562,6 +531,36 @@ internal void EnsureLayout()
         }
     }
 
+    /// <summary>
+    /// Ensures the position of the selection indicator.
+    /// </summary>
+    private async void EnsureSelectionIndicatorPosition(double detailsHeight, Border? selectionIndicator)
+    {
+        await Task.Yield(); // let the animations and visual state changes complete
+
+        if (selectionIndicator is not null)
+        {
+            // Assign a TranslateTransform for animation
+            var translateTransform = new TranslateTransform();
+            selectionIndicator.RenderTransform = translateTransform;
+
+            var toValue = RowPresenter?.IsDetailsPanelVisible ?? false ? Math.Round(-detailsHeight / 2) : 0; // move up or down
+
+            var animation = new DoubleAnimation
+            {
+                To = toValue,
+                Duration = new Duration(TimeSpan.Zero)
+            };
+
+            var storyboard = new Storyboard();
+            Storyboard.SetTarget(animation, translateTransform);
+            Storyboard.SetTargetProperty(animation, "Y"); // vertical movement
+            storyboard.Children.Add(animation);
+
+            storyboard.Begin();
+        }
+    }
+
     /// <summary>
     /// Ensures alternate colors are applied to the row.
     /// </summary>

src/TableViewRowPresenter.cs

@@ -455,4 +455,9 @@ public void ClearCells()
     /// Gets or sets the TableView associated with the presenter.
     /// </summary>
     public TableView? TableView { get; private set; }
+
+    /// <summary>
+    /// Gets a value indicating whether the row details panel is currently visible.
+    /// </summary>
+    internal bool IsDetailsPanelVisible => _detailsPanel?.Visibility is Visibility.Visible;
 }