Mirrors/phanpy
1
0
Fork 0
mirror of https://github.com/cheeaun/phanpy.git synced 2025-02-09 01:26:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

More reliable back button

Browse source 
Uses new Navigation API
This commit is contained in:
Lim Chee Aun 2023-11-01 19:11:54 +08:00
parent caeeffaa72
commit 33f807de73
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/pages/status.jsx
View file

@ -66,6 +66,8 @@ const scrollIntoViewOptions = {
const STATUSES_SELECTOR = const STATUSES_SELECTOR =
'.status-link:not(details:not([open]) > summary ~ *, details:not([open]) > summary ~ * *), .status-focus:not(details:not([open]) > summary ~ *, details:not([open]) > summary ~ * *)'; '.status-link:not(details:not([open]) > summary ~ *, details:not([open]) > summary ~ * *), .status-focus:not(details:not([open]) > summary ~ *, details:not([open]) > summary ~ * *)';
const STATUS_URL_REGEX = /\/s\//i;
function StatusPage(params) { function StatusPage(params) {
const { id } = params; const { id } = params;
const { masto, instance } = api({ instance: params.instance }); const { masto, instance } = api({ instance: params.instance });
@ -872,6 +874,17 @@ function StatusThread({ id, closeLink = '/', instance: propInstance }) {
], ],
); );
const prevLocationIsStatusPage = useMemo(() => {
// Navigation API
if (navigation?.entries) {
const prevEntry = navigation.entries()[navigation.currentEntry.index - 1];
if (prevEntry?.url) {
return STATUS_URL_REGEX.test(prevEntry.url);
}
}
return STATUS_URL_REGEX.test(states.prevLocation?.pathname);
}, [sKey]);
return ( return (
<div <div
tabIndex="-1" tabIndex="-1"
@ -908,7 +921,7 @@ function StatusThread({ id, closeLink = '/', instance: propInstance }) {
</div> */} </div> */}
<div class="header-grid header-grid-2"> <div class="header-grid header-grid-2">
<h1> <h1>
{!!/\/s\//i.test(snapStates.prevLocation?.pathname) && ( {prevLocationIsStatusPage && (
<button <button
type="button" type="button"
class="plain deck-back" class="plain deck-back"