diff --git a/packages/calcite-components/src/components/button/button.e2e.ts b/packages/calcite-components/src/components/button/button.e2e.ts index 7ac027ca14c..d1f3d15d4ee 100644 --- a/packages/calcite-components/src/components/button/button.e2e.ts +++ b/packages/calcite-components/src/components/button/button.e2e.ts @@ -94,7 +94,7 @@ describe("calcite-button", () => { hidden("calcite-button"); }); - it("renders child element as disabled or aria-disabled", async () => { + it("renders child element as disabled", async () => { const page = await newE2EPage(); await page.setContent(`Continue`); @@ -105,7 +105,6 @@ describe("calcite-button", () => { expect(elementAsLink).toBeNull(); expect(await elementAsButton.getProperty("disabled")).toBe(true); - expect(await elementAsButton.getProperty("ariaDisabled")).toBe(null); const element = await page.find("calcite-button"); element.setProperty("href", "#anchor"); @@ -118,7 +117,6 @@ describe("calcite-button", () => { expect(elementAsLink).not.toBeNull(); expect(await elementAsLink.getProperty("disabled")).toBe(undefined); - expect(await elementAsLink.getProperty("ariaDisabled")).toBe("true"); }); it("renders as a button with default props", async () => { diff --git a/packages/calcite-components/src/components/button/button.tsx b/packages/calcite-components/src/components/button/button.tsx index 0055426a824..b8ae14cb703 100644 --- a/packages/calcite-components/src/components/button/button.tsx +++ b/packages/calcite-components/src/components/button/button.tsx @@ -33,9 +33,9 @@ import { updateMessages, } from "../../utils/t9n"; import { Appearance, FlipContext, Kind, Scale, Width } from "../interfaces"; -import { toAriaBoolean } from "../../utils/dom"; import { IconNameOrString } from "../icon/interfaces"; import { isBrowser } from "../../utils/browser"; +import { toAriaBoolean } from "../../utils/dom"; import { ButtonMessages } from "./assets/button/t9n"; import { ButtonAlignment } from "./interfaces"; import { CSS } from "./resources"; @@ -266,7 +266,7 @@ export class Button return ( -
+
(this.slotRefEl = el as HTMLSlotElement)} diff --git a/packages/calcite-components/src/components/card/card.tsx b/packages/calcite-components/src/components/card/card.tsx index 61a79410a7c..7753d93f2e1 100644 --- a/packages/calcite-components/src/components/card/card.tsx +++ b/packages/calcite-components/src/components/card/card.tsx @@ -374,7 +374,6 @@ export class Card
-
+
(this.slotRefEl = el as HTMLSlotElement)} diff --git a/packages/calcite-components/src/components/chip/chip.tsx b/packages/calcite-components/src/components/chip/chip.tsx index 55a1b47ff47..e4c6452813f 100644 --- a/packages/calcite-components/src/components/chip/chip.tsx +++ b/packages/calcite-components/src/components/chip/chip.tsx @@ -413,7 +413,6 @@ export class Chip ? toAriaBoolean(this.selected) : undefined } - aria-disabled={disableInteraction ? toAriaBoolean(disabled) : undefined} aria-label={this.label} class={{ [CSS.container]: true, diff --git a/packages/calcite-components/src/components/date-picker-day/date-picker-day.tsx b/packages/calcite-components/src/components/date-picker-day/date-picker-day.tsx index b048610ac8a..9c3e465c6d6 100644 --- a/packages/calcite-components/src/components/date-picker-day/date-picker-day.tsx +++ b/packages/calcite-components/src/components/date-picker-day/date-picker-day.tsx @@ -181,7 +181,6 @@ export class DatePickerDay implements InteractiveComponent, LoadableComponent { return ( { - this.handleButton = el; - }} - // role of radio is being applied to allow space key to select in screen readers - role="radio" - tabIndex={this.disabled ? null : 0} - title={this.getTooltip()} - > - - + + { + this.handleButton = el; + }} + // role of radio is being applied to allow space key to select in screen readers + role="radio" + tabIndex={this.disabled ? null : 0} + title={this.getTooltip()} + > + + + ); } } diff --git a/packages/calcite-components/src/components/slider/slider.tsx b/packages/calcite-components/src/components/slider/slider.tsx index 91e9fe2a746..65dfa5f0a3f 100644 --- a/packages/calcite-components/src/components/slider/slider.tsx +++ b/packages/calcite-components/src/components/slider/slider.tsx @@ -438,7 +438,6 @@ export class Slider return (