feat: player next video popup #318
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nklhtv
requested changes
Nov 28, 2022
| @@ -0,0 +1,5 @@ | |||
| // Copyright (C) 2017-2022 Smart code 203358507 | |||
|
|
|||
| const NextEpisodeModal = require('./NextVideoPopup'); | |||
There was a problem hiding this comment.
could you match the naming here
src/routes/Player/Player.js
Outdated
| @@ -539,6 +563,18 @@ const Player = ({ urlParams, queryParams }) => { | |||
| onMouseMove={onBarMouseMove} | |||
| onMouseOver={onBarMouseMove} | |||
| /> | |||
| { | |||
| !subtitlesMenuOpen && !infoMenuOpen && !videosMenuOpen && nextVideoPopupOpen ? | |||
There was a problem hiding this comment.
the check here should be just nextVideoPopupOpen i think
src/routes/Player/Player.js
Outdated
| @@ -313,6 +325,17 @@ const Player = ({ urlParams, queryParams }) => { | |||
| pausedChanged(videoState.paused); | |||
| } | |||
| }, [videoState.paused]); | |||
| React.useEffect(() => { | |||
| if (nextVideoPopupDismissed.current === false) { | |||
There was a problem hiding this comment.
use !nextVideoPopupDismissed.current here
src/routes/Player/Player.js
Outdated
| React.useEffect(() => { | ||
| if (nextVideoPopupDismissed.current === false) { | ||
| if (videoState.time !== null && !isNaN(videoState.time) && videoState.duration !== null && !isNaN(videoState.duration)) { | ||
| if (videoState.time < videoState.duration && (videoState.duration - videoState.time) <= (35 * 1000)) { |
There was a problem hiding this comment.
you wont need the isNaN checks
src/routes/Player/Player.js
Outdated
| } else { | ||
| window.history.back(); | ||
| } | ||
| }, [player.libraryItem, player.nextVideo]); | ||
| }, [player.libraryItem, player.nextVideo, onPlayNextVideoRequested]); |
There was a problem hiding this comment.
this should not depend on player.libraryItem now
src/routes/Player/Player.js
Outdated
| React.useEffect(() => { | ||
| if (nextVideoPopupDismissed.current === false) { | ||
| if (videoState.time !== null && !isNaN(videoState.time) && videoState.duration !== null && !isNaN(videoState.duration)) { | ||
| if (videoState.time < videoState.duration && (videoState.duration - videoState.time) <= (35 * 1000)) { |
There was a problem hiding this comment.
i am not sure if you can combine all of those if statements into one
…into feat/player-next-video-popup
…r next video popup
nklhtv
approved these changes
Nov 28, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Screencast.from.2022-11-03.05-52-32.webm