Merge pull request w-ahmad#374 from cricketthomas/293-select-after-context-requested

Add option to select row or cell on context request

Author: w-ahmad

samples/WinUI.TableView.SampleApp/Pages/ContextFlyoutsPage.xaml

@@ -25,6 +25,7 @@
                               ItemsSource="{Binding Items}"
                               CellContextFlyoutOpening="OnCellContextFlyoutOpening"
                               RowContextFlyoutOpening="OnRowContextFlyoutOpening"
+                              ForceRowOrCellSelectionOnContextRequested="{x:Bind ForceRowOrCellSelectionToggleSwitch.IsOn, Mode=OneWay}"
                               AutoGeneratingColumn="{x:Bind local:ExampleModelColumnsHelper.OnAutoGeneratingColumns}">
                     <tv:TableView.RowContextFlyout>
                         <MenuFlyout>
@@ -75,12 +76,26 @@
                     </tv:TableView.CellContextFlyout>
                 </tv:TableView>
             </controls:SamplePresenter.Example>
+            <controls:SamplePresenter.Options>
+                <StackPanel MaxWidth="250" Spacing="16">
+                    <ToggleSwitch
+                     x:Name="ForceRowOrCellSelectionToggleSwitch"
+                     Header="Force Row or Cell to be selected on ContextFlyoutOpening"
+                     IsOn="True"
+                     OffContent="False"
+                     OnContent="True" />
+                </StackPanel>
+            </controls:SamplePresenter.Options>
             <controls:SamplePresenter.Xaml>
                 <x:String xml:space="preserve">
 &lt;tv:TableView x:Name="tableView"
-    ItemsSource="{Binding Items}" /&gt;
+    ItemsSource="{Binding Items}"
+    ForceRowOrCellSelectionOnContextRequested="$(ForceRowOrCellSelect)" /&gt;
                 </x:String>
             </controls:SamplePresenter.Xaml>
+            <controls:SamplePresenter.Substitutions>
+                <controls:CodeSubstitution Key="ForceRowOrCellSelect" Value="{x:Bind tableView.ForceRowOrCellSelectionOnContextRequested, Mode=OneWay}" />
+            </controls:SamplePresenter.Substitutions>
         </controls:SamplePresenter>
     </Grid>
 </Page>

src/TableView.Properties.cs

@@ -266,6 +266,12 @@ public partial class TableView
     /// </summary>
     public static readonly DependencyProperty ShowFilterItemsCountProperty = DependencyProperty.Register(nameof(ShowFilterItemsCount), typeof(bool), typeof(TableView), new PropertyMetadata(false));
 
+
+    /// <summary>
+    /// Identifies the <see cref="ForceRowOrCellSelectionOnContextRequested"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty ForceRowOrCellSelectionOnContextRequestedProperty = DependencyProperty.Register(nameof(ForceRowOrCellSelectionOnContextRequested), typeof(bool), typeof(TableView), new PropertyMetadata(false));
+
     /// <summary>
     /// Gets or sets a value indicating whether opening the column filter over header right-click is enabled.
     /// </summary>
@@ -331,6 +337,15 @@ public bool ShowFilterItemsCount
         set => SetValue(ShowFilterItemsCountProperty, value);
     }
 
+    /// <summary>
+    /// Gets or sets a value that indicates whether the TableView should force select the Row or Cell depending on the SelectionUnit
+    /// </summary>
+    public bool ForceRowOrCellSelectionOnContextRequested
+    {
+        get => (bool)GetValue(ForceRowOrCellSelectionOnContextRequestedProperty);
+        set => SetValue(ForceRowOrCellSelectionOnContextRequestedProperty, value);
+    }
+
     /// <summary>
     /// Gets or sets the selection start cell slot.
     /// </summary>

src/TableViewCell.cs

@@ -64,6 +64,13 @@ private void OnContextRequested(UIElement sender, ContextRequestedEventArgs e)
     {
         if (!e.TryGetPosition(sender, out var position)) return;
 #endif
+
+        // Select the cell before showing the Context Menu
+        if (TableView is not null && TableView.ForceRowOrCellSelectionOnContextRequested && !IsSelected)
+        {
+            TableView.MakeSelection(Slot, false);
+        }
+
         e.Handled = TableView?.ShowCellContext(this, position) is true;
     }
 

src/TableViewRow.cs

@@ -70,6 +70,13 @@ private void OnContextRequested(UIElement sender, ContextRequestedEventArgs e)
     {
         if (!e.TryGetPosition(sender, out var position)) return;
 #endif
+
+        // Select the row before showing the Context Menu
+        if (TableView is not null && TableView.ForceRowOrCellSelectionOnContextRequested && !IsSelected)
+        {
+            TableView.MakeSelection(new TableViewCellSlot(Index, -1), false);
+        }
+
         e.Handled = TableView?.ShowRowContext(this, position) is true;
     }