Skip to content

An open source design system that's fully customizable and agent ready

TypeScript

feat(selectable-card): toggle selection on Enter as well as Space (#4597)

freddymetadfccd575ab96
diff --git a/.changeset/selectable-card-enter-key.md b/.changeset/selectable-card-enter-key.md
new file mode 100644
index 0000000000..d5b4bf2460
--- /dev/null
+++ b/.changeset/selectable-card-enter-key.md
@@ -0,0 +1,6 @@
+---
+'@astryxdesign/core': patch
+---
+
+[feat] SelectableCard: pressing Enter now toggles selection, in addition to Space, when the card is focused
+@freddymeta
diff --git a/packages/core/src/SelectableCard/SelectableCard.doc.mjs b/packages/core/src/SelectableCard/SelectableCard.doc.mjs
index 0c0431c30a..c5770002be 100644
--- a/packages/core/src/SelectableCard/SelectableCard.doc.mjs
+++ b/packages/core/src/SelectableCard/SelectableCard.doc.mjs
@@ -12,6 +12,7 @@ export const docs = {
bestPractices: [
{guidance: true, description: 'Use for plan pickers, filter chips, or option grids.'},
{guidance: true, description: 'For single-select track one ID; for multi-select use a Set.'},
+ {guidance: true, description: 'When focused, toggle selection with Space or Enter.'},
{guidance: false, description: 'Use for navigation; use ClickableCard for that.'},
],
anatomy: [
@@ -62,6 +63,7 @@ export const docsDense = {
bestPractices: [
{guidance: true, description: 'Use for plan pickers, filter chips, option grids.'},
{guidance: true, description: 'For single-select track one ID; for multi-select use a Set.'},
+ {guidance: true, description: 'When focused, toggle selection with Space or Enter.'},
{guidance: false, description: 'Use for navigation; use ClickableCard instead.'},
],
},
diff --git a/packages/core/src/SelectableCard/SelectableCard.test.tsx b/packages/core/src/SelectableCard/SelectableCard.test.tsx
index 1e33517e0f..2a0274a78c 100644
--- a/packages/core/src/SelectableCard/SelectableCard.test.tsx
+++ b/packages/core/src/SelectableCard/SelectableCard.test.tsx
@@ -108,6 +108,61 @@ describe('SelectableCard', () => {
expect(handleChange).not.toHaveBeenCalled();
});
+ it('calls onChange with true when Enter is pressed on the checkbox (unselected)', () => {
+ const handleChange = vi.fn();
+ render(
+ <SelectableCard label="Test" isSelected={false} onChange={handleChange}>
+ Content
+ </SelectableCard>,
+ );
+ const checkbox = screen.getByRole('checkbox', {name: 'Test'});
+ fireEvent.keyDown(checkbox, {key: 'Enter'});
+ expect(handleChange).toHaveBeenCalledWith(true);
+ });
+
+ it('calls onChange with false when Enter is pressed on the checkbox (selected)', () => {
+ const handleChange = vi.fn();
+ render(
+ <SelectableCard label="Test" isSelected={true} onChange={handleChange}>
+ Content
+ </SelectableCard>,
+ );
+ const checkbox = screen.getByRole('checkbox', {name: 'Test'});
+ fireEvent.keyDown(checkbox, {key: 'Enter'});
+ expect(handleChange).toHaveBeenCalledWith(false);
+ });
+
+ it('does not toggle on Enter when disabled', () => {
+ const handleChange = vi.fn();
+ render(
+ <SelectableCard
+ label="Disabled"
+ isSelected={false}
+ onChange={handleChange}
+ isDisabled>
+ Content
+ </SelectableCard>,
+ );
+ const checkbox = screen.getByRole('checkbox', {name: 'Disabled'});
+ fireEvent.keyDown(checkbox, {key: 'Enter'});
+ expect(handleChange).not.toHaveBeenCalled();
+ });
+
+ it('toggles exactly once on Space (native), not doubled by the Enter handler', () => {
+ const handleChange = vi.fn();
+ render(
+ <SelectableCard label="Test" isSelected={false} onChange={handleChange}>
+ Content
+ </SelectableCard>,
+ );
+ const checkbox = screen.getByRole('checkbox', {name: 'Test'});
+ // Space activates the native checkbox, firing a single change event.
+ fireEvent.click(checkbox);
+ fireEvent.keyDown(checkbox, {key: ' '});
+ expect(handleChange).toHaveBeenCalledTimes(1);
+ expect(handleChange).toHaveBeenCalledWith(true);
+ });
+
describe('elevation', () => {
const noop = () => {};
diff --git a/packages/core/src/SelectableCard/SelectableCard.tsx b/packages/core/src/SelectableCard/SelectableCard.tsx
index 49c63e1e9c..00bddea883 100644
--- a/packages/core/src/SelectableCard/SelectableCard.tsx
+++ b/packages/core/src/SelectableCard/SelectableCard.tsx
@@ -22,6 +22,7 @@
*
* A hidden <input type="checkbox"> inside the card provides the accessible
* role, label, and checked state — the card surface itself has no role/tabIndex.
+ * Space toggles it natively; Enter is wired up as an additional toggle key.
*
* For static display, use Card.
* For navigation or action cards, use ClickableCard.
@@ -30,6 +31,7 @@
import {
type ReactNode,
type MouseEvent,
+ type KeyboardEvent,
useRef,
useCallback,
type Ref,
@@ -311,6 +313,19 @@ export function SelectableCard({
[isDisabled, isSelected, onChange],
);
+ // The focusable control is a native checkbox, which toggles on Space but
+ // ignores Enter. Add Enter as an extra toggle key; Space keeps its native
+ // handling, so we deliberately do not toggle on Space here (would double).
+ const handleKeyDown = useCallback(
+ (event: KeyboardEvent<HTMLInputElement>) => {
+ if (!isDisabled && event.key === 'Enter') {
+ event.preventDefault();
+ onChange(!isSelected);
+ }
+ },
+ [isDisabled, isSelected, onChange],
+ );
+
const {onClick, onMouseUp} = useClickableContainer({
containerRef,
interactiveRef,
@@ -369,6 +384,7 @@ export function SelectableCard({
aria-label={label}
disabled={isDisabled}
onChange={() => onChange(!isSelected)}
+ onKeyDown={handleKeyDown}
{...stylex.props(styles.srOnly)}
/>
{children}