Merge branch 'master' into releases/v0.23

fsbolero · Sep 16, 2023 · 8bd3fac · 8bd3fac
2 parents 38ffd45 + 8d316a6
commit 8bd3fac
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 24 deletions.
diff --git a/src/Bolero.Html/Html.fs b/src/Bolero.Html/Html.fs
@@ -1534,13 +1534,13 @@ module on =
 
     /// <summary>Create a handler for HTML event <c>wheel</c>.</summary>
     /// <param name="callback">The event callback.</param>
-    let inline wheel (callback: MouseEventArgs -> unit) : Attr =
-        attr.callback<MouseEventArgs> "onwheel" callback
+    let inline wheel (callback: WheelEventArgs -> unit) : Attr =
+        attr.callback<WheelEventArgs> "onwheel" callback
 
     /// <summary>Create a handler for HTML event <c>mousewheel</c>.</summary>
     /// <param name="callback">The event callback.</param>
-    let inline mousewheel (callback: MouseEventArgs -> unit) : Attr =
-        attr.callback<MouseEventArgs> "onmousewheel" callback
+    let inline mousewheel (callback: WheelEventArgs -> unit) : Attr =
+        attr.callback<WheelEventArgs> "onmousewheel" callback
 
     /// <summary>Create a handler for HTML event <c>contextmenu</c>.</summary>
     /// <param name="callback">The event callback.</param>
@@ -1864,8 +1864,8 @@ module on =
 
     /// <summary>Create a handler for HTML event <c>error</c>.</summary>
     /// <param name="callback">The event callback.</param>
-    let inline error (callback: ProgressEventArgs -> unit) : Attr =
-        attr.callback<ProgressEventArgs> "onerror" callback
+    let inline error (callback: ErrorEventArgs -> unit) : Attr =
+        attr.callback<ErrorEventArgs> "onerror" callback
 
     /// <summary>Create a handler for HTML event <c>activate</c>.</summary>
     /// <param name="callback">The event callback.</param>
@@ -1991,12 +1991,12 @@ module on =
             attr.async.callback<MouseEventArgs> "ondblclick" callback
         /// <summary>Create an asynchronous handler for HTML event <c>wheel</c>.</summary>
         /// <param name="callback">The event callback.</param>
-        let inline wheel (callback: MouseEventArgs -> Async<unit>) : Attr =
-            attr.async.callback<MouseEventArgs> "onwheel" callback
+        let inline wheel (callback: WheelEventArgs -> Async<unit>) : Attr =
+            attr.async.callback<WheelEventArgs> "onwheel" callback
         /// <summary>Create an asynchronous handler for HTML event <c>mousewheel</c>.</summary>
         /// <param name="callback">The event callback.</param>
-        let inline mousewheel (callback: MouseEventArgs -> Async<unit>) : Attr =
-            attr.async.callback<MouseEventArgs> "onmousewheel" callback
+        let inline mousewheel (callback: WheelEventArgs -> Async<unit>) : Attr =
+            attr.async.callback<WheelEventArgs> "onmousewheel" callback
         /// <summary>Create an asynchronous handler for HTML event <c>contextmenu</c>.</summary>
         /// <param name="callback">The event callback.</param>
         let inline contextmenu (callback: MouseEventArgs -> Async<unit>) : Attr =
@@ -2255,8 +2255,8 @@ module on =
             attr.async.callback<ProgressEventArgs> "onprogress" callback
         /// <summary>Create an asynchronous handler for HTML event <c>error</c>.</summary>
         /// <param name="callback">The event callback.</param>
-        let inline error (callback: ProgressEventArgs -> Async<unit>) : Attr =
-            attr.async.callback<ProgressEventArgs> "onerror" callback
+        let inline error (callback: ErrorEventArgs -> Async<unit>) : Attr =
+            attr.async.callback<ErrorEventArgs> "onerror" callback
         /// <summary>Create an asynchronous handler for HTML event <c>activate</c>.</summary>
         /// <param name="callback">The event callback.</param>
         let inline activate (callback: EventArgs -> Async<unit>) : Attr =
@@ -2368,12 +2368,12 @@ module on =
             attr.task.callback<MouseEventArgs> "ondblclick" callback
         /// <summary>Create an asynchronous handler for HTML event <c>wheel</c>.</summary>
         /// <param name="callback">The event callback.</param>
