Skip to content

fix(combobox, input-date-picker, input-number, input-text, input-time-picker, input, radio-button-group, segmented-control, select, text-area): use toAriaBoolean in aria-invalid attribute to provide valid AT error messaging #10079

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aPreciado88 merged 1 commit into from
Aug 15, 2024
Merged

fix(combobox, input-date-picker, input-number, input-text, input-time-picker, input, radio-button-group, segmented-control, select, text-area): use toAriaBoolean in aria-invalid attribute to provide valid AT error messaging #10079

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/calcite-components/src/components/combobox/combobox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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={{
Expand Down
4 changes: 2 additions & 2 deletions packages/calcite-components/src/components/input-date-picker/input-date-picker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
3 changes: 2 additions & 1 deletion packages/calcite-components/src/components/input-number/input-number.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import {
getSlotted,
isPrimaryPointerButton,
setRequestedIcon,
toAriaBoolean,
} from "../../utils/dom";
import { Alignment, Scale, Status } from "../interfaces";
import {
Expand Down Expand Up @@ -1092,7 +1093,7 @@ export class InputNumber
const childEl = (
<input
aria-errormessage={IDS.validationMessage}
aria-invalid={this.status === "invalid"}
aria-invalid={toAriaBoolean(this.status === "invalid")}
aria-label={getLabelText(this)}
autocomplete={this.autocomplete}
autofocus={this.el.autofocus ? true : null}
Expand Down
4 changes: 2 additions & 2 deletions packages/calcite-components/src/components/input-text/input-text.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
VNode,
Watch,
} from "@stencil/core";
import { getElementDir, getSlotted, setRequestedIcon } from "../../utils/dom";
import { getElementDir, getSlotted, setRequestedIcon, toAriaBoolean } from "../../utils/dom";
import {
connectForm,
disconnectForm,
Expand Down Expand Up @@ -674,7 +674,7 @@ export class InputText
const childEl = (
<input
aria-errormessage={IDS.validationMessage}
aria-invalid={this.status === "invalid"}
aria-invalid={toAriaBoolean(this.status === "invalid")}
aria-label={getLabelText(this)}
autocomplete={this.autocomplete}
autofocus={this.el.autofocus ? true : null}
Expand Down
4 changes: 2 additions & 2 deletions packages/calcite-components/src/components/input-time-picker/input-time-picker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ import { getSupportedLocale } from "../../utils/locale";
import { decimalPlaces } from "../../utils/math";
import { getIconScale } from "../../utils/component";
import { Validation } from "../functional/Validation";
import { focusFirstTabbable } from "../../utils/dom";
import { focusFirstTabbable, toAriaBoolean } from "../../utils/dom";
import { IconNameOrString } from "../icon/interfaces";
import { syncHiddenFormInput } from "../input/common/input";
import { CSS, IDS } from "./resources";
Expand Down Expand Up @@ -1017,7 +1017,7 @@ export class InputTimePicker
aria-autocomplete="none"
aria-errormessage={IDS.validationMessage}
aria-haspopup="dialog"
aria-invalid={this.status === "invalid"}
aria-invalid={toAriaBoolean(this.status === "invalid")}
disabled={disabled}
icon="clock"
id={this.referenceElementId}
Expand Down
5 changes: 3 additions & 2 deletions packages/calcite-components/src/components/input/input.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import {
getSlotted,
isPrimaryPointerButton,
setRequestedIcon,
toAriaBoolean,
} from "../../utils/dom";
import { Scale, Status, Alignment } from "../interfaces";
import {
Expand Down Expand Up @@ -1183,7 +1184,7 @@ export class Input
<input
accept={this.accept}
aria-errormessage={IDS.validationMessage}
aria-invalid={this.status === "invalid"}
aria-invalid={toAriaBoolean(this.status === "invalid")}
aria-label={getLabelText(this)}
autocomplete={this.autocomplete}
autofocus={autofocus}
Expand Down Expand Up @@ -1216,7 +1217,7 @@ export class Input
<this.childElType
accept={this.accept}
aria-errormessage={IDS.validationMessage}
aria-invalid={this.status === "invalid"}
aria-invalid={toAriaBoolean(this.status === "invalid")}
aria-label={getLabelText(this)}
autocomplete={this.autocomplete}
autofocus={autofocus}
Expand Down
3 changes: 2 additions & 1 deletion packages/calcite-components/src/components/radio-button-group/radio-button-group.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import {
Watch,
} from "@stencil/core";
import { createObserver } from "../../utils/observers";
import { toAriaBoolean } from "../../utils/dom";
import { Layout, Scale, Status } from "../interfaces";
import {
componentFocusable,
Expand Down Expand Up @@ -209,7 +210,7 @@ export class RadioButtonGroup implements LoadableComponent {
<Host role="radiogroup">
<div
aria-errormessage={IDS.validationMessage}
aria-invalid={this.status === "invalid"}
aria-invalid={toAriaBoolean(this.status === "invalid")}
class={CSS.itemWrapper}
>
<slot />
Expand Down
4 changes: 2 additions & 2 deletions packages/calcite-components/src/components/segmented-control/segmented-control.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
VNode,
Watch,
} from "@stencil/core";
import { getElementDir } from "../../utils/dom";
import { getElementDir, toAriaBoolean } from "../../utils/dom";
import {
afterConnectDefaultValueSet,
connectForm,
Expand Down Expand Up @@ -204,7 +204,7 @@ export class SegmentedControl
<Host onClick={this.handleClick} role="radiogroup">
<div
aria-errormessage={IDS.validationMessage}
aria-invalid={this.status === "invalid"}
aria-invalid={toAriaBoolean(this.status === "invalid")}
class={CSS.itemWrapper}
>
<InteractiveContainer disabled={this.disabled}>
Expand Down
4 changes: 2 additions & 2 deletions packages/calcite-components/src/components/select/select.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
VNode,
Watch,
} from "@stencil/core";
import { focusElement } from "../../utils/dom";
import { focusElement, toAriaBoolean } from "../../utils/dom";
import {
afterConnectDefaultValueSet,
connectForm,
Expand Down Expand Up @@ -422,7 +422,7 @@ export class Select
<div class={CSS.wrapper}>
<select
aria-errormessage={IDS.validationMessage}
aria-invalid={this.status === "invalid"}
aria-invalid={toAriaBoolean(this.status === "invalid")}
aria-label={getLabelText(this)}
class={CSS.select}
disabled={disabled}
Expand Down
6 changes: 3 additions & 3 deletions packages/calcite-components/src/components/text-area/text-area.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,9 +311,9 @@ export class TextArea
<textarea
aria-describedby={this.guid}
aria-errormessage={IDS.validationMessage}
aria-invalid={
this.status === "invalid" || toAriaBoolean(this.isCharacterLimitExceeded())
}
aria-invalid={toAriaBoolean(
this.status === "invalid" || this.isCharacterLimitExceeded(),
Copy link
Copy Markdown
Member

@driskull driskull Aug 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nitpick: is the comma needed here?

Copy link
Copy Markdown
Contributor Author

@aPreciado88 aPreciado88 Aug 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The comma is being added by Prettier in vs code

Copy link
Copy Markdown
Member

@driskull driskull Aug 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok 👍

)}
aria-label={getLabelText(this)}
autofocus={this.el.autofocus}
class={{
Expand Down