Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Components/Web.JS/dist/Release/blazor.server.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/Components/Web.JS/dist/Release/blazor.webview.js

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions src/Components/Web.JS/src/Rendering/Events/EventTypes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,8 @@ function parseMouseEvent(event: MouseEvent): MouseEventArgs {
offsetY: event.offsetY,
pageX: event.pageX,
pageY: event.pageY,
movementX: event.movementX,
movementY: event.movementY,
button: event.button,
buttons: event.buttons,
ctrlKey: event.ctrlKey,
Expand Down Expand Up @@ -421,6 +423,8 @@ interface MouseEventArgs {
offsetY: number;
pageX: number;
pageY: number;
movementX: number;
movementY: number;
button: number;
buttons: number;
ctrlKey: boolean;
Expand Down
4 changes: 4 additions & 0 deletions src/Components/Web/src/PublicAPI.Unshipped.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,7 @@ Microsoft.AspNetCore.Components.Forms.InputRadio<TValue>.Element.get -> Microsof
Microsoft.AspNetCore.Components.Forms.InputRadio<TValue>.Element.set -> void
Microsoft.AspNetCore.Components.Web.Virtualization.Virtualize<TItem>.SpacerElement.get -> string!
Microsoft.AspNetCore.Components.Web.Virtualization.Virtualize<TItem>.SpacerElement.set -> void
Microsoft.AspNetCore.Components.Web.MouseEventArgs.MovementX.get -> double
Microsoft.AspNetCore.Components.Web.MouseEventArgs.MovementX.set -> void
Microsoft.AspNetCore.Components.Web.MouseEventArgs.MovementY.get -> double
Microsoft.AspNetCore.Components.Web.MouseEventArgs.MovementY.set -> void
10 changes: 10 additions & 0 deletions src/Components/Web/src/Web/MouseEventArgs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,16 @@ public class MouseEventArgs : EventArgs
/// </summary>
public double PageY { get; set; }

/// <summary>
/// The X coordinate of the mouse pointer relative to the position of the last mousemove event.
/// </summary>
public double MovementX { get; set; }

/// <summary>
/// The Y coordinate of the mouse pointer relative to the position of the last mousemove event.
/// </summary>
public double MovementY { get; set; }

/// <summary>
/// The button number that was pressed when the mouse event was fired:
/// Left button=0,
Expand Down
10 changes: 10 additions & 0 deletions src/Components/Web/src/WebEventData/MouseEventArgsReader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ internal static class MouseEventArgsReader
private static readonly JsonEncodedText OffsetY = JsonEncodedText.Encode("offsetY");
private static readonly JsonEncodedText PageX = JsonEncodedText.Encode("pageX");
private static readonly JsonEncodedText PageY = JsonEncodedText.Encode("pageY");
private static readonly JsonEncodedText MovementX = JsonEncodedText.Encode("movementX");
private static readonly JsonEncodedText MovementY = JsonEncodedText.Encode("movementY");
private static readonly JsonEncodedText Button = JsonEncodedText.Encode("button");
private static readonly JsonEncodedText Buttons = JsonEncodedText.Encode("buttons");
private static readonly JsonEncodedText CtrlKey = JsonEncodedText.Encode("ctrlKey");
Expand Down Expand Up @@ -74,6 +76,14 @@ internal static void ReadProperty(MouseEventArgs eventArgs, JsonProperty propert
{
eventArgs.PageY = property.Value.GetDouble();
}
else if (property.NameEquals(MovementX.EncodedUtf8Bytes))
{
eventArgs.MovementX = property.Value.GetDouble();
}
else if (property.NameEquals(MovementY.EncodedUtf8Bytes))
{
eventArgs.MovementY = property.Value.GetDouble();
}
else if (property.NameEquals(Button.EncodedUtf8Bytes))
{
eventArgs.Button = property.Value.GetInt64();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ public void Read_Works()
PageY = 7.8,
ScreenX = 0.1,
ScreenY = 4.4,
MovementX = 0.1,
MovementY = 4.4,
ShiftKey = false,
Type = "type",
};
Expand Down Expand Up @@ -55,6 +57,8 @@ internal static void AssertEqual(MouseEventArgs expected, MouseEventArgs actual)
Assert.Equal(expected.PageY, actual.PageY);
Assert.Equal(expected.ScreenX, actual.ScreenX);
Assert.Equal(expected.ScreenY, actual.ScreenY);
Assert.Equal(expected.MovementX, actual.MovementX);
Assert.Equal(expected.MovementY, actual.MovementY);
Assert.Equal(expected.ShiftKey, actual.ShiftKey);
Assert.Equal(expected.Type, actual.Type);
}
Expand Down