Skip to content

Calendar: Overlay arrow navigation through days is problematic #7928 #7933

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

Open
bogdan-dimoiu wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Calendar: Overlay arrow navigation through days is problematic #7928 #7933

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 60 additions & 2 deletions components/lib/calendar/Calendar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1284,7 +1284,36 @@ export const Calendar = React.memo(
navigateToMonth(true, groupIndex, event);
}
} else {
navigateToMonth(true, groupIndex, event);
let prevRow = cell.parentElement.previousElementSibling;

if (prevRow) {
const lastCellIndex = prevRow.children.length - 1;
const lastCell = prevRow.children[lastCellIndex];
let focusCell = lastCell.children[0];

if (!DomHandler.getAttribute(focusCell, 'data-p-disabled')) {
focusCell.tabIndex = '0';
focusCell.focus();
} else {
const prevRowCells = Array.from(prevRow.children).reverse();
let hasPrevFocusableDate = prevRowCells.find((el) => {
let focusCell = el.children[0];

return !DomHandler.getAttribute(focusCell, 'data-p-disabled');
});

if (hasPrevFocusableDate) {
let focusCell = hasPrevFocusableDate.children[0];

focusCell.tabIndex = '0';
focusCell.focus();
} else {
navigateToMonth(true, groupIndex, event);
}
}
} else {
navigateToMonth(true, groupIndex, event);
}
}

event.preventDefault();
Expand All @@ -1298,6 +1327,7 @@ export const Calendar = React.memo(
if (nextCell) {
const cells = Array.from(cell.parentElement.children);
const nextCells = cells.slice(cellIndex + 1);

let hasNextFocusableDate = nextCells.find((el) => {
let focusCell = el.children[0];

Expand All @@ -1313,7 +1343,35 @@ export const Calendar = React.memo(
navigateToMonth(false, groupIndex, event);
}
} else {
navigateToMonth(false, groupIndex, event);
let nextRow = cell.parentElement.nextElementSibling;

if (nextRow) {
const firstCell = nextRow.children[0];
let focusCell = firstCell.children[0];

if (!DomHandler.getAttribute(focusCell, 'data-p-disabled')) {
focusCell.tabIndex = '0';
focusCell.focus();
} else {
const nextRowCells = Array.from(nextRow.children);
let hasNextFocusableDate = nextRowCells.find((el) => {
let focusCell = el.children[0];

return !DomHandler.getAttribute(focusCell, 'data-p-disabled');
});

if (hasNextFocusableDate) {
let focusCell = hasNextFocusableDate.children[0];

focusCell.tabIndex = '0';
focusCell.focus();
} else {
navigateToMonth(false, groupIndex, event);
}
}
} else {
navigateToMonth(false, groupIndex, event);
}
}

event.preventDefault();
Expand Down
Loading