Skip to content

Fix ListView tests for highlight + modifier keys #5247

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
snowystinger merged 3 commits into from
Oct 17, 2023
Merged

Fix ListView tests for highlight + modifier keys #5247

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ecc188a
Fix ListView tests to be accurate
snowystinger Oct 15, 2023
08a5e6d
replace a couple instances of keydown/up
snowystinger Oct 15, 2023
0ab1f92
Merge branch 'main' into fix-listview-tests
snowystinger Oct 17, 2023
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
66 changes: 39 additions & 27 deletions packages/@react-spectrum/list/test/ListView.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1013,33 +1013,41 @@ describe('ListView', function () {

describe('selectionStyle highlight', function () {
installPointerEvent();
it('should toggle items in selection highlight with ctrl-click on Mac', async function () {
it('should toggle items in selection highlight with meta-click on Mac', async function () {
let uaMock = jest.spyOn(navigator, 'platform', 'get').mockImplementation(() => 'Mac');
let tree = renderSelectionList({onSelectionChange, selectionMode: 'multiple', selectionStyle: 'highlight'});

let rows = tree.getAllByRole('row');
expect(rows[1]).toHaveAttribute('aria-selected', 'false');
expect(rows[2]).toHaveAttribute('aria-selected', 'false');
await user.keyboard('[ControlLeft>]');
await user.keyboard('[MetaLeft>]');
await user.click(getRow(tree, 'Bar'));
await user.keyboard('[/ControlLeft]');
await user.keyboard('[/MetaLeft]');

checkSelection(onSelectionChange, ['bar']);
expect(rows[1]).toHaveAttribute('aria-selected', 'true');
expect(announce).toHaveBeenLastCalledWith('Bar selected.');
expect(announce).toHaveBeenCalledTimes(1);

onSelectionChange.mockClear();
await user.keyboard('[ControlLeft>]');
fireEvent.pointerDown(rows[2], {pointerType: 'mouse', ctrlKey: true});
fireEvent.pointerUp(rows[2], {pointerType: 'mouse', ctrlKey: true});
fireEvent.click(rows[2], {ctrlKey: true});
await user.keyboard('[/ControlLeft]');
await user.keyboard('[MetaLeft>]');
await user.click(getRow(tree, 'Baz'));
await user.keyboard('[/MetaLeft]');
checkSelection(onSelectionChange, ['bar', 'baz']);
expect(rows[1]).toHaveAttribute('aria-selected', 'true');
expect(rows[2]).toHaveAttribute('aria-selected', 'true');
expect(announce).toHaveBeenLastCalledWith('Baz selected. 2 items selected.');
expect(announce).toHaveBeenCalledTimes(2);

onSelectionChange.mockClear();
await user.keyboard('[MetaLeft>]');
await user.click(getRow(tree, 'Bar'));
await user.keyboard('[/MetaLeft]');
checkSelection(onSelectionChange, ['baz']);
expect(rows[1]).toHaveAttribute('aria-selected', 'false');
expect(rows[2]).toHaveAttribute('aria-selected', 'true');
expect(announce).toHaveBeenLastCalledWith('Baz selected.');
expect(announce).toHaveBeenCalledTimes(2);
expect(announce).toHaveBeenLastCalledWith('Baz selected. 1 item selected.');
expect(announce).toHaveBeenCalledTimes(3);

uaMock.mockRestore();
});
Expand Down Expand Up @@ -1075,35 +1083,41 @@ describe('ListView', function () {
uaMock.mockRestore();
});

it('should toggle items in selection highlight with meta-click on Windows', async function () {
it('should toggle items in selection highlight with ctrl-click on Windows', async function () {
let uaMock = jest.spyOn(navigator, 'userAgent', 'get').mockImplementation(() => 'Windows');
let tree = renderSelectionList({onSelectionChange, selectionMode: 'multiple', selectionStyle: 'highlight'});

let rows = tree.getAllByRole('row');
expect(rows[1]).toHaveAttribute('aria-selected', 'false');
expect(rows[2]).toHaveAttribute('aria-selected', 'false');
await user.keyboard('[MetaLeft>]');
fireEvent.pointerDown(getRow(tree, 'Bar'), {pointerType: 'mouse', metaKey: true});
fireEvent.pointerUp(getRow(tree, 'Bar'), {pointerType: 'mouse', metaKey: true});
fireEvent.click(getRow(tree, 'Bar'), {metaKey: true});
await user.keyboard('[/MetaLeft]');
await user.keyboard('[CtrlLeft>]');
await user.click(getRow(tree, 'Bar'));
await user.keyboard('[/CtrlLeft]');

checkSelection(onSelectionChange, ['bar']);
expect(rows[1]).toHaveAttribute('aria-selected', 'true');
expect(announce).toHaveBeenLastCalledWith('Bar selected.');
expect(announce).toHaveBeenCalledTimes(1);

onSelectionChange.mockClear();
await user.keyboard('[MetaLeft>]');
fireEvent.pointerDown(getRow(tree, 'Baz'), {pointerType: 'mouse', metaKey: true});
fireEvent.pointerUp(getRow(tree, 'Baz'), {pointerType: 'mouse', metaKey: true});
fireEvent.click(getRow(tree, 'Baz'), {metaKey: true});
await user.keyboard('[/MetaLeft]');
await user.keyboard('[CtrlLeft>]');
await user.click(getRow(tree, 'Baz'));
await user.keyboard('[/CtrlLeft]');
checkSelection(onSelectionChange, ['bar', 'baz']);
expect(rows[1]).toHaveAttribute('aria-selected', 'true');
expect(rows[2]).toHaveAttribute('aria-selected', 'true');
expect(announce).toHaveBeenLastCalledWith('Baz selected. 2 items selected.');
expect(announce).toHaveBeenCalledTimes(2);

onSelectionChange.mockClear();
await user.keyboard('[CtrlLeft>]');
await user.click(getRow(tree, 'Bar'));
await user.keyboard('[/CtrlLeft]');
checkSelection(onSelectionChange, ['baz']);
expect(rows[1]).toHaveAttribute('aria-selected', 'false');
expect(rows[2]).toHaveAttribute('aria-selected', 'true');
expect(announce).toHaveBeenLastCalledWith('Baz selected.');
expect(announce).toHaveBeenCalledTimes(2);
expect(announce).toHaveBeenLastCalledWith('Baz selected. 1 item selected.');
expect(announce).toHaveBeenCalledTimes(3);

uaMock.mockRestore();
});
Expand Down Expand Up @@ -1184,14 +1198,12 @@ describe('ListView', function () {
expect(announce).toHaveBeenLastCalledWith('Bar selected.');
expect(announce).toHaveBeenCalledTimes(1);

fireEvent.keyDown(row, {key: 'Space'});
fireEvent.keyUp(row, {key: 'Space'});
await user.keyboard('{Space}');
expect(onSelectionChange).toHaveBeenCalledTimes(1);
expect(onAction).toHaveBeenCalledTimes(0);
expect(announce).toHaveBeenCalledTimes(1);

fireEvent.keyDown(row, {key: 'Enter'});
fireEvent.keyUp(row, {key: 'Enter'});
await user.keyboard('{Enter}');
expect(onSelectionChange).toHaveBeenCalledTimes(1);
expect(onAction).toHaveBeenCalledTimes(1);
expect(onAction).toHaveBeenCalledWith('bar');
Expand Down