@passui/react 0.1.45 → 0.1.46

package/src/components/sheet/sheet.tsx

@@ -1,42 +1,42 @@
-import { AnimatePresence, motion, useReducedMotion } from "motion/react"
-import { type ReactNode, useRef } from "react"
-import { useVisualViewport } from "../../hooks/use-visual-viewport"
-import { cn } from "../../lib/class-names"
-import { contentCrossfade, spring, zoomReveal } from "../../motion/transitions"
-import { SheetPortal } from "./sheet-portal"
-import { useSheetFocus } from "./use-sheet-focus"
+import { AnimatePresence, motion, useReducedMotion } from "motion/react";
+import { type ReactNode, useRef } from "react";
+import { useVisualViewport } from "../../hooks/use-visual-viewport";
+import { cn } from "../../lib/class-names";
+import { contentCrossfade, spring, zoomReveal } from "../../motion/transitions";
+import { SheetPortal } from "./sheet-portal";
+import { useSheetFocus } from "./use-sheet-focus";
 
-export type SheetPlacement = "adaptive" | "center"
-export type SheetSize = "sm" | "md" | "lg"
+export type SheetPlacement = "adaptive" | "center";
+export type SheetSize = "sm" | "md" | "lg";
 
 const outerPaddings: Record<SheetSize, string> = {
-    sm: "p-4",
-    md: "p-6",
-    lg: "p-8",
-}
+	sm: "p-4",
+	md: "p-6",
+	lg: "p-8",
+};
 const panelMaxWidths: Record<SheetSize, string> = {
-    sm: "max-w-sm",
-    md: "max-w-[560px]",
-    lg: "max-w-2xl",
-}
+	sm: "max-w-sm",
+	md: "max-w-[560px]",
+	lg: "max-w-2xl",
+};
 
 export interface SheetProps {
-    /** Controls whether the sheet is presented. */
-    open: boolean
-    /** Called on Escape or an outside press. */
-    onClose: () => void
-    /** Allow tapping the backdrop to close. Escape still calls onClose. @default true */
-    dismissOnOutsidePress?: boolean
-    /** Read out by screen readers as the sheet's name. */
-    label: string
-    /** ID of a visible heading to use instead of label for the accessible name. */
-    labelledBy?: string
-    /** `adaptive` rises from the bottom on phones; `center` always floats. @default "adaptive" */
-    placement?: SheetPlacement
-    /** Outer padding and panel max-width. @default "md" */
-    size?: SheetSize
-    className?: string
-    children: ReactNode
+	/** Controls whether the sheet is presented. */
+	open: boolean;
+	/** Called on Escape or an outside press. */
+	onClose: () => void;
+	/** Allow tapping the backdrop to close. Escape still calls onClose. @default true */
+	dismissOnOutsidePress?: boolean;
+	/** Read out by screen readers as the sheet's name. */
+	label: string;
+	/** ID of a visible heading to use instead of label for the accessible name. */
+	labelledBy?: string;
+	/** `adaptive` rises from the bottom on phones; `center` always floats. @default "adaptive" */
+	placement?: SheetPlacement;
+	/** Outer padding and panel max-width. @default "md" */
+	size?: SheetSize;
+	className?: string;
+	children: ReactNode;
 }
 
 /**
@@ -44,117 +44,122 @@ export interface SheetProps {
  * middle on larger screens. Escape or a tap outside closes it.
  */
 export function Sheet({ open, ...props }: SheetProps) {
-    return (
-        <AnimatePresence>
-            {open && (
-                <SheetPortal>
-                    <OpenSheet {...props} />
-                </SheetPortal>
-            )}
-        </AnimatePresence>
-    )
+	return (
+		<AnimatePresence>
+			{open && (
+				<SheetPortal>
+					<OpenSheet {...props} />
+				</SheetPortal>
+			)}
+		</AnimatePresence>
+	);
 }
 
 function OpenSheet({
-    onClose,
-    dismissOnOutsidePress = true,
-    label,
-    labelledBy,
-    placement = "adaptive",
-    size = "md",
-    className,
-    children,
+	onClose,
+	dismissOnOutsidePress = true,
+	label,
+	labelledBy,
+	placement = "adaptive",
+	size = "md",
+	className,
+	children,
 }: Omit<SheetProps, "open">) {
-    const panel = useRef<HTMLDivElement>(null)
-    const reducedMotion = useReducedMotion()
-    const viewport = useVisualViewport()
-    useSheetFocus(panel, onClose)
+	const panel = useRef<HTMLDivElement>(null);
+	const reducedMotion = useReducedMotion();
+	const viewport = useVisualViewport();
+	useSheetFocus(panel, onClose);
 
-    return (
-        <div
-            className={cn(
-                "fixed inset-0 z-[65] flex justify-center",
-                placement === "center"
-                    ? cn("items-center", outerPaddings[size])
-                    : cn("items-end sm:items-center", `sm:${outerPaddings[size]}`)
-            )}
-            style={
-                viewport
-                    ? {
-                          top: viewport.top,
-                          left: viewport.left,
-                          width: viewport.width,
-                          height: viewport.height,
-                          bottom: "auto",
-                          right: "auto",
-                      }
-                    : undefined
-            }
-        >
-            <motion.div
-                aria-hidden="true"
-                className="absolute inset-0 bg-black/30 backdrop-blur-md"
-                initial={{ opacity: 0 }}
-                animate={{ opacity: 1 }}
-                exit={{ opacity: 0 }}
-                onClick={dismissOnOutsidePress ? onClose : undefined}
-            />
-            <motion.div
-                ref={panel}
-                role="dialog"
-                aria-modal="true"
-                aria-label={labelledBy ? undefined : label}
-                aria-labelledby={labelledBy}
-                tabIndex={-1}
-                className={cn(
-                    "glass-menu relative flex w-full flex-col overflow-hidden",
-                    "max-h-[92%]",
-                    panelMaxWidths[size],
-                    placement === "center" ? "rounded-sheet" : "rounded-t-sheet sm:rounded-sheet",
-                    className
-                )}
-                style={{
-                    transformOrigin: placement === "center" ? "center center" : "bottom center",
-                }}
-                initial={
-                    reducedMotion
-                        ? { opacity: 0 }
-                        : placement === "center"
-                          ? zoomReveal.initial
-                          : { y: 40, opacity: 0, scale: 0.96 }
-                }
-                animate={
-                    reducedMotion
-                        ? { opacity: 1 }
-                        : placement === "center"
-                          ? zoomReveal.animate
-                          : { y: 0, opacity: 1, scale: 1 }
-                }
-                exit={
-                    reducedMotion
-                        ? { opacity: 0 }
-                        : placement === "center"
-                          ? zoomReveal.exit
-                          : { y: 30, opacity: 0, scale: 0.98 }
-                }
-                transition={
-                    reducedMotion
-                        ? { duration: 0 }
-                        : placement === "center"
-                          ? zoomReveal.transition
-                          : { ...spring.bouncy, opacity: { duration: 0.18 } }
-                }
-            >
-                <motion.div
-                    className="flex min-h-0 flex-1 flex-col overflow-y-auto"
-                    initial={reducedMotion ? false : contentCrossfade.initial}
-                    animate={reducedMotion ? undefined : contentCrossfade.animate}
-                    exit={reducedMotion ? undefined : contentCrossfade.exit}
-                    transition={reducedMotion ? { duration: 0 } : contentCrossfade.transition}
-                >
-                    {children}
-                </motion.div>
-            </motion.div>
-        </div>
-    )
+	return (
+		<div
+			className={cn(
+				"fixed inset-0 z-[65] flex justify-center",
+				placement === "center"
+					? cn("items-center", outerPaddings[size])
+					: cn("items-end sm:items-center", `sm:${outerPaddings[size]}`),
+			)}
+			style={
+				viewport
+					? {
+							top: viewport.top,
+							left: viewport.left,
+							width: viewport.width,
+							height: viewport.height,
+							bottom: "auto",
+							right: "auto",
+						}
+					: undefined
+			}
+		>
+			<motion.div
+				aria-hidden="true"
+				className="absolute inset-0 bg-black/30 backdrop-blur-md"
+				initial={{ opacity: 0 }}
+				animate={{ opacity: 1 }}
+				exit={{ opacity: 0 }}
+				onClick={dismissOnOutsidePress ? onClose : undefined}
+			/>
+			<motion.div
+				ref={panel}
+				role="dialog"
+				aria-modal="true"
+				aria-label={labelledBy ? undefined : label}
+				aria-labelledby={labelledBy}
+				tabIndex={-1}
+				className={cn(
+					"glass-menu relative flex w-full flex-col overflow-hidden",
+					"max-h-[92%]",
+					panelMaxWidths[size],
+					placement === "center"
+						? "rounded-sheet"
+						: "rounded-t-sheet sm:rounded-sheet",
+					className,
+				)}
+				style={{
+					transformOrigin:
+						placement === "center" ? "center center" : "bottom center",
+				}}
+				initial={
+					reducedMotion
+						? { opacity: 0 }
+						: placement === "center"
+							? zoomReveal.initial
+							: { y: 40, opacity: 0, scale: 0.96 }
+				}
+				animate={
+					reducedMotion
+						? { opacity: 1 }
+						: placement === "center"
+							? zoomReveal.animate
+							: { y: 0, opacity: 1, scale: 1 }
+				}
+				exit={
+					reducedMotion
+						? { opacity: 0 }
+						: placement === "center"
+							? zoomReveal.exit
+							: { y: 30, opacity: 0, scale: 0.98 }
+				}
+				transition={
+					reducedMotion
+						? { duration: 0 }
+						: placement === "center"
+							? zoomReveal.transition
+							: { ...spring.bouncy, opacity: { duration: 0.18 } }
+				}
+			>
+				<motion.div
+					className="flex min-h-0 flex-1 flex-col overflow-y-auto"
+					initial={reducedMotion ? false : contentCrossfade.initial}
+					animate={reducedMotion ? undefined : contentCrossfade.animate}
+					exit={reducedMotion ? undefined : contentCrossfade.exit}
+					transition={
+						reducedMotion ? { duration: 0 } : contentCrossfade.transition
+					}
+				>
+					{children}
+				</motion.div>
+			</motion.div>
+		</div>
+	);
 }

