Skip to content

chore: drop canOverrideNativeFocus runtime probe #177

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

Open
layershifter wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore: drop canOverrideNativeFocus runtime probe #177

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 3 additions & 31 deletions src/FocusEvent.mts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,27 +37,6 @@ interface WindowWithKeyborgFocusEvent extends Window {
__keyborgData?: KeyborgFocusEventData;
}

function canOverrideNativeFocus(win: Window): boolean {
const HTMLElement = (win as WindowWithKeyborgFocusEvent).HTMLElement;
const origFocus = HTMLElement.prototype.focus;

let isCustomFocusCalled = false;

HTMLElement.prototype.focus = function focus(): void {
isCustomFocusCalled = true;
};

const btn = win.document.createElement("button");

btn.focus();

HTMLElement.prototype.focus = origFocus;

return isCustomFocusCalled;
}

let _canOverrideNativeFocus = false;

export interface KeyborgFocusInEventDetails {
relatedTarget?: HTMLElement;
isFocusedProgrammatically?: boolean;
Expand Down Expand Up @@ -97,11 +76,6 @@ export function setupFocusEvent(win: Window): void {
const kwin = win as WindowWithKeyborgFocusEvent;
const doc = kwin.document;
const proto = kwin.HTMLElement.prototype;

if (!_canOverrideNativeFocus) {
_canOverrideNativeFocus = canOverrideNativeFocus(kwin);
}

const origFocus = proto.focus;

if ((origFocus as KeyborgFocus).__keyborgNativeFocus) {
Expand Down Expand Up @@ -258,12 +232,10 @@ export function setupFocusEvent(win: Window): void {
// Tabster (and other users) can still use the legacy details field - keeping for backwards compat
event.details = details;

if (_canOverrideNativeFocus || data[LAST_FOCUSED_PROGRAMMATICALLY]) {
details.isFocusedProgrammatically =
target === data[LAST_FOCUSED_PROGRAMMATICALLY]?.deref();
details.isFocusedProgrammatically =
target === data[LAST_FOCUSED_PROGRAMMATICALLY]?.deref();

data[LAST_FOCUSED_PROGRAMMATICALLY] = undefined;
}
data[LAST_FOCUSED_PROGRAMMATICALLY] = undefined;

target.dispatchEvent(event);
};
Expand Down