Skip to content

Remove MouseWithTargetIdEventArgs #569

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vnbaaij merged 5 commits into from
Jul 19, 2023
Merged

Remove MouseWithTargetIdEventArgs #569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4319ae6
Allow click on group of collapsed nav menu to trigger its action
mrpmorris Jul 19, 2023
1852803
Renamed TargetIdMouseEventArgs to MouseWithTargetIdEventArgs
mrpmorris Jul 19, 2023
149856e
Remove unneeded MouseWithTargetIdEventArgs
mrpmorris Jul 19, 2023
25ce021
Merge from upstream
mrpmorris Jul 19, 2023
63a791a
Remove MouseWithTargetIdEventArgs
mrpmorris Jul 19, 2023
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
11 changes: 0 additions & 11 deletions examples/Demo/Shared/Microsoft.Fast.Components.FluentUI.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions src/Core/Components/NavMenu/FluentNavMenuGroup.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
SelectedChanged="@HandleSelectedChangedAsync"
Expanded="@Expanded"
ExpandedChanged="@SetExpandedAsync"
Text="@Text"
@onclickwithtargetid="@HandleClickAsync">
Text="@Text">
@if (HasIcon)
{
<FluentIcon Value="@Icon" Width="20px" Slot="start" />
Expand Down
11 changes: 0 additions & 11 deletions src/Core/Components/NavMenu/FluentNavMenuGroup.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,17 +106,6 @@ protected internal override async ValueTask ExecuteAsync(NavMenuActionArgs args)

private Task ToggleCollapsedAsync() => SetExpandedAsync(!Expanded);

private async Task HandleClickAsync(MouseWithTargetIdEventArgs args)
{
if (args.TargetId != Id || args.Button != 0)
{
return;
}

var navMenuActionArgs = new NavMenuActionArgs(this);
await ExecuteAsync(navMenuActionArgs);
}

private async Task SetExpandedAsync(bool value)
{
if (value != Expanded)
Expand Down
1 change: 0 additions & 1 deletion src/Core/Events/EventHandlers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ namespace Microsoft.Fast.Components.FluentUI;
[EventHandler("onclosecolumnoptions", typeof(EventArgs), enableStopPropagation: true, enablePreventDefault: true)]
[EventHandler("ontooltipdismiss", typeof(EventArgs), enableStopPropagation: true, enablePreventDefault: true)]
[EventHandler("onsizechanged", typeof(EventArgs), enableStopPropagation: true, enablePreventDefault: true)]
[EventHandler("onclickwithtargetid", typeof(MouseWithTargetIdEventArgs), enableStopPropagation: true, enablePreventDefault:true)]
public static class EventHandlers
{
}
15 changes: 0 additions & 15 deletions src/Core/Events/MouseWithTargetIdEventArgs.cs
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions src/Core/wwwroot/Microsoft.Fast.Components.FluentUI.lib.module.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,6 @@ export function afterStarted(Blazor) {

customElements.define("split-panels", SplitPanels);


Blazor.registerCustomEventType('clickwithtargetid', {
browserEventName: 'click',
createEventArgs: event => {
let id = event.target.attributes['id']?.value ?? null;
return {
button: event.button,
buttons: event.buttons,
clientX: event.clientX,
clientY: event.clientY,
screenX: event.screenX,
screenY: event.screenY,
detail: event.detail,
altKey: event.altKey,
ctrlKey: event.ctrlKey,
metaKey: event.metaKey,
shiftKey: event.shiftKey,
type: event.type,
targetId: id
};
}
});
Blazor.registerCustomEventType('radiogroupclick', {
browserEventName: 'click',
createEventArgs: event => {
Expand Down