Converted ItemsControlRegionAdapter to use ItemsSource. As of Avaloni…

…a PR #10827, `ItemsControl.Items` is readonly and should use `ItemsControls.ItemsSource` (PR #10590)
AvaloniaCommunity · May 31, 2023 · 0f52858 · 0f52858
1 parent e45996a
commit 0f52858
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/samples/SampleMvvmApp/Views/DashboardView.axaml b/samples/SampleMvvmApp/Views/DashboardView.axaml
@@ -30,7 +30,7 @@
 
       <ComboBox VerticalAlignment="Center"
                 HorizontalAlignment="Stretch"
-                Items="{Binding ThemeStyles}"
+                ItemsSource="{Binding ThemeStyles}"
                 SelectedItem="{Binding ThemeSelected}">
         <!--SelectedIndex="{Binding ThemeSelectedIndex}" >-->
         <ComboBox.ItemTemplate>
@@ -51,7 +51,7 @@
 
     <ListBox Grid.Row="3"
              Margin="2"
-             Items="{Binding ListItems}"
+             ItemsSource="{Binding ListItems}"
              ScrollViewer.HorizontalScrollBarVisibility="Visible"
              ScrollViewer.VerticalScrollBarVisibility="Visible"
              SelectedIndex="{Binding ListItemSelected}"

diff --git a/src/Prism.Avalonia/Regions/ItemsControlRegionAdapter.cs b/src/Prism.Avalonia/Regions/ItemsControlRegionAdapter.cs
@@ -50,12 +50,9 @@ protected override void Adapt(IRegion region, ItemsControl regionTarget)
             }
 
             // Avalonia v11-Preview5 needs IRegion implement IList. Enforcing it to return AvaloniaList<object> fixes this.
-            // Avalonia v11-Preview8 ItemsControl.Items is readonly.
+            // Avalonia v11-Preview8 ItemsControl.Items is readonly (#10827).
             ////regionTarget.Items = region.Views as Avalonia.Collections.AvaloniaList<object>;
-            foreach (var item in region.Views as Avalonia.Collections.AvaloniaList<object>)
-            {
-                regionTarget.Items.Add(item);
-            }
+            regionTarget.ItemsSource = region.Views as Avalonia.Collections.AvaloniaList<object>;
         }
 
         /// <summary>

diff --git a/src/Prism.Avalonia/Regions/Region.cs b/src/Prism.Avalonia/Regions/Region.cs
@@ -369,6 +369,7 @@ private void InnerAdd(object view, string viewName, IRegionManager scopedRegionM
                 {
                     throw new InvalidOperationException(String.Format(CultureInfo.InvariantCulture, Resources.RegionViewNameExistsException, viewName));
                 }
+
                 itemMetadata.Name = viewName;
             }
 

diff --git a/tests/Avalonia/Prism.Avalonia.Tests/Mocks/Views/MockBindingsView.axaml b/tests/Avalonia/Prism.Avalonia.Tests/Mocks/Views/MockBindingsView.axaml
@@ -10,7 +10,7 @@
   <StackPanel>
     <ListBox Margin="2"
            VerticalAlignment="Bottom"
-           Items="{Binding ListItems}"
+           ItemsSource="{Binding ListItems}"
            ScrollViewer.HorizontalScrollBarVisibility="Visible"
            ScrollViewer.VerticalScrollBarVisibility="Visible"
            SelectedIndex="{Binding ListItemSelected}"
-Original file line number
+Diff line change
@@ Expand Up @@
                     {
                         throw new InvalidOperationException(String.Format(CultureInfo.InvariantCulture, Resources.RegionViewNameExistsException, viewName));
                     }
                     itemMetadata.Name = viewName;
                 }
@@ Expand Down @@