Skip to content

Fix focus navigation while fetching nested nodes #115

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
AndrewKravchenko wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix focus navigation while fetching nested nodes #115

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/focus-store.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,15 +389,20 @@ export default function createFocusStore({
}

function handleArrow(arrow: Arrow) {
const newState = handleArrowUtil({
const { newState, prevState } = handleArrowUtil({
focusState: currentState,
arrow,
});
}) || {};

if (!newState) {
return;
}

if (prevState !== currentState) {
handleArrow(arrow);
return;
}

if (newState.interactionMode !== 'lrud') {
newState.interactionMode = 'lrud';
}
Expand Down
15 changes: 12 additions & 3 deletions src/handle-arrow/handle-arrow.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,15 @@ interface HandleArrowOptions {
arrow: Arrow;
}

type HandleArrowResult = {
prevState: FocusState;
newState: FocusState | null;
} | null;

export default function handleArrow({
focusState,
arrow,
}: HandleArrowOptions): FocusState | null {
}: HandleArrowOptions): HandleArrowResult {
const orientation: Orientation =
arrow === 'right' || arrow === 'left' ? 'horizontal' : 'vertical';
const direction: Direction =
Expand All @@ -34,15 +39,17 @@ export default function handleArrow({
if (!navigationStyle) {
return null;
} else if (navigationStyle.style === 'default') {
return defaultNavigation({
const newState = defaultNavigation({
arrow,
focusState,
targetNode: navigationStyle.targetNode,
direction,
orientation,
});

return { prevState: focusState, newState };
} else if (navigationStyle.style === 'grid') {
return gridNavigation({
const newState = gridNavigation({
arrow,
focusState,
focusedNode,
Expand All @@ -51,6 +58,8 @@ export default function handleArrow({
direction,
orientation,
});

return { prevState: focusState, newState };
}

return null;
Expand Down