mirror of
https://github.com/cheeaun/phanpy.git
synced 2025-02-17 07:41:35 +03:00
At this point, better write my own matchPath right?
This commit is contained in:
parent
9401fc38e1
commit
26f8b618a5
2 changed files with 7 additions and 6 deletions
|
@ -12,8 +12,8 @@ function Public({ local }) {
|
|||
const isLocal = !!local;
|
||||
const params = useParams();
|
||||
const { masto, instance } = api({ instance: params.instance });
|
||||
const title = `${instance} (${isLocal ? 'local' : 'federated'})`;
|
||||
useTitle(title, `:instance?/p/l?`);
|
||||
const title = `${isLocal ? 'Local' : 'Federated'} timeline (${instance})`;
|
||||
useTitle(title, isLocal ? `/:instance?/p/l` : `/:instance?/p`);
|
||||
const latestItem = useRef();
|
||||
|
||||
const publicIterator = useRef();
|
||||
|
@ -59,8 +59,8 @@ function Public({ local }) {
|
|||
title={title}
|
||||
titleComponent={
|
||||
<h1 class="header-account">
|
||||
<b>{instance}</b>
|
||||
<div>{isLocal ? 'local' : 'federated'}</div>
|
||||
<b>{isLocal ? 'Local timeline' : 'Federated timeline'}</b>
|
||||
<div>{instance}</div>
|
||||
</h1>
|
||||
}
|
||||
id="public"
|
||||
|
|
|
@ -12,8 +12,8 @@ export default function useTitle(title, path) {
|
|||
let paths = [];
|
||||
// Workaround for matchPath not working for optional path segments
|
||||
// https://github.com/remix-run/react-router/discussions/9862
|
||||
if (/:\w+\?/.test(path)) {
|
||||
paths.push(path.replace(/\?/g, ''));
|
||||
if (/:?\w+\?/.test(path)) {
|
||||
paths.push(path.replace(/(:\w+)\?/g, '$1'));
|
||||
paths.push(path.replace(/\/?:\w+\?/g, ''));
|
||||
}
|
||||
let matched = false;
|
||||
|
@ -22,6 +22,7 @@ export default function useTitle(title, path) {
|
|||
} else {
|
||||
matched = matchPath(path, currentLocation);
|
||||
}
|
||||
console.debug({ paths, matched, currentLocation });
|
||||
useEffect(() => {
|
||||
if (path && !matched) return;
|
||||
document.title = title ? `${title} / ${CLIENT_NAME}` : CLIENT_NAME;
|
||||
|
|
Loading…
Add table
Reference in a new issue