package/src/components/sheet/use-sheet-focus.ts

@@ -1,94 +1,109 @@
-import { type RefObject, useEffect, useLayoutEffect, useRef, useState } from "react"
-import { ownsFloatingLayer } from "../../lib/floating-layers"
-import { enterModalEnvironment } from "./modal-environment"
+import {
+	type RefObject,
+	useEffect,
+	useLayoutEffect,
+	useRef,
+	useState,
+} from "react";
+import { ownsFloatingLayer } from "../../lib/floating-layers";
+import { enterModalEnvironment } from "./modal-environment";
 
-const sheets: HTMLElement[] = []
+const sheets: HTMLElement[] = [];
 const focusableSelector = [
-    "a[href]",
-    "button",
-    "input:not([type=hidden])",
-    "select",
-    "textarea",
-    "[tabindex]",
-    "[contenteditable=true]",
-].join(",")
+	"a[href]",
+	"button",
+	"input:not([type=hidden])",
+	"select",
+	"textarea",
+	"[tabindex]",
+	"[contenteditable=true]",
+].join(",");
 
 function focusableElements(panel: HTMLElement): HTMLElement[] {
-    return Array.from(panel.querySelectorAll<HTMLElement>(focusableSelector)).filter(
-        (element) =>
-            element.tabIndex >= 0 &&
-            !element.matches(":disabled") &&
-            !element.closest("[inert]") &&
-            element.getClientRects().length > 0 &&
-            getComputedStyle(element).visibility !== "hidden"
-    )
+	return Array.from(
+		panel.querySelectorAll<HTMLElement>(focusableSelector),
+	).filter(
+		(element) =>
+			element.tabIndex >= 0 &&
+			!element.matches(":disabled") &&
+			!element.closest("[inert]") &&
+			element.getClientRects().length > 0 &&
+			getComputedStyle(element).visibility !== "hidden",
+	);
 }
 
 /** Keeps keyboard focus in the foremost sheet, including its floating pickers. */
