treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Fix Back button going outside the app (#24835)

pull/59/head^2^2
Florin 2023-05-03 23:14:04 -07:00 committed by GitHub
parent e1ebcc007d
commit 27bafabb64
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/javascript/mastodon/components/column_back_button.jsx
View File

@ -21,7 +21,10 @@ export default class ColumnBackButton extends React.PureComponent {
if (onClick) {
onClick();
} else if (window.history && window.history.state) {
}
// Check if there is a previous page in the app to go back to per https://stackoverflow.com/a/70532858/9703201
// When upgrading to V6, check `location.key !== 'default'` instead per https://github.com/remix-run/history/blob/main/docs/api-reference.md#location
else if (router.location.key) {
router.history.goBack();
} else {
router.history.push('/');