Skip to content

Merge dev onto main #311

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
Antoni-Czaplicki merged 1 commit into from
Jul 2, 2026
Merged

Merge dev onto main #311

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
22 changes: 22 additions & 0 deletions src/app/wrapped/use-wrapped-player.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,21 @@ function clampIndex(index: number, count: number): number {
return Math.max(0, Math.min(max, index));
}

const INTERACTIVE_KEYBOARD_TARGET =
'a[href], button, input, select, textarea, [contenteditable="true"], [role="button"], [role="checkbox"], [role="combobox"], [role="radio"], [role="searchbox"], [role="switch"], [role="textbox"]';

function hasInteractiveKeyboardTarget(event: KeyboardEvent): boolean {
return event.composedPath().some((target) => {
if (!(target instanceof HTMLElement)) {
return false;
}

return (
target.isContentEditable || target.matches(INTERACTIVE_KEYBOARD_TARGET)
);
});
}

interface UseWrappedPlayerOptions {
count: number;
getDuration: (index: number) => number;
Expand Down Expand Up @@ -150,6 +165,13 @@ export function useWrappedPlayer({
// Keyboard control.
useEffect(() => {
const onKey = (event: KeyboardEvent) => {
if (
hasInteractiveKeyboardTarget(event) ||
document.querySelector('[role="dialog"]') !== null
) {
return;
}

if (
event.key === "ArrowRight" ||
event.key === " " ||
Expand Down
Loading