Skip to content

Fix onboarding submit button validity state #183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ZeyadAbbas wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Fix onboarding submit button validity state #183

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8edf08e
fixed stale submit button
ZeyadAbbas Jun 5, 2026
9ede00b
lint fix attempt 1/274
ZeyadAbbas Jun 5, 2026
4a773a9
lint fix attempt 2/274
ZeyadAbbas Jun 5, 2026
a968592
lint fix attempt 3/274
ZeyadAbbas Jun 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 21 additions & 12 deletions src/components/getting-started/OnboardingForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import StepLabel from '@mui/material/StepLabel';
import Stepper from '@mui/material/Stepper';
import { useTheme } from '@mui/material/styles';
import useMediaQuery from '@mui/system/useMediaQuery';
import { useStore } from '@tanstack/react-form';
import { useMutation } from '@tanstack/react-query';
import { useRouter } from 'next/navigation';
import { MouseEvent, useCallback, useState } from 'react';
Expand Down Expand Up @@ -120,6 +121,9 @@ export default function OnboardingForm({
},
validators: { onChange: accountOnboardingSchema },
});
const fieldMeta = useStore(form.store, (state) => state.fieldMeta);
const isFieldsValid = useStore(form.store, (state) => state.isFieldsValid);
const isSubmitting = useStore(form.store, (state) => state.isSubmitting);

/*
* Steps
Expand Down Expand Up @@ -168,7 +172,7 @@ export default function OnboardingForm({
}
}, []);

const validateFields = () => {
const validateFields = async () => {
const step = steps[activeStep.current];
if (typeof step === 'undefined') {
return true;
Expand All @@ -177,8 +181,10 @@ export default function OnboardingForm({
if (typeof fields === 'undefined') {
return true;
}
console.log(fields);
fields.forEach((step) => form.validateField(step, 'change'));
const errors = await Promise.all(
fields.map((step) => form.validateField(step, 'change')),
);
return errors.every((fieldErrors) => fieldErrors.length === 0);
};

const currentFieldsValid = () => {
Expand All @@ -190,13 +196,16 @@ export default function OnboardingForm({
if (typeof fields === 'undefined') {
return true;
}
return fields.every((step) => form.state.fieldMeta[step]?.isValid ?? true);
return fields.every((step) => fieldMeta[step]?.isValid ?? true);
};

const handleNext = (event: MouseEvent<HTMLButtonElement>) => {
const handleNext = async (event: MouseEvent<HTMLButtonElement>) => {
// Validates mounted fields and prevents user from navigating if there exist errors
validateFields();
if (!currentFieldsValid()) return;
const isCurrentStepValid = await validateFields();
if (!isCurrentStepValid) {
event.preventDefault();
return;
}

if (activeStep.current < steps.length - (hasFinish ? 2 : 1)) {
// Prevents submit button from activating prematurely when navigating
Expand Down Expand Up @@ -225,7 +234,7 @@ export default function OnboardingForm({
<Button
className={`normal-case ${activeStep.current === steps.length - 1 ? 'invisible' : ''}`}
loadingPosition="start"
color={!form.state.isFieldsValid ? 'inherit' : 'primary'}
color={!isFieldsValid ? 'inherit' : 'primary'}
onClick={handleBack}
disabled={
activeStep.current === 0 || activeStep.current === steps.length - 1
Expand All @@ -245,7 +254,7 @@ export default function OnboardingForm({
variant="contained"
className="normal-case"
disabled={!currentFieldsValid()}
loading={form.state.isSubmitting}
loading={isSubmitting}
loadingPosition="start"
color={!currentFieldsValid() ? 'inherit' : 'primary'}
onClick={handleNext}
Expand Down Expand Up @@ -285,10 +294,10 @@ export default function OnboardingForm({
>
<StepButton
color="inherit"
onClick={() => {
onClick={async () => {
// Validates mounted fields and prevents user from navigating if there exist errors
validateFields();
if (!currentFieldsValid()) return;
const isCurrentStepValid = await validateFields();
if (!isCurrentStepValid) return;

setActiveStep((prev) => ({
current: index,
Expand Down
Loading