This repository has been archived by the owner on May 1, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
#5844 fixes #5625 * UWP CollectionView SelectionMode * Null check * SelectItems get property * ItemTemplatePair type check * Avoid mutually trigger OnSelectionChange * Extended -> Multiple + Avoid creating new SelectedItems
- Loading branch information
Showing
5 changed files
with
241 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -67,3 +67,4 @@ tools/ | |
| !tools/mdoc/**/* | ||
| caketools/ | ||
| *.binlog | ||
| .ionide/** | ||
20 changes: 20 additions & 0 deletions
20
Xamarin.Forms.Platform.UAP/CollectionView/CollectionViewRenderer.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| using System; | ||
| using System.ComponentModel; | ||
| using System.Diagnostics; | ||
| using System.Linq; | ||
| using System.Runtime.CompilerServices; | ||
| using System.Threading.Tasks; | ||
| using Windows.Foundation; | ||
| using Windows.UI.Xaml; | ||
| using Windows.UI.Xaml.Controls; | ||
| using Windows.UI.Xaml.Controls.Primitives; | ||
| using Windows.UI.Xaml.Data; | ||
| using Xamarin.Forms.Internals; | ||
| using Xamarin.Forms.Platform.UAP; | ||
|
|
||
| namespace Xamarin.Forms.Platform.UWP | ||
| { | ||
| public class CollectionViewRenderer : SelectableItemsViewRenderer | ||
| { | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
198 changes: 198 additions & 0 deletions
198
Xamarin.Forms.Platform.UAP/CollectionView/SelectableItemsViewRenderer.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,198 @@ | ||
| using System; | ||
| using System.ComponentModel; | ||
| using System.Linq; | ||
| using Windows.UI.Xaml.Controls; | ||
| using UWPListViewSelectionMode = Windows.UI.Xaml.Controls.ListViewSelectionMode; | ||
|
|
||
| namespace Xamarin.Forms.Platform.UWP | ||
| { | ||
| public class SelectableItemsViewRenderer : ItemsViewRenderer | ||
| { | ||
| SelectableItemsView _selectableItemsView; | ||
|
|
||
| protected override void OnElementChanged(ElementChangedEventArgs<CollectionView> args) | ||
| { | ||
| var oldListViewBase = ListViewBase; | ||
| if (oldListViewBase != null) | ||
| { | ||
| oldListViewBase.ClearValue(ListViewBase.SelectionModeProperty); | ||
| oldListViewBase.SelectionChanged -= OnNativeSelectionChanged; | ||
| } | ||
|
|
||
| if (args.OldElement != null) | ||
| { | ||
| args.OldElement.SelectionChanged -= OnSelectionChanged; | ||
| } | ||
|
|
||
| base.OnElementChanged(args); | ||
| _selectableItemsView = args.NewElement; | ||
|
|
||
| if (_selectableItemsView != null) | ||
| { | ||
| _selectableItemsView.SelectionChanged += OnSelectionChanged; | ||
| } | ||
|
|
||
| var newListViewBase = ListViewBase; | ||
|
|
||
| if (newListViewBase != null) | ||
| { | ||
| newListViewBase.SetBinding(ListViewBase.SelectionModeProperty, | ||
| new Windows.UI.Xaml.Data.Binding | ||
| { | ||
| Source = _selectableItemsView, | ||
| Path = new Windows.UI.Xaml.PropertyPath("SelectionMode"), | ||
| Converter = new SelectionModeConvert(), | ||
| Mode = Windows.UI.Xaml.Data.BindingMode.TwoWay | ||
| }); | ||
|
|
||
| newListViewBase.SelectionChanged += OnNativeSelectionChanged; | ||
| } | ||
| UpdateNativeSelection(); | ||
| } | ||
|
|
||
| void UpdateNativeSelection() | ||
| { | ||
| switch (ListViewBase.SelectionMode) | ||
| { | ||
| case UWPListViewSelectionMode.None: | ||
| break; | ||
| case UWPListViewSelectionMode.Single: | ||
| ListViewBase.SelectionChanged -= OnNativeSelectionChanged; | ||
| if (_selectableItemsView != null) | ||
| { | ||
| if (_selectableItemsView.SelectedItem == null) | ||
| { | ||
| ListViewBase.SelectedItem = null; | ||
| } | ||
| else | ||
| { | ||
| ListViewBase.SelectedItem = | ||
| ListViewBase.Items.First(item => | ||
| { | ||
| if (item is ItemTemplatePair itemPair) | ||
| { | ||
| return itemPair.Item == _selectableItemsView.SelectedItem; | ||
| } | ||
| else | ||
| { | ||
| return item == _selectableItemsView.SelectedItem; | ||
| } | ||
| }); | ||
|
|
||
| } | ||
| } | ||
| ListViewBase.SelectionChanged += OnNativeSelectionChanged; | ||
| break; | ||
| case UWPListViewSelectionMode.Multiple: | ||
| ListViewBase.SelectionChanged -= OnNativeSelectionChanged; | ||
| ListViewBase.SelectedItems.Clear(); | ||
| foreach (var nativeItem in ListViewBase.Items) | ||
| { | ||
| if (nativeItem is ItemTemplatePair itemPair && _selectableItemsView.SelectedItems.Contains(itemPair.Item)) | ||
| { | ||
| ListViewBase.SelectedItems.Add(nativeItem); | ||
| } | ||
| else if (_selectableItemsView.SelectedItems.Contains(nativeItem)) | ||
| { | ||
| ListViewBase.SelectedItems.Add(nativeItem); | ||
| } | ||
| } | ||
| ListViewBase.SelectionChanged += OnNativeSelectionChanged; | ||
| break; | ||
| case UWPListViewSelectionMode.Extended: | ||
| break; | ||
| default: | ||
| break; | ||
| } | ||
|
|
||
| } | ||
|
|
||
| void OnSelectionChanged(object sender, SelectionChangedEventArgs e) | ||
| { | ||
| UpdateNativeSelection(); | ||
| } | ||
|
|
||
| void OnNativeSelectionChanged(object sender, Windows.UI.Xaml.Controls.SelectionChangedEventArgs e) | ||
| { | ||
| if (Element != null) | ||
| { | ||
| switch (ListViewBase.SelectionMode) | ||
| { | ||
| case UWPListViewSelectionMode.None: | ||
| break; | ||
| case UWPListViewSelectionMode.Single: | ||
| var selectedItem = | ||
| ListViewBase.SelectedItem is ItemTemplatePair itemPair ? itemPair.Item : ListViewBase.SelectedItem; | ||
| Element.SelectionChanged -= OnSelectionChanged; | ||
| Element.SetValueFromRenderer(SelectableItemsView.SelectedItemProperty, selectedItem); | ||
| Element.SelectionChanged += OnSelectionChanged; | ||
| break; | ||
| case UWPListViewSelectionMode.Multiple: | ||
| Element.SelectionChanged -= OnSelectionChanged; | ||
|
|
||
| _selectableItemsView.SelectedItems.Clear(); | ||
| var selectedItems = | ||
| ListViewBase.SelectedItems | ||
| .Select(a => | ||
| { | ||
| var item = a is ItemTemplatePair itemPair1 ? itemPair1.Item : a; | ||
| return item; | ||
| }) | ||
| .ToList(); | ||
|
|
||
| foreach (var item in selectedItems) | ||
| { | ||
| _selectableItemsView.SelectedItems.Add(item); | ||
| } | ||
|
|
||
| Element.SelectionChanged += OnSelectionChanged; | ||
| break; | ||
|
|
||
| case UWPListViewSelectionMode.Extended: | ||
| break; | ||
|
|
||
| default: | ||
| break; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| class SelectionModeConvert : Windows.UI.Xaml.Data.IValueConverter | ||
| { | ||
| public object Convert(object value, Type targetType, object parameter, string language) | ||
| { | ||
| var formSelectionMode = (SelectionMode)value; | ||
| switch (formSelectionMode) | ||
| { | ||
| case SelectionMode.None: | ||
| return UWPListViewSelectionMode.None; | ||
| case SelectionMode.Single: | ||
| return UWPListViewSelectionMode.Single; | ||
| case SelectionMode.Multiple: | ||
| return UWPListViewSelectionMode.Multiple; | ||
| default: | ||
| return UWPListViewSelectionMode.None; | ||
| } | ||
| } | ||
|
|
||
| public object ConvertBack(object value, Type targetType, object parameter, string language) | ||
| { | ||
| var uwpListViewSelectionMode = (UWPListViewSelectionMode)value; | ||
| switch (uwpListViewSelectionMode) | ||
| { | ||
| case UWPListViewSelectionMode.None: | ||
| return SelectionMode.None; | ||
| case UWPListViewSelectionMode.Single: | ||
| return SelectionMode.Single; | ||
| case UWPListViewSelectionMode.Multiple: | ||
| return SelectionMode.Multiple; | ||
| case UWPListViewSelectionMode.Extended: | ||
| return SelectionMode.None; | ||
| default: | ||
| return SelectionMode.None; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters