Skip to content

Feat/add fullscreen support for safari #143

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

Open
kKaskak wants to merge 4 commits into
base: master
Choose a base branch
from
+122 −3
Open

Feat/add fullscreen support for safari #143

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0841b03
feat: add fullscreen support for safari
kKaskak May 4, 2026
4a6a130
add prop for fullscreen recognision
kKaskak May 4, 2026
d37bb8b
support subtitles in fullscreen mode
kKaskak May 4, 2026
21fc741
fix: correctly unload tracks after fullscreen change
kKaskak May 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 38 additions & 2 deletions src/HTMLVideo/HTMLVideo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,13 @@ function HTMLVideo(options) {
};
containerElement.appendChild(videoElement);

function onFullscreenChanged() {
onPropChanged('fullscreen');
}
videoElement.addEventListener('webkitbeginfullscreen', onFullscreenChanged);
videoElement.addEventListener('webkitendfullscreen', onFullscreenChanged);
videoElement.addEventListener('fullscreenchange', onFullscreenChanged);

var hls = null;
var events = new EventEmitter();
var destroyed = false;
Expand All @@ -125,7 +132,8 @@ function HTMLVideo(options) {
volume: false,
muted: false,
playbackSpeed: false,
videoScale: false
videoScale: false,
fullscreen: false
};

function getProp(propName) {
Expand Down Expand Up @@ -323,6 +331,12 @@ function HTMLVideo(options) {
case 'videoScale': {
return videoElement.style.objectFit || 'contain';
}
case 'fullscreen': {
if (stream === null) {
return null;
}
return videoElement.webkitDisplayingFullscreen === true || document.fullscreenElement === videoElement;
}
default: {
return null;
}
Expand Down Expand Up @@ -550,6 +564,23 @@ function HTMLVideo(options) {

break;
}
case 'fullscreen': {
if (stream === null) break;
if (propValue) {
if (typeof videoElement.webkitEnterFullscreen === 'function') {
videoElement.webkitEnterFullscreen();
} else if (typeof videoElement.requestFullscreen === 'function') {
videoElement.requestFullscreen();
}
} else {
if (typeof videoElement.webkitExitFullscreen === 'function' && videoElement.webkitDisplayingFullscreen) {
videoElement.webkitExitFullscreen();
} else if (document.fullscreenElement === videoElement) {
document.exitFullscreen();
}
}
break;
}
}
}
function command(commandName, commandArgs) {
Expand All @@ -571,6 +602,7 @@ function HTMLVideo(options) {
onPropChanged('selectedSubtitlesTrackId');
onPropChanged('audioTracks');
onPropChanged('selectedAudioTrackId');
onPropChanged('fullscreen');
getContentType(stream)
.then(function(contentType) {
if (stream !== commandArgs.stream) {
Expand Down Expand Up @@ -636,6 +668,7 @@ function HTMLVideo(options) {
onPropChanged('selectedSubtitlesTrackId');
onPropChanged('audioTracks');
onPropChanged('selectedAudioTrackId');
onPropChanged('fullscreen');
break;
}
case 'destroy': {
Expand Down Expand Up @@ -668,6 +701,9 @@ function HTMLVideo(options) {
videoElement.onvolumechange = null;
videoElement.onratechange = null;
videoElement.textTracks.onchange = null;
videoElement.removeEventListener('webkitbeginfullscreen', onFullscreenChanged);
videoElement.removeEventListener('webkitendfullscreen', onFullscreenChanged);
videoElement.removeEventListener('fullscreenchange', onFullscreenChanged);
containerElement.removeChild(videoElement);
containerElement.removeChild(styleElement);
break;
Expand Down Expand Up @@ -727,7 +763,7 @@ HTMLVideo.canPlayStream = function(stream) {
HTMLVideo.manifest = {
name: 'HTMLVideo',
external: false,
props: ['stream', 'loaded', 'paused', 'time', 'duration', 'buffering', 'buffered', 'audioTracks', 'selectedAudioTrackId', 'subtitlesTracks', 'selectedSubtitlesTrackId', 'subtitlesOffset', 'subtitlesSize', 'subtitlesTextColor', 'subtitlesBackgroundColor', 'subtitlesOutlineColor', 'subtitlesOpacity', 'volume', 'muted', 'playbackSpeed', 'videoScale'],
props: ['stream', 'loaded', 'paused', 'time', 'duration', 'buffering', 'buffered', 'audioTracks', 'selectedAudioTrackId', 'subtitlesTracks', 'selectedSubtitlesTrackId', 'subtitlesOffset', 'subtitlesSize', 'subtitlesTextColor', 'subtitlesBackgroundColor', 'subtitlesOutlineColor', 'subtitlesOpacity', 'volume', 'muted', 'playbackSpeed', 'videoScale', 'fullscreen'],
commands: ['load', 'unload', 'destroy'],
events: ['propValue', 'propChanged', 'ended', 'error', 'subtitlesTrackLoaded', 'audioTrackLoaded']
};
Expand Down
48 changes: 47 additions & 1 deletion src/withHTMLSubtitles/withHTMLSubtitles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,47 @@ function withHTMLSubtitles(Video) {
containerElement.style.zIndex = '0';
containerElement.appendChild(subtitlesElement);

var videoElement = containerElement.querySelector('video');
var nativeTextTrack = null;

function createNativeTrack() {
removeNativeTrack();
if (cuesByTime === null || selectedTrackId === null) return;
var selectedTrack = tracks.find(function(track) { return track.id === selectedTrackId; });
if (!selectedTrack) return;
var delayMs = delay || 0;
nativeTextTrack = videoElement.addTextTrack('subtitles', selectedTrack.label || selectedTrack.lang, selectedTrack.lang || '');
cuesByTime.times.forEach(function(time) {
cuesByTime[time].forEach(function(cue) {
if (cue.startTime !== time) return;
var start = (cue.startTime + delayMs) / 1000;
var end = (cue.endTime + delayMs) / 1000;
if (start < 0) start = 0;
if (end <= start) return;
nativeTextTrack.addCue(new VTTCue(start, end, cue.text));
});
});
nativeTextTrack.mode = 'showing';
}
function removeNativeTrack() {
if (nativeTextTrack !== null) {
nativeTextTrack.mode = 'disabled';
nativeTextTrack = null;
}
}
function onWebkitBeginFullscreen() {
createNativeTrack();
subtitlesElement.style.display = 'none';
}
function onWebkitEndFullscreen() {
removeNativeTrack();
subtitlesElement.style.display = '';
}
if (videoElement) {
videoElement.addEventListener('webkitbeginfullscreen', onWebkitBeginFullscreen);
videoElement.addEventListener('webkitendfullscreen', onWebkitEndFullscreen);
}

var videoState = {
time: null,
paused: false,
Expand Down Expand Up @@ -190,7 +231,7 @@ function withHTMLSubtitles(Video) {

events.emit(eventName, propName, getProp(propName, propValue));

if (propName === 'selectedSubtitlesTrackId' && propValue !== null && selectedTrackId !== null) {
if (propName === 'selectedSubtitlesTrackId' && propValue !== null && selectedTrackId !== null && nativeTextTrack === null) {
setProp('selectedExtraSubtitlesTrackId', null);
}
}
Expand Down Expand Up @@ -556,6 +597,7 @@ function withHTMLSubtitles(Video) {
return false;
}
case 'unload': {
removeNativeTrack();
stopRenderLoop();
lastTimeIndex = null;
cuesByTime = null;
Expand All @@ -571,6 +613,10 @@ function withHTMLSubtitles(Video) {
case 'destroy': {
command('unload');
destroyed = true;
if (videoElement) {
videoElement.removeEventListener('webkitbeginfullscreen', onWebkitBeginFullscreen);
videoElement.removeEventListener('webkitendfullscreen', onWebkitEndFullscreen);
}
onPropChanged('extraSubtitlesSize');
onPropChanged('extraSubtitlesOffset');
onPropChanged('extraSubtitlesTextColor');
Expand Down