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.

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

Datagrid remaining keyboard shortcuts #2519

Merged
merged 20 commits into from
Nov 20, 2019
Merged

Datagrid remaining keyboard shortcuts #2519

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
3c582e6
Implements some of the remaining key shortcuts for the data grid
ffknob Nov 12, 2019
9fc1ea5
Data grid
ffknob Nov 12, 2019
7b7d5bc
Page down/up now walks through the grid's pages
ffknob Nov 12, 2019
71808f5
Adds some more keybindings for the data grid component and includes a
ffknob Nov 12, 2019
0ee5510
Removes the conditional testing for alphanumeric key events
ffknob Nov 13, 2019
e77a176
Merge branch 'master' into datagrid-remaining-keyboard-shortcuts
ffknob Nov 13, 2019
c783cd3
Merge branch 'master' into datagrid-remaining-keyboard-shortcuts
ffknob Nov 14, 2019
406b2bf
Refactors the Page Up/Page Down as suggested by @chandlerprall
ffknob Nov 14, 2019
5c198e7
Keeps focus on same cell position (row/column) when changing pages
ffknob Nov 14, 2019
992d5d6
Merge branch 'master' into datagrid-remaining-keyboard-shortcuts
ffknob Nov 15, 2019
25830ce
Creates a context for the data grid and tries to use it to solve
ffknob Nov 15, 2019
3845a10
Fixes bug when paging down and the last page has less rows than the row
ffknob Nov 15, 2019
1d1c7e7
Creates a state to hold the updateFocus() matrix
ffknob Nov 17, 2019
fe3fc64
Calls updateFocus() inside a requestAnimationFrame()
ffknob Nov 18, 2019
0fd79d8
Merge branch 'master' into datagrid-remaining-keyboard-shortcuts
ffknob Nov 18, 2019
8c01784
EuiDataGrid keyboard navigation tweaks
chandlerprall Nov 19, 2019
05c7f10
Refactored cellsUpdateFocus usage
chandlerprall Nov 19, 2019
4cbb9fa
commented on an anti-pattern
chandlerprall Nov 20, 2019
93043d5
Merge pull request #1 from chandlerprall/drks
ffknob Nov 20, 2019
a3569c6
Merge branch 'master' into datagrid-remaining-keyboard-shortcuts
ffknob Nov 20, 2019
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
34 changes: 34 additions & 0 deletions src/components/datagrid/data_grid.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,40 @@ function createKeyDownHandler(
setFocusedCell([x + 1, y]);
}
break;
case keyCodes.PAGE_UP:
event.preventDefault();
// TODO: Scrolls the grid/page so that the currently visible upper most row becomes the bottom most (#2482)
break;
case keyCodes.PAGE_DOWN:
event.preventDefault();
// TODO: Scrolls the grid/page so that the currently visible bottom most row becomes the top most (#2482)
break;
case keyCodes.CTRL && keyCodes.END:
event.preventDefault();
setFocusedCell([colCount, rowCount - 1]);
break;
case keyCodes.CTRL && keyCodes.HOME:
event.preventDefault();
setFocusedCell([0, 0]);
break;
case keyCodes.END:
event.preventDefault();
setFocusedCell([colCount, y]);
break;
case keyCodes.HOME:
event.preventDefault();
setFocusedCell([0, y]);
break;
default:
if (
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@chandlerprall Should we move the whole switch statement to an if/else? Having to do this feels silly...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I took the liberty to go ahead and make the change as suggested by @myasonik . Feel free to let me know if you want the switch statement back.

(keyCode >= 48 && keyCode <= 57) ||
(keyCode >= 65 && keyCode <= 90)
) {
event.preventDefault();
// Alphanumeric
// TODO: If a cell contains an input widget, places focus on the first one, and inserts key (#2482)
}
break;
}
};
}
Expand Down
12 changes: 12 additions & 0 deletions src/services/key_codes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,35 @@ export const ESCAPE = 27;
export const TAB = 9;
export const BACKSPACE = 8;
export const F2 = 113;
export const CTRL = 17;

// Arrow keys
export const DOWN = 40;
export const UP = 38;
export const LEFT = 37;
export const RIGHT = 39;

export const PAGE_UP = 33;
export const PAGE_DOWN = 34;
export const END = 35;
export const HOME = 36;

export enum keyCodes {
ENTER = 13,
SPACE = 32,
ESCAPE = 27,
TAB = 9,
BACKSPACE = 8,
F2 = 113,
CTRL = 17,

DOWN = 40,
UP = 38,
LEFT = 37,
RIGHT = 39,

PAGE_UP = 33,
PAGE_DOWN = 34,
END = 35,
HOME = 36,
}