1
0
mirror of https://github.com/videojs/video.js.git synced 2025-03-29 22:07:10 +02:00

fix: Exit PIP if entering fullscreen (#8082)

* exit PIP if entering fullscreen

* assert that entering full screen leaves PiP
This commit is contained in:
Jacob Hamblin 2023-02-01 10:03:36 -07:00 committed by GitHub
parent 9bda6be36c
commit 267b5c6bff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 0 deletions

View File

@ -2784,6 +2784,10 @@ class Player extends Component {
* @fires Player#fullscreenchange
*/
requestFullscreen(fullscreenOptions) {
if (this.isInPictureInPicture()) {
this.exitPictureInPicture();
}
const self = this;
return new Promise((resolve, reject) => {

View File

@ -243,6 +243,29 @@ QUnit.test('full window can be preferred to fullscreen tech', function(assert) {
player.dispose();
});
QUnit.test('fullscreen mode should exit picture-in-picture if it was enabled', function(assert) {
const player = FullscreenTestHelpers.makePlayer(false, {
preferFullWindow: true
});
const fakeExitPictureInPicture = sinon.replace(player, 'exitPictureInPicture', sinon.fake(() => {}));
player.fsApi_ = {};
player.tech_.supportsFullScreen = () => true;
assert.strictEqual(player.isFullscreen(), false, 'player should not be fullscreen initially');
player.isInPictureInPicture(true);
player.trigger('enterpictureinpicture');
assert.strictEqual(player.isInPictureInPicture(), true, 'player is in picture-in-picture');
assert.strictEqual(fakeExitPictureInPicture.called, false, 'should not have called exitPictureInPicture yet');
player.requestFullscreen();
assert.strictEqual(player.isFullscreen(), true, 'player should be fullscreen');
assert.strictEqual(fakeExitPictureInPicture.called, true, 'should have called exitPictureInPicture');
player.dispose();
});
QUnit.test('fullwindow mode should exit when ESC event triggered', function(assert) {
const player = TestHelpers.makePlayer();