@brightspace-ui/labs 2.63.2 → 2.63.4

package/package.json

@@ -112,5 +112,5 @@
     "parse-srt": "^1.0.0-alpha",
     "webvtt-parser": "^2"
   },
-  "version": "2.63.2"
+  "version": "2.63.4"
 }

package/src/components/media-player/media-player-audio-descriptions.js

@@ -253,10 +253,7 @@ export const MediaPlayerAudioDescriptionsMixin = superclass => class extends sup
 		if (!track) return;
 
 		if (currentTime < this._audioDescriptionPreviousTime) {
-			this._audioDescriptionIndex = track.descriptions.findIndex(description => description.time >= currentTime);
-			if (this._audioDescriptionIndex < 0) this._audioDescriptionIndex = track.descriptions.length;
-			this._cancelAudioDescription();
-			this._activeDescriptionCue = null;
+			this._resetAudioDescriptionCursor(currentTime);
 		}
 
 		const next = track.descriptions[this._audioDescriptionIndex];

package/src/components/media-player/media-player.js

@@ -732,6 +732,17 @@ class MediaPlayer extends LocalizeLabsElement(MediaPlayerAudioDescriptionsMixin(
 		return this._media ? this._media.textTracks : null;
 	}
 
+	connectedCallback() {
+		super.connectedCallback();
+		fullscreenApi.onchange(this.#onFullscreenChange);
+	}
+
+	disconnectedCallback() {
+		fullscreenApi.off('change', this.#onFullscreenChange);
+		this.#releaseFullscreenEscape();
+		super.disconnectedCallback();
+	}
+
 	firstUpdated(changedProperties) {
 		super.firstUpdated(changedProperties);
 
@@ -1039,8 +1050,38 @@ class MediaPlayer extends LocalizeLabsElement(MediaPlayerAudioDescriptionsMixin(
 		return this.localize('components:mediaPlayer:off');
 	}
 
+	#isFullscreen = false;
+	#keyboardLocked = false;
 	#searchTimeout = null;
 
+	#onFullscreenChange = () => {
+		const root = this.shadowRoot;
+		const isFullscreen = !!this._mediaContainer && (root?.fullscreenElement ?? root?.webkitFullscreenElement) === this._mediaContainer;
+		if (isFullscreen === this.#isFullscreen) return;
+		this.#isFullscreen = isFullscreen;
+
+		if (isFullscreen) {
+			document.addEventListener('keydown', this.#onFullscreenKeyDown, true);
+			// Lets Escape reach the page so open menus can close before fullscreen exits (Chromium only)
+			navigator.keyboard?.lock?.(['Escape'])
+				.then(() => {
+					if (this.#isFullscreen) this.#keyboardLocked = true;
+					else navigator.keyboard.unlock();
+				})
+				.catch(() => {});
+		} else {
+			this.#releaseFullscreenEscape();
+			// Browsers without keyboard lock exit fullscreen on Escape without dispatching it to the page
+			this.#getOpenDropdowns().forEach(dropdown => dropdown.close());
+		}
+	};
+
+	// Capture phase runs before the dropdowns' own Escape handler closes them
+	#onFullscreenKeyDown = e => {
+		if (e.key !== 'Escape' || this.#getOpenDropdowns().length > 0) return;
+		fullscreenApi.exit();
+	};
+
 	_beginIOSVideoFullscreen() {
 		this._iosVideoFullscreen = true;
 	}
@@ -2355,6 +2396,18 @@ class MediaPlayer extends LocalizeLabsElement(MediaPlayerAudioDescriptionsMixin(
 			}
 		}
 	}
+
+	#getOpenDropdowns() {
+		return [...(this.shadowRoot?.querySelectorAll('d2l-dropdown-menu[opened], d2l-dropdown-content[opened]') ?? [])];
+	}
+
+	#releaseFullscreenEscape() {
+		document.removeEventListener('keydown', this.#onFullscreenKeyDown, true);
+		if (this.#keyboardLocked) {
+			navigator.keyboard?.unlock?.();
+			this.#keyboardLocked = false;
+		}
+	}
 }
 
 customElements.define('d2l-labs-media-player', MediaPlayer);