Merge

Author: Avid29

components/Extensions/src/ListViewBase/ListViewExtensions.AlternateRows.cs

@@ -85,8 +85,6 @@ private static void OnAlternateRowPropertyChanged(DependencyObject sender, Depen
         listViewBase.Items.VectorChanged -= OnItemsVectorChanged;
         listViewBase.Unloaded -= OnListViewBaseUnloaded_AltRow;
 
-        _trackedListViews[listViewBase.Items] = listViewBase;
-
         // Resubscribe to events as necessary
         var altColor = GetAlternateColor(listViewBase);
         var altStyle = GetAlternateStyle(listViewBase);
@@ -98,10 +96,16 @@ private static void OnAlternateRowPropertyChanged(DependencyObject sender, Depen
             listViewBase.ContainerContentChanging += OnContainerContentChanging;
             listViewBase.Items.VectorChanged += OnItemsVectorChanged;
             listViewBase.Unloaded += OnListViewBaseUnloaded_AltRow;
+
+            _trackedListViews[listViewBase.Items] = listViewBase;
+        }
+        else
+        {
+            _trackedListViews.Remove(listViewBase.Items);
         }
 
-        // Update all items to apply the new property
-        UpdateItems(listViewBase);
+            // Update all items to apply the new property
+            UpdateItems(listViewBase);
     }
 
     private static void OnContainerContentChanging(ListViewBase sender, ContainerContentChangingEventArgs args) => UpdateItem(sender, args.ItemIndex);

components/Extensions/src/ListViewBase/ListViewExtensions.StretchItemContainer.cs

@@ -20,7 +20,7 @@ public static partial class ListViewExtensions
     /// <param name="obj">The <see cref="ListViewBase"/> to get the associated <see cref="ItemContainerStretchDirection"/> from</param>
     /// <returns>The <see cref="ItemContainerStretchDirection"/> associated with the <see cref="ListViewBase"/></returns>
     public static ItemContainerStretchDirection? GetItemContainerStretchDirection(ListViewBase obj)
-        => (ItemContainerStretchDirection)obj.GetValue(ItemContainerStretchDirectionProperty);
+        => (ItemContainerStretchDirection?)obj.GetValue(ItemContainerStretchDirectionProperty);
 
     /// <summary>
     /// Sets the stretch <see cref="ItemContainerStretchDirection"/> associated with the specified <see cref="ListViewBase"/>
@@ -51,11 +51,11 @@ private static void ItemContainerStretchDirectionChanging(ListViewBase sender, C
     {
         var stretchDirection = GetItemContainerStretchDirection(sender);
 
-        // Set vertical content stretching
+        // Set horizontal content stretching
         if (stretchDirection is ItemContainerStretchDirection.Horizontal or ItemContainerStretchDirection.Both)
             args.ItemContainer.HorizontalContentAlignment = HorizontalAlignment.Stretch;
 
-        // Set horizontal content stretching
+        // Set vertical content stretching
         if (stretchDirection is ItemContainerStretchDirection.Vertical or ItemContainerStretchDirection.Both)
             args.ItemContainer.VerticalContentAlignment = VerticalAlignment.Stretch;
     }