fix(core): disable toggle captions when there are no captions (#1598)

This commit is contained in:
Sam Potts
2026-05-26 09:49:50 +10:00
committed by GitHub
parent 23c6224446
commit 760870fdf2
12 changed files with 55 additions and 21 deletions
@@ -1,4 +1,5 @@
import { createState } from '@videojs/store';
import { isCaptionOrSubtitleTrack } from '@videojs/utils/dom';
import { defaults } from '@videojs/utils/object';
import { isFunction } from '@videojs/utils/predicate';
import type { NonNullableObject } from '@videojs/utils/types';
@@ -66,9 +67,7 @@ export class CaptionsButtonCore {
getState(): CaptionsButtonState {
const media = this.#media!;
const availability: CaptionsButtonState['availability'] = media.textTrackList.some(
(t) => t.kind === 'captions' || t.kind === 'subtitles'
)
const availability: CaptionsButtonState['availability'] = media.textTrackList.some(isCaptionOrSubtitleTrack)
? 'available'
: 'unavailable';
@@ -46,6 +46,8 @@ export interface MediaSnapshot {
muted?: boolean | undefined;
fullscreen?: boolean | undefined;
subtitlesShowing?: boolean | undefined;
/** When false, caption toggles are unavailable and status feedback is suppressed. */
subtitlesAvailable?: boolean | undefined;
pip?: boolean | undefined;
currentTime?: number | undefined;
duration?: number | undefined;
@@ -111,6 +113,7 @@ export function deriveStatus(
case 'volumeStep':
return deriveVolumeStatus(event, snapshot, labels);
case 'toggleSubtitles': {
if (snapshot.subtitlesAvailable === false) return null;
const showing = snapshot.subtitlesShowing !== undefined ? !snapshot.subtitlesShowing : true;
return {
status: showing ? 'captions-on' : 'captions-off',
@@ -49,6 +49,7 @@ describe('status', () => {
it('derives captions, fullscreen, and picture-in-picture statuses', () => {
expect(deriveStatus({ action: 'toggleSubtitles' }, SNAPSHOT)?.status).toBe('captions-on');
expect(deriveStatus({ action: 'toggleSubtitles' }, { ...SNAPSHOT, subtitlesAvailable: false })).toBeNull();
expect(deriveStatus({ action: 'toggleFullscreen' }, SNAPSHOT)?.status).toBe('fullscreen');
expect(deriveStatus({ action: 'toggleFullscreen' }, { ...SNAPSHOT, fullscreen: true })?.status).toBe(
'exit-fullscreen'
@@ -1,3 +1,5 @@
import { isCaptionOrSubtitleTrack } from '@videojs/utils/dom';
import type { RemotePlaybackState } from './remote-playback';
import type { GoogleCastMediaElement } from './types';
import {
@@ -141,9 +143,7 @@ export class GoogleCastProvider {
const mediaInfo = new chrome.cast.media.MediaInfo(this.media.castSrc, this.media.castContentType ?? '');
mediaInfo.customData = (this.media.castCustomData as object) ?? null;
const subtitles = [...this.media.querySelectorAll('track')].filter(
(el) => el.src && (el.kind === 'subtitles' || el.kind === 'captions')
);
const subtitles = [...this.media.querySelectorAll('track')].filter((el) => el.src && isCaptionOrSubtitleTrack(el));
const { Track, TrackType, TextTrackType } = chrome.cast.media;
const activeTrackIds: number[] = [];
@@ -481,7 +481,7 @@ export class GoogleCastProvider {
async #updateRemoteTextTrack() {
if (!this.isCasting) return;
const localSubs = [...this.media.textTracks].filter(({ kind }) => kind === 'subtitles' || kind === 'captions');
const localSubs = [...this.media.textTracks].filter(isCaptionOrSubtitleTrack);
const matched = (this.#remote.mediaInfo?.tracks ?? [])
.filter(({ type }) => type === chrome.cast.media.TrackType.TEXT)
@@ -1,4 +1,4 @@
import { listen } from '@videojs/utils/dom';
import { isCaptionOrSubtitleTrack, listen } from '@videojs/utils/dom';
import type { Constructor } from '@videojs/utils/types';
import type { CuesParsedData, NonNativeTextTracksData } from 'hls.js';
import Hls from 'hls.js';
@@ -83,7 +83,7 @@ export function HlsJsMediaTextTracksMixin<Base extends Constructor<HlsEngineHost
if (!engine.subtitleTracks.length) return;
const showingTrack = Array.from(media.textTracks).find((textTrack) => {
return textTrack.id && textTrack.mode === 'showing' && ['subtitles', 'captions'].includes(textTrack.kind);
return textTrack.id && textTrack.mode === 'showing' && isCaptionOrSubtitleTrack(textTrack);
});
if (!showingTrack) return;
@@ -165,7 +165,7 @@ function addTextTrack(
if (defaultTrack) {
trackEl.default = true;
}
trackEl.track.mode = ['subtitles', 'captions'].includes(kind) ? 'disabled' : 'hidden';
trackEl.track.mode = isCaptionOrSubtitleTrack({ kind }) ? 'disabled' : 'hidden';
// Add data attribute to identify tracks that should be removed when switching sources/destroying hls.js instance.
trackEl.setAttribute('data-removeondestroy', '');
@@ -1,4 +1,4 @@
import { findTrackElement, getTextTrackList, listen } from '@videojs/utils/dom';
import { findTrackElement, getTextTrackList, isCaptionOrSubtitleTrack, listen } from '@videojs/utils/dom';
import type { MediaTextCue, MediaTextTrack, MediaTextTrackState } from '../../../core/media/state';
import type { TextTrackLike } from '../../../core/media/types';
@@ -17,10 +17,7 @@ export const textTrackFeature = definePlayerFeature({
const { media } = target();
if (!isMediaTextTrackCapable(media)) return false;
const subtitlesTracks = getTextTrackList(
media,
(track) => track.kind === 'subtitles' || track.kind === 'captions'
);
const subtitlesTracks = getTextTrackList(media, isCaptionOrSubtitleTrack);
if (!subtitlesTracks.length) return false;
const showing = subtitlesTracks.some((track) => track.mode === 'showing');
@@ -62,7 +59,7 @@ export const textTrackFeature = definePlayerFeature({
mode: track.mode,
});
if ((track.kind === 'captions' || track.kind === 'subtitles') && track.mode === 'showing') {
if (isCaptionOrSubtitleTrack(track) && track.mode === 'showing') {
subtitlesShowing = true;
}
}
+6 -1
View File
@@ -1,3 +1,5 @@
import { isCaptionOrSubtitleTrack } from '@videojs/utils/dom';
import { IndicatorVisibilityCoordinator } from '../../core/ui/input-feedback/indicator-lifecycle';
import type { InputActionEvent, MediaSnapshot } from '../../core/ui/input-feedback/status';
import { getGestureCoordinator } from '../gesture/coordinator';
@@ -34,12 +36,15 @@ export function getMediaSnapshot(store: MediaSnapshotStore | undefined): MediaSn
const state = store.state;
const time = selectTime(state);
const textTrack = selectTextTrack(state);
return {
paused: selectPlayback(state)?.paused,
volume: selectVolume(state)?.volume,
muted: selectVolume(state)?.muted,
fullscreen: selectFullscreen(state)?.fullscreen,
subtitlesShowing: selectTextTrack(state)?.subtitlesShowing,
subtitlesShowing: textTrack?.subtitlesShowing,
subtitlesAvailable: textTrack ? (textTrack.textTrackList ?? []).some(isCaptionOrSubtitleTrack) : undefined,
pip: selectPiP(state)?.pip,
currentTime: time?.currentTime,
duration: time?.duration,
@@ -38,6 +38,7 @@ describe('input-action', () => {
muted: false,
fullscreen: true,
subtitlesShowing: true,
textTrackList: [{ kind: 'captions', label: 'English', language: 'en', mode: 'showing' }],
pip: false,
currentTime: 30,
duration: 120,
@@ -49,6 +50,7 @@ describe('input-action', () => {
muted: false,
fullscreen: true,
subtitlesShowing: true,
subtitlesAvailable: true,
pip: false,
currentTime: 30,
duration: 120,