mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
chore: remove unused routing components
This commit is contained in:
parent
cd11e6e36f
commit
68b21bbb04
8 changed files with 23 additions and 120 deletions
|
@ -1,6 +1,5 @@
|
|||
import loadable, { LoadableComponent } from '@loadable/component';
|
||||
import React from 'react';
|
||||
import { Route } from 'react-router-dom';
|
||||
|
||||
export enum AsyncRouteType {
|
||||
Stable,
|
||||
|
@ -42,32 +41,7 @@ const StableAsyncPage = loadable(
|
|||
{ cacheKey: (props: AsyncPageProps) => props.page }
|
||||
);
|
||||
|
||||
export const toAsyncPageRoute = ({ path, page, element, type = AsyncRouteType.Stable }: AsyncRoute) => {
|
||||
let Element = element;
|
||||
if (!Element) {
|
||||
switch (type) {
|
||||
case AsyncRouteType.Dashboard:
|
||||
Element = DashboardAsyncPage;
|
||||
break;
|
||||
case AsyncRouteType.Experimental:
|
||||
Element = ExperimentalAsyncPage;
|
||||
break;
|
||||
case AsyncRouteType.Stable:
|
||||
default:
|
||||
Element = StableAsyncPage;
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<Route
|
||||
key={path}
|
||||
path={path}
|
||||
element={<Element page={page ?? path} />}
|
||||
/>
|
||||
);
|
||||
};
|
||||
|
||||
export function toAsyncPageRouteConfig({ path, page, element, type = AsyncRouteType.Stable }: AsyncRoute) {
|
||||
export function toAsyncPageRoute({ path, page, element, type = AsyncRouteType.Stable }: AsyncRoute) {
|
||||
let Element = element;
|
||||
if (!Element) {
|
||||
switch (type) {
|
||||
|
|
|
@ -1,48 +0,0 @@
|
|||
import React, { useLayoutEffect } from 'react';
|
||||
import { HistoryRouterProps, Router } from 'react-router-dom';
|
||||
import { Update } from 'history';
|
||||
|
||||
/** Strips leading "!" from paths */
|
||||
const normalizePath = (pathname: string) => pathname.replace(/^!/, '');
|
||||
|
||||
/**
|
||||
* A slightly customized version of the HistoryRouter from react-router-dom.
|
||||
* We need to use HistoryRouter to have a shared history state between react-router and appRouter, but it does not seem
|
||||
* to be properly exported in the upstream package.
|
||||
* We also needed some customizations to handle #! routes.
|
||||
* Refs: https://github.com/remix-run/react-router/blob/v6.3.0/packages/react-router-dom/index.tsx#L222
|
||||
*/
|
||||
export function HistoryRouter({ basename, children, history }: HistoryRouterProps) {
|
||||
const [state, setState] = React.useState<Update>({
|
||||
action: history.action,
|
||||
location: history.location
|
||||
});
|
||||
|
||||
useLayoutEffect(() => {
|
||||
const onHistoryChange = (update: Update) => {
|
||||
if (update.location.pathname.startsWith('!')) {
|
||||
// When the location changes, we need to check for #! paths and replace the location with the "!" stripped
|
||||
history.replace(normalizePath(update.location.pathname), update.location.state);
|
||||
} else {
|
||||
setState(update);
|
||||
}
|
||||
};
|
||||
|
||||
history.listen(onHistoryChange);
|
||||
}, [ history ]);
|
||||
|
||||
return (
|
||||
<Router
|
||||
basename={basename}
|
||||
// eslint-disable-next-line react/no-children-prop
|
||||
children={children}
|
||||
location={{
|
||||
...state.location,
|
||||
// The original location does not get replaced with the normalized version, so we need to strip it here
|
||||
pathname: normalizePath(state.location.pathname)
|
||||
}}
|
||||
navigationType={state.action}
|
||||
navigator={history}
|
||||
/>
|
||||
);
|
||||
}
|
|
@ -1,5 +1,4 @@
|
|||
import React from 'react';
|
||||
import { Route } from 'react-router-dom';
|
||||
|
||||
import ViewManagerPage, { ViewManagerPageProps } from '../viewManager/ViewManagerPage';
|
||||
|
||||
|
@ -9,18 +8,6 @@ export interface LegacyRoute {
|
|||
}
|
||||
|
||||
export function toViewManagerPageRoute(route: LegacyRoute) {
|
||||
return (
|
||||
<Route
|
||||
key={route.path}
|
||||
path={route.path}
|
||||
element={
|
||||
<ViewManagerPage {...route.pageProps} />
|
||||
}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
export function toViewManagerPageRouteConfig(route: LegacyRoute) {
|
||||
return {
|
||||
path: route.path,
|
||||
element: <ViewManagerPage {...route.pageProps} />
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import React from 'react';
|
||||
import { Navigate, Route, RouteObject, useLocation } from 'react-router-dom';
|
||||
import { Navigate, RouteObject, useLocation } from 'react-router-dom';
|
||||
|
||||
export interface Redirect {
|
||||
from: string
|
||||
|
@ -17,17 +17,7 @@ const RedirectWithSearch = ({ to }: { to: string }) => {
|
|||
);
|
||||
};
|
||||
|
||||
export function toRedirectRoute({ from, to }: Redirect) {
|
||||
return (
|
||||
<Route
|
||||
key={from}
|
||||
path={from}
|
||||
element={<RedirectWithSearch to={to} />}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
export function toRedirectRouteConfig({ from, to }: Redirect): RouteObject {
|
||||
export function toRedirectRoute({ from, to }: Redirect): RouteObject {
|
||||
return {
|
||||
path: from,
|
||||
element: <RedirectWithSearch to={to} />
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue