implemented cell and row context flyouts on uno

Author: w-ahmad

src/TableView.Properties.cs

@@ -135,7 +135,6 @@ public partial class TableView
     /// </summary>
     public static readonly DependencyProperty AlternateRowBackgroundProperty = DependencyProperty.Register(nameof(AlternateRowBackground), typeof(Brush), typeof(TableView), new PropertyMetadata(null, OnAlternateRowColorChanged));
 
-#if WINDOWS
     /// <summary>
     /// Identifies the RowContextFlyout dependency property.
     /// </summary>
@@ -145,7 +144,6 @@ public partial class TableView
     /// Identifies the CellContextFlyout dependency property.
     /// </summary>
     public static readonly DependencyProperty CellContextFlyoutProperty = DependencyProperty.Register(nameof(CellContextFlyout), typeof(FlyoutBase), typeof(TableView), new PropertyMetadata(null));
-#endif
     /// <summary>
     /// Identifies the ColumnHeaderStyle dependency property.
     /// </summary>
@@ -155,7 +153,7 @@ public partial class TableView
     /// Identifies the CellStyle dependency property.
     /// </summary>
     public static readonly DependencyProperty CellStyleProperty = DependencyProperty.Register(nameof(CellStyle), typeof(Style), typeof(TableView), new PropertyMetadata(null, OnCellStyleChanged));
-    
+
     /// <summary>
     /// Identifies the CurrentCellSlot dependency property.
     /// </summary>
@@ -461,7 +459,6 @@ public Brush AlternateRowForeground
         set => SetValue(AlternateRowForegroundProperty, value);
     }
 
-#if WINDOWS
     /// <summary>
     /// Gets or sets the context flyout for rows.
     /// </summary>
@@ -479,7 +476,6 @@ public FlyoutBase? CellContextFlyout
         get => (FlyoutBase?)GetValue(CellContextFlyoutProperty);
         set => SetValue(CellContextFlyoutProperty, value);
     }
-#endif
 
     /// <summary>
     /// Gets or sets the style applied to all column headers.

src/TableView.cs

@@ -1349,11 +1349,10 @@ internal void EnsureCells()
     }
 #endif
 
-#if WINDOWS
     /// <summary>
     /// Shows the context flyout for the specified row.
     /// </summary>
-    internal void ShowRowContext(TableViewRow row, Point position)
+    internal bool ShowRowContext(TableViewRow row, Point position)
     {
         var eventArgs = new TableViewRowContextFlyoutEventArgs(row.Index, row, row.Content, RowContextFlyout);
         RowContextFlyoutOpening?.Invoke(this, eventArgs);
@@ -1362,19 +1361,25 @@ internal void ShowRowContext(TableViewRow row, Point position)
         {
             var presenter = row.FindDescendant<ListViewItemPresenter>();
 
-            RowContextFlyout.ShowAt(presenter, new FlyoutShowOptions
+            RowContextFlyout.ShowAt(row, new FlyoutShowOptions
             {
-                ShowMode = FlyoutShowMode.Standard,
+#if WINDOWS
+                ShowMode = FlyoutShowMode.Standard, 
+#endif
                 Placement = RowContextFlyout.Placement,
                 Position = position
             });
+
+            return true;
         }
+
+        return false;
     }
 
     /// <summary>
     /// Shows the context flyout for the specified cell.
     /// </summary>
-    internal void ShowCellContext(TableViewCell cell, Point position)
+    internal bool ShowCellContext(TableViewCell cell, Point position)
     {
         var eventArgs = new TableViewCellContextFlyoutEventArgs(cell.Slot, cell, cell.Row?.Content!, CellContextFlyout);
         CellContextFlyoutOpening?.Invoke(this, eventArgs);
@@ -1383,13 +1388,18 @@ internal void ShowCellContext(TableViewCell cell, Point position)
         {
             CellContextFlyout.ShowAt(cell, new FlyoutShowOptions
             {
-                ShowMode = FlyoutShowMode.Standard,
+#if WINDOWS
+                ShowMode = FlyoutShowMode.Standard, 
+#endif
                 Placement = CellContextFlyout.Placement,
                 Position = position
             });
+
+            return true;
         }
+
+        return false;
     }
-#endif
 
     /// <summary>
     /// Sets the state of the corner button.
@@ -1460,7 +1470,6 @@ public virtual void OnClearSorting(TableViewClearSortingEventArgs eventArgs)
     /// </summary>
     public event DependencyPropertyChangedEventHandler? IsReadOnlyChanged;
 
-#if WINDOWS
     /// <summary>
     /// Event triggered when the row context flyout is opening.
     /// </summary>
@@ -1470,7 +1479,6 @@ public virtual void OnClearSorting(TableViewClearSortingEventArgs eventArgs)
     /// Event triggered when the cell context flyout is opening.
     /// </summary>
     public event EventHandler<TableViewCellContextFlyoutEventArgs>? CellContextFlyoutOpening;
-#endif
 
     /// <summary>
     /// Occurs when a sorting is being applied to a column in the TableView.

src/TableViewCell.cs

@@ -43,18 +43,23 @@ public TableViewCell()
 #endif
     }
 
-#if WINDOWS
+
+#if !WINDOWS
+    protected override void OnRightTapped(RightTappedRoutedEventArgs e)
+    {
+        base.OnRightTapped(e);
+
+        var position = e.GetPosition(this);
+#else
     /// <summary>
     /// Handles the ContextRequested event.
     /// </summary>
-    private void OnContextRequested(UIElement sender, ContextRequestedEventArgs args)
+    private void OnContextRequested(UIElement sender, ContextRequestedEventArgs e)
     {
-        if (TableView is not null && args.TryGetPosition(sender, out var position))
-        {
-            TableView.ShowCellContext(this, position);
-        }
-    }
+        if (!e.TryGetPosition(sender, out var position)) return;
 #endif
+        e.Handled = TableView?.ShowCellContext(this, position) is true;
+    }
 
 
     /// <summary>
@@ -179,11 +184,11 @@ protected override void OnTapped(TappedRoutedEventArgs e)
     {
         base.OnTapped(e);
 
-         if (TableView?.SelectionUnit is not TableViewSelectionUnit.Row || TableView.CurrentCellSlot != Slot)
-         {
-             MakeSelection();
-             e.Handled = true;
-         }
+        if (TableView?.SelectionUnit is not TableViewSelectionUnit.Row || TableView.CurrentCellSlot != Slot)
+        {
+            MakeSelection();
+            e.Handled = true;
+        }
     }
 
     protected override void OnPointerPressed(PointerRoutedEventArgs e)

src/TableViewRow.cs

@@ -48,35 +48,22 @@ public TableViewRow()
         RegisterPropertyChangedCallback(BackgroundProperty, delegate { OnBackgroundChanged(); });
     }
 
-#if WINDOWS
-    /// <summary>
-    /// Handles the ContextRequested event.
-    /// </summary>
-    private void OnContextRequested(UIElement sender, ContextRequestedEventArgs args)
+#if !WINDOWS
+    protected override void OnRightTapped(RightTappedRoutedEventArgs e)
     {
-        if (args.TryGetPosition(sender, out var position))
-        {
-            if (IsContextRequestedFromCell(position) && TableView?.CellContextFlyout is not null) return;
-
-            TableView?.ShowRowContext(this, position);
-        }
-    }
+        base.OnRightTapped(e);
 
+        var position = e.GetPosition(this);
+#else
     /// <summary>
-    /// Determines if the context request is from a cell.
+    /// Handles the ContextRequested event.
     /// </summary>
-    private bool IsContextRequestedFromCell(Windows.Foundation.Point position)
+    private void OnContextRequested(UIElement sender, ContextRequestedEventArgs e)
     {
-        if (CellPresenter is null) return false;
-
-        var transform = CellPresenter.TransformToVisual(this).Inverse;
-        var point = transform.TransformPoint(position);
-        var transformedPoint = CellPresenter.TransformToVisual(null).TransformPoint(point);
-        return VisualTreeHelper.FindElementsInHostCoordinates(transformedPoint, CellPresenter)
-                               .OfType<TableViewCell>()
-                               .Any();
-    }
+        if (!e.TryGetPosition(sender, out var position)) return;
 #endif
+        e.Handled = TableView?.ShowRowContext(this, position) is true;
+    }
 
     /// <summary>
     /// Handles the IsSelected property changed.
@@ -173,10 +160,10 @@ protected override void OnContentChanged(object oldContent, object newContent)
         else
         {
 #endif
-            foreach (var cell in Cells)
-            {
-                cell.RefreshElement();
-            }
+        foreach (var cell in Cells)
+        {
+            cell.RefreshElement();
+        }
 #if WINDOWS
         }
 #endif
@@ -510,14 +497,14 @@ internal void EnsureLayout()
 #endif
                                      : new Thickness(20, 0, 16, 0);
 #if !WINDOWS
-        var multiSelectSquare = this.FindDescendant<Border>(x => x.Name is "MultiSelectSquare");
-        if (multiSelectSquare is not null)
-        {
-            multiSelectSquare.Opacity = 0.5;
-            multiSelectSquare.CornerRadius = new CornerRadius(4);
-            multiSelectSquare.BorderThickness = new Thickness(1);
-            multiSelectSquare.Margin = new Thickness(10, 0, 0, 0);
-        }
+            var multiSelectSquare = this.FindDescendant<Border>(x => x.Name is "MultiSelectSquare");
+            if (multiSelectSquare is not null)
+            {
+                multiSelectSquare.Opacity = 0.5;
+                multiSelectSquare.CornerRadius = new CornerRadius(4);
+                multiSelectSquare.BorderThickness = new Thickness(1);
+                multiSelectSquare.Margin = new Thickness(10, 0, 0, 0);
+            }
 #endif
         }
     }