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
3 changes: 2 additions & 1 deletion src/Core/Components/KeyCode/FluentKeyCode.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,8 @@ public async ValueTask DisposeAsync()
}
}
catch (Exception ex) when (ex is JSDisconnectedException ||
ex is OperationCanceledException)
ex is OperationCanceledException ||
ex is JSException)
{
// The JSRuntime side may routinely be gone already if the reason we're disposing is that
// the client disconnected. This is not an error.
Expand Down
21 changes: 13 additions & 8 deletions src/Core/Components/KeyCode/FluentKeyCode.razor.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,19 +77,24 @@ export function RegisterKeyCode(globalDocument, eventNames, id, elementRef, only
}

export function UnregisterKeyCode(eventId) {
if (!document.fluentKeyCodeEvents) {
return;
}

if (document.fluentKeyCodeEvents != null) {
const keyEvent = document.fluentKeyCodeEvents[eventId];
const element = keyEvent.source;
const keyEvent = document.fluentKeyCodeEvents[eventId];
if (!keyEvent) {
return;
}

if (!!keyEvent.handlerKeydown) {
const element = keyEvent.source;
if (element) {
if (keyEvent.handlerKeydown) {
element.removeEventListener("keydown", keyEvent.handlerKeydown);
}

if (!!keyEvent.handlerKeyup) {
if (keyEvent.handlerKeyup) {
element.removeEventListener("keyup", keyEvent.handlerKeyup);
}

delete document.fluentKeyCodeEvents[eventId];
}

delete document.fluentKeyCodeEvents[eventId];
}
Loading