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.

Update lead form field errors when the form validates

Rafi77dcfb4f8862
diff --git a/apps/web/ui/submitted-leads/form-fields/country-field.tsx b/apps/web/ui/submitted-leads/form-fields/country-field.tsx
index fc65ae27a5..59e889e8b0 100644
--- a/apps/web/ui/submitted-leads/form-fields/country-field.tsx
+++ b/apps/web/ui/submitted-leads/form-fields/country-field.tsx
@@ -13,9 +13,9 @@ export function CountryField({
keyPath?: string;
field: CountryFieldData;
}) {
- const { getFieldState, control } = useFormContext<any>();
+ const { getFieldState, control, formState } = useFormContext<any>();
const keyPath = keyPathProp || `formData.${field.key}`;
- const state = getFieldState(keyPath);
+ const state = getFieldState(keyPath, formState);
const error = !!state.error;
return (
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 a67b726a87..7a0e77b0ed 100644
--- a/apps/web/ui/submitted-leads/form-fields/date-field.tsx
+++ b/apps/web/ui/submitted-leads/form-fields/date-field.tsx
@@ -13,9 +13,9 @@ export function DateField({
keyPath?: string;
field: DateFieldData;
}) {
- const { register, getFieldState } = useFormContext<any>();
+ const { register, getFieldState, formState } = useFormContext<any>();
const keyPath = keyPathProp || `formData.${field.key}`;
- const state = getFieldState(keyPath);
+ const state = getFieldState(keyPath, formState);
const error = !!state.error;
return (
diff --git a/apps/web/ui/submitted-leads/form-fields/multi-select-field.tsx b/apps/web/ui/submitted-leads/form-fields/multi-select-field.tsx
index 4211bafd5c..2a58aad191 100644
--- a/apps/web/ui/submitted-leads/form-fields/multi-select-field.tsx
+++ b/apps/web/ui/submitted-leads/form-fields/multi-select-field.tsx
@@ -13,9 +13,9 @@ export function MultiSelectField({
keyPath?: string;
field: MultiSelectFieldData;
}) {
- const { getFieldState, control } = useFormContext<any>();
+ const { getFieldState, control, formState } = useFormContext<any>();
const keyPath = keyPathProp || `formData.${field.key}`;
- const state = getFieldState(keyPath);
+ const state = getFieldState(keyPath, formState);
const options = field.options;
return (
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 6572e72b6c..4843be52c9 100644
--- a/apps/web/ui/submitted-leads/form-fields/number-field.tsx
+++ b/apps/web/ui/submitted-leads/form-fields/number-field.tsx
@@ -13,9 +13,9 @@ export function NumberField({
keyPath?: string;
field: NumberFieldData;
}) {
- const { register, getFieldState } = useFormContext<any>();
+ const { register, getFieldState, formState } = useFormContext<any>();
const keyPath = keyPathProp || `formData.${field.key}`;
- const state = getFieldState(keyPath);
+ const state = getFieldState(keyPath, formState);
const error = !!state.error;
const min = field.constraints?.min;
const max = field.constraints?.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 578c096e37..20d09bfd15 100644
--- a/apps/web/ui/submitted-leads/form-fields/phone-field.tsx
+++ b/apps/web/ui/submitted-leads/form-fields/phone-field.tsx
@@ -13,9 +13,9 @@ export function PhoneField({
keyPath?: string;
field: PhoneFieldData;
}) {
- const { register, getFieldState } = useFormContext<any>();
+ const { register, getFieldState, formState } = useFormContext<any>();
const keyPath = keyPathProp || `formData.${field.key}`;
- const state = getFieldState(keyPath);
+ const state = getFieldState(keyPath, formState);
const error = !!state.error;
return (
diff --git a/apps/web/ui/submitted-leads/form-fields/select-field.tsx b/apps/web/ui/submitted-leads/form-fields/select-field.tsx
index 28c73cb34c..333f386eda 100644
--- a/apps/web/ui/submitted-leads/form-fields/select-field.tsx
+++ b/apps/web/ui/submitted-leads/form-fields/select-field.tsx
@@ -14,9 +14,9 @@ export function SelectField({
keyPath?: string;
field: SelectFieldData;
}) {
- const { getFieldState, control } = useFormContext<any>();
+ const { getFieldState, control, formState } = useFormContext<any>();
const keyPath = keyPathProp || `formData.${field.key}`;
- const state = getFieldState(keyPath);
+ const state = getFieldState(keyPath, formState);
const error = !!state.error;
const options = field.options.map((option) => ({
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 028c13474a..4c1a9ff56f 100644
--- a/apps/web/ui/submitted-leads/form-fields/text-field.tsx
+++ b/apps/web/ui/submitted-leads/form-fields/text-field.tsx
@@ -16,10 +16,10 @@ export function TextField({
field: TextFieldData;
inputProps?: React.InputHTMLAttributes<HTMLInputElement>;
}) {
- const { register, getFieldState, watch } = useFormContext<any>();
+ const { register, getFieldState, watch, formState } = useFormContext<any>();
const keyPath = keyPathProp || `formData.${field.key}`;
const value = watch(keyPath);
- const state = getFieldState(keyPath);
+ const state = getFieldState(keyPath, formState);
const currentLength = value?.length || 0;
const maxLength = field.constraints?.maxLength;
const exceedsMaxLength = maxLength && currentLength > maxLength;
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 a67bbd38ff..b2ea656072 100644
--- a/apps/web/ui/submitted-leads/form-fields/textarea-field.tsx
+++ b/apps/web/ui/submitted-leads/form-fields/textarea-field.tsx
@@ -14,10 +14,10 @@ export function TextareaField({
keyPath?: string;
field: TextareaFieldData;
}) {
- const { register, getFieldState, watch } = useFormContext<any>();
+ const { register, getFieldState, watch, formState } = useFormContext<any>();
const keyPath = keyPathProp || `formData.${field.key}`;
const value = watch(keyPath);
- const state = getFieldState(keyPath);
+ const state = getFieldState(keyPath, formState);
const currentLength = value?.length || 0;
const maxLength = field.constraints?.maxLength;
const exceedsMaxLength = maxLength && currentLength > 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 0c8f4509a6..ec896ac6af 100644
--- a/apps/web/ui/submitted-leads/form-fields/url-field.tsx
+++ b/apps/web/ui/submitted-leads/form-fields/url-field.tsx
@@ -13,9 +13,9 @@ export function UrlField({
keyPath?: string;
field: UrlFieldData;
}) {
- const { register, getFieldState } = useFormContext<any>();
+ const { register, getFieldState, formState } = useFormContext<any>();
const keyPath = keyPathProp || `formData.${field.key}`;
- const state = getFieldState(keyPath);
+ const state = getFieldState(keyPath, formState);
const error = !!state.error;
return (