shortcut for enter to unfocus + slash to focus searchbar

This commit is contained in:
mrjvs 2023-11-29 18:20:31 +01:00
parent 08cc5260bd
commit 8bf6510eaf
4 changed files with 121 additions and 77 deletions

View File

@ -1,5 +1,5 @@
import c from "classnames";
import { useState } from "react";
import { forwardRef, useState } from "react";
import { Flare } from "@/components/utils/Flare";
@ -13,50 +13,53 @@ export interface SearchBarProps {
value: string;
}
export function SearchBarInput(props: SearchBarProps) {
const [focused, setFocused] = useState(false);
export const SearchBarInput = forwardRef<HTMLInputElement, SearchBarProps>(
(props, ref) => {
const [focused, setFocused] = useState(false);
function setSearch(value: string) {
props.onChange(value, false);
}
function setSearch(value: string) {
props.onChange(value, false);
}
return (
<Flare.Base
className={c({
"hover:flare-enabled group relative flex flex-col rounded-[28px] transition-colors sm:flex-row sm:items-center":
true,
"bg-search-background": !focused,
"bg-search-focused": focused,
})}
>
<Flare.Light
flareSize={400}
enabled={focused}
className="rounded-[28px]"
backgroundClass={c({
"transition-colors": true,
return (
<Flare.Base
className={c({
"hover:flare-enabled group relative flex flex-col rounded-[28px] transition-colors sm:flex-row sm:items-center":
true,
"bg-search-background": !focused,
"bg-search-focused": focused,
})}
/>
<Flare.Child className="flex flex-1 flex-col">
<div className="pointer-events-none absolute bottom-0 left-5 top-0 flex max-h-14 items-center text-search-icon">
<Icon icon={Icons.SEARCH} />
</div>
<TextInputControl
onUnFocus={() => {
setFocused(false);
props.onUnFocus();
}}
onFocus={() => setFocused(true)}
onChange={(val) => setSearch(val)}
value={props.value}
className="w-full flex-1 bg-transparent px-4 py-4 pl-12 text-search-text placeholder-search-placeholder focus:outline-none sm:py-4 sm:pr-2"
placeholder={props.placeholder}
>
<Flare.Light
flareSize={400}
enabled={focused}
className="rounded-[28px]"
backgroundClass={c({
"transition-colors": true,
"bg-search-background": !focused,
"bg-search-focused": focused,
})}
/>
</Flare.Child>
</Flare.Base>
);
}
<Flare.Child className="flex flex-1 flex-col">
<div className="pointer-events-none absolute bottom-0 left-5 top-0 flex max-h-14 items-center text-search-icon">
<Icon icon={Icons.SEARCH} />
</div>
<TextInputControl
ref={ref}
onUnFocus={() => {
setFocused(false);
props.onUnFocus();
}}
onFocus={() => setFocused(true)}
onChange={(val) => setSearch(val)}
value={props.value}
className="w-full flex-1 bg-transparent px-4 py-4 pl-12 text-search-text placeholder-search-placeholder focus:outline-none sm:py-4 sm:pr-2"
placeholder={props.placeholder}
/>
</Flare.Child>
</Flare.Base>
);
}
);

View File

@ -0,0 +1,22 @@
import { useEffect } from "react";
export function useSlashFocus(ref: React.RefObject<HTMLInputElement>) {
useEffect(() => {
const listener = (e: KeyboardEvent) => {
if (e.key === "/") {
if (
document.activeElement &&
document.activeElement.tagName.toLowerCase() === "input"
)
return;
e.preventDefault();
ref.current?.focus();
}
};
window.addEventListener("keydown", listener);
return () => {
window.removeEventListener("keydown", listener);
};
}, [ref]);
}

View File

@ -1,3 +1,5 @@
import { forwardRef } from "react";
export interface TextInputControlPropsNoLabel {
onChange?: (data: string) => void;
onUnFocus?: () => void;
@ -13,39 +15,51 @@ export interface TextInputControlProps extends TextInputControlPropsNoLabel {
label?: string;
}
export function TextInputControl({
onChange,
onUnFocus,
value,
label,
name,
autoComplete,
className,
placeholder,
onFocus,
}: TextInputControlProps) {
const input = (
<input
type="text"
className={className}
placeholder={placeholder}
onChange={(e) => onChange && onChange(e.target.value)}
value={value}
name={name}
autoComplete={autoComplete}
onBlur={() => onUnFocus && onUnFocus()}
onFocus={() => onFocus?.()}
/>
);
if (label) {
return (
<label>
<span>{label}</span>
{input}
</label>
export const TextInputControl = forwardRef<
HTMLInputElement,
TextInputControlProps
>(
(
{
onChange,
onUnFocus,
value,
label,
name,
autoComplete,
className,
placeholder,
onFocus,
},
ref
) => {
const input = (
<input
type="text"
ref={ref}
className={className}
placeholder={placeholder}
onChange={(e) => onChange && onChange(e.target.value)}
value={value}
name={name}
autoComplete={autoComplete}
onBlur={() => onUnFocus && onUnFocus()}
onFocus={() => onFocus?.()}
onKeyDown={(e) =>
e.key === "Enter" ? (e.target as HTMLInputElement).blur() : null
}
/>
);
}
return input;
}
if (label) {
return (
<label>
<span>{label}</span>
{input}
</label>
);
}
return input;
}
);

View File

@ -1,8 +1,9 @@
import { useCallback, useState } from "react";
import { useCallback, useRef, useState } from "react";
import Sticky from "react-sticky-el";
import { SearchBarInput } from "@/components/form/SearchBar";
import { ThinContainer } from "@/components/layout/ThinContainer";
import { useSlashFocus } from "@/components/player/hooks/useSlashFocus";
import { HeroTitle } from "@/components/text/HeroTitle";
import { useRandomTranslation } from "@/hooks/useRandomTranslation";
import { useSearchQuery } from "@/hooks/useSearchQuery";
@ -33,6 +34,9 @@ export function HeroPart({ setIsSticky, searchParams }: HeroPartProps) {
const title = t(`home.titles.${time}`);
const inputRef = useRef<HTMLInputElement>(null);
useSlashFocus(inputRef);
return (
<ThinContainer>
<div className="mt-44 space-y-16 text-center">
@ -48,6 +52,7 @@ export function HeroPart({ setIsSticky, searchParams }: HeroPartProps) {
onFixedToggle={stickStateChanged}
>
<SearchBarInput
ref={inputRef}
onChange={setSearch}
value={search}
onUnFocus={setSearchUnFocus}