Merge branch 'refactor-table' into revert-event

# Conflicts:
#	src/BootstrapBlazor/Components/BaseComponents/DynamicElement.cs

Author: ArgoZhang

src/BootstrapBlazor/Components/BaseComponents/DynamicElement.cs

@@ -78,6 +78,34 @@ public class DynamicElement : BootstrapComponentBase
     [Parameter]
     public bool TriggerContextMenu { get; set; }
 
+    /// <summary>
+    /// <para lang="zh">获得/设置 OnTouchStart 回调委托</para>
+    /// <para lang="en">Gets or sets the OnTouchStart callback delegate</para>
+    /// </summary>
+    [Parameter]
+    public Func<TouchEventArgs, Task>? OnTouchStart { get; set; }
+
+    /// <summary>
+    /// <para lang="zh">获得/设置 OnTouchEnd 回调委托</para>
+    /// <para lang="en">Gets or sets the OnTouchEnd callback delegate</para>
+    /// </summary>
+    [Parameter]
+    public Func<TouchEventArgs, Task>? OnTouchEnd { get; set; }
+
+    /// <summary>
+    /// <para lang="zh">获得/设置 是否触发 OnTouchStart 事件 默认 false</para>
+    /// <para lang="en">Gets or sets whether to trigger OnTouchStart events. Default is false</para>
+    /// </summary>
+    [Parameter]
+    public bool TriggerTouchStart { get; set; }
+
+    /// <summary>
+    /// <para lang="zh">获得/设置 是否触发 OnTouchEnd 事件 默认 false</para>
+    /// <para lang="en">Gets or sets whether to trigger OnTouchEnd events. Default is false</para>
+    /// </summary>
+    [Parameter]
+    public bool TriggerTouchEnd { get; set; }
+
     /// <summary>
     /// <para lang="zh">获得/设置 内容组件</para>
     /// <para lang="en">Gets or sets the child content</para>
@@ -139,6 +167,16 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)
             builder.AddEventPreventDefaultAttribute(9, "oncontextmenu", true);
         }
 
+        if (IsTriggerTouchStart())
+        {
+            builder.AddAttribute(11, "ontouchstart", EventCallback.Factory.Create<TouchEventArgs>(this, OnTriggerTouchStart));
+        }
+
+        if (IsTriggerTouchEnd())
+        {
+            builder.AddAttribute(12, "ontouchend", EventCallback.Factory.Create<TouchEventArgs>(this, OnTriggerTouchEnd));
+        }
+
         builder.AddContent(10, ChildContent);
 
         if (GenerateElement || IsTriggerClick() || IsTriggerDoubleClick())
@@ -153,6 +191,10 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)
 
     private bool IsTriggerContextMenu() => TriggerContextMenu && OnContextMenu != null;
 
+    private bool IsTriggerTouchStart() => TriggerTouchStart && OnTouchStart != null;
+
+    private bool IsTriggerTouchEnd() => TriggerTouchEnd && OnTouchEnd != null;
+
     private async Task OnTriggerClick()
     {
         if (OnClick != null)
@@ -176,4 +218,20 @@ private async Task OnTriggerContextMenu(MouseEventArgs e)
             await OnContextMenu(e);
         }
     }
+
+    private async Task OnTriggerTouchStart(TouchEventArgs e)
+    {
+        if (OnTouchStart != null)
+        {
+            await OnTouchStart(e);
+        }
+    }
+
+    private async Task OnTriggerTouchEnd(TouchEventArgs e)
+    {
+        if (OnTouchEnd != null)
+        {
+            await OnTouchEnd(e);
+        }
+    }
 }

src/BootstrapBlazor/Components/Table/Table.razor

@@ -734,7 +734,8 @@
         @<DynamicElement @key="GetKeyByITem(item)" TagName="tr"
                          class="@GetRowClassString(item)" style="@GetRowStyleString(item)" 
                          TriggerContextMenu="ContextMenuZone != null" OnContextMenu="e => OnContextMenu(e, item)"
-                         @ontouchstart="e => OnTouchStart(e, item)" @ontouchend="OnTouchEnd"
+                         TriggerTouchStart="true" OnTouchStart="e => OnTouchStart(e, item)"
+                         TriggerTouchEnd="true" OnTouchEnd="OnTouchEnd"
                          TriggerClick="@(ClickToSelect || OnClickRowCallback != null)" OnClick="() => ClickRow(item)"
                          TriggerDoubleClick="@(DoubleClickToEdit || OnDoubleClickRowCallback != null)"
                          OnDoubleClick="() => DoubleClickRow(item)">

src/BootstrapBlazor/Components/Table/Table.razor.cs

@@ -2000,9 +2000,10 @@ private async Task OnTouchStart(TouchEventArgs e, TItem item)
         }
     }
 
-    private void OnTouchEnd()
+    private Task OnTouchEnd(TouchEventArgs e)
     {
         TouchStart = false;
+        return Task.CompletedTask;
     }
 
     private object? GetKeyByITem(TItem item) => SortableList != null ? item : null; //OnGetRowKey?.Invoke(item);

test/UnitTest/Components/DynamicElementTest.cs

@@ -3,6 +3,8 @@
 // See the LICENSE file in the project root for more information.
 // Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone
 
+using Microsoft.AspNetCore.Components.Web;
+
 namespace UnitTest.Components;
 
 public class DynamicElementTest
@@ -18,4 +20,45 @@ public void Key_OK()
 
         Assert.Equal("<div></div>", cut.Markup);
     }
+
+    [Fact]
+    public void TouchEvents_Ok()
+    {
+        var context = new BunitContext();
+        TouchEventArgs? touchStartArgs = null;
+        TouchEventArgs? touchEndArgs = null;
+        var touchStartEventArgs = new TouchEventArgs
+        {
+            Touches = [new TouchPoint { ClientX = 10, ClientY = 20, ScreenX = 30, ScreenY = 40 }]
+        };
+        var touchEndEventArgs = new TouchEventArgs
+        {
+            ChangedTouches = [new TouchPoint { ClientX = 11, ClientY = 21, ScreenX = 31, ScreenY = 41 }]
+        };
+
+        var cut = context.Render<DynamicElement>(pb =>
+        {
+            pb.Add(a => a.TagName, "span");
+            pb.Add(a => a.TriggerTouchStart, true);
+            pb.Add(a => a.OnTouchStart, e =>
+            {
+                touchStartArgs = e;
+                return Task.CompletedTask;
+            });
+            pb.Add(a => a.TriggerTouchEnd, true);
+            pb.Add(a => a.OnTouchEnd, e =>
+            {
+                touchEndArgs = e;
+                return Task.CompletedTask;
+            });
+            pb.AddChildContent("Touch");
+        });
+
+        var element = cut.Find("span");
+        element.TriggerEvent("ontouchstart", touchStartEventArgs);
+        element.TriggerEvent("ontouchend", touchEndEventArgs);
+
+        Assert.Same(touchStartEventArgs, touchStartArgs);
+        Assert.Same(touchEndEventArgs, touchEndArgs);
+    }
 }