Merge pull request #178 from symbiogenesis/tapped-command-hotfix

fix RowTappedCommand gesture recognizers from blocking UI
akgulebubekir · May 2, 2024 · 966d26a · 966d26a · MichelePannacciTerex · May 5, 2024
2 parents d4bdf1a + 60f7d25
commit 966d26a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Maui.DataGrid/DataGrid.xaml b/Maui.DataGrid/DataGrid.xaml
@@ -51,11 +51,7 @@
                     SelectionMode="{Binding SelectionMode, Source={Reference self}}">
                 <CollectionView.ItemTemplate>
                     <DataTemplate x:DataType="x:Object">
-                        <local:DataGridRow DataGrid="{Reference self}" RowToEdit="{Binding RowToEdit, Source={Reference self}}" HeightRequest="{Binding RowHeight, Source={Reference self}, Mode=OneTime}" >
-                            <local:DataGridRow.GestureRecognizers>
-                                <TapGestureRecognizer Command="{Binding RowTappedCommand, Source={x:Reference self}}" CommandParameter="{Binding .}" />
-                            </local:DataGridRow.GestureRecognizers>
-                        </local:DataGridRow>
+                        <local:DataGridRow DataGrid="{Reference self}" RowToEdit="{Binding RowToEdit, Source={Reference self}}" HeightRequest="{Binding RowHeight, Source={Reference self}, Mode=OneTime}" />
                     </DataTemplate>
                 </CollectionView.ItemTemplate>
             </CollectionView>

diff --git a/Maui.DataGrid/DataGrid.xaml.cs b/Maui.DataGrid/DataGrid.xaml.cs
@@ -1333,7 +1333,11 @@ private void OnColumnsChanged(object? sender, NotifyCollectionChangedEventArgs e
 
     private void OnRefreshing(object? sender, EventArgs e) => _refreshingEventManager.HandleEvent(this, e, nameof(Refreshing));
 
-    private void OnSelectionChanged(object? sender, SelectionChangedEventArgs e) => _itemSelectedEventManager.HandleEvent(this, e, nameof(ItemSelected));
+    private void OnSelectionChanged(object? sender, SelectionChangedEventArgs e)
+    {
+        _itemSelectedEventManager.HandleEvent(this, e, nameof(ItemSelected));
+        RowTappedCommand?.Execute(e);
+    }
 
     private void OnItemsSourceCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
     {