Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
25 changes: 15 additions & 10 deletions js/ui/menu.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,24 +34,29 @@ export class Menu {
}

handleKey(e) {
if (e.key === 'ArrowUp' || e.key === 'w' || e.key === 'k') { e.preventDefault(); this.moveUp(); return true; }
if (e.key === 'ArrowDown' || e.key === 's' || e.key === 'j') { e.preventDefault(); this.moveDown(); return true; }
if (e.key === 'Enter' || e.key === ' ') {
e.preventDefault();
this.activate();
return true;
}
// Key shortcuts: match first char of option label
// Explicit option shortcuts take priority so they aren't shadowed by navigation keys
for (let i = 0; i < this.options.length; i++) {
const opt = this.options[i];
if (opt.disabled) continue;
if (opt.key && e.key.toLowerCase() === opt.key.toLowerCase()) {
e.preventDefault();
this.selected = i;
this.activate();
return true;
}
// Auto-shortcut: first letter
if (!opt.key && opt.label && e.key.toLowerCase() === opt.label[0]?.toLowerCase()) {
}
if (e.key === 'ArrowUp' || e.key === 'w') { e.preventDefault(); this.moveUp(); return true; }
if (e.key === 'ArrowDown' || e.key === 's') { e.preventDefault(); this.moveDown(); return true; }
if (e.key === 'Enter' || e.key === ' ') {
e.preventDefault();
this.activate();
return true;
}
// Auto-shortcut: first letter of option label (for options without an explicit key)
for (let i = 0; i < this.options.length; i++) {
const opt = this.options[i];
if (opt.disabled || opt.key) continue;
if (opt.label && e.key.toLowerCase() === opt.label[0]?.toLowerCase()) {
this.selected = i;
this.activate();
return true;
Expand Down
8 changes: 4 additions & 4 deletions js/ui/screens/charCreate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -305,15 +305,15 @@ export class CharCreateScreen {

_handleListKey(event, list) {
const key = event.key;
if (key === 'ArrowUp' || key === 'k' || key === 'w') { event.preventDefault(); list.moveUp(); return; }
if (key === 'ArrowDown' || key === 'j' || key === 's') { event.preventDefault(); list.moveDown(); return; }
if (key === 'ArrowUp' || key === 'w') { event.preventDefault(); list.moveUp(); return; }
if (key === 'ArrowDown' || key === 's') { event.preventDefault(); list.moveDown(); return; }
if (key === 'Enter' || key === 'Tab') { event.preventDefault(); this._nextStep(); return; }
}

_handleSkillsKey(event) {
const key = event.key;
if (key === 'ArrowUp' || key === 'k') { event.preventDefault(); this.skillList.moveUp(); return; }
if (key === 'ArrowDown' || key === 'j') { event.preventDefault(); this.skillList.moveDown(); return; }
if (key === 'ArrowUp') { event.preventDefault(); this.skillList.moveUp(); return; }
if (key === 'ArrowDown') { event.preventDefault(); this.skillList.moveDown(); return; }
if (key === ' ') {
event.preventDefault();
this._toggleSkill(this.skillList.selected);
Expand Down
2 changes: 1 addition & 1 deletion js/ui/screens/jukebox.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export class JukeboxScreen {
}

// Arrow keys and Page Up/Down handled by ScrollList
if (k === 'ArrowUp' || k === 'w' || k === 'W' || k === 'k' || k === 'K') {
if (k === 'ArrowUp' || k === 'w' || k === 'W') {
event.preventDefault();
this.list.moveUp();
return;
Expand Down
1 change: 0 additions & 1 deletion js/ui/screens/worldmap.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ export class WorldMapScreen {
const moves = {
'ArrowUp': [0,-1], 'ArrowDown': [0,1], 'ArrowLeft': [-1,0], 'ArrowRight': [1,0],
'w': [0,-1], 's': [0,1], 'a': [-1,0], 'd': [1,0],
'k': [0,-1], 'j': [0,1], 'h': [-1,0], 'l': [1,0],
};

if (e.key in moves) {
Expand Down
Loading