diff --git a/src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/UITK/BindableUIElements/BindableListView.cs b/src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/UITK/BindableUIElements/BindableListView.cs index fbb0cd0..25aa2ae 100644 --- a/src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/UITK/BindableUIElements/BindableListView.cs +++ b/src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/UITK/BindableUIElements/BindableListView.cs @@ -85,12 +85,26 @@ private VisualElement MakeItem() private void BindItem(VisualElement item, int index) { - BindItem(item, index, _itemsSource.Value[index], _objectProvider); + if (index >= 0 && index < itemsSource.Count) + { + BindItem(item, index, _itemsSource.Value[index], _objectProvider); + } + else + { + BindItem(item, index, default, _objectProvider); + } } private void UnbindItem(VisualElement item, int index) { - UnbindItem(item, index, _itemsSource.Value[index], _objectProvider); + if (index >= 0 && index < itemsSource.Count) + { + UnbindItem(item, index, _itemsSource.Value[index], _objectProvider); + } + else + { + UnbindItem(item, index, default, _objectProvider); + } } private void OnItemsCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)