mirror of
https://github.com/Stremio/stremio-web.git
synced 2026-04-20 10:42:12 +00:00
feat: Player - move subtitles up when control bar is shown
Signed-off-by: Lachezar Lechev <lachezar@ambire.com>
This commit is contained in:
parent
0463cb109f
commit
c654c7c1f5
1 changed files with 17 additions and 0 deletions
|
|
@ -51,6 +51,9 @@ const Player = ({ urlParams, queryParams }) => {
|
|||
const nextVideoPopupDismissed = React.useRef(false);
|
||||
const defaultSubtitlesSelected = React.useRef(false);
|
||||
const defaultAudioTrackSelected = React.useRef(false);
|
||||
const controlBar = React.useRef(null);
|
||||
const [controlBarHeight, setControlBarHeight] = React.useState(0);
|
||||
|
||||
const [error, setError] = React.useState(null);
|
||||
const [videoState, setVideoState] = React.useReducer(
|
||||
(videoState, nextVideoState) => ({ ...videoState, ...nextVideoState }),
|
||||
|
|
@ -251,11 +254,23 @@ const Player = ({ urlParams, queryParams }) => {
|
|||
}, []);
|
||||
const onContainerMouseLeave = React.useCallback(() => {
|
||||
setImmersedDebounced.cancel();
|
||||
// TODO: Move subtitles position down
|
||||
dispatch({ type: 'setProp', propName: 'subtitlesOffset', propValue: settings.subtitlesOffset + controlBarHeight });
|
||||
dispatch({ type: 'setProp', propName: 'extraSubtitlesOffset', propValue: settings.subtitlesOffset + controlBarHeight });
|
||||
setImmersed(true);
|
||||
}, []);
|
||||
const onBarMouseMove = React.useCallback((event) => {
|
||||
// TODO: move subtitles up
|
||||
dispatch({ type: 'setProp', propName: 'subtitlesOffset', propValue: settings.subtitlesOffset });
|
||||
dispatch({ type: 'setProp', propName: 'extraSubtitlesOffset', propValue: settings.subtitlesOffset });
|
||||
event.nativeEvent.immersePrevented = true;
|
||||
}, []);
|
||||
|
||||
React.useEffect(() => {
|
||||
if(controlBarHeight.current) {
|
||||
setControlBarHeight(controlBarHeight.current.clientHeight);
|
||||
}
|
||||
}, []);
|
||||
React.useEffect(() => {
|
||||
setError(null);
|
||||
if (player.selected === null) {
|
||||
|
|
@ -673,6 +688,7 @@ const Player = ({ urlParams, queryParams }) => {
|
|||
onMouseMove={onBarMouseMove}
|
||||
onMouseOver={onBarMouseMove}
|
||||
/>
|
||||
<div ref={controlBar}>
|
||||
<ControlBar
|
||||
className={classnames(styles['layer'], styles['control-bar-layer'])}
|
||||
paused={videoState.paused}
|
||||
|
|
@ -704,6 +720,7 @@ const Player = ({ urlParams, queryParams }) => {
|
|||
onMouseMove={onBarMouseMove}
|
||||
onMouseOver={onBarMouseMove}
|
||||
/>
|
||||
</div>
|
||||
{
|
||||
nextVideoPopupOpen ?
|
||||
<NextVideoPopup
|
||||
|
|
|
|||
Loading…
Reference in a new issue