mirror of
https://github.com/carbon-design-system/carbon-components-svelte.git
synced 2025-09-18 19:46:36 +00:00
1. We should verify if the input is in an error state onMount
and set the error
accordingly.
2. Fix last commits and the `invalid` state border works again. 3. If the `invalid` state is set by the user, we must use `setCustomValidity` to set input validity to false. 4. `invalidText` must have a default and must not be empty. If empty, it will set the validity to true. I don't know if we should check for that.
This commit is contained in:
parent
30d4567247
commit
faddb4c654
3 changed files with 33 additions and 14 deletions
|
@ -55,7 +55,7 @@
|
|||
export let invalid = false;
|
||||
|
||||
/** Specify the invalid state text */
|
||||
export let invalidText = "";
|
||||
export let invalidText = "Number is not valid";
|
||||
|
||||
/** Set to `true` to indicate an warning state */
|
||||
export let warn = false;
|
||||
|
@ -101,7 +101,7 @@
|
|||
|
||||
let error = false;
|
||||
|
||||
import { createEventDispatcher } from "svelte";
|
||||
import { createEventDispatcher, onMount } from "svelte";
|
||||
import Add from "../icons/Add.svelte";
|
||||
import Subtract from "../icons/Subtract.svelte";
|
||||
import WarningFilled from "../icons/WarningFilled.svelte";
|
||||
|
@ -138,18 +138,27 @@
|
|||
return raw != "" ? Number(raw) : null;
|
||||
}
|
||||
|
||||
function onInput({ target }) {
|
||||
value = parse(target.value);
|
||||
error = !ref.checkValidity() || invalid;
|
||||
function getValidity() {
|
||||
return !ref.checkValidity() || invalid;
|
||||
}
|
||||
|
||||
dispatch("input", value);
|
||||
function onInput({ target }) {
|
||||
error = getValidity();
|
||||
|
||||
dispatch("input", parse(target.value));
|
||||
}
|
||||
|
||||
function onChange({ target }) {
|
||||
error = !ref.checkValidity() || invalid;
|
||||
error = getValidity();
|
||||
|
||||
dispatch("change", parse(target.value));
|
||||
}
|
||||
|
||||
$: if (ref) ref.setCustomValidity(invalid ? invalidText : "");
|
||||
|
||||
onMount(() => {
|
||||
error = getValidity();
|
||||
});
|
||||
</script>
|
||||
|
||||
<!-- svelte-ignore a11y-mouse-events-have-key-events -->
|
||||
|
@ -162,7 +171,7 @@
|
|||
on:mouseleave
|
||||
>
|
||||
<div
|
||||
data-invalid="{error || undefined}"
|
||||
data-invalid="{invalid || error ? true : undefined}"
|
||||
class:bx--number="{true}"
|
||||
class:bx--number--helpertext="{true}"
|
||||
class:bx--number--readonly="{readonly}"
|
||||
|
@ -258,7 +267,7 @@
|
|||
</div>
|
||||
{/if}
|
||||
</div>
|
||||
{#if !error && !warn && helperText}
|
||||
{#if !invalid && !error && !warn && helperText}
|
||||
<div
|
||||
class:bx--form__helper-text="{true}"
|
||||
class:bx--form__helper-text--disabled="{disabled}"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue