pihkaal/pihkaal-me
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(utils): wrong useButtonNavigation last handling

Browse Source
This commit is contained in:
Stevan
2026-02-12 01:07:33 +01:00
parent 88c1f183c9
commit b188812e82
1 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/composables/useButtonNavigation.ts
View File

@@ -268,9 +268,16 @@ export const useButtonNavigation = <T extends Record<string, Rect>>({
if (nextButton.value) { if (nextButton.value) {
targetButton = nextButton.value; targetButton = nextButton.value;
} else { } else {
const leftConfig = getNavigationTarget(currentNav.left); for (const [button, nav] of Object.entries(navigation) as [
const rightConfig = getNavigationTarget(currentNav.right); Entry,
targetButton = leftConfig?.target ?? rightConfig?.target; (typeof navigation)[Entry],
][]) {
const downConfig = getNavigationTarget(nav.down);
if (downConfig?.target === currentButton) {
targetButton = button;
break;
}
}
} }
} else { } else {
const targetNav = navigation[upConfig.target]; const targetNav = navigation[upConfig.target];
@@ -292,9 +299,16 @@ export const useButtonNavigation = <T extends Record<string, Rect>>({
if (nextButton.value) { if (nextButton.value) {
targetButton = nextButton.value; targetButton = nextButton.value;
} else { } else {
const leftConfig = getNavigationTarget(currentNav.left); for (const [button, nav] of Object.entries(navigation) as [
const rightConfig = getNavigationTarget(currentNav.right); Entry,
targetButton = leftConfig?.target ?? rightConfig?.target; (typeof navigation)[Entry],
][]) {
const upConfig = getNavigationTarget(nav.up);
if (upConfig?.target === currentButton) {
targetButton = button;
break;
}
}
} }
} else { } else {
const targetNav = navigation[downConfig.target]; const targetNav = navigation[downConfig.target];