Skip to content
15 changes: 13 additions & 2 deletions apps/studio/src/modules/add-site/components/create-site-form.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,7 @@ export const CreateSiteForm = ( {
}

const hasErrors =
! siteName.trim() ||
!! pathError ||
( useCustomDomain && !! customDomainError ) ||
! adminUsername.trim() ||
Expand All @@ -306,7 +307,15 @@ export const CreateSiteForm = ( {
onValidityChange( isValid );
}
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [ pathError, customDomainError, useCustomDomain, adminUsername, adminPassword, adminEmail ] );
}, [
siteName,
pathError,
customDomainError,
useCustomDomain,
adminUsername,
adminPassword,
adminEmail,
] );

const handleSiteNameChange = useCallback(
async ( name: string ) => {
Expand Down Expand Up @@ -455,7 +464,9 @@ export const CreateSiteForm = ( {
onKeyDown={ ( event ) => {
if ( event.key === 'Enter' ) {
event.preventDefault();
handleFormSubmit( event as FormEvent );
if ( errorCount === 0 ) {
handleFormSubmit( event as FormEvent );
}
}
} }
data-testid="site-name-input"
Expand Down
Loading