fix exception when changing the items collection while bringing conta…

…iner into view
sbaeumlisberger · Feb 4, 2024 · 515bb9a · 515bb9a
1 parent c100d42
commit 515bb9a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/VirtualizingWrapPanel/VirtualizingWrapPanel.cs b/src/VirtualizingWrapPanel/VirtualizingWrapPanel.cs
@@ -137,6 +137,12 @@ protected override Size MeasureOverride(Size availableSize)
 
             ItemContainerManager.IsRecycling = IsRecycling;
 
+            if(bringIntoViewItemIndex >= Items.Count)
+            {
+                bringIntoViewItemIndex = -1;
+                bringIntoViewContainer = null;
+            }
+
             MeasureBringIntoViewContainer(InfiniteSize);
 
             Size newViewportSize;
@@ -192,6 +198,12 @@ protected override Size ArrangeOverride(Size finalSize)
         {
             ViewportSize = finalSize;
 
+            if (bringIntoViewItemIndex >= Items.Count)
+            {
+                bringIntoViewItemIndex = -1;
+                bringIntoViewContainer = null;
+            }
+
             ArrangeBringIntoViewContainer();
 
             foreach (var cachedContainer in ItemContainerManager.CachedContainers)

diff --git a/src/VirtualizingWrapPanel/VirtualizingWrapPanel.csproj b/src/VirtualizingWrapPanel/VirtualizingWrapPanel.csproj
@@ -9,7 +9,7 @@
 
     <PropertyGroup>
         <title>VirtualizingWrapPanel</title>
-        <Version>2.0.4</Version>
+        <Version>2.0.5</Version>
         <Authors>S. Bäumlisbergerr</Authors>
         <Copyright>© S. Bäumlisberger</Copyright>
         <Description>Implementation of a VirtualizingWrapPanel for WPF.</Description>
@@ -36,7 +36,7 @@
         <PackageReadmeFile>README.md</PackageReadmeFile>
 
         <PackageReleaseNotes>
-- Fix: InvalidOperationException when items collection is empty
+- Fix: Exception when changing the items collection while bringing container into view
         </PackageReleaseNotes>
 
         <RootNamespace>WpfToolkit.Controls</RootNamespace>