-        let inline wheel (callback: MouseEventArgs -> Task) : Attr =
-            attr.task.callback<MouseEventArgs> "onwheel" callback
+        let inline wheel (callback: WheelEventArgs -> Task) : Attr =
+            attr.task.callback<WheelEventArgs> "onwheel" callback
         /// <summary>Create an asynchronous handler for HTML event <c>mousewheel</c>.</summary>
         /// <param name="callback">The event callback.</param>
-        let inline mousewheel (callback: MouseEventArgs -> Task) : Attr =
-            attr.task.callback<MouseEventArgs> "onmousewheel" callback
+        let inline mousewheel (callback: WheelEventArgs -> Task) : Attr =
+            attr.task.callback<WheelEventArgs> "onmousewheel" callback
         /// <summary>Create an asynchronous handler for HTML event <c>contextmenu</c>.</summary>
         /// <param name="callback">The event callback.</param>
         let inline contextmenu (callback: MouseEventArgs -> Task) : Attr =
@@ -2632,8 +2632,8 @@ module on =
             attr.task.callback<ProgressEventArgs> "onprogress" callback
         /// <summary>Create an asynchronous handler for HTML event <c>error</c>.</summary>
         /// <param name="callback">The event callback.</param>
-        let inline error (callback: ProgressEventArgs -> Task) : Attr =
-            attr.task.callback<ProgressEventArgs> "onerror" callback
+        let inline error (callback: ErrorEventArgs -> Task) : Attr =
+            attr.task.callback<ErrorEventArgs> "onerror" callback
         /// <summary>Create an asynchronous handler for HTML event <c>activate</c>.</summary>
         /// <param name="callback">The event callback.</param>
         let inline activate (callback: EventArgs -> Task) : Attr =

diff --git a/src/Bolero.Templating.Provider/Parsing.fs b/src/Bolero.Templating.Provider/Parsing.fs
@@ -78,8 +78,8 @@ module HoleType =
         | "onmouseup" -> typeof<MouseEventArgs>
         | "onclick" -> typeof<MouseEventArgs>
         | "ondblclick" -> typeof<MouseEventArgs>
-        | "onwheel" -> typeof<MouseEventArgs>
-        | "onmousewheel" -> typeof<MouseEventArgs>
+        | "onwheel" -> typeof<WheelEventArgs>
+        | "onmousewheel" -> typeof<WheelEventArgs>
         | "oncontextmenu" -> typeof<MouseEventArgs>
         | "ondrag" -> typeof<DragEventArgs>
         | "ondragend" -> typeof<DragEventArgs>
@@ -118,7 +118,7 @@ module HoleType =
         | "onload" -> typeof<ProgressEventArgs>
         | "onloadend" -> typeof<ProgressEventArgs>
         | "onprogress" -> typeof<ProgressEventArgs>
-        | "onerror" -> typeof<ProgressEventArgs>
+        | "onerror" -> typeof<ErrorEventArgs>
 // END EVENTS
         | _ -> typeof<EventArgs>
 

diff --git a/src/Bolero/Bolero.fsproj b/src/Bolero/Bolero.fsproj
@@ -24,6 +24,9 @@
     <None Include="Bolero.targets" />
     <None Include="paket.references" />
     <None Include="paket.template" />
+    <None Include="attrs.csv" />
+    <None Include="events.csv" />
+    <None Include="tags.csv" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Bolero.Build\Bolero.Build.csproj">

diff --git a/src/Bolero/events.csv b/src/Bolero/events.csv
@@ -10,8 +10,8 @@ mousedown,Mouse
 mouseup,Mouse
 click,Mouse
 dblclick,Mouse
-wheel,Mouse
-mousewheel,Mouse
+wheel,Wheel
+mousewheel,Wheel
 contextmenu,Mouse
 drag,Drag
 dragend,Drag
@@ -76,7 +76,7 @@ abort,Progress
 load,Progress
 loadend,Progress
 progress,Progress
-error,Progress
+error,Error
 activate,
 beforeactivate,
 beforedeactivate,

diff --git a/src/tpdummy/Microsoft.AspNetCore.Components.Web/Library.fs b/src/tpdummy/Microsoft.AspNetCore.Components.Web/Library.fs
@@ -8,6 +8,7 @@ type MouseEventArgs = class end
 type PointerEventArgs = class end
 type ProgressEventArgs = class end
 type TouchEventArgs = class end
+type WheelEventArgs = class inherit MouseEventArgs end
 
 namespace Microsoft.AspNetCore.Components.Web.Virtualization