diff --git a/packages/calcite-components/src/components/button/button.tsx b/packages/calcite-components/src/components/button/button.tsx index b8ae14cb703..d5fa047691e 100644 --- a/packages/calcite-components/src/components/button/button.tsx +++ b/packages/calcite-components/src/components/button/button.tsx @@ -267,7 +267,7 @@ export class Button {(this.selectionCell || this.readCellContentsToAT) && ( - + {this.selectionCell && this.selectionText} {this.readCellContentsToAT && !this.selectionCell && this.contentsText} diff --git a/packages/calcite-components/src/components/table-header/table-header.tsx b/packages/calcite-components/src/components/table-header/table-header.tsx index a5ea7bec4d9..f39778658e2 100644 --- a/packages/calcite-components/src/components/table-header/table-header.tsx +++ b/packages/calcite-components/src/components/table-header/table-header.tsx @@ -261,11 +261,7 @@ export class TableHeader implements LocalizedComponent, LoadableComponent, T9nCo /> )} {(this.selectionCell || this.numberCell) && ( - + {this.screenReaderText} )} diff --git a/packages/calcite-components/src/components/table-row/table-row.tsx b/packages/calcite-components/src/components/table-row/table-row.tsx index a715ecf8eb4..9e2d841c6cf 100644 --- a/packages/calcite-components/src/components/table-row/table-row.tsx +++ b/packages/calcite-components/src/components/table-row/table-row.tsx @@ -13,7 +13,11 @@ import { } from "@stencil/core"; import { LocalizedComponent } from "../../utils/locale"; import { Alignment, Scale, SelectionMode } from "../interfaces"; -import { focusElementInGroup, FocusElementInGroupDestination } from "../../utils/dom"; +import { + focusElementInGroup, + FocusElementInGroupDestination, + toAriaBoolean, +} from "../../utils/dom"; import { RowType, TableInteractionMode, TableRowFocusEvent } from "../table/interfaces"; import { isActivationKey } from "../../utils/key"; import { @@ -410,7 +414,7 @@ export class TableRow implements InteractiveComponent, LocalizedComponent { (this.tableRowEl = el)} diff --git a/packages/calcite-components/src/components/text-area/text-area.tsx b/packages/calcite-components/src/components/text-area/text-area.tsx index e9562989af4..fe68f538946 100644 --- a/packages/calcite-components/src/components/text-area/text-area.tsx +++ b/packages/calcite-components/src/components/text-area/text-area.tsx @@ -366,7 +366,7 @@ export class TextArea {this.isCharacterLimitExceeded() && ( - + {this.replacePlaceHoldersInMessages()} )} diff --git a/packages/calcite-components/src/components/tree/tree.tsx b/packages/calcite-components/src/components/tree/tree.tsx index deaf636d865..6f07c8e5d91 100644 --- a/packages/calcite-components/src/components/tree/tree.tsx +++ b/packages/calcite-components/src/components/tree/tree.tsx @@ -9,7 +9,7 @@ import { Prop, VNode, } from "@stencil/core"; -import { focusElement, nodeListToArray } from "../../utils/dom"; +import { focusElement, nodeListToArray, toAriaBoolean } from "../../utils/dom"; import { Scale, SelectionMode } from "../interfaces"; import { TreeItemSelectDetail } from "../tree-item/interfaces"; import { getTraversableItems, isTreeItem } from "./utils"; @@ -88,9 +88,9 @@ export class Tree { aria-multiselectable={ this.child ? undefined - : ( - this.selectionMode === "multiple" || this.selectionMode === "multichildren" - ).toString() + : toAriaBoolean( + this.selectionMode === "multiple" || this.selectionMode === "multichildren", + ) } onKeyDown={this.keyDownHandler} role={!this.child ? "tree" : undefined}