complete the merge

This commit is contained in:
ShittyKopper 2024-05-06 04:48:46 +03:00
commit c1a1050835
4 changed files with 17 additions and 17 deletions

View file

@ -23,7 +23,6 @@ type LocationState = MastodonLocationState | null | undefined;
type HistoryPath = Path | LocationDescriptor<LocationState>;
const browserHistory = createBrowserHistory<LocationState>();
const originalPush = browserHistory.push.bind(browserHistory);
const originalReplace = browserHistory.replace.bind(browserHistory);
export function useAppHistory() {
@ -49,11 +48,7 @@ function normalizePath(
);
}
if (layoutFromWindow() === 'multi-column' && !path.startsWith('/deck')) {
originalPush(`/deck${path}`, state);
} else {
originalPush(path, state);
}
return location;
}
browserHistory.replace = (path: HistoryPath, state?: MastodonLocationState) => {