Skip to content

Contain keyboard focus within the active sign-in overlay #672

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

Draft
Copilot wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Contain keyboard focus within the active sign-in overlay #672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b90037
Initial plan
Copilot Sep 18, 2026
3027962
Keep sign-in keyboard focus and accessibility within active overlay
Copilot Sep 18, 2026
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/renderer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ <h2 class="signin-title">OneNote Web Clipper</h2>
<button id="signin-msa-btn" class="signin-btn">Sign in with Microsoft account</button>
<button id="signin-orgid-btn" class="signin-btn signin-btn-secondary">Sign in with work or school account</button>
<div id="signin-error" class="signin-error" role="alert" style="display:none;"></div>
<div id="signin-progress" class="signin-progress" style="display:none;">Signing in...</div>
<div id="signin-progress" class="signin-progress" tabindex="-1" style="display:none;">Signing in...</div>
</div>
</div>
<div id="preview-area">
Expand Down
27 changes: 24 additions & 3 deletions src/scripts/renderer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -826,27 +826,46 @@ let signinError = document.getElementById("signin-error") as HTMLDivElement;
let signinProgress = document.getElementById("signin-progress") as HTMLDivElement;
let signinMsaBtn = document.getElementById("signin-msa-btn") as HTMLButtonElement;
let signinOrgIdBtn = document.getElementById("signin-orgid-btn") as HTMLButtonElement;
let signinBackground = document.querySelectorAll<HTMLElement>("#preview-area, #sidebar, #aria-status");
signinMsaBtn.textContent = loc("WebClipper.Action.SigninMsa", "Sign in with a Microsoft account");
signinOrgIdBtn.textContent = loc("WebClipper.Action.SigninOrgId", "Sign in with a work or school account");

document.addEventListener("keydown", (e) => {
if (e.key !== "Tab" || signinOverlay.style.display === "none") { return; }
let buttons = [signinMsaBtn, signinOrgIdBtn].filter((button) => !button.disabled);
e.preventDefault();
if (!buttons.length) {
signinProgress.focus();
return;
}
let index = buttons.indexOf(document.activeElement as HTMLButtonElement);
let nextIndex = index < 0 ? (e.shiftKey ? buttons.length - 1 : 0)
: (index + (e.shiftKey ? -1 : 1) + buttons.length) % buttons.length;
buttons[nextIndex].focus();
});

function showSignInPanel() {
signinOverlay.style.display = "flex";
// Inert also removes the background previews and live region from the accessibility tree.
signinBackground.forEach((element) => { element.inert = true; });
// Focus first sign-in button for keyboard/screen reader users
setTimeout(function() { signinMsaBtn.focus(); }, 100);
signinMsaBtn.focus();
}

function hideSignInPanel() {
signinOverlay.style.display = "none";
signinBackground.forEach((element) => { element.inert = false; });
// Move focus to first mode button
let firstModeBtn = document.querySelector(".mode-btn") as HTMLElement;
if (firstModeBtn) { setTimeout(function() { firstModeBtn.focus(); }, 100); }
if (firstModeBtn) { firstModeBtn.focus(); }
}

function showSignInProgress() {
signinMsaBtn.disabled = true;
signinOrgIdBtn.disabled = true;
signinProgress.style.display = "block";
signinError.style.display = "none";
signinProgress.focus();
}

function showSignInError(msg: string) {
Expand All @@ -855,6 +874,7 @@ function showSignInError(msg: string) {
signinProgress.style.display = "none";
signinError.textContent = msg;
signinError.style.display = "block";
signinMsaBtn.focus();
}

// Log renderer invocation
Expand Down Expand Up @@ -3276,6 +3296,7 @@ port.onMessage.addListener((message: any) => {
signinOrgIdBtn.disabled = false;
signinProgress.style.display = "none";
signinError.style.display = "none";
signinMsaBtn.focus();
} else {
showSignInError(message.error || loc("WebClipper.Error.SignInUnsuccessful", "Sign-in failed. Please try again."));
}
Expand Down Expand Up @@ -3335,7 +3356,7 @@ port.onMessage.addListener((message: any) => {
iframe.style.display = "none";
previewFrameWrap.style.display = "none";
capturePanel.style.display = "none";
// Buttons stay interactive; the sign-in overlay covers them while signed out.
// The sign-in overlay makes the background inert while signed out.
document.querySelectorAll(".mode-btn").forEach((b) => {
b.classList.remove("selected");
});
Expand Down