Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update watch view playlist component to auto scroll to current video #3399

Merged
merged 5 commits into from
May 19, 2023
Merged

Update watch view playlist component to auto scroll to current video #3399

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
06f8774
* Update watch view playlist component to auto scroll to current video
PikachuEXE Apr 4, 2023
820001f
! Fix window being scrolled when playlist is out of initial view
PikachuEXE Apr 4, 2023
9215b0f
* Use `nextTick` instead of `setTimeout`
PikachuEXE Apr 17, 2023
6b5c0c1
Revert "* Use `nextTick` instead of `setTimeout`"
PikachuEXE Apr 18, 2023
1b5b01a
* Remove setTimeout, fix issue when Invidious API used
PikachuEXE May 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 27 additions & 3 deletions src/renderer/components/watch-video-playlist/watch-video-playlist.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { defineComponent } from 'vue'
import { defineComponent, nextTick } from 'vue'
import { mapMutations } from 'vuex'
import FtLoader from '../ft-loader/ft-loader.vue'
import FtCard from '../ft-card/ft-card.vue'
Expand All @@ -12,7 +12,7 @@ export default defineComponent({
components: {
'ft-loader': FtLoader,
'ft-card': FtCard,
'ft-list-video-lazy': FtListVideoLazy
'ft-list-video-lazy': FtListVideoLazy,
},
props: {
playlistId: {
Expand All @@ -22,7 +22,11 @@ export default defineComponent({
videoId: {
type: String,
required: true
}
},
watchViewLoading: {
type: Boolean,
required: true
},
},
data: function () {
return {
Expand Down Expand Up @@ -79,6 +83,26 @@ export default defineComponent({
this.shufflePlaylistItems()
}
}
},
watchViewLoading: function(newVal, oldVal) {
// This component is loaded/rendered before watch view loaded
if (oldVal && !newVal) {
// If loading true => false
// setTimeout to put this into event queue
// executed after render
// Scroll current item into view after render complete
const container = this.$refs.playlistItems
const currentVideoItem = (this.$refs.currentVideoItem || [])[0]
if (container != null && currentVideoItem != null) {
container.scrollTop = currentVideoItem.offsetTop - container.offsetTop
// Since components are only rendered after scroll,
// the scroll position requires another adjustment
// Timeout value depends on how soon the components finish rendering
nextTick(() => {
container.scrollTop = currentVideoItem.offsetTop - container.offsetTop
})
}
}
}
},
mounted: function () {
Expand Down
2 changes: 2 additions & 0 deletions src/renderer/components/watch-video-playlist/watch-video-playlist.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,13 @@
</p>
<div
v-if="!isLoading"
ref="playlistItems"
class="playlistItems"
>
<div
v-for="(item, index) in playlistItems"
:key="index"
:ref="currentVideoIndex === (index + 1) ? 'currentVideoItem' : null"
class="playlistItem"
>
<div class="videoIndexContainer">
Expand Down
1 change: 1 addition & 0 deletions src/renderer/views/Watch/Watch.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@
v-if="watchingPlaylist"
v-show="!isLoading"
ref="watchVideoPlaylist"
:watch-view-loading="isLoading"
:playlist-id="playlistId"
:video-id="videoId"
class="watchVideoSideBar watchVideoPlaylist"
Expand Down