Skip to content
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.

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

Add basic keyboard navigation tests #2289

Merged
merged 4 commits into from
Jan 21, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
"@storybook/react": "^6.1.11",
"@testing-library/jest-dom": "^5.11.6",
"@testing-library/react": "^11.2.2",
"@testing-library/user-event": "^12.6.0",
"@types/faker": "^5.1.5",
"@types/jest": "^26.0.19",
"@types/lodash": "^4.14.165",
Expand Down
14 changes: 14 additions & 0 deletions src/DataGrid.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,19 @@ function DataGrid<R, SR>({
onExpandedGroupIdsChange(newExpandedGroupIds);
}

function onGridFocus() {
if (!isCellWithinBounds(selectedPosition)) {
// Tabbing into the grid should initiate keyboard navigation
const initialPosition: SelectCellState = { idx: 0, rowIdx: 0, mode: 'SELECT' };
if (isCellWithinBounds(initialPosition)) {
setSelectedPosition(initialPosition);
}
} else {
// otherwise if we already have a selected cell, we should scroll back to it when focusing the grid
scrollToCell(selectedPosition);
}
}

function handleKeyDown(event: React.KeyboardEvent<HTMLDivElement>) {
const { key, keyCode } = event;
const row = rows[selectedPosition.rowIdx];
Expand Down Expand Up @@ -930,6 +943,7 @@ function DataGrid<R, SR>({
tabIndex={0}
className={focusSinkClassname}
onKeyDown={handleKeyDown}
onFocus={onGridFocus}
/>
<div style={{ height: Math.max(rows.length * rowHeight, clientHeight) }} />
{getViewportRows()}
Expand Down
120 changes: 120 additions & 0 deletions test/keyboardNavigation.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
import userEvent from '@testing-library/user-event';
import { fireEvent } from '@testing-library/react';
import type { Column } from '../src';
import { setup, getSelectedCell } from './utils';

type Row = undefined;

const rows: readonly Row[] = Array(100);

const columns: readonly Column<Row>[] = [
{ key: 'col1', name: 'col1' },
{ key: 'col2', name: 'col2' },
{ key: 'col3', name: 'col3' },
{ key: 'col4', name: 'col4' },
{ key: 'col5', name: 'col5' },
{ key: 'col6', name: 'col6' },
{ key: 'col7', name: 'col7' }
];

function validateCellPosition(x: number, y: number) {
const cell = getSelectedCell();
expect(cell).toHaveAttribute('aria-colindex', `${x + 1}`);
expect(cell!.parentNode).toHaveAttribute('aria-rowindex', `${y + 2}`);
}

test('basic keyboard navigation', () => {
setup({ columns, rows });

// no initial selection
expect(getSelectedCell()).not.toBeInTheDocument();

// tab into the grid
userEvent.tab();
validateCellPosition(0, 0);

// tab to the next cell
userEvent.tab();
validateCellPosition(1, 0);

// tab back to the previous cell
userEvent.tab({ shift: true });
validateCellPosition(0, 0);

// arrow navigation
userEvent.type(document.activeElement!, '{arrowdown}');
validateCellPosition(0, 1);
userEvent.type(document.activeElement!, '{arrowright}');
validateCellPosition(1, 1);
userEvent.type(document.activeElement!, '{arrowup}');
validateCellPosition(1, 0);
userEvent.type(document.activeElement!, '{arrowleft}');
validateCellPosition(0, 0);

// page {up,down}/home/end navigation
fireEvent.keyDown(document.activeElement!, { key: 'PageDown' });
validateCellPosition(0, 29);
fireEvent.keyDown(document.activeElement!, { key: 'PageDown' });
validateCellPosition(0, 58);
fireEvent.keyDown(document.activeElement!, { key: 'PageUp' });
validateCellPosition(0, 29);
fireEvent.keyDown(document.activeElement!, { key: 'End' });
validateCellPosition(6, 29);
fireEvent.keyDown(document.activeElement!, { key: 'Home' });
validateCellPosition(0, 29);
fireEvent.keyDown(document.activeElement!, { key: 'End', ctrlKey: true });
validateCellPosition(6, 99);
fireEvent.keyDown(document.activeElement!, { key: 'Home', ctrlKey: true });
validateCellPosition(0, 0);
});

test('at-bounds basic keyboard navigation', () => {
setup({ columns, rows });

// tab into the grid
userEvent.tab();
validateCellPosition(0, 0);

// arrow navigation
userEvent.type(document.activeElement!, '{arrowup}');
validateCellPosition(0, 0);
userEvent.type(document.activeElement!, '{arrowleft}');
validateCellPosition(0, 0);
fireEvent.keyDown(document.activeElement!, { key: 'End', ctrlKey: true });
validateCellPosition(6, 99);
userEvent.type(document.activeElement!, '{arrowdown}');
validateCellPosition(6, 99);
userEvent.type(document.activeElement!, '{arrowright}');
validateCellPosition(6, 99);

// page {up,down}/home/end navigation
fireEvent.keyDown(document.activeElement!, { key: 'End' });
validateCellPosition(6, 99);
fireEvent.keyDown(document.activeElement!, { key: 'End', ctrlKey: true });
validateCellPosition(6, 99);
fireEvent.keyDown(document.activeElement!, { key: 'PageDown' });
validateCellPosition(6, 99);
fireEvent.keyDown(document.activeElement!, { key: 'Home', ctrlKey: true });
validateCellPosition(0, 0);
fireEvent.keyDown(document.activeElement!, { key: 'Home' });
validateCellPosition(0, 0);
fireEvent.keyDown(document.activeElement!, { key: 'Home', ctrlKey: true });
validateCellPosition(0, 0);
fireEvent.keyDown(document.activeElement!, { key: 'PageUp' });
validateCellPosition(0, 0);

// shift+tab tabs out of the grid
userEvent.tab({ shift: true });
expect(document.body).toHaveFocus();

// tab at the end of a row selects the first cell on the next row
userEvent.tab();
fireEvent.keyDown(document.activeElement!, { key: 'End' });
userEvent.tab();
validateCellPosition(0, 1);

// tab at the end of the grid tabs out of the grid
fireEvent.keyDown(document.activeElement!, { key: 'End', ctrlKey: true });
userEvent.tab();
expect(document.body).toHaveFocus();
});
33 changes: 33 additions & 0 deletions test/setup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,36 @@ Object.defineProperties(HTMLDivElement.prototype, {
}
}
});

// Basic scroll polyfill
const scrollStates = new WeakMap<Element, { scrollTop: number; scrollLeft: number }>();

function getScrollState(div: Element) {
if (scrollStates.has(div)) {
return scrollStates.get(div)!;
}
const scrollState = { scrollTop: 0, scrollLeft: 0 };
scrollStates.set(div, scrollState);
return scrollState;
}

Object.defineProperties(Element.prototype, {
scrollTop: {
get(this: Element) {
return getScrollState(this).scrollTop;
},
set(this: Element, value: number) {
getScrollState(this).scrollTop = value;
this.dispatchEvent(new Event('scroll'));
}
},
scrollLeft: {
get(this: Element) {
return getScrollState(this).scrollLeft;
},
set(this: Element, value: number) {
getScrollState(this).scrollLeft = value;
this.dispatchEvent(new Event('scroll'));
}
}
});
4 changes: 4 additions & 0 deletions test/utils.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,7 @@ export function getCells() {
export function getHeaderCells() {
return screen.getAllByRole('columnheader');
}

export function getSelectedCell() {
return document.querySelector<HTMLDivElement>('.rdg-cell-selected');
}