Browse Source

add episode selector, fix bug where video doesnt unload properly, move to react helmet async to fix react warning

Co-authored-by: Jip Frijlink <JipFr@users.noreply.github.com>
pull/497/head
mrjvs 2 years ago
parent
commit
3c5fb66073
  1. 2
      package.json
  2. 33
      pnpm-lock.yaml
  3. 2
      src/_oldvideo/components/actions/PageTitleAction.tsx
  4. 2
      src/components/Overlay.tsx
  5. 203
      src/components/player/atoms/Episodes.tsx
  6. 6
      src/components/player/atoms/Settings.tsx
  7. 26
      src/components/player/atoms/Time.tsx
  8. 1
      src/components/player/atoms/index.ts
  9. 43
      src/components/player/display/base.ts
  10. 2
      src/components/player/display/displayInterface.ts
  11. 18
      src/components/player/internals/Button.tsx
  12. 74
      src/components/player/internals/ContextUtils.tsx
  13. 2
      src/components/player/internals/HeadUpdater.tsx
  14. 18
      src/components/player/internals/VideoContainer.tsx
  15. 35
      src/hooks/useOverlayRouter.ts
  16. 13
      src/index.tsx
  17. 2
      src/pages/HomePage.tsx
  18. 9
      src/pages/PlayerView.tsx
  19. 2
      src/pages/parts/errors/ErrorWrapperPart.tsx
  20. 3
      src/pages/parts/player/PlayerPart.tsx
  21. 2
      src/setup/index.css
  22. 2
      src/stores/player/slices/display.ts
  23. 1
      src/stores/player/slices/source.ts

2
package.json

@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-ga4": "^2.0.0",
"react-helmet": "^6.1.0",
"react-helmet-async": "^1.3.0",
"react-i18next": "^12.1.1",
"react-router-dom": "^5.2.0",
"react-stickynode": "^4.1.0",

33
pnpm-lock.yaml

@ -80,9 +80,9 @@ dependencies: @@ -80,9 +80,9 @@ dependencies:
react-ga4:
specifier: ^2.0.0
version: 2.1.0
react-helmet:
specifier: ^6.1.0
version: 6.1.0(react@17.0.2)
react-helmet-async:
specifier: ^1.3.0
version: 1.3.0(react-dom@17.0.2)(react@17.0.2)
react-i18next:
specifier: ^12.1.1
version: 12.3.1(i18next@22.5.1)(react-dom@17.0.2)(react@17.0.2)
@ -4191,6 +4191,12 @@ packages: @@ -4191,6 +4191,12 @@ packages:
side-channel: 1.0.4
dev: true
/invariant@2.2.4:
resolution: {integrity: sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==}
dependencies:
loose-envify: 1.4.0
dev: false
/is-array-buffer@3.0.2:
resolution: {integrity: sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==}
dependencies:
@ -5219,16 +5225,19 @@ packages: @@ -5219,16 +5225,19 @@ packages:
resolution: {integrity: sha512-ZKS7PGNFqqMd3PJ6+C2Jtz/o1iU9ggiy8Y8nUeksgVuvNISbmrQtJiZNvC/TjDsqD0QlU5Wkgs7i+w9+OjHhhQ==}
dev: false
/react-helmet@6.1.0(react@17.0.2):
resolution: {integrity: sha512-4uMzEY9nlDlgxr61NL3XbKRy1hEkXmKNXhjbAIOVw5vcFrsdYbH2FEwcNyWvWinl103nXgzYNlns9ca+8kFiWw==}
/react-helmet-async@1.3.0(react-dom@17.0.2)(react@17.0.2):
resolution: {integrity: sha512-9jZ57/dAn9t3q6hneQS0wukqC2ENOBgMNVEhb/ZG9ZSxUetzVIw4iAmEU38IaVg3QGYauQPhSeUTuIUtFglWpg==}
peerDependencies:
react: '>=16.3.0'
react: ^16.6.0 || ^17.0.0 || ^18.0.0
react-dom: ^16.6.0 || ^17.0.0 || ^18.0.0
dependencies:
object-assign: 4.1.1
'@babel/runtime': 7.22.11
invariant: 2.2.4
prop-types: 15.8.1
react: 17.0.2
react-dom: 17.0.2(react@17.0.2)
react-fast-compare: 3.2.2
react-side-effect: 2.1.2(react@17.0.2)
shallowequal: 1.1.0
dev: false
/react-i18next@12.3.1(i18next@22.5.1)(react-dom@17.0.2)(react@17.0.2):
@ -5295,14 +5304,6 @@ packages: @@ -5295,14 +5304,6 @@ packages:
tiny-warning: 1.0.3
dev: false
/react-side-effect@2.1.2(react@17.0.2):
resolution: {integrity: sha512-PVjOcvVOyIILrYoyGEpDN3vmYNLdy1CajSFNt4TDsVQC5KpTijDvWVoR+/7Rz2xT978D8/ZtFceXxzsPwZEDvw==}
peerDependencies:
react: ^16.3.0 || ^17.0.0 || ^18.0.0
dependencies:
react: 17.0.2
dev: false
/react-stickynode@4.1.0(react-dom@17.0.2)(react@17.0.2):
resolution: {integrity: sha512-zylWgfad75jLfh/gYIayDcDWIDwO4weZrsZqDpjZ/axhF06zRjdCWFBgUr33Pvv2+htKWqPSFksWTyB6aMQ1ZQ==}
peerDependencies:

