diff --git a/packages/calcite-components/src/components/combobox/combobox.tsx b/packages/calcite-components/src/components/combobox/combobox.tsx index 4ed82076997..448794d32c3 100644 --- a/packages/calcite-components/src/components/combobox/combobox.tsx +++ b/packages/calcite-components/src/components/combobox/combobox.tsx @@ -71,7 +71,7 @@ import { Validation } from "../functional/Validation"; import { IconNameOrString } from "../icon/interfaces"; import { ComboboxMessages } from "./assets/combobox/t9n"; import { ComboboxChildElement, SelectionDisplay } from "./interfaces"; -import { ComboboxChildSelector, ComboboxItem, ComboboxItemGroup, CSS } from "./resources"; +import { ComboboxChildSelector, ComboboxItem, ComboboxItemGroup, CSS, IDS } from "./resources"; import { getItemAncestors, getItemChildren, @@ -1634,8 +1634,10 @@ export class Combobox aria-activedescendant={this.activeDescendant} aria-autocomplete="list" aria-controls={`${listboxUidPrefix}${guid}`} + aria-errormessage={IDS.validationMessage} aria-expanded={toAriaBoolean(open)} aria-haspopup="listbox" + aria-invalid={this.status === "invalid"} aria-label={getLabelText(this)} aria-owns={`${listboxUidPrefix}${guid}`} class={{ @@ -1811,6 +1813,7 @@ export class Combobox {this.validationMessage && this.status === "invalid" ? ( = ({ scale, status, + id, icon, message, }) => (
- + {message}
diff --git a/packages/calcite-components/src/components/input-date-picker/input-date-picker.tsx b/packages/calcite-components/src/components/input-date-picker/input-date-picker.tsx index 5009fcd90a1..f0ffa1e9f23 100644 --- a/packages/calcite-components/src/components/input-date-picker/input-date-picker.tsx +++ b/packages/calcite-components/src/components/input-date-picker/input-date-picker.tsx @@ -92,7 +92,7 @@ import { syncHiddenFormInput } from "../input/common/input"; import { isBrowser } from "../../utils/browser"; import { normalizeToCurrentCentury, isTwoDigitYear } from "./utils"; import { InputDatePickerMessages } from "./assets/input-date-picker/t9n"; -import { CSS } from "./resources"; +import { CSS, IDS } from "./resources"; @Component({ tag: "calcite-input-date-picker", @@ -568,8 +568,10 @@ export class InputDatePicker aria-autocomplete="none" aria-controls={this.dialogId} aria-describedby={this.placeholderTextId} + aria-errormessage={IDS.validationMessage} aria-expanded={toAriaBoolean(this.open)} aria-haspopup="dialog" + aria-invalid={this.status === "invalid"} class={{ [CSS.input]: true, [CSS.inputNoBottomBorder]: this.layout === "vertical" && this.range, @@ -661,8 +663,10 @@ export class InputDatePicker -
+
{this.validationMessage && this.status === "invalid" ? ( -
+
@@ -211,6 +215,7 @@ export class SegmentedControl {this.validationMessage && this.status === "invalid" ? (