Fix TapGestureRecognizer not working

muak · Dec 5, 2023 · daa719a · daa719a
1 parent abc4b47
commit daa719a
Show file tree

Hide file tree

Showing 12 changed files with 134 additions and 49 deletions.
diff --git a/AiForms.Maui.SettingsView.sln b/AiForms.Maui.SettingsView.sln
@@ -8,9 +8,6 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SettingsView", "SettingsView\SettingsView.csproj", "{B73793A3-0AA7-4086-8F2B-A3CE3A5E6BE1}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{547F99F7-22F8-4C24-A613-9F088A9F2BD3}"
-	ProjectSection(SolutionItems) = preProject
-		nuget\AzurePipelines.nuspec = nuget\AzurePipelines.nuspec
-	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/Sample/MauiProgram.cs b/Sample/MauiProgram.cs
@@ -25,6 +25,7 @@ public static MauiApp CreateMauiApp()
                     containerRegistry.RegisterForNavigation<ContentPage>();
                     containerRegistry.RegisterForNavigation<ListPage, ListViewModel>();
                     containerRegistry.RegisterForNavigation<CustomHeaderPage, CustomHeaderViewModel>();
+                    containerRegistry.RegisterForNavigation<TapSurveyPage, TapSurveyViewModel>();
                 })
                 .OnAppStart(async(container, navigation) =>
                 {

diff --git a/Sample/ViewModels/MainViewModel.cs b/Sample/ViewModels/MainViewModel.cs
@@ -48,7 +48,7 @@ public MainViewModel(INavigationService navigationService)
 
                 //Description.Value += "01234567890";
                 //await navigationService.NavigateAsync("ListPage");
-                await navigationService.NavigateAsync("CustomHeaderPage");
+                await navigationService.NavigateAsync("TapSurveyPage");
             });
 
             AddContentCommand.Subscribe(_ =>

diff --git a/Sample/ViewModels/TapSurveyViewModel.cs b/Sample/ViewModels/TapSurveyViewModel.cs
@@ -0,0 +1,10 @@
+using System;
+namespace Sample.ViewModels;
+
+public class TapSurveyViewModel:BindableBase
+{
+    public TapSurveyViewModel()
+    {
+    }
+}
+
diff --git a/Sample/Views/TapSurveyPage.xaml b/Sample/Views/TapSurveyPage.xaml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:sv="clr-namespace:AiForms.Settings;assembly=SettingsView"
+             x:Class="Sample.Views.TapSurveyPage"
+             Title="TapSurveyPage">
+    <sv:SettingsView>
+
+        <sv:Section>
+            <sv:Section.HeaderView>
+                <HorizontalStackLayout>
+                    <Label Text="Header" HeightRequest="44">
+                        <Label.GestureRecognizers>
+                            <TapGestureRecognizer Tapped="TapGestureRecognizer_Tapped_3" />
+                        </Label.GestureRecognizers>
+                    </Label>
+                </HorizontalStackLayout>
+            </sv:Section.HeaderView>
+
+            <sv:Section.FooterView>
+                <HorizontalStackLayout>
+                    <Label Text="Footer" HeightRequest="44">
+                        <Label.GestureRecognizers>
+                            <TapGestureRecognizer Tapped="TapGestureRecognizer_Tapped_4" />
+                        </Label.GestureRecognizers>
+                    </Label>
+                </HorizontalStackLayout>
+            </sv:Section.FooterView>
+
+            <sv:CustomCell IsSelectable="True">
+
+                <Grid ColumnDefinitions="*,*,*">
+                    <StackLayout Grid.Column="0">
+                        <StackLayout.GestureRecognizers>
+                            <TapGestureRecognizer Tapped="TapGestureRecognizer_Tapped" />
+                        </StackLayout.GestureRecognizers>
+                        <Image />
+                        <Label Text="A"
+                               FontAttributes="Bold"
+                               HorizontalOptions="Center"/>
+                    </StackLayout>
+                    <StackLayout Grid.Column="1">
+                        <StackLayout.GestureRecognizers>
+                            <TapGestureRecognizer Tapped="TapGestureRecognizer_Tapped_1" />
+                        </StackLayout.GestureRecognizers>
+                        <Image />
+                        <Label Text="B"
+                               FontAttributes="Bold"
+                               HorizontalOptions="Center"/>
+                    </StackLayout>
+                    <StackLayout Grid.Column="2">
+                        <StackLayout.GestureRecognizers>
+                            <TapGestureRecognizer Tapped="TapGestureRecognizer_Tapped_2" />
+                        </StackLayout.GestureRecognizers>
+                        <Image />
+                        <Label Text="C"
+                               FontAttributes="Bold"
+                               HorizontalOptions="Center"/>
+                    </StackLayout>
+                </Grid>
+
+            </sv:CustomCell>
+
+        </sv:Section>
+
+    </sv:SettingsView>
+</ContentPage>
diff --git a/Sample/Views/TapSurveyPage.xaml.cs b/Sample/Views/TapSurveyPage.xaml.cs
@@ -0,0 +1,29 @@
+namespace Sample.Views;
+
+public partial class TapSurveyPage : ContentPage
+{
+    public TapSurveyPage()
+    {
+        InitializeComponent();
+    }
+
+    void TapGestureRecognizer_Tapped(System.Object sender, Microsoft.Maui.Controls.TappedEventArgs e)
+    {
+    }
+
+    void TapGestureRecognizer_Tapped_1(System.Object sender, Microsoft.Maui.Controls.TappedEventArgs e)
+    {
+    }
+
+    void TapGestureRecognizer_Tapped_2(System.Object sender, Microsoft.Maui.Controls.TappedEventArgs e)
+    {
+    }
+
+    void TapGestureRecognizer_Tapped_3(System.Object sender, Microsoft.Maui.Controls.TappedEventArgs e)
+    {
+    }
+
+    void TapGestureRecognizer_Tapped_4(System.Object sender, Microsoft.Maui.Controls.TappedEventArgs e)
+    {
+    }
+}
diff --git a/SettingsView/Platforms/Android/FormsViewContainer.cs b/SettingsView/Platforms/Android/FormsViewContainer.cs
@@ -138,6 +138,11 @@ public void DisconnectHandler()
 
     public void UpdateCell(View view)
     {
+        // Workaround GestureRecognizer bug
+        // TODO: if fix this issue, remove the following code.
+        // https://github.com/dotnet/maui/issues/17948
+        view.Parent = Application.Current.MainPage;
+
         if (_contentView == view && !CustomCell.IsForceLayout)
         {
             return;

diff --git a/SettingsView/Platforms/Android/HeaderFooterContainer.cs b/SettingsView/Platforms/Android/HeaderFooterContainer.cs
@@ -110,6 +110,11 @@ public void UpdateIsEnabled()
 
     public void UpdateCell(View view)
     {
+        // Workaround GestureRecognizer bug
+        // TODO: if fix this issue, remove the following code.
+        // https://github.com/dotnet/maui/issues/17948
+        view.Parent = Application.Current.MainPage;
+
         if (_contentView != null)
         {
             _contentView.PropertyChanged -= CellPropertyChanged;

diff --git a/SettingsView/Platforms/iOS/Cells/CustomCellContent.cs b/SettingsView/Platforms/iOS/Cells/CustomCellContent.cs
@@ -96,6 +96,11 @@ protected virtual void UpdateIsEnabled()
 
     public virtual void UpdateCell(View newCell, UITableView tableView)
     {
+        // Workaround GestureRecognizer bug
+        // TODO: if fix this issue, remove the following code.
+        // https://github.com/dotnet/maui/issues/17948
+        newCell.Parent = Application.Current.MainPage;
+
         _tableView = tableView;       
 
         var oldCell = _virtualCell;
@@ -149,6 +154,11 @@ public virtual void UpdateCell(View newCell, UITableView tableView)
         }
         else
         {
+            // Workaround GestureRecognizer bug
+            // TODO: if fix this issue, remove the following code.
+            // https://github.com/dotnet/maui/issues/17948
+            newCell.Parent = Application.Current.MainPage;
+
             // If Handler is not generated, generate it.            
             handler = newCell.ToHandler(newCell.FindMauiContext());
         }

diff --git a/SettingsView/Platforms/iOS/CustomHeaderFooterView.cs b/SettingsView/Platforms/iOS/CustomHeaderFooterView.cs
@@ -142,6 +142,11 @@ protected virtual void UpdateIsEnabled()
 
     public virtual void UpdateCell(View newCell,UITableView tableView)
     {
+        // Workaround GestureRecognizer bug
+        // TODO: if fix this issue, remove the following code.
+        // https://github.com/dotnet/maui/issues/17948
+        newCell.Parent = Application.Current.MainPage;
+
         if (_virtualCell == newCell)
         {
             return;

diff --git a/SettingsView/SettingsView.csproj b/SettingsView/SettingsView.csproj
@@ -20,7 +20,7 @@
 		<Description>This is a flexible TableView specialized in settings for Android / iOS. 
 There are various cells such as (LabelCell,ButtonCell,CommandCell,SwitchCell,CheckboxCell,RadioCell,PickerCell,EntryCell,NumberPickerCell,TimePickerCell,DatePickerCell,CustomCell)</Description>
 		<PackageReleaseNotes>
-			Supported .NET8
+			Fix TapGestureRecognizer issue
         </PackageReleaseNotes>
 		<PackageTags>MAUI TableView Cell Setting Configuration Option ListView UITableView RecyclerView ReOrder DragDrop</PackageTags>
 	</PropertyGroup>

diff --git a/nuget/AzurePipelines.nuspec b/nuget/AzurePipelines.nuspec