@npo/player 1.24.4 → 1.24.5

package/lib/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@npo/player",
-  "version": "1.24.4",
+  "version": "1.24.5",
   "description": "NPO Player",
   "author": "Publieke Omroep <player@npo.nl>",
   "contributors": [

package/lib/src/ui/handlers/playnextstreen.test.d.ts

@@ -1,6 +1 @@
-import '@testing-library/jest-dom';
-declare global {
-    interface Window {
-        bitmovin: any;
-    }
-}
+export {};

package/lib/ui/handlers/playnextscreen.js

@@ -3,6 +3,7 @@ export function showPlayNextScreenIfNeeded(overlayDuration, containerEl, proceed
     const playnextOverlay = containerEl.querySelector('.bmpui-overlay-playnext');
     if (playnextOverlay?.classList.contains('show'))
         return;
+    clearInterval(countdownInterval);
     playnextOverlay?.classList.add('show');
     const playNextButton = playnextOverlay?.querySelector('.ui-playNextButton');
     if (playNextButton) {
@@ -22,5 +23,6 @@ export function showPlayNextScreenIfNeeded(overlayDuration, containerEl, proceed
     }, 1000);
 }
 export function hidePlayNextScreen(containerEl) {
+    clearInterval(countdownInterval);
     containerEl.querySelector('.bmpui-overlay-playnext')?.classList.remove('show');
 }

package/lib/ui/handlers/playnextstreen.test.d.ts

@@ -1,6 +1 @@
-import '@testing-library/jest-dom';
-declare global {
-    interface Window {
-        bitmovin: any;
-    }
-}
+export {};

package/lib/ui/handlers/playnextstreen.test.js

@@ -1,48 +1,45 @@
-import { showPlayNextScreenIfNeeded } from './playnextscreen';
-import { sendCustomMessage } from '../nativemobileuicontainer';
-import '@testing-library/jest-dom';
-jest.mock('../nativemobileuicontainer');
-describe('showPlayNextScreenIfNeeded', () => {
+import { hidePlayNextScreen, showPlayNextScreenIfNeeded } from './playnextscreen';
+describe('showPlayNextScreenIfNeeded and hidePlayNextScreen', () => {
     let containerEl;
-    let playnextOverlay;
-    let countdownLabel;
-    let playNextButton;
     let proceedCallBack;
+    const OVERLAY_DURATION_MS = 5000;
+    const INTERVAL_STEP_MS = 1000;
     beforeEach(() => {
-        ;
-        sendCustomMessage.mockClear();
-        playnextOverlay = document.createElement('div');
-        playnextOverlay.classList.add('bmpui-overlay-playnext');
-        countdownLabel = document.createElement('div');
-        countdownLabel.classList.add('countdown');
-        playnextOverlay.appendChild(countdownLabel);
-        playNextButton = document.createElement('button');
-        playNextButton.classList.add('ui-playNextButton');
-        playnextOverlay.appendChild(playNextButton);
+        jest.useFakeTimers();
         containerEl = document.createElement('div');
-        containerEl.appendChild(playnextOverlay);
+        containerEl.innerHTML = `
+      <div class="bmpui-overlay-playnext">
+        <button class="ui-playNextButton"></button>
+      </div>
+    `;
+        document.body.appendChild(containerEl);
         proceedCallBack = jest.fn();
     });
     afterEach(() => {
         jest.clearAllTimers();
+        containerEl.remove();
     });
-    it('should not show overlay if it is already shown', () => {
-        playnextOverlay.classList.add('show');
-        showPlayNextScreenIfNeeded(10, containerEl, proceedCallBack);
-        expect(playnextOverlay).toHaveClass('show');
-        expect(proceedCallBack).not.toHaveBeenCalled();
+    it('should show the play next overlay and start the countdown', () => {
+        showPlayNextScreenIfNeeded(OVERLAY_DURATION_MS / INTERVAL_STEP_MS, containerEl, proceedCallBack);
+        const playnextOverlay = containerEl.querySelector('.bmpui-overlay-playnext');
+        expect(playnextOverlay?.classList.contains('show')).toBe(true);
+        jest.advanceTimersByTime(OVERLAY_DURATION_MS);
+        expect(proceedCallBack).toHaveBeenCalled();
+        expect(playnextOverlay?.classList.contains('show')).toBe(false);
     });
-    it('should show overlay and start countdown', () => {
-        jest.useFakeTimers();
-        showPlayNextScreenIfNeeded(10, containerEl, proceedCallBack);
-        expect(playnextOverlay).toHaveClass('show');
-        expect(playNextButton.style.getPropertyValue('--animation-duration')).toBe('10s');
+    it('should clear interval when countdown reaches zero', () => {
+        showPlayNextScreenIfNeeded(OVERLAY_DURATION_MS / INTERVAL_STEP_MS, containerEl, proceedCallBack);
+        jest.advanceTimersByTime(OVERLAY_DURATION_MS);
+        expect(proceedCallBack).toHaveBeenCalledTimes(1);
+        jest.advanceTimersByTime(INTERVAL_STEP_MS);
+        expect(proceedCallBack).toHaveBeenCalledTimes(1);
     });
-    it('should call proceedCallBack and hide overlay when countdown finishes', () => {
-        jest.useFakeTimers();
-        showPlayNextScreenIfNeeded(1, containerEl, proceedCallBack);
-        jest.advanceTimersByTime(2000);
-        expect(proceedCallBack).toHaveBeenCalled();
-        expect(playnextOverlay).not.toHaveClass('show');
+    it('should hide the play next overlay and clear the countdown interval when hidePlayNextScreen is called', () => {
+        showPlayNextScreenIfNeeded(OVERLAY_DURATION_MS / INTERVAL_STEP_MS, containerEl, proceedCallBack);
+        hidePlayNextScreen(containerEl);
+        const playnextOverlay = containerEl.querySelector('.bmpui-overlay-playnext');
+        expect(playnextOverlay?.classList.contains('show')).toBe(false);
+        jest.advanceTimersByTime(INTERVAL_STEP_MS);
+        expect(proceedCallBack).not.toHaveBeenCalled();
     });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@npo/player",
-  "version": "1.24.4",
+  "version": "1.24.5",
   "description": "NPO Player",
   "author": "Publieke Omroep <player@npo.nl>",
   "contributors": [