Skip to content

armgit / dub

Public Imported from GitHub
0

The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.

Show a message for every lead form field rule

Rafic40131ffa7bd
diff --git a/apps/web/ui/submitted-leads/form-fields/date-field.tsx b/apps/web/ui/submitted-leads/form-fields/date-field.tsx
index 7a0e77b0ed..8c17fcca2e 100644
--- a/apps/web/ui/submitted-leads/form-fields/date-field.tsx
+++ b/apps/web/ui/submitted-leads/form-fields/date-field.tsx
@@ -2,7 +2,7 @@ import { dateFieldSchema } from "@/lib/zod/schemas/submitted-lead-form";
import { cn } from "@dub/utils";
import { useFormContext } from "react-hook-form";
import * as z from "zod/v4";
-import { FormControl } from "./form-control";
+import { FormControl, requiredFieldRule } from "./form-control";
type DateFieldData = z.infer<typeof dateFieldSchema>;
@@ -34,7 +34,7 @@ export function DateField({
: "border-neutral-300 text-neutral-900 placeholder-neutral-400 focus:border-[var(--brand)] focus:ring-[var(--brand)]",
)}
{...register(keyPath, {
- required: field.required,
+ required: requiredFieldRule(field.required),
})}
/>
</FormControl>
diff --git a/apps/web/ui/submitted-leads/form-fields/form-control.tsx b/apps/web/ui/submitted-leads/form-fields/form-control.tsx
index 351e5c0e90..604f50a7dc 100644
--- a/apps/web/ui/submitted-leads/form-fields/form-control.tsx
+++ b/apps/web/ui/submitted-leads/form-fields/form-control.tsx
@@ -1,6 +1,17 @@
import { cn } from "@dub/utils";
import { HTMLAttributes } from "react";
+export const requiredFieldRule = (required: boolean) =>
+ required ? "Please fill in this field" : false;
+
+export const maxLengthRule = (maxLength?: number) =>
+ maxLength
+ ? {
+ value: maxLength,
+ message: `Please enter at most ${maxLength} characters`,
+ }
+ : undefined;
+
export type FormControlProps = {
label: string;
required?: boolean;
diff --git a/apps/web/ui/submitted-leads/form-fields/number-field.tsx b/apps/web/ui/submitted-leads/form-fields/number-field.tsx
index 4843be52c9..0b9a2b311d 100644
--- a/apps/web/ui/submitted-leads/form-fields/number-field.tsx
+++ b/apps/web/ui/submitted-leads/form-fields/number-field.tsx
@@ -2,7 +2,7 @@ import { numberFieldSchema } from "@/lib/zod/schemas/submitted-lead-form";
import { cn } from "@dub/utils";
import { useFormContext } from "react-hook-form";
import * as z from "zod/v4";
-import { FormControl } from "./form-control";
+import { FormControl, requiredFieldRule } from "./form-control";
type NumberFieldData = z.infer<typeof numberFieldSchema>;
@@ -38,13 +38,19 @@ export function NumberField({
: "border-neutral-300 text-neutral-900 placeholder-neutral-400 focus:border-[var(--brand)] focus:ring-[var(--brand)]",
)}
{...register(keyPath, {
- required: field.required,
+ required: requiredFieldRule(field.required),
valueAsNumber: true,
...(min !== undefined && {
- min: { value: min, message: `Must be at least ${min}` },
+ min: {
+ value: min,
+ message: `Please enter a number of at least ${min}`,
+ },
}),
...(max !== undefined && {
- max: { value: max, message: `Must be at most ${max}` },
+ max: {
+ value: max,
+ message: `Please enter a number of at most ${max}`,
+ },
}),
})}
/>
diff --git a/apps/web/ui/submitted-leads/form-fields/phone-field.tsx b/apps/web/ui/submitted-leads/form-fields/phone-field.tsx
index 20d09bfd15..661c4e4784 100644
--- a/apps/web/ui/submitted-leads/form-fields/phone-field.tsx
+++ b/apps/web/ui/submitted-leads/form-fields/phone-field.tsx
@@ -2,7 +2,7 @@ import { phoneFieldSchema } from "@/lib/zod/schemas/submitted-lead-form";
import { cn } from "@dub/utils";
import { useFormContext } from "react-hook-form";
import * as z from "zod/v4";
-import { FormControl } from "./form-control";
+import { FormControl, requiredFieldRule } from "./form-control";
type PhoneFieldData = z.infer<typeof phoneFieldSchema>;
@@ -34,7 +34,7 @@ export function PhoneField({
: "border-neutral-300 text-neutral-900 placeholder-neutral-400 focus:border-[var(--brand)] focus:ring-[var(--brand)]",
)}
{...register(keyPath, {
- required: field.required,
+ required: requiredFieldRule(field.required),
})}
/>
</FormControl>
diff --git a/apps/web/ui/submitted-leads/form-fields/text-field.tsx b/apps/web/ui/submitted-leads/form-fields/text-field.tsx
index 4c1a9ff56f..0e239e0b2f 100644
--- a/apps/web/ui/submitted-leads/form-fields/text-field.tsx
+++ b/apps/web/ui/submitted-leads/form-fields/text-field.tsx
@@ -2,7 +2,7 @@ import { textFieldSchema } from "@/lib/zod/schemas/submitted-lead-form";
import { cn } from "@dub/utils";
import { useFormContext } from "react-hook-form";
import * as z from "zod/v4";
-import { FormControl } from "./form-control";
+import { FormControl, maxLengthRule, requiredFieldRule } from "./form-control";
import { MaxCharacterCount } from "./max-character-count";
type TextFieldData = z.infer<typeof textFieldSchema>;
@@ -29,7 +29,12 @@ export function TextField({
const inputType = inputProps?.type || "text";
return (
- <FormControl label={field.label} required={field.required} dir="auto">
+ <FormControl
+ label={field.label}
+ required={field.required}
+ error={state.error?.message}
+ dir="auto"
+ >
<input
type={inputType}
className={cn(
@@ -40,10 +45,13 @@ export function TextField({
)}
{...inputProps}
{...register(keyPath, {
- required: field.required,
- maxLength: maxLength,
+ required: requiredFieldRule(field.required),
+ maxLength: maxLengthRule(maxLength),
pattern: field.constraints?.pattern
- ? new RegExp(field.constraints.pattern)
+ ? {
+ value: new RegExp(field.constraints.pattern),
+ message: "Please enter a valid value",
+ }
: undefined,
...(inputType === "email" && {
validate: (value: string) => {
diff --git a/apps/web/ui/submitted-leads/form-fields/textarea-field.tsx b/apps/web/ui/submitted-leads/form-fields/textarea-field.tsx
index b2ea656072..bd963deaeb 100644
--- a/apps/web/ui/submitted-leads/form-fields/textarea-field.tsx
+++ b/apps/web/ui/submitted-leads/form-fields/textarea-field.tsx
@@ -2,7 +2,7 @@ import { textareaFieldSchema } from "@/lib/zod/schemas/submitted-lead-form";
import { cn } from "@dub/utils";
import { useFormContext } from "react-hook-form";
import * as z from "zod/v4";
-import { FormControl } from "./form-control";
+import { FormControl, maxLengthRule, requiredFieldRule } from "./form-control";
import { MaxCharacterCount } from "./max-character-count";
type TextareaFieldData = z.infer<typeof textareaFieldSchema>;
@@ -24,7 +24,12 @@ export function TextareaField({
const error = !!state.error || exceedsMaxLength;
return (
- <FormControl label={field.label} required={field.required} dir="auto">
+ <FormControl
+ label={field.label}
+ required={field.required}
+ error={state.error?.message}
+ dir="auto"
+ >
<textarea
className={cn(
"mt-2 block w-full rounded-md text-sm focus:outline-none",
@@ -34,8 +39,8 @@ export function TextareaField({
)}
rows={4}
{...register(keyPath, {
- required: field.required,
- maxLength: maxLength,
+ required: requiredFieldRule(field.required),
+ maxLength: maxLengthRule(maxLength),
})}
/>
diff --git a/apps/web/ui/submitted-leads/form-fields/url-field.tsx b/apps/web/ui/submitted-leads/form-fields/url-field.tsx
index ec896ac6af..bcc72a6df6 100644
--- a/apps/web/ui/submitted-leads/form-fields/url-field.tsx
+++ b/apps/web/ui/submitted-leads/form-fields/url-field.tsx
@@ -2,7 +2,7 @@ import { urlFieldSchema } from "@/lib/zod/schemas/submitted-lead-form";
import { cn, isValidUrl } from "@dub/utils";
import { useFormContext } from "react-hook-form";
import * as z from "zod/v4";
-import { FormControl } from "./form-control";
+import { FormControl, requiredFieldRule } from "./form-control";
type UrlFieldData = z.infer<typeof urlFieldSchema>;
@@ -35,7 +35,7 @@ export function UrlField({
: "border-neutral-300 text-neutral-900 placeholder-neutral-400 focus:border-[var(--brand)] focus:ring-[var(--brand)]",
)}
{...register(keyPath, {
- required: field.required,
+ required: requiredFieldRule(field.required),
validate: (value: string) => {
if (!value) return true;
return isValidUrl(value) || "Please enter a valid URL";