Skip to content

fix(card): ensure setFocus focuses card when it contains nested interactive children #12724

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
jcfranco merged 1 commit into from
Aug 20, 2025
Merged

fix(card): ensure setFocus focuses card when it contains nested interactive children #12724

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
12 changes: 11 additions & 1 deletion packages/calcite-components/src/components/card/card.e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,17 @@ describe("calcite-card", () => {
});

describe("focusable", () => {
focusable("calcite-card");
describe("default", () => {
focusable("calcite-card");
});

describe("with interactive children", () => {
focusable(html`
<calcite-card id="parent">
<div tabindex="0">focusable child</div>
</calcite-card>
`);
});
});

describe("accessible", () => {
Expand Down
13 changes: 7 additions & 6 deletions packages/calcite-components/src/components/card/card.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
// @ts-strict-ignore
import { createRef } from "lit-html/directives/ref.js";
import {
LitElement,
property,
createEvent,
h,
JsxNode,
LitElement,
method,
property,
state,
JsxNode,
ToEvents,
} from "@arcgis/lumina";
import { slotChangeHasAssignedElement } from "../../utils/dom";
Expand Down Expand Up @@ -135,9 +135,10 @@ export class Card extends LitElement implements InteractiveComponent {
*/
@method()
async setFocus(options?: FocusOptions): Promise<void> {
return this.focusSetter(() => {
return this.containerEl.value;
}, options);
return this.focusSetter(
() => ({ target: this.containerEl.value, includeContainer: true }),
options,
);
}

//#endregion
Expand Down
Loading