Skip to content

Commit

Permalink
fix: Exit PIP if entering fullscreen (videojs#8082)
Browse files Browse the repository at this point in the history
* exit PIP if entering fullscreen

* assert that entering full screen leaves PiP
  • Loading branch information
jacobhamblin authored and edirub committed Jun 8, 2023
1 parent b8ffc40 commit 6a0acfd
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/js/player.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down
23 changes: 23 additions & 0 deletions test/unit/player-fullscreen.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down

0 comments on commit 6a0acfd

Please sign in to comment.