Merge branch 'main' into type-enhancements

mister-ben · web-flow · commit 84cd78ddb490 · 2025-04-23T15:26:31.000+02:00
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -12,7 +12,8 @@ jobs:
       NETLIFY_BASE: 'videojs-preview.netlify.app'
     runs-on: ubuntu-latest
     permissions:
-      contents: read
+      contents: write      # Required for creating a release
+      discussions: write   # Required for creating a release
       id-token: write      # Required for provenance
       packages: write      # Required for publishing
     steps:
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,26 @@
+<a name="8.23.3"></a>
+## [8.23.3](https://github.com/videojs/video.js/compare/v8.23.2...v8.23.3) (2025-04-16)
+
+### Bug Fixes
+
+* update release workflow `discussion` permission ([#9031](https://github.com/videojs/video.js/issues/9031)) ([1a09554](https://github.com/videojs/video.js/commit/1a09554))
+
+<a name="8.23.2"></a>
+## [8.23.2](https://github.com/videojs/video.js/compare/v8.23.1...v8.23.2) (2025-04-16)
+
+### Bug Fixes
+
+* update release workfow permissions ([#9027](https://github.com/videojs/video.js/issues/9027)) ([e0b2521](https://github.com/videojs/video.js/commit/e0b2521))
+
+<a name="8.23.1"></a>
+## [8.23.1](https://github.com/videojs/video.js/compare/v8.23.0...v8.23.1) (2025-04-15)
+
+### Bug Fixes
+
+* controlText for text track modal ([#8989](https://github.com/videojs/video.js/issues/8989)) ([751ac56](https://github.com/videojs/video.js/commit/751ac56))
+* only change focus from BPB if not tap or mouse click ([#9015](https://github.com/videojs/video.js/issues/9015)) ([76aadfe](https://github.com/videojs/video.js/commit/76aadfe))
+* update text-track-cue styles on useractive ([#9023](https://github.com/videojs/video.js/issues/9023)) ([8e1889c](https://github.com/videojs/video.js/commit/8e1889c))
+
 <a name="8.23.0"></a>
 # [8.23.0](https://github.com/videojs/video.js/compare/v8.22.0...v8.23.0) (2025-03-11)
 
@@ -85,7 +108,7 @@
 
 ### Features
 
-* Add methods to add and remove <source> elements ([#8886](https://github.com/videojs/video.js/issues/8886)) ([eddda97](https://github.com/videojs/video.js/commit/eddda97)), closes [1000#0](https://github.com/1000/issues/0)
+* Add methods to add and remove <source> elements ([#8886](https://github.com/videojs/video.js/issues/8886)) ([eddda97](https://github.com/videojs/video.js/commit/eddda97)), closes [#8886](https://github.com/videojs/video.js/issues/8886)
 
 ### Bug Fixes
 
diff --git a/README.md b/README.md
@@ -22,8 +22,8 @@ Video.js was started in the middle of 2010 and is now used on over ~~50,000~~ ~~
 Thanks to the awesome folks over at [Fastly][fastly], there's a free, CDN hosted version of Video.js that anyone can use. Add these tags to your document's `<head>`:
 
 ```html
-<link href="//vjs.zencdn.net/8.23.0/video-js.min.css" rel="stylesheet">
-<script src="//vjs.zencdn.net/8.23.0/video.min.js"></script>
+<link href="//vjs.zencdn.net/8.23.3/video-js.min.css" rel="stylesheet">
+<script src="//vjs.zencdn.net/8.23.3/video.min.js"></script>
 ```
 
 Alternatively, you can include Video.js by getting it from [npm](https://videojs.com/getting-started/#install-via-npm), downloading it from [GitHub releases](https://github.com/videojs/video.js/releases) or by including it via [unpkg](https://unpkg.com) or another JavaScript CDN, like CDNjs.
@@ -34,12 +34,12 @@ Alternatively, you can include Video.js by getting it from [npm](https://videojs
 <script src="https://unpkg.com/video.js/dist/video.min.js"></script>
 
 <!-- unpkg : use a specific version of Video.js (change the version numbers as necessary) -->
-<link href="https://unpkg.com/video.js@8.23.0/dist/video-js.min.css" rel="stylesheet">
-<script src="https://unpkg.com/video.js@8.23.0/dist/video.min.js"></script>
+<link href="https://unpkg.com/video.js@8.23.3/dist/video-js.min.css" rel="stylesheet">
+<script src="https://unpkg.com/video.js@8.23.3/dist/video.min.js"></script>
 
 <!-- cdnjs : use a specific version of Video.js (change the version numbers as necessary) -->
-<link href="https://cdnjs.cloudflare.com/ajax/libs/video.js/8.23.0/video-js.min.css" rel="stylesheet">
-<script src="https://cdnjs.cloudflare.com/ajax/libs/video.js/8.23.0/video.min.js"></script>
+<link href="https://cdnjs.cloudflare.com/ajax/libs/video.js/8.23.3/video-js.min.css" rel="stylesheet">
+<script src="https://cdnjs.cloudflare.com/ajax/libs/video.js/8.23.3/video.min.js"></script>
 ```
 
 Next, using Video.js is as simple as creating a `<video>` element, but with an additional `data-setup` attribute. At a minimum, this attribute must have a value of `'{}'`, but it can include any Video.js [options][options] - just make sure it contains valid JSON!
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "video.js",
   "description": "An HTML5 video player that supports HLS and DASH with a common API and skin.",
-  "version": "8.23.0",
+  "version": "8.23.3",
   "main": "./dist/video.cjs.js",
   "module": "./dist/video.es.js",
   "style": "./dist/video-js.css",
diff --git a/src/js/big-play-button.js b/src/js/big-play-button.js
@@ -46,8 +46,8 @@ class BigPlayButton extends Button {
   handleClick(event) {
     const playPromise = this.player_.play();
 
-    // exit early if clicked via the mouse
-    if (this.mouseused_ && 'clientX' in event && 'clientY' in event) {
+    // exit early if tapped or clicked via the mouse
+    if (event.type === 'tap' || this.mouseused_ && 'clientX' in event && 'clientY' in event) {
       silencePromise(playPromise);
 
       if (this.player_.tech(true)) {
diff --git a/src/js/tracks/text-track-display.js b/src/js/tracks/text-track-display.js
@@ -124,6 +124,8 @@ class TextTrackDisplay extends Component {
     };
 
     player.on('loadstart', (e) => this.toggleDisplay(e));
+    player.on('useractive', updateDisplayTextHandler);
+    player.on('userinactive', updateDisplayTextHandler);
     player.on('texttrackchange', updateDisplayTextHandler);
     player.on('loadedmetadata', (e) => {
       this.updateDisplayOverlay();
@@ -262,11 +264,14 @@ class TextTrackDisplay extends Component {
   }
 
   /**
-   * Update the displayed TextTrack when a either a {@link Player#texttrackchange} or
-   * a {@link Player#fullscreenchange} is fired.
+   * Update the displayed {@link TextTrack} when either a {@link Player#texttrackchange},
+   * a {@link Player#fullscreenchange}, a {@link Player#useractive}, or a
+   * {@link Player#userinactive} is fired.
    *
    * @listens Player#texttrackchange
    * @listens Player#fullscreenchange
+   * @listens Player#useractive
+   * @listens Player#userinactive
    */
   updateDisplay() {
     const tracks = this.player_.textTracks();
diff --git a/src/js/tracks/text-track-settings-controls.js b/src/js/tracks/text-track-settings-controls.js
@@ -16,10 +16,8 @@ class TrackSettingsControls extends Component {
     super(player, options);
 
     // Create DOM elements
-    const defaultsDescription = this.localize('restore all settings to the default values');
-
     const resetButton = new Button(player, {
-      controlText: defaultsDescription,
+      controlText: this.localize('restore all settings to the default values'),
       className: 'vjs-default-button'
     });
 
@@ -28,14 +26,15 @@ class TrackSettingsControls extends Component {
 
     this.addChild(resetButton);
 
+    const doneText = this.localize('Done');
     const doneButton = new Button(player, {
-      controlText: defaultsDescription,
+      controlText: doneText,
       className: 'vjs-done-button'
     });
 
     // Remove unrequired style classes
     doneButton.el().classList.remove('vjs-control', 'vjs-button');
-    doneButton.el().textContent = this.localize('Done');
+    doneButton.el().textContent = doneText;
 
     this.addChild(doneButton);
   }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "video.js",`
`3`	`3`	`"description": "An HTML5 video player that supports HLS and DASH with a common API and skin.",`
`4`		`- "version": "8.23.0",`
	`4`	`+ "version": "8.23.3",`
`5`	`5`	`"main": "./dist/video.cjs.js",`
`6`	`6`	`"module": "./dist/video.es.js",`
`7`	`7`	`"style": "./dist/video-js.css",`