Skip to content

Fix: confirmation for back button not working on mobile and in spawn p… #3015

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

Draft
VariableVince wants to merge 5 commits into
base: main
Choose a base branch
from
+18 −5
Draft

Fix: confirmation for back button not working on mobile and in spawn p… #3015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
47e1030
Fix confirmation for back button not working on mobile and in spawn p…
VariableVince Jan 24, 2026
bcd4e21
Prevent navigation back to homepage on repeated back button click
VariableVince Jan 24, 2026
7db746b
Type and remove old redundant comment
VariableVince Jan 24, 2026
54790ec
Test for mobile repeated click on back button..
VariableVince Jan 24, 2026
d7a4bc5
Test
VariableVince Jan 24, 2026
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: 6 additions & 3 deletions src/client/ClientGameRunner.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,12 +281,15 @@ export class ClientGameRunner {
* the window or navigate away during an active game session.
*
* @returns {boolean} `true` if the window close should be prevented
* (when the player is alive in the game), `false` otherwise
* (when the player is alive in the game or during spawn phase), `false` otherwise
* (when the player is not alive or doesn't exist)
*/
public shouldPreventWindowClose(): boolean {
// Show confirmation dialog if player is alive in the game
return !!this.myPlayer?.isAlive();
// gameView, not this.myPlayer, so it works before 1st click after spawn phase too
return (
(this.gameView.myPlayer()?.isAlive() ?? false) ||
this.gameView.inSpawnPhase()
);
}

private async saveGame(update: WinUpdate) {
Expand Down
14 changes: 12 additions & 2 deletions src/client/Main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -599,13 +599,23 @@ class Client {
if (!this.gameStop()) {
console.info("Player is active, ask before leaving game");

// Rollback navigator history to stay in game on cancel
// Before calling confirm so dialog also shows on mobile
history.pushState(null, "", window.location.origin + "#refresh");
history.pushState(null, "", this.currentUrl);
Copy link
Contributor

@deshack deshack Jan 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I'm not mistaken, you are rolling navigation back even if the user confirms he wants to exit the game.
Am I right?


const isConfirmed = confirm(
translateText("help_modal.exit_confirmation"),
);

if (!isConfirmed) {
// Rollback navigator history
history.pushState(null, "", this.currentUrl);
// Rebuild stack:
// - prevent being put back to homepage when clicking back button again after cancelling
// - replaceState instead of 2x pushState for cleaner history
// Can't prevent browser blocking popState on clicking back button again without in-game click first
// - preventable by only having pushState this.currentUrl here, which breaks confirm on mobile
// history.replaceState(null, "", window.location.origin + "#refresh");
// history.pushState(null, "", this.currentUrl);
return;
}
}
Expand Down
Loading