ActivityPub-federated video streaming platform using P2P directly in your web browser
Feature/control bar hide (#7725)
Sourav Sarkar0df4d88517ac
diff --git a/client/src/standalone/player/src/sass/shared/control-bar.scss b/client/src/standalone/player/src/sass/shared/control-bar.scssindex 5fbb673288..16ded50b1d 100644--- a/client/src/standalone/player/src/sass/shared/control-bar.scss+++ b/client/src/standalone/player/src/sass/shared/control-bar.scss@@ -314,6 +314,12 @@ $chapter-marker-size: 9px;--peertube-link-max-width: 200px;}+.vjs-peertube-skin.vjs-paused.vjs-paused-inactive .vjs-control-bar {+ opacity: 0;+ visibility: hidden;+ pointer-events: none;+}+// Override video.js style.vjs-peertube-skin.vjs-live.vjs-live-dvr .vjs-control-bar .vjs-progress-control {display: flex;diff --git a/client/src/standalone/player/src/shared/peertube/peertube-plugin.ts b/client/src/standalone/player/src/shared/peertube/peertube-plugin.tsindex 76841d18cb..e5e416aa25 100644--- a/client/src/standalone/player/src/shared/peertube/peertube-plugin.ts+++ b/client/src/standalone/player/src/shared/peertube/peertube-plugin.ts@@ -32,6 +32,11 @@ import { SettingsButton } from '../settings/settings-menu-button'const debugLogger = debug('peertube:player:peertube')+// Delay before hiding control bar after pause in normal view (ms)+const PAUSED_INACTIVE_TIMEOUT_NORMAL = 3000+// Delay before hiding control bar after pause in fullscreen view (ms)+const PAUSED_INACTIVE_TIMEOUT_FULLSCREEN = 5000+const Plugin = videojs.getPlugin('plugin') as typeof VideojsPluginclass PeerTubePlugin extends Plugin {@@ -50,6 +55,8 @@ class PeerTubePlugin extends Plugin {declare private mouseInControlBar: booleandeclare private mouseInSettings: boolean+ declare private pauseHideTimeout: ReturnType<typeof setTimeout>+declare private errorModal: ModalDialogdeclare private hasInitialSeek: boolean@@ -196,6 +203,7 @@ class PeerTubePlugin extends Plugin {dispose () {if (this.videoViewInterval) clearInterval(this.videoViewInterval)if (this.resizeObserver) this.resizeObserver.disconnect()+ if (this.pauseHideTimeout) clearTimeout(this.pauseHideTimeout)super.dispose()}@@ -299,9 +307,13 @@ class PeerTubePlugin extends Plugin {this.player.ready(() => {this.listenControlBarMouse()+ this.listenUserInput()})this.listenFullScreenChange()++ this.player.on('pause', () => this.onPause())+ this.player.on('play', () => this.onPlay())}private initOnVideoChange () {@@ -535,9 +547,31 @@ class PeerTubePlugin extends Plugin {private listenFullScreenChange () {this.player.on('fullscreenchange', () => {if (this.player.isFullscreen()) this.player.focus()++ // Re-schedule pause hide when toggling fullscreen so the correct timeout is used+ if (this.player.paused() && this.player.hasStarted_) this.schedulePauseHide()})}+ private listenUserInput () {+ // Listen for genuine user interactions to reset the pause-hide timer.+ // We listen for these DOM events rather than video.js's 'useractive' because+ // video.js fires 'useractive' via an internal interval (checkUserActivity_)+ // even while paused, which would cancel the hide timeout in a loop.+ const onRealInput = () => {+ // Ignore the pre-playback state: controls are already hidden until vjs-has-started+ if (!this.player?.paused() || !this.player.hasStarted_) return++ this.player.removeClass('vjs-paused-inactive')+ this.schedulePauseHide()+ }++ this.player.on('mousemove', onRealInput)+ this.player.on('keydown', onRealInput)+ this.player.on('touchstart', onRealInput)+ this.player.on('click', onRealInput)+ }+private listenControlBarMouse () {const controlBar = this.player.controlBarconst settingsButton = controlBar.settingsButton@@ -578,6 +612,50 @@ class PeerTubePlugin extends Plugin {this.player.options_.inactivityTimeout = timeout}+ // ---------------------------------------------------------------------------++ private onPause () {+ this.schedulePauseHide()+ }++ private onPlay () {+ this.cancelPauseHide()+ this.player.removeClass('vjs-paused-inactive')+ }++ private schedulePauseHide () {+ this.cancelPauseHide()++ // Use longer timeout in fullscreen so users have more time before controls hide+ const timeout = this.player.isFullscreen()+ ? PAUSED_INACTIVE_TIMEOUT_FULLSCREEN+ : PAUSED_INACTIVE_TIMEOUT_NORMAL++ this.pauseHideTimeout = setTimeout(() => {+ if (!this.player?.paused()) return++ // Don't hide while the user is parked on the controls or has a menu open mirroring the playing-state logic in alterInactivity()+ if (this.menuOpened || this.mouseInSettings || this.mouseInControlBar) {+ this.schedulePauseHide()+ return+ }++ this.player.addClass('vjs-paused-inactive')+ // Do NOT call userActive(false) here: video.js re-fires 'useractive' while paused+ // (its internal checkUserActivity_ loop keeps users "active" when paused), which+ // would trigger onUserActive → cancelPauseHide → schedulePauseHide in an infinite+ // loop, preventing the control bar from ever hiding. The CSS rule on+ // vjs-paused + vjs-paused-inactive is sufficient to fade the control bar.+ }, timeout)+ }++ private cancelPauseHide () {+ if (this.pauseHideTimeout) {+ clearTimeout(this.pauseHideTimeout)+ this.pauseHideTimeout = undefined+ }+ }+private initCaptions () {if (this.currentSubtitle) debugLogger('Init captions with current subtitle ' + this.currentSubtitle)else debugLogger('Init captions without current subtitle')