diff --git a/packages/calcite-components/src/components/combobox/combobox.tsx b/packages/calcite-components/src/components/combobox/combobox.tsx index 448794d32c3..63ad63b9fcb 100644 --- a/packages/calcite-components/src/components/combobox/combobox.tsx +++ b/packages/calcite-components/src/components/combobox/combobox.tsx @@ -1637,7 +1637,7 @@ export class Combobox aria-errormessage={IDS.validationMessage} aria-expanded={toAriaBoolean(open)} aria-haspopup="listbox" - aria-invalid={this.status === "invalid"} + aria-invalid={toAriaBoolean(this.status === "invalid")} aria-label={getLabelText(this)} aria-owns={`${listboxUidPrefix}${guid}`} class={{ 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 f64c0260998..185ccdd35f6 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 @@ -572,7 +572,7 @@ export class InputDatePicker aria-errormessage={IDS.validationMessage} aria-expanded={toAriaBoolean(this.open)} aria-haspopup="dialog" - aria-invalid={this.status === "invalid"} + aria-invalid={toAriaBoolean(this.status === "invalid")} class={{ [CSS.input]: true, [CSS.inputNoBottomBorder]: this.layout === "vertical" && this.range, @@ -667,7 +667,7 @@ export class InputDatePicker aria-errormessage={IDS.validationMessage} aria-expanded={toAriaBoolean(this.open)} aria-haspopup="dialog" - aria-invalid={this.status === "invalid"} + aria-invalid={toAriaBoolean(this.status === "invalid")} class={{ [CSS.input]: true, [CSS.inputBorderTopColorOne]: this.layout === "vertical" && this.range, diff --git a/packages/calcite-components/src/components/input-number/input-number.tsx b/packages/calcite-components/src/components/input-number/input-number.tsx index c0f434b2a90..0ffb54b7ef4 100644 --- a/packages/calcite-components/src/components/input-number/input-number.tsx +++ b/packages/calcite-components/src/components/input-number/input-number.tsx @@ -17,6 +17,7 @@ import { getSlotted, isPrimaryPointerButton, setRequestedIcon, + toAriaBoolean, } from "../../utils/dom"; import { Alignment, Scale, Status } from "../interfaces"; import { @@ -1092,7 +1093,7 @@ export class InputNumber const childEl = (
diff --git a/packages/calcite-components/src/components/segmented-control/segmented-control.tsx b/packages/calcite-components/src/components/segmented-control/segmented-control.tsx index 983d5502379..9b374d688aa 100644 --- a/packages/calcite-components/src/components/segmented-control/segmented-control.tsx +++ b/packages/calcite-components/src/components/segmented-control/segmented-control.tsx @@ -11,7 +11,7 @@ import { VNode, Watch, } from "@stencil/core"; -import { getElementDir } from "../../utils/dom"; +import { getElementDir, toAriaBoolean } from "../../utils/dom"; import { afterConnectDefaultValueSet, connectForm, @@ -204,7 +204,7 @@ export class SegmentedControl
diff --git a/packages/calcite-components/src/components/select/select.tsx b/packages/calcite-components/src/components/select/select.tsx index c954687b571..6dda150d91a 100644 --- a/packages/calcite-components/src/components/select/select.tsx +++ b/packages/calcite-components/src/components/select/select.tsx @@ -11,7 +11,7 @@ import { VNode, Watch, } from "@stencil/core"; -import { focusElement } from "../../utils/dom"; +import { focusElement, toAriaBoolean } from "../../utils/dom"; import { afterConnectDefaultValueSet, connectForm, @@ -422,7 +422,7 @@ export class Select