diff --git a/src/lib/elements/forms/inputEmail.svelte b/src/lib/elements/forms/inputEmail.svelte index 4b72f6d49..9b07303d7 100644 --- a/src/lib/elements/forms/inputEmail.svelte +++ b/src/lib/elements/forms/inputEmail.svelte @@ -24,15 +24,14 @@ }); const handleInvalid = (event: Event) => { + event.preventDefault(); errorMessage = element.validationMessage; - if (element.validity.typeMismatch) { errorMessage = 'Your email should be formatted as: name@example.com'; } if (element.validity.valueMissing) { errorMessage = 'This field is required'; } - event.preventDefault(); showHelper = true; }; diff --git a/src/lib/elements/forms/inputNumber.svelte b/src/lib/elements/forms/inputNumber.svelte index 511b8c89b..acf1453e6 100644 --- a/src/lib/elements/forms/inputNumber.svelte +++ b/src/lib/elements/forms/inputNumber.svelte @@ -25,13 +25,13 @@ }); const handleInvalid = (event: Event) => { - errorMessage = element.validationMessage; + event.preventDefault(); + errorMessage = element.validationMessage; if (element.validity.valueMissing) { errorMessage = 'This field is required'; } - event.preventDefault(); showHelper = true; }; diff --git a/src/lib/elements/forms/inputPassword.svelte b/src/lib/elements/forms/inputPassword.svelte index 9c5433e7f..452834751 100644 --- a/src/lib/elements/forms/inputPassword.svelte +++ b/src/lib/elements/forms/inputPassword.svelte @@ -29,6 +29,7 @@ }); const handleInvalid = (event: Event) => { + event.preventDefault(); errorMessage = element.validationMessage; console.log(element.validity); if (element.validity.valueMissing) { @@ -37,7 +38,6 @@ if (element.validity.tooShort) { errorMessage = 'Password should contain at least 8 characters'; } - event.preventDefault(); showHelper = true; }; diff --git a/src/lib/elements/forms/inputPhone.svelte b/src/lib/elements/forms/inputPhone.svelte index 9349e6373..5fa512e5b 100644 --- a/src/lib/elements/forms/inputPhone.svelte +++ b/src/lib/elements/forms/inputPhone.svelte @@ -25,11 +25,11 @@ }); const handleInvalid = (event: Event) => { + event.preventDefault(); errorMessage = element.validationMessage; if (element.validity.valueMissing) { errorMessage = 'This field is required'; } - event.preventDefault(); showHelper = true; }; diff --git a/src/lib/elements/forms/inputRadio.svelte b/src/lib/elements/forms/inputRadio.svelte index 8a00b6b68..681885ac1 100644 --- a/src/lib/elements/forms/inputRadio.svelte +++ b/src/lib/elements/forms/inputRadio.svelte @@ -16,11 +16,11 @@ let element: HTMLInputElement; const handleInvalid = (event: Event) => { + event.preventDefault(); errorMessage = element.validationMessage; if (element.validity.valueMissing) { errorMessage = 'This field is required'; } - event.preventDefault(); showHelper = true; }; diff --git a/src/lib/elements/forms/inputSelect.svelte b/src/lib/elements/forms/inputSelect.svelte index 16f6935da..6129cb11e 100644 --- a/src/lib/elements/forms/inputSelect.svelte +++ b/src/lib/elements/forms/inputSelect.svelte @@ -18,12 +18,12 @@ let element: HTMLSelectElement; const handleInvalid = (event: Event) => { + event.preventDefault(); errorMessage = element.validationMessage; if (element.validity.valueMissing) { errorMessage = 'This field is required'; } - event.preventDefault(); showHelper = true; }; diff --git a/src/lib/elements/forms/inputSwitch.svelte b/src/lib/elements/forms/inputSwitch.svelte index df47d1720..1e395cbfb 100644 --- a/src/lib/elements/forms/inputSwitch.svelte +++ b/src/lib/elements/forms/inputSwitch.svelte @@ -13,12 +13,12 @@ let element: HTMLInputElement; const handleInvalid = (event: Event) => { + event.preventDefault(); errorMessage = element.validationMessage; if (element.validity.valueMissing) { errorMessage = 'This field is required'; } - event.preventDefault(); showHelper = true; }; diff --git a/src/lib/elements/forms/inputTags.svelte b/src/lib/elements/forms/inputTags.svelte index 0f4e4b5b4..a1d4e41e3 100644 --- a/src/lib/elements/forms/inputTags.svelte +++ b/src/lib/elements/forms/inputTags.svelte @@ -52,11 +52,11 @@ }; const handleInvalid = (event: Event) => { + event.preventDefault(); errorMessage = element.validationMessage; if (element.validity.valueMissing) { errorMessage = 'This field is required'; } - event.preventDefault(); showHelper = true; }; diff --git a/src/lib/elements/forms/inputText.svelte b/src/lib/elements/forms/inputText.svelte index 1353a4175..5235c215c 100644 --- a/src/lib/elements/forms/inputText.svelte +++ b/src/lib/elements/forms/inputText.svelte @@ -25,11 +25,11 @@ }); const handleInvalid = (event: Event) => { + event.preventDefault(); errorMessage = element.validationMessage; if (element.validity.valueMissing) { errorMessage = 'This field is required'; } - event.preventDefault(); showHelper = true; }; diff --git a/src/lib/elements/forms/inputTextarea.svelte b/src/lib/elements/forms/inputTextarea.svelte index e197e9802..6d02c9675 100644 --- a/src/lib/elements/forms/inputTextarea.svelte +++ b/src/lib/elements/forms/inputTextarea.svelte @@ -24,11 +24,11 @@ }); const handleInvalid = (event: Event) => { + event.preventDefault(); errorMessage = element.validationMessage; if (element.validity.valueMissing) { errorMessage = 'This field is required'; } - event.preventDefault(); showHelper = true; };