- Decouple the typeahead's dismiss from real focus: a separate `dismissed` flag (set on Escape/pick, cleared on typing/refocus) replaces manually clearing `focused`, so closing the panel no longer wedges it shut while the input keeps DOM focus — typing again re-opens it (verified in-browser). - Scroll the highlighted option into view during arrow-key nav (listRef + data-idx + scrollIntoView), instead of leaving listRef unused. - Wire the input as a combobox for screen readers: role=combobox, aria-autocomplete/expanded/controls/activedescendant + per-option ids. - Drop the redundant client-side .slice (the request already caps at limit=10). - SearchBar gains an `inputProps` passthrough for the combobox ARIA. - Add PlexSearchBox.dom.test.tsx (4 tests): per-scope pill options, suggestion render + keyboard pick→jumpTo, and the Escape→retype reopen regression. Reviewer's scrollbar-blur concern was a false positive — the listbox container is not focusable, so a mousedown on it never blurs the input.
103 lines
3.7 KiB
TypeScript
103 lines
3.7 KiB
TypeScript
import {
|
|
type FocusEventHandler,
|
|
type InputHTMLAttributes,
|
|
type KeyboardEventHandler,
|
|
type ReactNode,
|
|
} from "react";
|
|
import { useTranslation } from "react-i18next";
|
|
import { Search, X } from "lucide-react";
|
|
|
|
// The floating search pill in the top header. One component for every module that searches
|
|
// (feed, Plex, channels, playlists): a glass rounded box with a search icon, the input, a
|
|
// clear button, and a "Go" trigger (Enter also fires it). The feed passes its live-YouTube
|
|
// escalation as the Go action; the other modules filter as you type and Go just commits/blurs.
|
|
//
|
|
// Optional slots keep the box reusable while letting one module enrich it: `leading` replaces the
|
|
// search icon with a control (Plex's search scope-pill), and `below` renders an absolutely
|
|
// positioned panel attached under the box (Plex's instant typeahead results). `onFocus`/`onBlur`/
|
|
// `onKeyDown` pass through to the input so a caller can drive that panel (open on focus, arrow-key
|
|
// navigation); the built-in Enter→Go fires only if the caller didn't `preventDefault()` first.
|
|
export default function SearchBar({
|
|
value,
|
|
onChange,
|
|
placeholder,
|
|
onGo,
|
|
goLabel,
|
|
goIcon,
|
|
goDisabled,
|
|
goTitle,
|
|
leading,
|
|
below,
|
|
onFocus,
|
|
onBlur,
|
|
onKeyDown,
|
|
inputProps,
|
|
}: {
|
|
value: string;
|
|
onChange: (q: string) => void;
|
|
placeholder: string;
|
|
// Enter / the Go button call this. Omit to hide the Go button entirely.
|
|
onGo?: () => void;
|
|
goLabel?: string;
|
|
goIcon?: ReactNode;
|
|
goDisabled?: boolean;
|
|
goTitle?: string;
|
|
leading?: ReactNode;
|
|
below?: ReactNode;
|
|
onFocus?: FocusEventHandler<HTMLInputElement>;
|
|
onBlur?: FocusEventHandler<HTMLInputElement>;
|
|
onKeyDown?: KeyboardEventHandler<HTMLInputElement>;
|
|
// Extra attributes spread onto the <input> (e.g. Plex's combobox ARIA). Spread FIRST so the
|
|
// component's own value/handlers always win.
|
|
inputProps?: InputHTMLAttributes<HTMLInputElement>;
|
|
}) {
|
|
const { t } = useTranslation();
|
|
const fire = () => {
|
|
if (onGo && !goDisabled) onGo();
|
|
};
|
|
return (
|
|
<div className="pointer-events-auto relative flex-1 min-w-0 max-w-xl">
|
|
<div className="h-11 pl-3 pr-2 rounded-2xl glass-menu flex items-center gap-2 focus-within:outline-2 focus-within:outline-accent/60 focus-within:outline-offset-2">
|
|
{leading ?? <Search className="w-4 h-4 shrink-0 text-muted" />}
|
|
<input
|
|
{...inputProps}
|
|
value={value}
|
|
onChange={(e) => onChange(e.target.value)}
|
|
onFocus={onFocus}
|
|
onBlur={onBlur}
|
|
onKeyDown={(e) => {
|
|
onKeyDown?.(e);
|
|
if (e.key === "Enter" && !e.defaultPrevented) fire();
|
|
}}
|
|
placeholder={placeholder}
|
|
className="flex-1 min-w-0 bg-transparent outline-hidden text-sm placeholder:text-muted"
|
|
/>
|
|
{value && (
|
|
<button
|
|
onClick={() => onChange("")}
|
|
title={t("header.clearSearch")}
|
|
aria-label={t("header.clearSearch")}
|
|
className="shrink-0 p-0.5 rounded-full text-muted transition hover:text-fg hover:bg-border/60"
|
|
>
|
|
<X className="w-4 h-4" />
|
|
</button>
|
|
)}
|
|
{onGo && (
|
|
<button
|
|
onClick={fire}
|
|
disabled={goDisabled}
|
|
title={goTitle ?? goLabel ?? t("header.goTip")}
|
|
className="shrink-0 inline-flex items-center gap-1.5 rounded-xl bg-accent px-3 py-1.5 text-xs font-semibold text-accent-fg transition hover:opacity-90 disabled:opacity-40 disabled:pointer-events-none"
|
|
>
|
|
{goIcon}
|
|
<span className={goIcon ? "hidden md:inline" : undefined}>
|
|
{goLabel ?? t("header.go")}
|
|
</span>
|
|
</button>
|
|
)}
|
|
</div>
|
|
{below}
|
|
</div>
|
|
);
|
|
}
|