-export function useSheetFocus(panel: RefObject<HTMLDivElement | null>, onClose: () => void) {
-    // Capture before children mount, since a child may use autoFocus.
-    const [opener] = useState(() =>
-        typeof document === "undefined" ? null : document.activeElement
-    )
-    const close = useRef(onClose)
-    useEffect(() => {
-        close.current = onClose
-    }, [onClose])
+export function useSheetFocus(
+	panel: RefObject<HTMLDivElement | null>,
+	onClose: () => void,
+) {
+	// Capture before children mount, since a child may use autoFocus.
+	const [opener] = useState(() =>
+		typeof document === "undefined" ? null : document.activeElement,
+	);
+	const close = useRef(onClose);
+	useEffect(() => {
+		close.current = onClose;
+	}, [onClose]);
 
-    useLayoutEffect(() => {
-        const surface = panel.current
-        if (!surface) return
-        sheets.push(surface)
-        const foremost = () => sheets.at(-1) === surface
-        const focusFirst = () => (focusableElements(surface)[0] ?? surface).focus()
-        const inFloatingLayer = (element: Element | null) => ownsFloatingLayer(surface, element)
-        const belongsToSheet = (element: Element | null) =>
-            surface.contains(element) || inFloatingLayer(element)
+	useLayoutEffect(() => {
+		const surface = panel.current;
+		if (!surface) return;
+		sheets.push(surface);
+		const foremost = () => sheets.at(-1) === surface;
+		const focusFirst = () => (focusableElements(surface)[0] ?? surface).focus();
+		const inFloatingLayer = (element: Element | null) =>
+			ownsFloatingLayer(surface, element);
+		const belongsToSheet = (element: Element | null) =>
+			surface.contains(element) || inFloatingLayer(element);
 
-        if (!surface.contains(document.activeElement)) surface.focus({ preventScroll: true })
-        const leaveModalEnvironment = enterModalEnvironment(surface)
+		if (!surface.contains(document.activeElement))
+			surface.focus({ preventScroll: true });
+		const leaveModalEnvironment = enterModalEnvironment(surface);
 
-        const onFocus = (event: FocusEvent) => {
-            if (foremost() && !belongsToSheet(event.target as Element | null)) focusFirst()
-        }
-        const onKey = (event: KeyboardEvent) => {
-            if (!foremost() || event.defaultPrevented) return
-            if (event.key === "Escape") {
-                // Floating controls handle their own Escape before the sheet.
-                if (inFloatingLayer(document.activeElement)) return
-                event.preventDefault()
-                event.stopPropagation()
-                close.current()
-            }
-            if (event.key !== "Tab") return
-            const controls = focusableElements(surface)
-            const first = controls[0] ?? surface
-            const last = controls.at(-1) ?? surface
-            const active = document.activeElement
-            if (
-                event.shiftKey &&
-                (active === surface || active === first || !surface.contains(active))
-            ) {
-                event.preventDefault()
-                last.focus()
-            } else if (
-                !event.shiftKey &&
-                (active === last || !surface.contains(active) || active === surface)
-            ) {
-                event.preventDefault()
-                first.focus()
-            }
-        }
+		const onFocus = (event: FocusEvent) => {
+			if (foremost() && !belongsToSheet(event.target as Element | null))
+				focusFirst();
+		};
+		const onKey = (event: KeyboardEvent) => {
+			if (!foremost() || event.defaultPrevented) return;
+			if (event.key === "Escape") {
+				// Floating controls handle their own Escape before the sheet.
+				if (inFloatingLayer(document.activeElement)) return;
+				event.preventDefault();
+				event.stopPropagation();
+				close.current();
+			}
+			if (event.key !== "Tab") return;
+			const controls = focusableElements(surface);
+			const first = controls[0] ?? surface;
+			const last = controls.at(-1) ?? surface;
+			const active = document.activeElement;
+			if (
+				event.shiftKey &&
+				(active === surface || active === first || !surface.contains(active))
+			) {
+				event.preventDefault();
+				last.focus();
+			} else if (
+				!event.shiftKey &&
+				(active === last || !surface.contains(active) || active === surface)
+			) {
+				event.preventDefault();
+				first.focus();
+			}
+		};
 
-        document.addEventListener("focusin", onFocus)
-        window.addEventListener("keydown", onKey)
-        return () => {
-            const wasForemost = foremost()
-            sheets.splice(sheets.indexOf(surface), 1)
-            document.removeEventListener("focusin", onFocus)
-            window.removeEventListener("keydown", onKey)
-            leaveModalEnvironment()
-            if (wasForemost && opener instanceof HTMLElement && opener.isConnected) opener.focus()
-        }
-    }, [panel, opener])
+		document.addEventListener("focusin", onFocus);
+		window.addEventListener("keydown", onKey);
+		return () => {
+			const wasForemost = foremost();
+			sheets.splice(sheets.indexOf(surface), 1);
+			document.removeEventListener("focusin", onFocus);
+			window.removeEventListener("keydown", onKey);
+			leaveModalEnvironment();
+			if (wasForemost && opener instanceof HTMLElement && opener.isConnected)
+				opener.focus();
+		};
+	}, [panel, opener]);
 }