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

Jump to bottom

[react-interaction] Tweak Focus Table component #16862

Merged
merged 1 commit into from Sep 23, 2019
Merged

[react-interaction] Tweak Focus Table component #16862

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
36 changes: 20 additions & 16 deletions packages/react-interactions/accessibility/src/FocusTable.js
View file
Open in desktop
Expand Up @@ -62,10 +62,10 @@ function focusCell(cell: ReactScopeMethods): void {
}
}

function focusCellByRowIndex(row: ReactScopeMethods, rowIndex: number): void {
function focusCellByIndex(row: ReactScopeMethods, cellIndex: number): void {
const cells = row.getChildren();
if (cells !== null) {
const cell = cells[rowIndex];
const cell = cells[cellIndex];
if (cell) {
focusCell(cell);
}
Expand Down Expand Up @@ -150,31 +150,33 @@ export function createFocusTable(): Array<React.Component> {
const currentCell = scopeRef.current;
switch (event.key) {
case 'ArrowUp': {
const [cells, rowIndex] = getRowCells(currentCell);
const [cells, cellIndex] = getRowCells(currentCell);
if (cells !== null) {
const [columns, columnIndex] = getRows(currentCell);
if (columns !== null) {
if (columnIndex > 0) {
const column = columns[columnIndex - 1];
focusCellByRowIndex(column, rowIndex);
} else if (columnIndex === 0) {
const [rows, rowIndex] = getRows(currentCell);
if (rows !== null) {
if (rowIndex > 0) {
const row = rows[rowIndex - 1];
focusCellByIndex(row, cellIndex);
event.preventDefault();
} else if (rowIndex === 0) {
triggerNavigateOut(currentCell, 'up');
}
}
}
return;
}
case 'ArrowDown': {
const [cells, rowIndex] = getRowCells(currentCell);
const [cells, cellIndex] = getRowCells(currentCell);
if (cells !== null) {
const [columns, columnIndex] = getRows(currentCell);
if (columns !== null) {
if (columnIndex !== -1) {
if (columnIndex === columns.length - 1) {
const [rows, rowIndex] = getRows(currentCell);
if (rows !== null) {
if (rowIndex !== -1) {
if (rowIndex === rows.length - 1) {
triggerNavigateOut(currentCell, 'down');
} else {
const column = columns[columnIndex + 1];
focusCellByRowIndex(column, rowIndex);
const row = rows[rowIndex + 1];
focusCellByIndex(row, cellIndex);
event.preventDefault();
}
}
}
Expand All @@ -186,6 +188,7 @@ export function createFocusTable(): Array<React.Component> {
if (cells !== null) {
if (rowIndex > 0) {
focusCell(cells[rowIndex - 1]);
event.preventDefault();
} else if (rowIndex === 0) {
triggerNavigateOut(currentCell, 'left');
}
Expand All @@ -200,6 +203,7 @@ export function createFocusTable(): Array<React.Component> {
triggerNavigateOut(currentCell, 'right');
} else {
focusCell(cells[rowIndex + 1]);
event.preventDefault();
}
}
}
Expand Down
1 change: 1 addition & 0 deletions packages/react-reconciler/src/ReactFiber.js
View file
Open in desktop
Expand Up @@ -789,6 +789,7 @@ function createFiberFromScope(
) {
const fiber = createFiber(ScopeComponent, pendingProps, key, mode);
fiber.type = scope;
fiber.elementType = scope;
fiber.expirationTime = expirationTime;
return fiber;
}
Expand Down