2
src/_oldvideo/components/actions/PageTitleAction.tsx

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
import { Helmet } from "react-helmet";
import { Helmet } from "react-helmet-async";
import { useVideoPlayerDescriptor } from "@/_oldvideo/state/hooks";

2
src/components/Overlay.tsx

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
import { Helmet } from "react-helmet";
import { Helmet } from "react-helmet-async";
import { Transition } from "@/components/Transition";

203
src/components/player/atoms/Episodes.tsx

@ -0,0 +1,203 @@ @@ -0,0 +1,203 @@
import { ReactNode, useCallback, useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import { useAsync } from "react-use";
import { getMetaFromId } from "@/backend/metadata/getmeta";
import { MWMediaType, MWSeasonMeta } from "@/backend/metadata/types/mw";
import { Icons } from "@/components/Icon";
import { OverlayAnchor } from "@/components/overlays/OverlayAnchor";
import { Overlay } from "@/components/overlays/OverlayDisplay";
import { OverlayPage } from "@/components/overlays/OverlayPage";
import { OverlayRouter } from "@/components/overlays/OverlayRouter";
import { usePlayerMeta } from "@/components/player/hooks/usePlayerMeta";
import { VideoPlayerButton } from "@/components/player/internals/Button";
import { Context } from "@/components/player/internals/ContextUtils";
import { useOverlayRouter } from "@/hooks/useOverlayRouter";
import { usePlayerStore } from "@/stores/player/store";
function CenteredText(props: { children: React.ReactNode }) {
return (
<div className="h-full w-full flex justify-center items-center p-8 text-center">
{props.children}
</div>
);
}
function useSeasonData(mediaId: string, seasonId: string) {
const [seasons, setSeason] = useState<MWSeasonMeta[] | null>(null);
const state = useAsync(async () => {
const data = await getMetaFromId(MWMediaType.SERIES, mediaId, seasonId);
if (data?.meta.type !== MWMediaType.SERIES) return null;
setSeason(data.meta.seasons);
return {
season: data.meta.seasonData,
fullData: data,
};
}, [mediaId, seasonId]);
return [state, seasons] as const;
}
function SeasonsView({
selectedSeason,
setSeason,
}: {
selectedSeason: string;
setSeason: (id: string) => void;
}) {
const meta = usePlayerStore((s) => s.meta);
const [loadingState, seasons] = useSeasonData(
meta?.tmdbId ?? "",
selectedSeason
);
let content: ReactNode = null;
if (seasons) {
content = (
<Context.Section className="pb-6">
{seasons?.map((season) => {
return (
<Context.Link key={season.id} onClick={() => setSeason(season.id)}>
<Context.LinkTitle>{season.title}</Context.LinkTitle>
<Context.LinkChevron />
</Context.Link>
);
})}
</Context.Section>
);
} else if (loadingState.error)
content = <CenteredText>Error loading season</CenteredText>;
else if (loadingState.loading)
content = <CenteredText>Loading...</CenteredText>;
return (
<Context.CardWithScrollable>
<Context.Title>{meta?.title}</Context.Title>
{content}
</Context.CardWithScrollable>
);
}
function EpisodesView({
id,
selectedSeason,
goBack,
}: {
id: string;
selectedSeason: string;
goBack?: () => void;
}) {
const { t } = useTranslation();
const router = useOverlayRouter(id);
const { setPlayerMeta } = usePlayerMeta();
const meta = usePlayerStore((s) => s.meta);
const [loadingState] = useSeasonData(meta?.tmdbId ?? "", selectedSeason);
const playEpisode = useCallback(
(episodeId: string) => {
if (loadingState.value)
setPlayerMeta(loadingState.value.fullData, episodeId);
router.close();
},
[setPlayerMeta, loadingState, router]
);
let content: ReactNode = null;
if (loadingState.error)
content = <CenteredText>Error loading season</CenteredText>;
else if (loadingState.loading)
content = <CenteredText>Loading...</CenteredText>;
else if (loadingState.value) {
content = (
<Context.Section className="pb-6">
{loadingState.value.season.episodes.map((ep) => {
return (
<Context.Link
key={ep.id}
onClick={() => playEpisode(ep.id)}
active={ep.id === meta?.episode?.tmdbId}
>
<Context.LinkTitle>
<div className="text-left flex items-center space-x-3">
<span className="p-0.5 px-2 rounded inline bg-video-context-border bg-opacity-10">
E{ep.number}
</span>
<span className="line-clamp-1 break-all">{ep.title}</span>
</div>
</Context.LinkTitle>
<Context.LinkChevron />
</Context.Link>
);
})}
</Context.Section>
);
}
return (
<Context.CardWithScrollable>
<Context.BackLink onClick={goBack}>
{loadingState?.value?.season.title || t("videoPlayer.loading")}
</Context.BackLink>
{content}
</Context.CardWithScrollable>
);
}
function EpisodesOverlay({ id }: { id: string }) {
const router = useOverlayRouter(id);
const meta = usePlayerStore((s) => s.meta);
const [selectedSeason, setSelectedSeason] = useState(
meta?.season?.tmdbId ?? ""
);
const setSeason = useCallback(
(seasonId: string) => {
setSelectedSeason(seasonId);
router.navigate("/episodes");
},
[router]
);
return (
<Overlay id={id}>
<OverlayRouter id={id}>
<OverlayPage id={id} path="/" width={343} height={431}>
<SeasonsView setSeason={setSeason} selectedSeason={selectedSeason} />
</OverlayPage>
<OverlayPage id={id} path="/episodes" width={343} height={431}>
<EpisodesView
selectedSeason={selectedSeason}
id={id}
goBack={() => router.navigate("/")}
/>
</OverlayPage>
</OverlayRouter>
</Overlay>
);
}
export function Episodes() {
const { t } = useTranslation();
const router = useOverlayRouter("episodes");
const setHasOpenOverlay = usePlayerStore((s) => s.setHasOpenOverlay);
const type = usePlayerStore((s) => s.meta?.type);
useEffect(() => {
setHasOpenOverlay(router.isRouterActive);
}, [setHasOpenOverlay, router.isRouterActive]);
if (type !== "show") return null;
return (
<OverlayAnchor id={router.id}>
<VideoPlayerButton
onClick={() => router.open("/episodes")}
icon={Icons.EPISODES}
>
{t("videoPlayer.buttons.episodes")}
</VideoPlayerButton>
<EpisodesOverlay id={router.id} />
</OverlayAnchor>
);
}

6
src/components/player/atoms/Settings.tsx

@ -101,7 +101,7 @@ function SettingsOverlay({ id }: { id: string }) { @@ -101,7 +101,7 @@ function SettingsOverlay({ id }: { id: string }) {
<OverlayRouter id={id}>
<OverlayPage id={id} path="/" width={343} height={431}>
<Context.Card>
<Context.Title>Video settings</Context.Title>
<Context.SectionTitle>Video settings</Context.SectionTitle>
<Context.Section>
<Context.Link onClick={() => router.navigate("/quality")}>
<Context.LinkTitle>Quality</Context.LinkTitle>
@ -119,11 +119,11 @@ function SettingsOverlay({ id }: { id: string }) { @@ -119,11 +119,11 @@ function SettingsOverlay({ id }: { id: string }) {
</Context.Link>
</Context.Section>
<Context.Title>Viewing Experience</Context.Title>
<Context.SectionTitle>Viewing Experience</Context.SectionTitle>
<Context.Section>
<Context.Link onClick={() => router.navigate("/quality")}>
<Context.LinkTitle>Enable Captions</Context.LinkTitle>
<Context.IconButton icon={Icons.CHEVRON_DOWN} />
<Context.LinkChevron />
</Context.Link>
<Context.Link>
<Context.LinkTitle>Caption settings</Context.LinkTitle>

26
src/components/player/atoms/Time.tsx

@ -40,22 +40,22 @@ export function Time() { @@ -40,22 +40,22 @@ export function Time() {
},
});
const timeString = `${formatSeconds(currentTime, hasHours)} / ${formatSeconds(
duration,
hasHours
)}`;
const timeFinishedString = `${t("videoPlayer.timeLeft", {
timeLeft: formatSeconds(
secondsRemaining,
durationExceedsHour(secondsRemaining)
),
})} ${formattedTimeFinished}`;
const child =
timeFormat === VideoPlayerTimeFormat.REGULAR ? (
<>
{formatSeconds(currentTime, hasHours)}{" "}
<span>/ {formatSeconds(duration, hasHours)}</span>
</>
<span>{timeString}</span>
) : (
<>
{t("videoPlayer.timeLeft", {
timeLeft: formatSeconds(
secondsRemaining,
durationExceedsHour(secondsRemaining)
),
})}{" "}
{formattedTimeFinished}
</>
<span>{timeFinishedString}</span>
);
return (

1
src/components/player/atoms/index.ts

@ -9,3 +9,4 @@ export * from "./Volume"; @@ -9,3 +9,4 @@ export * from "./Volume";
export * from "./Title";
export * from "./EpisodeTitle";
export * from "./Settings";
export * from "./Episodes";

43
src/components/player/display/base.ts

@ -29,15 +29,17 @@ export function makeVideoElementDisplayInterface(): DisplayInterface { @@ -29,15 +29,17 @@ export function makeVideoElementDisplayInterface(): DisplayInterface {
if (src.type === "hls") {
if (!Hls.isSupported()) throw new Error("HLS not supported");
hls = new Hls({ enableWorker: false });
hls.on(Hls.Events.ERROR, (event, data) => {
console.error("HLS error", data);
if (data.fatal) {
throw new Error(
`HLS ERROR:${data.error?.message ?? "Something went wrong"}`
);
}
});
if (!hls) {
hls = new Hls({ enableWorker: false });
hls.on(Hls.Events.ERROR, (event, data) => {
console.error("HLS error", data);
if (data.fatal) {
throw new Error(
`HLS ERROR:${data.error?.message ?? "Something went wrong"}`
);
}
});
}
hls.attachMedia(vid);
hls.loadSource(src.url);
@ -77,6 +79,21 @@ export function makeVideoElementDisplayInterface(): DisplayInterface { @@ -77,6 +79,21 @@ export function makeVideoElementDisplayInterface(): DisplayInterface {
});
}
function unloadSource() {
if (videoElement) videoElement.removeAttribute("src");
if (hls) {
hls.destroy();
hls = null;
}
}
function destroyVideoElement() {
unloadSource();
if (videoElement) {
videoElement = null;
}
}
function fullscreenChange() {
isFullscreen =
!!document.fullscreenElement || // other browsers
@ -88,20 +105,18 @@ export function makeVideoElementDisplayInterface(): DisplayInterface { @@ -88,20 +105,18 @@ export function makeVideoElementDisplayInterface(): DisplayInterface {
on,
off,
destroy: () => {
if (hls) hls.destroy();
if (videoElement) {
videoElement.src = "";
videoElement.remove();
}
destroyVideoElement();
fscreen.removeEventListener("fullscreenchange", fullscreenChange);
},
load(newSource) {
if (!newSource) unloadSource();
source = newSource;
emit("loading", true);
setSource();
},
processVideoElement(video) {
destroyVideoElement();
videoElement = video;
setSource();
},

2
src/components/player/display/displayInterface.ts

@ -17,7 +17,7 @@ export type DisplayInterfaceEvents = { @@ -17,7 +17,7 @@ export type DisplayInterfaceEvents = {
export interface DisplayInterface extends Listener<DisplayInterfaceEvents> {
play(): void;
pause(): void;
load(source: LoadableSource): void;
load(source: LoadableSource | null): void;
processVideoElement(video: HTMLVideoElement): void;
processContainerElement(container: HTMLElement): void;
toggleFullscreen(): void;

18
src/components/player/internals/Button.tsx

@ -1,3 +1,5 @@ @@ -1,3 +1,5 @@
import classNames from "classnames";
import { Icon, Icons } from "@/components/Icon";
export function VideoPlayerButton(props: {
@ -12,15 +14,21 @@ export function VideoPlayerButton(props: { @@ -12,15 +14,21 @@ export function VideoPlayerButton(props: {
<button
type="button"
onClick={props.onClick}
className={[
"p-2 rounded-full hover:bg-video-buttonBackground hover:bg-opacity-75 transition-transform duration-100",
className={classNames([
"p-2 rounded-full hover:bg-video-buttonBackground hover:bg-opacity-50 transition-transform duration-100 flex items-center",
props.activeClass ??
"active:scale-110 active:bg-opacity-100 active:text-white",
"active:scale-110 active:bg-opacity-75 active:text-white",
props.className ?? "",
].join(" ")}
])}
>
{props.icon && (
<Icon className={props.iconSizeClass || "text-2xl"} icon={props.icon} />
<Icon
className={classNames(
props.iconSizeClass || "text-2xl",
props.children ? "mr-3" : ""
)}
icon={props.icon}
/>
)}
{props.children}
</button>

74
src/components/player/internals/ContextUtils.tsx

@ -3,12 +3,26 @@ import classNames from "classnames"; @@ -3,12 +3,26 @@ import classNames from "classnames";
import { Icon, Icons } from "@/components/Icon";
function Card(props: { children: React.ReactNode }) {
return <div className="px-6 py-0">{props.children}</div>;
return (
<div className="h-full grid grid-rows-[1fr]">
<div className="px-6 h-full overflow-y-auto overflow-x-hidden">
{props.children}
</div>
</div>
);
}
function CardWithScrollable(props: { children: React.ReactNode }) {
return (
<div className="[&>*]:px-6 h-full grid grid-rows-[auto,1fr] [&>*:nth-child(2)]:overflow-y-auto [&>*:nth-child(2)]:overflow-x-hidden">
{props.children}
</div>
);
}
function Title(props: { children: React.ReactNode }) {
function SectionTitle(props: { children: React.ReactNode }) {
return (
<h3 className="uppercase mt-8 font-bold text-video-context-type-secondary text-sm pl-1 pb-2.5 border-b border-opacity-25 border-video-context-border mb-6">
<h3 className="uppercase font-bold text-video-context-type-secondary text-sm pt-8 pl-1 pb-2.5 border-b border-opacity-25 border-video-context-border">
{props.children}
</h3>
);
@ -18,7 +32,7 @@ function LinkTitle(props: { children: React.ReactNode; textClass?: string }) { @@ -18,7 +32,7 @@ function LinkTitle(props: { children: React.ReactNode; textClass?: string }) {
return (
<span
className={classNames([
"font-medium",
"font-medium text-left",
props.textClass || "text-video-context-type-main",
])}
>
@ -27,16 +41,23 @@ function LinkTitle(props: { children: React.ReactNode; textClass?: string }) { @@ -27,16 +41,23 @@ function LinkTitle(props: { children: React.ReactNode; textClass?: string }) {
);
}
function Section(props: { children: React.ReactNode }) {
return <div className="my-5">{props.children}</div>;
function Section(props: { children: React.ReactNode; className?: string }) {
return (
<div className={classNames("pt-5", props.className)}>{props.children}</div>
);
}
function Link(props: { onClick?: () => void; children: React.ReactNode }) {
function Link(props: {
onClick?: () => void;
children: React.ReactNode;
active?: boolean;
}) {
const classes = classNames(
"flex justify-between items-center py-2 pl-3 pr-3 -ml-3 rounded w-full",
{
"cursor-default": !props.onClick,
"hover:bg-video-context-border hover:bg-opacity-10": !!props.onClick,
"bg-video-context-border bg-opacity-10": props.active,
}
);
const styles = { width: "calc(100% + 1.5rem)" };
@ -61,25 +82,36 @@ function Link(props: { onClick?: () => void; children: React.ReactNode }) { @@ -61,25 +82,36 @@ function Link(props: { onClick?: () => void; children: React.ReactNode }) {
);
}
function Title(props: {
children: React.ReactNode;
rightSide?: React.ReactNode;
}) {
return (
<div>
<h3 className="font-bold text-video-context-type-main pb-3 pt-5 border-b border-opacity-25 border-video-context-border flex justify-between items-center">
<div className="flex items-center space-x-3">{props.children}</div>
<div>{props.rightSide}</div>
</h3>
</div>
);
}
function BackLink(props: {
onClick?: () => void;
children: React.ReactNode;
rightSide?: React.ReactNode;
}) {
return (
<h3 className="font-bold text-video-context-type-main pb-3 pt-5 border-b border-opacity-25 border-video-context-border mb-6 flex justify-between items-center">
<div className="flex items-center space-x-3">
<button
type="button"
className="-ml-2 p-2 rounded hover:bg-video-context-light hover:bg-opacity-10"
onClick={props.onClick}
>
<Icon className="text-xl" icon={Icons.ARROW_LEFT} />
</button>
<span>{props.children}</span>
</div>
<div>{props.rightSide}</div>
</h3>
<Title rightSide={props.rightSide}>
<button
type="button"
className="-ml-2 p-2 rounded hover:bg-video-context-light hover:bg-opacity-10"
onClick={props.onClick}
>
<Icon className="text-xl" icon={Icons.ARROW_LEFT} />
</button>
<span className="line-clamp-1 break-all">{props.children}</span>
</Title>
);
}
@ -124,7 +156,9 @@ function Anchor(props: { children: React.ReactNode; onClick: () => void }) { @@ -124,7 +156,9 @@ function Anchor(props: { children: React.ReactNode; onClick: () => void }) {
export const Context = {
Card,
CardWithScrollable,
Title,
SectionTitle,
BackLink,
Section,
Link,

2
src/components/player/internals/HeadUpdater.tsx

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
import { Helmet } from "react-helmet";
import { Helmet } from "react-helmet-async";
import { useTranslation } from "react-i18next";
import { usePlayerStore } from "@/stores/player/store";

18
src/components/player/internals/VideoContainer.tsx

@ -9,14 +9,24 @@ function useDisplayInterface() { @@ -9,14 +9,24 @@ function useDisplayInterface() {
const display = usePlayerStore((s) => s.display);
const setDisplay = usePlayerStore((s) => s.setDisplay);
const displayRef = useRef(display);
useEffect(() => {
if (!display) {
setDisplay(makeVideoElementDisplayInterface());
displayRef.current = display;
}, [display]);
useEffect(() => {
if (!displayRef.current) {
const newDisplay = makeVideoElementDisplayInterface();
displayRef.current = newDisplay;
setDisplay(newDisplay);
}
return () => {
if (display) setDisplay(null);
if (displayRef.current) {
displayRef.current = null;
setDisplay(null);
}
};
}, [display, setDisplay]);
}, [setDisplay]);
}
export function useShouldShowVideoElement() {

35
src/hooks/useOverlayRouter.ts

@ -60,23 +60,26 @@ export function useInternalOverlayRouter(id: string) { @@ -60,23 +60,26 @@ export function useInternalOverlayRouter(id: string) {
setTransition(null);
}, [setRoute, route, setTransition]);
const open = useCallback(() => {
const anchor = document.getElementById(`__overlayRouter::${id}`);
if (anchor) {
const rect = anchor.getBoundingClientRect();
setAnchorPoint({
h: rect.height,
w: rect.width,
x: rect.x,
y: rect.y,
});
} else {
setAnchorPoint(null);
}
const open = useCallback(
(defaultRoute = "/") => {
const anchor = document.getElementById(`__overlayRouter::${id}`);
if (anchor) {
const rect = anchor.getBoundingClientRect();
setAnchorPoint({
h: rect.height,
w: rect.width,
x: rect.x,
y: rect.y,
});
} else {
setAnchorPoint(null);
}
setTransition(null);
setRoute(`/${id}`);
}, [id, setRoute, setTransition, setAnchorPoint]);
setTransition(null);
setRoute(joinPath(splitPath(defaultRoute, id)));
},
[id, setRoute, setTransition, setAnchorPoint]
);
return {
showBackwardsTransition,

13
src/index.tsx

@ -2,6 +2,7 @@ import "core-js/stable"; @@ -2,6 +2,7 @@ import "core-js/stable";
import React, { Suspense } from "react";
import type { ReactNode } from "react";
import ReactDOM from "react-dom";
import { HelmetProvider } from "react-helmet-async";
import { BrowserRouter, HashRouter } from "react-router-dom";
import { registerSW } from "virtual:pwa-register";
@ -48,11 +49,13 @@ function TheRouter(props: { children: ReactNode }) { @@ -48,11 +49,13 @@ function TheRouter(props: { children: ReactNode }) {
ReactDOM.render(
<React.StrictMode>
<ErrorBoundary>
<TheRouter>
<Suspense fallback="">
<LazyLoadedApp />
</Suspense>
</TheRouter>
<HelmetProvider>
<TheRouter>
<Suspense fallback="">
<LazyLoadedApp />
</Suspense>
</TheRouter>
</HelmetProvider>
</ErrorBoundary>
</React.StrictMode>,
document.getElementById("root")

2
src/pages/HomePage.tsx

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
import { useEffect, useState } from "react";
import { Helmet } from "react-helmet";
import { Helmet } from "react-helmet-async";
import { useTranslation } from "react-i18next";
import { WideContainer } from "@/components/layout/WideContainer";

9
src/pages/PlayerView.tsx

@ -1,8 +1,7 @@ @@ -1,8 +1,7 @@
import { RunOutput } from "@movie-web/providers";
import { useCallback, useEffect, useState } from "react";
import { useCallback, useEffect, useRef, useState } from "react";
import { useParams } from "react-router-dom";
import { MWStreamType } from "@/backend/helpers/streams";
import { usePlayer } from "@/components/player/hooks/usePlayer";
import { usePlayerMeta } from "@/components/player/hooks/usePlayerMeta";
import { convertRunoutputToSource } from "@/components/player/utils/convertRunoutputToSource";
@ -21,9 +20,13 @@ export function PlayerView() { @@ -21,9 +20,13 @@ export function PlayerView() {
const { setPlayerMeta, scrapeMedia } = usePlayerMeta();
const [backUrl] = useState("/"); // TODO redirect to search when needed
const lastMedia = useRef(params.media);
useEffect(() => {
if (params.media === lastMedia.current) return;
lastMedia.current = params.media;
console.log("resetting");
reset();
}, [params.media, reset]);
}, [params, reset]);
const playAfterScrape = useCallback(
(out: RunOutput | null) => {

2
src/pages/parts/errors/ErrorWrapperPart.tsx

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
import { ReactNode } from "react";
import { Helmet } from "react-helmet";
import { Helmet } from "react-helmet-async";
import { useTranslation } from "react-i18next";
import { VideoPlayerHeader } from "@/_oldvideo/components/parts/VideoPlayerHeader";

3
src/pages/parts/player/PlayerPart.tsx

@ -63,7 +63,8 @@ export function PlayerPart(props: PlayerPartProps) { @@ -63,7 +63,8 @@ export function PlayerPart(props: PlayerPartProps) {
{/* Do mobile controls here :) */}
<Player.Time />
</Player.LeftSideControls>
<div className="flex items-center">
<div className="flex items-center space-x-3">
<Player.Episodes />
<Player.Settings />
<Player.Fullscreen />
</div>

2
src/setup/index.css

@ -200,7 +200,7 @@ input[type=range].styled-slider.slider-progress::-ms-fill-lower { @@ -200,7 +200,7 @@ input[type=range].styled-slider.slider-progress::-ms-fill-lower {
}
::-webkit-scrollbar-thumb {
background-color: theme("colors.denim-500");
background-color: theme("colors.video.context.border");
border: 5px solid transparent;
border-left: 0;
background-clip: content-box;

2
src/stores/player/slices/display.ts

@ -81,7 +81,7 @@ export const createDisplaySlice: MakeSlice<DisplaySlice> = (set, get) => ({ @@ -81,7 +81,7 @@ export const createDisplaySlice: MakeSlice<DisplaySlice> = (set, get) => ({
});
},
reset() {
get().display?.destroy();
get().display?.load(null);
set((s) => {
s.status = playerStatus.IDLE;
s.meta = null;

1
src/stores/player/slices/source.ts

@ -2,7 +2,6 @@ import { ScrapeMedia } from "@movie-web/providers"; @@ -2,7 +2,6 @@ import { ScrapeMedia } from "@movie-web/providers";
import { MakeSlice } from "@/stores/player/slices/types";
import {
LoadableSource,
SourceQuality,
SourceSliceSource,
selectQuality,

Loading…
Cancel
Save