Fix “Back” button sometimes redirecting out of Mastodon (#25281)

2023-07-17 17:32:46 +02:00
parent d0f00206dc
commit a442a1d1c6
4 changed files with 40 additions and 14 deletions
--- a/app/javascript/mastodon/features/ui/index.jsx
+++ b/app/javascript/mastodon/features/ui/index.jsx
@ -479,10 +479,12 @@ class UI extends PureComponent {
  };

  handleHotkeyBack = () => {
-    if (window.history && window.history.state) {
-      this.context.router.history.goBack();
+    const { router } = this.context;
+
+    if (router.history.location?.state?.fromMastodon) {
+      router.history.goBack();
    } else {
-      this.context.router.history.push('/');
+      router.history.push('/');
    }
  };