Skip to content

Commit 6e1d9ca

Browse files
Merge branch 'master' into fixes/PropertyNames
2 parents 1e3c564 + 28f8bf8 commit 6e1d9ca

File tree

2 files changed

+23
-0
lines changed

2 files changed

+23
-0
lines changed

src/Avalonia.Base/Collections/AvaloniaList.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,13 @@ public virtual void InsertRange(int index, IEnumerable<T> items)
394394
} while (en.MoveNext());
395395

396396
if (notificationItems is not null)
397+
{
397398
NotifyAdd(notificationItems, index);
399+
}
400+
else
401+
{
402+
NotifyCountChanged();
403+
}
398404
}
399405
}
400406
}

tests/Avalonia.Base.UnitTests/Collections/AvaloniaListTests.cs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,23 @@ public void Adding_Items_Should_Raise_CollectionChanged()
146146
Assert.True(raised);
147147
}
148148

149+
[Fact]
150+
public void AddRange_IEnumerable_Should_Raise_Count_PropertyChanged()
151+
{
152+
var target = new AvaloniaList<int>(new[] { 1, 2, 3, 4, 5 });
153+
var raised = false;
154+
155+
target.PropertyChanged += (s, e) => {
156+
Assert.Equal(e.PropertyName, nameof(target.Count));
157+
Assert.Equal(target.Count, 7);
158+
raised = true;
159+
};
160+
161+
target.AddRange(Enumerable.Range(6, 2));
162+
163+
Assert.True(raised);
164+
}
165+
149166
[Fact]
150167
public void AddRange_Items_Should_Raise_Correct_CollectionChanged()
151168
{

0 commit comments

Comments
 (0)