refactor: migrate contact form to TanStack Form

- Replace manual state management with @tanstack/react-form
- Add proper Field/FieldLabel components for accessibility
- Simplify server action (remove useActionState signature)
- Remove use-debounce dependency
- Update PGP key links and minor styling tweaks

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

app/contact/page.tsx

@@ -13,7 +13,7 @@ const Page = () => {
     <>
       <PageTitle canonical="/contact">Contact</PageTitle>
 
-      <div className="w-full md:mx-auto md:w-2/3">
+      <div className="mx-auto w-full max-w-2xl">
         <div className="prose prose-sm prose-neutral dark:prose-invert max-w-none">
           <p>
             Fill out this quick form and I&rsquo;ll get back to you as soon as I can! You can also{" "}
@@ -30,7 +30,7 @@ const Page = () => {
           <p>
             You can grab my public key here:{" "}
             <a
-              href="https://jrvs.io/pgp"
+              href="https://keyoxide.org/hkp/3bc6e5776bf379d36f6714802b0c9cf251e69a39"
               target="_blank"
               rel="noopener"
               title="3BC6 E577 6BF3 79D3 6F67 1480 2B0C 9CF2 51E6 9A39"

app/page.tsx

@@ -119,7 +119,7 @@ const Page = () => {
         </Link>{" "}
         <sup className="">
           <a
-            href="https://jrvs.io/pgp"
+            href="https://keyoxide.org/hkp/3bc6e5776bf379d36f6714802b0c9cf251e69a39"
             target="_blank"
             rel="noopener pgpkey"
             title="Download my PGP key"

app/projects/page.tsx

@@ -73,7 +73,7 @@ const Page = async () => {
                 href={repo!.url}
                 target="_blank"
                 rel="noopener noreferrer"
-                className="inline-block text-base leading-relaxed font-semibold"
+                className="inline-block text-base leading-relaxed font-semibold text-[#0969da] hover:underline dark:text-[#4493f8]"
               >
                 {repo!.name}
               </a>

components/contact-form.tsx

@@ -1,116 +1,133 @@
 "use client";
 
-import { useActionState, useState, useEffect } from "react";
+import { useState } from "react";
-import { useDebouncedCallback } from "use-debounce";
+import { useForm } from "@tanstack/react-form";
 import { SendIcon, Loader2Icon, CheckIcon, XIcon } from "lucide-react";
-import Form from "next/form";
 import { Input } from "@/components/ui/input";
 import { Textarea } from "@/components/ui/textarea";
 import { Button } from "@/components/ui/button";
+import { Field, FieldLabel, FieldError } from "@/components/ui/field";
 import { MarkdownIcon } from "@/components/icons";
 import { cn } from "@/lib/utils";
-import { send, type ContactState } from "@/lib/server/contact";
+import { sendContactForm, type ContactResult } from "@/lib/server/contact";
-import { ContactSchema, type ContactInput } from "@/lib/schemas/contact";
+import { ContactSchema } from "@/lib/schemas/contact";
 
 const ContactForm = () => {
-  const [formState, formAction, pending] = useActionState<ContactState, FormData>(send, {
+  const [result, setResult] = useState<ContactResult | null>(null);
-    success: false,
-    message: "",
-  });
 
-  // keep track of input so we can repopulate the fields if the form fails
+  const form = useForm({
-  const [formFields, setFormFields] = useState<ContactInput>({
+    defaultValues: {
       name: "",
       email: "",
       message: "",
-  });
+    },
+    validators: {
+      onBlur: ContactSchema,
+    },
+    onSubmit: async ({ value }) => {
+      try {
+        const formData = new FormData();
+        formData.append("name", value.name);
+        formData.append("email", value.email);
+        formData.append("message", value.message);
 
-  // keep track of which fields have been touched
+        const response = await sendContactForm(formData);
-  const [touched, setTouched] = useState<Record<keyof ContactInput, boolean>>({
+        setResult(response);
-    name: false,
-    email: false,
-    message: false,
-  });
 
-  // client-side validation using shared schema
+        if (response.success) {
-  const [clientErrors, setClientErrors] = useState<Partial<Record<keyof ContactInput, string[]>>>({});
+          form.reset();
-
-  const debouncedValidate = useDebouncedCallback(() => {
-    const result = ContactSchema.safeParse(formFields);
-    setClientErrors(result.success ? {} : result.error.flatten().fieldErrors);
-  }, 150);
-
-  useEffect(() => {
-    debouncedValidate();
-  }, [formFields, debouncedValidate]);
-
-  const hasClientErrors = Object.values(clientErrors).some((errs) => (errs?.length || 0) > 0);
-
-  const getErrorForField = (field: keyof ContactInput): string | undefined => {
-    if (touched[field]) {
-      return clientErrors[field]?.[0];
         }
-    return formState.errors?.[field]?.[0];
+      } catch (error) {
-  };
+        console.error("[contact-form] error:", error);
-
+        setResult({
-  const nameError = getErrorForField("name");
+          success: false,
-  const emailError = getErrorForField("email");
+          message: "Something went wrong. Please try again.",
-  const messageError = getErrorForField("message");
+        });
+      }
+    },
+  });
 
   return (
-    <Form action={formAction} className="my-6 space-y-4">
+    <form
-      <div className="not-prose">
+      onSubmit={(e) => {
+        e.preventDefault();
+        form.handleSubmit();
+      }}
+      className="my-5 space-y-4"
+    >
+      <form.Subscribe selector={(state) => state.isSubmitting || result?.success}>
+        {(isDisabled) => (
+          <>
+            <form.Field name="name">
+              {(field) => {
+                const isInvalid = field.state.meta.isTouched && field.state.meta.errors.length > 0;
+                return (
+                  <Field data-invalid={isInvalid || undefined} className="gap-1.5">
+                    <FieldLabel htmlFor="name">Name</FieldLabel>
                     <Input
-          type="text"
+                      id="name"
                       name="name"
-          placeholder="Name"
+                      type="text"
-          value={formFields.name}
+                      placeholder="Microsoft Bob"
-          onChange={(e) => {
+                      autoComplete="name"
-            setFormFields({ ...formFields, name: e.target.value });
+                      value={field.state.value}
-            setTouched((t) => ({ ...t, name: true }));
+                      onBlur={field.handleBlur}
-          }}
+                      onChange={(e) => field.handleChange(e.target.value)}
-          onBlur={() => setTouched((t) => ({ ...t, name: true }))}
+                      disabled={!!isDisabled}
-          disabled={pending || formState.success}
+                      aria-invalid={isInvalid || undefined}
-          aria-invalid={nameError ? "true" : undefined}
                     />
-        {nameError && <span className="text-destructive text-[0.8rem] font-semibold">{nameError}</span>}
+                    {isInvalid && <FieldError errors={field.state.meta.errors} />}
-      </div>
+                  </Field>
+                );
+              }}
+            </form.Field>
 
-      <div>
+            <form.Field name="email">
+              {(field) => {
+                const isInvalid = field.state.meta.isTouched && field.state.meta.errors.length > 0;
+                return (
+                  <Field data-invalid={isInvalid || undefined} className="gap-1.5">
+                    <FieldLabel htmlFor="email">Email</FieldLabel>
                     <Input
-          type="email"
+                      id="email"
                       name="email"
-          placeholder="Email"
+                      type="email"
                       inputMode="email"
-          value={formFields.email}
+                      placeholder="robert@hotmail.com"
-          onChange={(e) => {
+                      autoComplete="email"
-            setFormFields({ ...formFields, email: e.target.value });
+                      spellCheck={false}
-            setTouched((t) => ({ ...t, email: true }));
+                      value={field.state.value}
-          }}
+                      onBlur={field.handleBlur}
-          onBlur={() => setTouched((t) => ({ ...t, email: true }))}
+                      onChange={(e) => field.handleChange(e.target.value)}
-          disabled={pending || formState.success}
+                      disabled={!!isDisabled}
-          aria-invalid={emailError ? "true" : undefined}
+                      aria-invalid={isInvalid || undefined}
                     />
-        {emailError && <span className="text-destructive text-[0.8rem] font-semibold">{emailError}</span>}
+                    {isInvalid && <FieldError errors={field.state.meta.errors} />}
-      </div>
+                  </Field>
-
+                );
-      <div>
-        <Textarea
-          name="message"
-          placeholder="Write something..."
-          value={formFields.message}
-          onChange={(e) => {
-            setFormFields({ ...formFields, message: e.target.value });
-            setTouched((t) => ({ ...t, message: true }));
               }}
-          onBlur={() => setTouched((t) => ({ ...t, message: true }))}
+            </form.Field>
-          disabled={pending || formState.success}
+
-          aria-invalid={messageError ? "true" : undefined}
+            <form.Field name="message">
+              {(field) => {
+                const isInvalid = field.state.meta.isTouched && field.state.meta.errors.length > 0;
+                return (
+                  <Field data-invalid={isInvalid || undefined} className="gap-1.5">
+                    <FieldLabel htmlFor="message">Message</FieldLabel>
+                    <Textarea
+                      id="message"
+                      name="message"
+                      placeholder="Write something…"
+                      value={field.state.value}
+                      onBlur={field.handleBlur}
+                      onChange={(e) => field.handleChange(e.target.value)}
+                      disabled={!!isDisabled}
+                      aria-invalid={isInvalid || undefined}
                       className="min-h-[6lh] resize-y"
                     />
-        {messageError && <span className="text-destructive text-[0.8rem] font-semibold">{messageError}</span>}
+                    {isInvalid && <FieldError errors={field.state.meta.errors} />}
 
-        <div className="text-foreground/85 my-2 text-[0.8rem] leading-relaxed">
+                    <p className="text-foreground/85 mt-1.5 text-[0.8rem] leading-relaxed">
                       <MarkdownIcon className="mr-1.5 inline-block size-4 align-text-top" />
                       Basic{" "}
                       <a
@@ -122,44 +139,62 @@ const ContactForm = () => {
                       >
                         Markdown syntax
                       </a>{" "}
-          is allowed here, e.g.: <strong>**bold**</strong>, <em>_italics_</em>, [
+                      is allowed, e.g.: <strong>**bold**</strong>, <em>_italics_</em>, [
                       <a href="https://jarv.is" target="_blank" rel="noopener" className="hover:no-underline">
                         links
                       </a>
                       ](https://jarv.is), and <code>`code`</code>.
-        </div>
+                    </p>
-      </div>
+                  </Field>
+                );
+              }}
+            </form.Field>
+          </>
+        )}
+      </form.Subscribe>
 
       <div className="flex min-h-16 items-center space-x-4">
-        {!formState.success && (
+        <form.Subscribe selector={(state) => [, state.isSubmitting]}>
-          <Button type="submit" size="lg" disabled={pending || hasClientErrors}>
+          {([isSubmitting]) => (
-            {pending ? (
             <>
-                <Loader2Icon className="animate-spin" />
+              {!result?.success && (
-                Sending...
+                <Button type="submit" size="lg" disabled={isSubmitting}>
+                  {isSubmitting ? (
+                    <>
+                      <Loader2Icon className="animate-spin" aria-hidden="true" />
+                      Sending…
                     </>
                   ) : (
                     <>
-                <SendIcon />
+                      <SendIcon aria-hidden="true" />
                       Send
                     </>
                   )}
                 </Button>
               )}
 
-        {!pending && formState.message && (
+              {!isSubmitting && result?.message && (
                 <div
+                  role="status"
+                  aria-live="polite"
                   className={cn(
                     "space-x-0.5 text-[0.9rem] font-semibold",
-              formState.success ? "text-green-600 dark:text-green-400" : "text-destructive"
+                    result.success ? "text-green-600 dark:text-green-400" : "text-destructive"
                   )}
                 >
-            {formState.success ? <CheckIcon className="inline size-4" /> : <XIcon className="inline size-4" />}{" "}
+                  {result.success ? (
-            <span>{formState.message}</span>
+                    <CheckIcon className="inline size-4" aria-hidden="true" />
+                  ) : (
+                    <XIcon className="inline size-4" aria-hidden="true" />
+                  )}{" "}
+                  <span>{result.message}</span>
                 </div>
               )}
+            </>
+          )}
+        </form.Subscribe>
       </div>
-    </Form>
+    </form>
   );
 };
 

lib/server/contact.ts

@@ -6,49 +6,49 @@ import { ContactSchema } from "@/lib/schemas/contact";
 import siteConfig from "@/lib/config/site";
 import { checkBotId } from "botid/server";
 
-// Schema and type now imported from shared validation module
+export type ContactResult = {
-
-export type ContactState = {
   success: boolean;
   message: string;
   errors?: Record<string, string[]>;
 };
 
-export const send = async (state: ContactState, payload: FormData): Promise<ContactState> => {
+export const sendContactForm = async (formData: FormData): Promise<ContactResult> => {
   // TODO: remove after debugging why automated spam entries are causing 500 errors
-  console.debug("[server/contact] received payload:", payload);
+  console.debug("[server/contact] received payload:", formData);
 
   // BotID server-side verification
   const verification = await checkBotId();
   if (verification.isBot) {
     console.warn("[server/contact] botid verification failed:", verification);
-    throw new Error("Bot check failed");
-  }
-
-  try {
-    const data = ContactSchema.safeParse(Object.fromEntries(payload));
-
-    if (!data.success) {
     return {
       success: false,
-        message: "Please make sure all fields are filled in.",
+      message: "Verification failed. Please try again.",
-        errors: data.error.flatten().fieldErrors,
     };
   }
 
+  const parsed = ContactSchema.safeParse(Object.fromEntries(formData));
+
+  if (!parsed.success) {
+    return {
+      success: false,
+      message: "Please make sure all fields are filled in correctly.",
+      errors: parsed.error.flatten().fieldErrors,
+    };
+  }
+
+  try {
     if (env.RESEND_FROM_EMAIL === "onboarding@resend.dev") {
       // https://resend.com/docs/api-reference/emails/send-email
       console.warn("[server/contact] 'RESEND_FROM_EMAIL' is not set, falling back to onboarding@resend.dev.");
     }
 
-    // send email
     const resend = new Resend(env.RESEND_API_KEY);
     await resend.emails.send({
-      from: `${data.data.name} <${env.RESEND_FROM_EMAIL || "onboarding@resend.dev"}>`,
+      from: `${parsed.data.name} <${env.RESEND_FROM_EMAIL || "onboarding@resend.dev"}>`,
-      replyTo: `${data.data.name} <${data.data.email}>`,
+      replyTo: `${parsed.data.name} <${parsed.data.email}>`,
       to: [env.RESEND_TO_EMAIL],
       subject: `[${siteConfig.name}] Contact Form Submission`,
-      text: data.data.message,
+      text: parsed.data.message,
     });
 
     return { success: true, message: "Thanks! You should hear from me soon." };

package.json

@@ -47,6 +47,7 @@
     "@radix-ui/react-toggle-group": "^1.1.11",
     "@radix-ui/react-tooltip": "^1.2.8",
     "@t3-oss/env-nextjs": "^0.13.10",
+    "@tanstack/react-form": "^1.28.0",
     "@vercel/analytics": "^1.6.1",
     "@vercel/functions": "^3.4.0",
     "@vercel/speed-insights": "^1.3.1",
@@ -98,7 +99,6 @@
     "tailwind-merge": "^3.4.0",
     "tailwindcss": "^4.1.18",
     "unified": "^11.0.5",
-    "use-debounce": "^10.1.0",
     "zod": "^4.3.6"
   },
   "devDependencies": {

pnpm-lock.yaml

@@ -89,6 +89,9 @@ importers:
       '@t3-oss/env-nextjs':
         specifier: ^0.13.10
         version: 0.13.10(typescript@5.9.3)(zod@4.3.6)
+      '@tanstack/react-form':
+        specifier: ^1.28.0
+        version: 1.28.0(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
       '@vercel/analytics':
         specifier: ^1.6.1
         version: 1.6.1(next@16.1.6(@babel/core@7.28.6)(babel-plugin-react-compiler@19.1.0-rc.3)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(react@19.2.4)
@@ -242,9 +245,6 @@ importers:
       unified:
         specifier: ^11.0.5
         version: 11.0.5
-      use-debounce:
-        specifier: ^10.1.0
-        version: 10.1.0(react@19.2.4)
       zod:
         specifier: ^4.3.6
         version: 4.3.6
@@ -1970,6 +1970,38 @@ packages:
     peerDependencies:
       tailwindcss: '>=3.0.0 || insiders || >=4.0.0-alpha.20 || >=4.0.0-beta.1'
 
+  '@tanstack/devtools-event-client@0.4.0':
+    resolution: {integrity: sha512-RPfGuk2bDZgcu9bAJodvO2lnZeHuz4/71HjZ0bGb/SPg8+lyTA+RLSKQvo7fSmPSi8/vcH3aKQ8EM9ywf1olaw==}
+    engines: {node: '>=18'}
+
+  '@tanstack/form-core@1.28.0':
+    resolution: {integrity: sha512-MX3YveB6SKHAJ2yUwp+Ca/PCguub8bVEnLcLUbFLwdkSRMkP0lMGdaZl+F0JuEgZw56c6iFoRyfILhS7OQpydA==}
+
+  '@tanstack/pacer-lite@0.1.1':
+    resolution: {integrity: sha512-y/xtNPNt/YeyoVxE/JCx+T7yjEzpezmbb+toK8DDD1P4m7Kzs5YR956+7OKexG3f8aXgC3rLZl7b1V+yNUSy5w==}
+    engines: {node: '>=18'}
+
+  '@tanstack/react-form@1.28.0':
+    resolution: {integrity: sha512-ibLcf5QkTogV0Ly944CuqGxWTpHyreNA4Cy8Wtky7zE9wtE3HVapQt4/hUuXo51zihfTkv5URiXpoTSKF5Xosg==}
+    peerDependencies:
+      '@tanstack/react-start': '*'
+      react: ^17.0.0 || ^18.0.0 || ^19.0.0
+    peerDependenciesMeta:
+      '@tanstack/react-start':
+        optional: true
+
+  '@tanstack/react-store@0.8.0':
+    resolution: {integrity: sha512-1vG9beLIuB7q69skxK9r5xiLN3ztzIPfSQSs0GfeqWGO2tGIyInZx0x1COhpx97RKaONSoAb8C3dxacWksm1ow==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+
+  '@tanstack/store@0.7.7':
+    resolution: {integrity: sha512-xa6pTan1bcaqYDS9BDpSiS63qa6EoDkPN9RsRaxHuDdVDNntzq3xNwR5YKTU/V3SkSyC9T4YVOPh2zRQN0nhIQ==}
+
+  '@tanstack/store@0.8.0':
+    resolution: {integrity: sha512-Om+BO0YfMZe//X2z0uLF2j+75nQga6TpTJgLJQBiq85aOyZNIhkCgleNcud2KQg4k4v9Y9l+Uhru3qWMPGTOzQ==}
+
   '@tybys/wasm-util@0.10.1':
     resolution: {integrity: sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==}
 
@@ -5052,12 +5084,6 @@ packages:
       '@types/react':
         optional: true
 
-  use-debounce@10.1.0:
-    resolution: {integrity: sha512-lu87Za35V3n/MyMoEpD5zJv0k7hCn0p+V/fK2kWD+3k2u3kOCwO593UArbczg1fhfs2rqPEnHpULJ3KmGdDzvg==}
-    engines: {node: '>= 16.0.0'}
-    peerDependencies:
-      react: '*'
-
   use-sidecar@1.1.3:
     resolution: {integrity: sha512-Fedw0aZvkhynoPYlA5WXrMCAMm+nSWdZt6lzJQ7Ok8S6Q+VsHmHpRWndVRJ8Be0ZbkfPc5LRYH+5XrzXcEeLRQ==}
     engines: {node: '>=10'}
@@ -6695,6 +6721,35 @@ snapshots:
       postcss-selector-parser: 6.0.10
       tailwindcss: 4.1.18
 
+  '@tanstack/devtools-event-client@0.4.0': {}
+
+  '@tanstack/form-core@1.28.0':
+    dependencies:
+      '@tanstack/devtools-event-client': 0.4.0
+      '@tanstack/pacer-lite': 0.1.1
+      '@tanstack/store': 0.7.7
+
+  '@tanstack/pacer-lite@0.1.1': {}
+
+  '@tanstack/react-form@1.28.0(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
+    dependencies:
+      '@tanstack/form-core': 1.28.0
+      '@tanstack/react-store': 0.8.0(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      react: 19.2.4
+    transitivePeerDependencies:
+      - react-dom
+
+  '@tanstack/react-store@0.8.0(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
+    dependencies:
+      '@tanstack/store': 0.8.0
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
+      use-sync-external-store: 1.6.0(react@19.2.4)
+
+  '@tanstack/store@0.7.7': {}
+
+  '@tanstack/store@0.8.0': {}
+
   '@tybys/wasm-util@0.10.1':
     dependencies:
       tslib: 2.8.1
@@ -10378,10 +10433,6 @@ snapshots:
     optionalDependencies:
       '@types/react': 19.2.10
 
-  use-debounce@10.1.0(react@19.2.4):
-    dependencies:
-      react: 19.2.4
-
   use-sidecar@1.1.3(@types/react@19.2.10)(react@19.2.4):
     dependencies:
       detect-node-es: 1.1.0