From 39807ef452d22844d98c96a60f7eb7c241566471 Mon Sep 17 00:00:00 2001 From: adilallo <39313955+adilallo@users.noreply.github.com> Date: Wed, 11 Nov 2026 17:01:44 -0700 Subject: [PATCH] Pin phone sheets to the visible viewport, and let people correct login and organizer errors. --- .../AskOrganizerInquiryModal.container.tsx | 16 +++++- .../AskOrganizerInquiryModal.types.ts | 2 + .../AskOrganizerInquiryModal.view.tsx | 2 + .../modals/Create/Create.container.tsx | 5 +- app/components/modals/Create/Create.types.ts | 2 + app/components/modals/Create/Create.view.tsx | 2 + .../modals/Create/CreateModalFrame.view.tsx | 10 +++- .../modals/Login/Login.container.tsx | 5 +- app/components/modals/Login/Login.types.ts | 2 + app/components/modals/Login/Login.view.tsx | 8 ++- app/components/modals/Login/LoginForm.tsx | 3 ++ app/hooks/useVisualViewportHeight.ts | 32 +++++++++--- messages/en/modals/askOrganizerInquiry.json | 2 + tests/components/AskOrganizerInquiry.test.tsx | 49 ++++++++++++++++++ tests/components/Login.test.tsx | 37 +++++++++++++- tests/components/LoginForm.test.tsx | 25 ++++++++++ .../hooks/useVisualViewportHeight.test.ts | 50 +++++++++++++++++++ 17 files changed, 236 insertions(+), 16 deletions(-) create mode 100644 tests/unit/hooks/useVisualViewportHeight.test.ts diff --git a/app/components/modals/AskOrganizerInquiry/AskOrganizerInquiryModal.container.tsx b/app/components/modals/AskOrganizerInquiry/AskOrganizerInquiryModal.container.tsx index 7c0fb85..0c999ad 100644 --- a/app/components/modals/AskOrganizerInquiry/AskOrganizerInquiryModal.container.tsx +++ b/app/components/modals/AskOrganizerInquiry/AskOrganizerInquiryModal.container.tsx @@ -23,8 +23,10 @@ const AskOrganizerInquiryModalContainer = memo( description: t("description"), emailLabel: t("emailLabel"), emailPlaceholder: t("emailPlaceholder"), + emailInvalid: t("emailInvalid"), questionLabel: t("questionLabel"), questionPlaceholder: t("questionPlaceholder"), + questionTooShort: t("questionTooShort"), submitButton: t("submitButton"), closeAfterSuccess: t("closeAfterSuccess"), successTitle: t("successTitle"), @@ -59,6 +61,16 @@ const AskOrganizerInquiryModalContainer = memo( } }, [isOpen]); + const onEmailChange = useCallback((value: string) => { + setEmail(value); + setEmailError(false); + }, []); + + const onMessageChange = useCallback((value: string) => { + setMessage(value); + setQuestionError(false); + }, []); + const onSubmit = useCallback( async (e: FormEvent) => { e.preventDefault(); @@ -149,8 +161,8 @@ const AskOrganizerInquiryModalContainer = memo( sendFailed={sendFailed} emailError={emailError} questionError={questionError} - onEmailChange={setEmail} - onMessageChange={setMessage} + onEmailChange={onEmailChange} + onMessageChange={onMessageChange} onHoneypotChange={setHoneypot} onSubmit={onSubmit} onDismissFailed={() => setSendFailed(false)} diff --git a/app/components/modals/AskOrganizerInquiry/AskOrganizerInquiryModal.types.ts b/app/components/modals/AskOrganizerInquiry/AskOrganizerInquiryModal.types.ts index 85b7fdf..a66d8a3 100644 --- a/app/components/modals/AskOrganizerInquiry/AskOrganizerInquiryModal.types.ts +++ b/app/components/modals/AskOrganizerInquiry/AskOrganizerInquiryModal.types.ts @@ -8,8 +8,10 @@ export interface AskOrganizerInquiryModalCopy { description: string; emailLabel: string; emailPlaceholder: string; + emailInvalid: string; questionLabel: string; questionPlaceholder: string; + questionTooShort: string; submitButton: string; closeAfterSuccess: string; successTitle: string; diff --git a/app/components/modals/AskOrganizerInquiry/AskOrganizerInquiryModal.view.tsx b/app/components/modals/AskOrganizerInquiry/AskOrganizerInquiryModal.view.tsx index 657931a..e3212fb 100644 --- a/app/components/modals/AskOrganizerInquiry/AskOrganizerInquiryModal.view.tsx +++ b/app/components/modals/AskOrganizerInquiry/AskOrganizerInquiryModal.view.tsx @@ -125,6 +125,7 @@ export function AskOrganizerInquiryModalView({ value={email} onChange={(e) => onEmailChange(e.target.value)} error={emailError} + textHint={emailError ? copy.emailInvalid : false} inputSize="medium" showHelpIcon={false} /> @@ -136,6 +137,7 @@ export function AskOrganizerInquiryModalView({ value={message} onChange={(e) => onMessageChange(e.target.value)} error={questionError} + textHint={questionError ? copy.questionTooShort : false} size="medium" appearance="embedded" rows={4} diff --git a/app/components/modals/Create/Create.container.tsx b/app/components/modals/Create/Create.container.tsx index 095f641..87affc3 100644 --- a/app/components/modals/Create/Create.container.tsx +++ b/app/components/modals/Create/Create.container.tsx @@ -48,7 +48,7 @@ const CreateContainer = memo( }) => { const createRef = useRef(null); const overlayRef = useRef(null); - const viewportHeight = useVisualViewportHeight( + const viewport = useVisualViewportHeight( isOpen && presentation === "sheet", ); @@ -92,7 +92,8 @@ const CreateContainer = memo( kebabMenuItems={kebabMenuItems} belowCard={belowCard} presentation={presentation} - viewportHeight={viewportHeight} + viewportHeight={viewport?.height} + viewportOffsetTop={viewport?.offsetTop} /> ); }, diff --git a/app/components/modals/Create/Create.types.ts b/app/components/modals/Create/Create.types.ts index 3a4d60e..6563114 100644 --- a/app/components/modals/Create/Create.types.ts +++ b/app/components/modals/Create/Create.types.ts @@ -95,4 +95,6 @@ export interface CreateViewProps { belowCard?: React.ReactNode; presentation: CreateModalPresentationValue; viewportHeight?: number; + /** `visualViewport.offsetTop`, so a phone sheet tracks the visible region on iOS. */ + viewportOffsetTop?: number; } diff --git a/app/components/modals/Create/Create.view.tsx b/app/components/modals/Create/Create.view.tsx index a704cf6..63f79c1 100644 --- a/app/components/modals/Create/Create.view.tsx +++ b/app/components/modals/Create/Create.view.tsx @@ -43,6 +43,7 @@ export function CreateView({ belowCard, presentation, viewportHeight, + viewportOffsetTop, }: CreateViewProps) { return ( ( const backdropRef = useRef(null); const previousActiveElementRef = useRef(null); const [portalReady, setPortalReady] = useState(() => !usePortal); - const viewportHeight = useVisualViewportHeight(isOpen); + const viewport = useVisualViewportHeight(isOpen); // Defer enabling the portal until after the layout commit so we don’t sync-setState // inside the effect (eslint react-hooks/set-state-in-effect) while still mounting @@ -135,7 +135,8 @@ const LoginContainer = memo( portalReady={portalReady} usePortal={usePortal} backdropVariant={backdropVariant} - viewportHeight={viewportHeight} + viewportHeight={viewport?.height} + viewportOffsetTop={viewport?.offsetTop} > {children} diff --git a/app/components/modals/Login/Login.types.ts b/app/components/modals/Login/Login.types.ts index 310a178..f2884b1 100644 --- a/app/components/modals/Login/Login.types.ts +++ b/app/components/modals/Login/Login.types.ts @@ -35,4 +35,6 @@ export interface LoginViewProps { backdropVariant: LoginBackdropVariant; /** Visible viewport height on phones so the footer rides above the keyboard. */ viewportHeight?: number; + /** `visualViewport.offsetTop`, so the sheet tracks the visible region on iOS. */ + viewportOffsetTop?: number; } diff --git a/app/components/modals/Login/Login.view.tsx b/app/components/modals/Login/Login.view.tsx index 8de85b6..3136f03 100644 --- a/app/components/modals/Login/Login.view.tsx +++ b/app/components/modals/Login/Login.view.tsx @@ -24,13 +24,19 @@ export function LoginView({ usePortal, backdropVariant, viewportHeight, + viewportOffsetTop, }: LoginViewProps) { if (!isOpen) return null; if (usePortal && !portalReady) return null; const phoneSheetStyle = viewportHeight != null - ? { height: viewportHeight, maxHeight: viewportHeight } + ? { + top: viewportOffsetTop ?? 0, + bottom: "auto" as const, + height: viewportHeight, + maxHeight: viewportHeight, + } : undefined; const belowCardLink = belowCard ? ( diff --git a/app/components/modals/Login/LoginForm.tsx b/app/components/modals/Login/LoginForm.tsx index bcd2ba1..24e3620 100644 --- a/app/components/modals/Login/LoginForm.tsx +++ b/app/components/modals/Login/LoginForm.tsx @@ -158,6 +158,7 @@ export default function LoginForm({ setFormError(""); const trimmed = email.trim().toLowerCase(); if (!EMAIL_PATTERN.test(trimmed)) { + setSent(false); setEmailError(t("errors.emailInvalid")); return; } @@ -173,6 +174,7 @@ export default function LoginForm({ : undefined; const result = await requestMagicLink(trimmed, nextPath, draft); if (result.ok === false) { + setSent(false); if (result.retryAfterMs != null && result.retryAfterMs > 0) { const seconds = Math.ceil(result.retryAfterMs / 1000); setFormError( @@ -190,6 +192,7 @@ export default function LoginForm({ setLinkExpired(false); setSent(true); } catch { + setSent(false); setFormError(t("errors.network")); } finally { setSubmitting(false); diff --git a/app/hooks/useVisualViewportHeight.ts b/app/hooks/useVisualViewportHeight.ts index 83e741f..6698278 100644 --- a/app/hooks/useVisualViewportHeight.ts +++ b/app/hooks/useVisualViewportHeight.ts @@ -1,22 +1,40 @@ import { useEffect, useState } from "react"; /** - * Visible viewport height, including the shrink when a phone keyboard opens. + * Visible viewport box, including the shrink and offset when a phone keyboard opens. + * + * iOS Safari reports the keyboard by shrinking `visualViewport.height` and + * shifting `offsetTop`. A `fixed` overlay has to use both, or its footer stays + * in the layout viewport behind the keyboard. * * @param enabled When false, skip listeners and return `undefined`. - * @returns Pixel height of `visualViewport`, or `undefined` when disabled. + * @returns Height and top offset of `visualViewport`, or `undefined` when disabled. * * @example - * const viewportHeight = useVisualViewportHeight(isOpen); + * const viewport = useVisualViewportHeight(isOpen); */ -export function useVisualViewportHeight(enabled: boolean): number | undefined { - const [height, setHeight] = useState(undefined); +export function useVisualViewportHeight( + enabled: boolean, +): { height: number; offsetTop: number } | undefined { + const [frame, setFrame] = useState< + { height: number; offsetTop: number } | undefined + >(undefined); useEffect(() => { if (!enabled) return; const vp = window.visualViewport; const sync = () => { - setHeight(vp?.height ?? window.innerHeight); + const next = { + height: vp?.height ?? window.innerHeight, + offsetTop: vp?.offsetTop ?? 0, + }; + setFrame((prev) => + prev && + prev.height === next.height && + prev.offsetTop === next.offsetTop + ? prev + : next, + ); }; sync(); vp?.addEventListener("resize", sync); @@ -29,5 +47,5 @@ export function useVisualViewportHeight(enabled: boolean): number | undefined { }; }, [enabled]); - return enabled ? height : undefined; + return enabled ? frame : undefined; } diff --git a/messages/en/modals/askOrganizerInquiry.json b/messages/en/modals/askOrganizerInquiry.json index f3a315b..539cc89 100644 --- a/messages/en/modals/askOrganizerInquiry.json +++ b/messages/en/modals/askOrganizerInquiry.json @@ -4,7 +4,9 @@ "description": "Have a question about organizing? Send it over and an experienced organizer will get back to you.", "emailLabel": "Email address", "emailPlaceholder": "you@example.com", + "emailInvalid": "Enter an email address like name@example.org.", "questionLabel": "Your question", + "questionTooShort": "Please enter at least 10 characters.", "questionPlaceholder": "What would you like to know?", "submitButton": "Send question", "closeAfterSuccess": "Close", diff --git a/tests/components/AskOrganizerInquiry.test.tsx b/tests/components/AskOrganizerInquiry.test.tsx index f4951a8..2cbbab0 100644 --- a/tests/components/AskOrganizerInquiry.test.tsx +++ b/tests/components/AskOrganizerInquiry.test.tsx @@ -95,4 +95,53 @@ describe("AskOrganizerInquiryModal", () => { screen.getByRole("button", { name: /send question/i }), ).toBeInTheDocument(); }); + + it("shows field hints for an invalid email and a short question, then clears them on edit", async () => { + const user = userEvent.setup(); + renderWithProviders( + , + ); + + await user.type( + screen.getByRole("textbox", { name: /email address/i }), + "not-an-email", + ); + await user.type( + screen.getByRole("textbox", { name: /your question/i }), + "Too short", + ); + await user.click(screen.getByRole("button", { name: /send question/i })); + + expect( + await screen.findByText("Enter an email address like name@example.org."), + ).toBeInTheDocument(); + expect(fetchMock).not.toHaveBeenCalled(); + + await user.type( + screen.getByRole("textbox", { name: /email address/i }), + "@example.org", + ); + expect( + screen.queryByText("Enter an email address like name@example.org."), + ).not.toBeInTheDocument(); + + await user.clear(screen.getByRole("textbox", { name: /email address/i })); + await user.type( + screen.getByRole("textbox", { name: /email address/i }), + "rosa@example.org", + ); + await user.click(screen.getByRole("button", { name: /send question/i })); + + expect( + await screen.findByText("Please enter at least 10 characters."), + ).toBeInTheDocument(); + + await user.type( + screen.getByRole("textbox", { name: /your question/i }), + " more", + ); + expect( + screen.queryByText("Please enter at least 10 characters."), + ).not.toBeInTheDocument(); + }); }); diff --git a/tests/components/Login.test.tsx b/tests/components/Login.test.tsx index 8f525e0..d9a8064 100644 --- a/tests/components/Login.test.tsx +++ b/tests/components/Login.test.tsx @@ -1,14 +1,23 @@ -import { describe, it, expect, vi, beforeEach } from "vitest"; +import { describe, it, expect, vi, beforeEach, afterEach } from "vitest"; import { screen, fireEvent, waitFor } from "@testing-library/react"; import "@testing-library/jest-dom/vitest"; import { renderWithProviders } from "../utils/test-utils"; import Login from "../../app/components/modals/Login"; describe("Login", () => { + const originalViewport = window.visualViewport; + beforeEach(() => { vi.clearAllMocks(); }); + afterEach(() => { + Object.defineProperty(window, "visualViewport", { + configurable: true, + value: originalViewport, + }); + }); + it("uses blurredYellow backdrop by default (header overlay)", async () => { renderWithProviders( @@ -172,4 +181,30 @@ describe("Login", () => { expect(screen.getByLabelText("Close")).toBeInTheDocument(); expect(screen.queryByLabelText("More options")).not.toBeInTheDocument(); }); + + it("pins the overlay to the visual viewport offset", async () => { + Object.defineProperty(window, "visualViewport", { + configurable: true, + value: { + height: 500, + offsetTop: 80, + addEventListener: () => {}, + removeEventListener: () => {}, + }, + }); + renderWithProviders( + +

Login content

+
, + ); + const backdrop = await waitFor(() => { + const dialog = screen.getByRole("dialog"); + expect(dialog.parentElement).toHaveStyle({ + top: "80px", + height: "500px", + }); + return dialog.parentElement; + }); + expect(backdrop).toHaveStyle({ bottom: "auto" }); + }); }); diff --git a/tests/components/LoginForm.test.tsx b/tests/components/LoginForm.test.tsx index dc21934..ba69f06 100644 --- a/tests/components/LoginForm.test.tsx +++ b/tests/components/LoginForm.test.tsx @@ -424,4 +424,29 @@ describe("LoginForm", () => { expect(requestMagicLink).toHaveBeenCalledTimes(2); }); }); + + it("shows the email field again when send it again fails", async () => { + const user = userEvent.setup(); + vi.mocked(requestMagicLink) + .mockResolvedValueOnce({ ok: true }) + .mockRejectedValueOnce(new Error("network")); + renderLoginForm(); + await user.type( + screen.getByRole("textbox", { name: /email address/i }), + "pat@example.com", + ); + await user.click( + screen.getByRole("button", { name: /send login link/i }), + ); + await user.click( + await screen.findByRole("button", { name: /send it again/i }), + ); + + expect( + await screen.findByRole("textbox", { name: /email address/i }), + ).toHaveValue("pat@example.com"); + expect( + screen.getByText(/check your connection/i), + ).toBeInTheDocument(); + }); }); diff --git a/tests/unit/hooks/useVisualViewportHeight.test.ts b/tests/unit/hooks/useVisualViewportHeight.test.ts new file mode 100644 index 0000000..b4e6901 --- /dev/null +++ b/tests/unit/hooks/useVisualViewportHeight.test.ts @@ -0,0 +1,50 @@ +import { renderHook, act } from "@testing-library/react"; +import { describe, it, expect, afterEach } from "vitest"; +import { useVisualViewportHeight } from "../../../app/hooks/useVisualViewportHeight"; + +describe("useVisualViewportHeight", () => { + const original = window.visualViewport; + + afterEach(() => { + Object.defineProperty(window, "visualViewport", { + configurable: true, + value: original, + }); + }); + + it("returns undefined when disabled", () => { + const { result } = renderHook(() => useVisualViewportHeight(false)); + expect(result.current).toBeUndefined(); + }); + + it("tracks height and the iOS keyboard offset", () => { + const listeners = new Map void>>(); + const vp = { + height: 800, + offsetTop: 0, + addEventListener: (type: string, fn: () => void) => { + const set = listeners.get(type) ?? new Set(); + set.add(fn); + listeners.set(type, set); + }, + removeEventListener: (type: string, fn: () => void) => { + listeners.get(type)?.delete(fn); + }, + }; + Object.defineProperty(window, "visualViewport", { + configurable: true, + value: vp, + }); + + const { result } = renderHook(() => useVisualViewportHeight(true)); + expect(result.current).toEqual({ height: 800, offsetTop: 0 }); + + act(() => { + vp.height = 420; + vp.offsetTop = 120; + listeners.get("scroll")?.forEach((fn) => fn()); + }); + + expect(result.current).toEqual({ height: 420, offsetTop: 120 }); + }); +});