Skip to content
Merged
Changes from all commits
Commits
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
29 changes: 24 additions & 5 deletions components/ui/Input.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { forwardRef } from "react";
import { forwardRef, useId } from "react";
import { cn } from "@/lib/utils/cn";

interface InputProps extends React.InputHTMLAttributes<HTMLInputElement> {
Expand All @@ -8,13 +8,22 @@ interface InputProps extends React.InputHTMLAttributes<HTMLInputElement> {
}

export const Input = forwardRef<HTMLInputElement, InputProps>(function Input(
{ error, prefix, suffix, className, ...props },
{ error, prefix, suffix, className, id: propsId, ...props },
ref,
) {
const generatedId = useId();
const id = propsId ?? generatedId;
const errorId = `${id}-error`;
const describedBy =
[error && errorId, props["aria-describedby"]].filter(Boolean).join(" ") ||
undefined;
return (
<div className="relative">
{prefix && (
<span className="pointer-events-none absolute left-3 top-1/2 -translate-y-1/2 font-mono text-sm text-text-tertiary">
<span
aria-hidden="true"
className="pointer-events-none absolute left-3 top-1/2 -translate-y-1/2 font-mono text-sm text-text-tertiary"
>
{prefix}
</span>
)}
Expand All @@ -30,13 +39,23 @@ export const Input = forwardRef<HTMLInputElement, InputProps>(function Input(
className,
)}
{...props}
id={id}
aria-invalid={error ? true : undefined}
aria-describedby={describedBy}
/>
{suffix && (
<span className="pointer-events-none absolute right-3 top-1/2 -translate-y-1/2 font-mono text-sm text-text-tertiary">
<span
aria-hidden="true"
className="pointer-events-none absolute right-3 top-1/2 -translate-y-1/2 font-mono text-sm text-text-tertiary"
>
{suffix}
</span>
)}
{error && <p className="mt-1 text-xs text-accent">{error}</p>}
{error && (
<p id={errorId} role="alert" className="mt-1 text-xs text-accent">
{error}
</p>
)}
</div>
);
});
Loading