diff --git a/front/packages/ui/src/player/components/hover.tsx b/front/packages/ui/src/player/components/hover.tsx index ce7c75a9..4ee75262 100644 --- a/front/packages/ui/src/player/components/hover.tsx +++ b/front/packages/ui/src/player/components/hover.tsx @@ -65,7 +65,6 @@ export const Hover = ({ isLoading, name, showName, - href, poster, chapters, subtitles, @@ -73,11 +72,11 @@ export const Hover = ({ fonts, previousSlug, nextSlug, + qualitiesAvailables = true, }: { isLoading: boolean; name?: string | null; showName?: string; - href?: string; poster?: KyooImage | null; chapters?: Chapter[]; subtitles?: Subtitle[]; @@ -85,6 +84,7 @@ export const Hover = ({ fonts?: string[]; previousSlug?: string | null; nextSlug?: string | null; + qualitiesAvailables?: boolean; }) => { const show = useAtomValue(hoverAtom); const setHover = useSetAtom(hoverReasonAtom); @@ -162,6 +162,7 @@ export const Hover = ({ subtitles={subtitles} audios={audios} fonts={fonts} + qualitiesAvailables={qualitiesAvailables} onMenuOpen={() => setHover((x) => ({ ...x, menuOpened: true }))} onMenuClose={() => { // Disable hover since the menu overlay makes the mouseout unreliable. diff --git a/front/packages/ui/src/player/components/right-buttons.tsx b/front/packages/ui/src/player/components/right-buttons.tsx index f661a727..abd44304 100644 --- a/front/packages/ui/src/player/components/right-buttons.tsx +++ b/front/packages/ui/src/player/components/right-buttons.tsx @@ -31,7 +31,6 @@ import MusicNote from "@material-symbols/svg-400/rounded/music_note-fill.svg"; import { Stylable, useYoshiki } from "yoshiki/native"; import { fullscreenAtom, subtitleAtom } from "../state"; import { AudiosMenu, QualitiesMenu } from "../video"; -import i18next from "i18next"; export const RightButtons = ({ audios, @@ -39,6 +38,7 @@ export const RightButtons = ({ fonts, onMenuOpen, onMenuClose, + qualitiesAvailables, ...props }: { audios?: Audio[]; @@ -46,6 +46,7 @@ export const RightButtons = ({ fonts?: string[]; onMenuOpen: () => void; onMenuClose: () => void; + qualitiesAvailables: boolean; } & Stylable) => { const { css } = useYoshiki(); const { t } = useTranslation(); @@ -90,14 +91,16 @@ export const RightButtons = ({ {...tooltip(t("player.audios"), true)} {...spacing} /> - + {qualitiesAvailables && ( + + )} {Platform.OS === "web" && ( (function Video( - { onLoad, source, onPointerDown, subtitles, ...props }, + { onLoad, onBuffer, source, onPointerDown, subtitles, ...props }, ref, ) { const { css } = useYoshiki(); @@ -77,11 +77,7 @@ const Video = forwardRef(function Video( }, [source]); return ( - onPointerDown?.({ nativeEvent: { pointerType: "pointer" } } as any)} - {...css({ flexGrow: 1, flexShrink: 1 })} - > + (function Video( }, }} onLoad={(info) => { + onBuffer?.({ isBuffering: false }); setInfo(info); onLoad?.(info); }} + onBuffer={onBuffer} selectedVideoTrack={video === -1 ? { type: "auto" } : { type: "resolution", value: video }} selectedAudioTrack={{ type: "index", value: audio }} textTracks={subtitles?.map((x) => ({ @@ -113,7 +111,7 @@ const Video = forwardRef(function Video( } {...props} /> - + ); });