Leahnaya/pokemon-showdown-client
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown-client.git synced 2026-03-21 17:50:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Preact: Keyboard shortcut to jump to next unread room (#2601)

Browse Source
This commit is contained in:
Ethan Strader 2026-03-16 02:57:15 -04:00 committed by GitHub
parent df969fceb6
commit ddfd9034a8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
play.pokemonshowdown.com/src/client-main.ts
View File

@ -2405,6 +2405,21 @@ export const PS = new class extends PSModel {
} }
return this.focusRoom(rooms[index + 1]); return this.focusRoom(rooms[index + 1]);
} }
focusUnreadRoom(direction: 'left' | 'right') {
const { rooms, index } = this.horizontalNav();
if (index === -1) return;
const unreadRooms = rooms.filter((room, i) =>
PS.rooms[room]?.isSubtleNotifying &&
(direction === 'left' ? i < index : i > index)
);
if (!unreadRooms.length) return;
const target = direction === 'left' ? unreadRooms[unreadRooms.length - 1] : unreadRooms[0];
return this.focusRoom(target);
}
alert(message: string, opts: { okButton?: string, parentElem?: HTMLElement | null, width?: number } = {}) { alert(message: string, opts: { okButton?: string, parentElem?: HTMLElement | null, width?: number } = {}) {
this.join(`popup-${this.popups.length}` as RoomID, { this.join(`popup-${this.popups.length}` as RoomID, {
args: { message, ...opts, parentElem: null }, args: { message, ...opts, parentElem: null },

5
play.pokemonshowdown.com/src/panel-chat.tsx
View File

@ -934,6 +934,7 @@ export class ChatTextEntry extends preact.Component<{
} }
handleKey(ev: KeyboardEvent) { handleKey(ev: KeyboardEvent) {
const cmdKey = ((ev.metaKey ? 1 : 0) + (ev.ctrlKey ? 1 : 0) === 1) && !ev.altKey && !ev.shiftKey; const cmdKey = ((ev.metaKey ? 1 : 0) + (ev.ctrlKey ? 1 : 0) === 1) && !ev.altKey && !ev.shiftKey;
const altKey = ev.altKey;
// const anyModifier = ev.ctrlKey || ev.altKey || ev.metaKey || ev.shiftKey; // const anyModifier = ev.ctrlKey || ev.altKey || ev.metaKey || ev.shiftKey;
if (ev.keyCode === 13 && !ev.shiftKey) { // Enter key if (ev.keyCode === 13 && !ev.shiftKey) { // Enter key
return this.submit(); return this.submit();
@ -965,7 +966,7 @@ export class ChatTextEntry extends preact.Component<{
// const newValue = `/pm ${PS.user.lastPM}, `; // const newValue = `/pm ${PS.user.lastPM}, `;
// this.setValue(newValue, newValue.length); // this.setValue(newValue, newValue.length);
// return true; // return true;
} else if (ev.shiftKey && ev.keyCode === 37) { } else if (ev.shiftKey && ev.keyCode === 37 && !altKey) {
if (PS.prefs.onepanel === 'vertical' || this.getValue().length > 0) return; if (PS.prefs.onepanel === 'vertical' || this.getValue().length > 0) return;
const curLoc = PS.room.location; const curLoc = PS.room.location;
let newLoc = curLoc; let newLoc = curLoc;
@ -1002,7 +1003,7 @@ export class ChatTextEntry extends preact.Component<{
PS.update(); PS.update();
} }
return true; return true;
} else if (ev.shiftKey && ev.keyCode === 39) { } else if (ev.shiftKey && ev.keyCode === 39 && !altKey) {
if (PS.prefs.onepanel === 'vertical' || this.getValue().length > 0) return; if (PS.prefs.onepanel === 'vertical' || this.getValue().length > 0) return;
const curLoc = PS.room.location; const curLoc = PS.room.location;
let newLoc = curLoc; let newLoc = curLoc;

7
play.pokemonshowdown.com/src/panels.tsx
View File

@ -542,6 +542,13 @@ export class PSView extends preact.Component {
} }
const modifierKey = ev.ctrlKey || ev.altKey || ev.metaKey || ev.shiftKey; const modifierKey = ev.ctrlKey || ev.altKey || ev.metaKey || ev.shiftKey;
const altKey = !ev.ctrlKey && ev.altKey && !ev.metaKey && !ev.shiftKey; const altKey = !ev.ctrlKey && ev.altKey && !ev.metaKey && !ev.shiftKey;
if (ev.altKey && ev.shiftKey && ev.keyCode === 37) { // alt + shift + left
PS.arrowKeysUsed = true;
PS.focusUnreadRoom('left');
} else if (ev.altKey && ev.shiftKey && ev.keyCode === 39) { // alt + shift + right
PS.arrowKeysUsed = true;
PS.focusUnreadRoom('right');
}
if (altKey && ev.keyCode === 38) { // alt + up if (altKey && ev.keyCode === 38) { // alt + up
PS.arrowKeysUsed = true; PS.arrowKeysUsed = true;
PS.focusUpRoom(); PS.focusUpRoom();