fix: styled subtitles browser compatibility (#576)

* chore(deps-dev): bump undici from 5.28.2 to 5.28.3 (#559) Bumps [undici](https://github.com/nodejs/undici) from 5.28.2 to 5.28.3. - [Release notes](https://github.com/nodejs/undici/releases) - [Commits](nodejs/undici@v5.28.2...v5.28.3) --- updated-dependencies: - dependency-name: undici dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * fix: av1 support (#557) * chore(edge): release 1.10.7-edge.0 (#561) * ME-6152-type-definitions (#560) * fix: type definitions * fix: type definitions * chore: remove jsdocs * fix: type definitions * fix: type definitions * fix: type definitions * chore: remove jsdocs * chore(edge): release 1.10.7-edge.1 (#562) * fix: types exports (#565) * chore(edge): release 1.10.7-edge.2 (#566) * feat: kareoke style subtitles (#563) * feat: karaoke style subtitles * fix: types exports * feat: kareoke style subtitles * feat: kareoke style subtitles * feat: kareoke style subtitles * chore: add example page * chore(edge): release 1.10.7-edge.3 (#567) * chore(edge): release 1.10.7-edge.3 * Update CHANGELOG.md --------- Co-authored-by: Tsachi Shlidor <[email protected]> * fix: allowUsageReport (#569) * chore(edge): release 1.10.7-edge.4 (#570) * fix: mimetypes (#572) * fix: mimetypes * fix: mimetypes * fix: mimetypes * fix: poster image for raw URLs (#573) * chore(edge): release 1.10.7-edge.5 (#574) * chore: example pages (#575) * chore: example pages * chore: example pages * chore: example pages * CI: Create update_master.yml * CI: Update update_master.yml * Update update_master.yml * CI: Update update_master.yml * CI: Update update_master.yml * CI: Update update_master.yml * CI: Update update_master.yml * ci: Update update_master.yml * ci: Update update_master.yml * ci: Update update_master.yml * chore: update update_master.yml * chore(deps-dev): bump undici from 5.28.2 to 5.28.3 (#559) * fix: av1 support (#557) * chore(edge): release 1.10.7-edge.0 (#561) * ME-6152-type-definitions (#560) * fix: type definitions * fix: type definitions * chore: remove jsdocs * fix: type definitions * fix: type definitions * fix: type definitions * chore: remove jsdocs * chore(edge): release 1.10.7-edge.1 (#562) * fix: types exports (#565) * chore(edge): release 1.10.7-edge.2 (#566) * feat: kareoke style subtitles (#563) * feat: karaoke style subtitles * fix: types exports * feat: kareoke style subtitles * feat: kareoke style subtitles * feat: kareoke style subtitles * chore: add example page * chore(edge): release 1.10.7-edge.3 (#567) * chore(edge): release 1.10.7-edge.3 * Update CHANGELOG.md * fix: allowUsageReport (#569) * chore(edge): release 1.10.7-edge.4 (#570) * fix: mimetypes (#572) * fix: mimetypes * fix: mimetypes * fix: mimetypes * fix: poster image for raw URLs (#573) * chore(edge): release 1.10.7-edge.5 (#574) * chore: example pages (#575) * chore: example pages * chore: example pages * chore: example pages * CI: Create update_master.yml * CI: Update update_master.yml * Update update_master.yml * CI: Update update_master.yml * CI: Update update_master.yml * CI: Update update_master.yml * CI: Update update_master.yml * ci: Update update_master.yml * ci: Update update_master.yml * ci: Update update_master.yml * Update update_master.yml * Update update_master.yml * fix: styled subtitles browser compatibility (#576) * fix: styled subtitles browser compatibility * chore: unlazy styled subtitles * chore(edge): release 1.11.1-edge.0 (#583) * Update styled-text-tracks.js * Update styled-text-tracks.scss --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tsachi Shlidor <[email protected]> Co-authored-by: cloudinary-jenkins <[email protected]>
cloudinary · Mar 19, 2024 · efbee25 · efbee25
1 parent da08ef2
commit efbee25
Show file tree

Hide file tree

Showing 4 changed files with 75 additions and 72 deletions.
diff --git a/src/assets/styles/components/text-tracks.scss b/src/assets/styles/components/text-tracks.scss
@@ -27,6 +27,11 @@
     bottom: 1.5rem !important;
   }
 
+  // Word highlight - default style
+  .cld-paced-text-tracks .vjs-text-track-cue b {
+    color: var(--color-accent);
+  }
+
   // Default caption styles, when not configured to `videojs-default` theme
   .vjs-text-track-display:not(.cld-styled-text-tracks-theme-videojs-default) {
     .vjs-text-track-cue {

diff --git a/src/plugins/styled-text-tracks/index.js b/src/plugins/styled-text-tracks/index.js
@@ -1,8 +1,9 @@
-export default async function lazyPlugin(config) {
+import styledTextTracks from './styled-text-tracks';
+
+export default async function styledTextTracksPlugin(config) {
   const player = this;
   try {
-    const { default: initPlugin } = await import(/* webpackChunkName: "styled-text-tracks" */ './styled-text-tracks');
-    player.ready(() => initPlugin(config, player));
+    player.ready(() => styledTextTracks(config, player));
   } catch (error) {
     console.error('Failed to load plugin:', error);
   }

diff --git a/src/plugins/styled-text-tracks/styled-text-tracks.js b/src/plugins/styled-text-tracks/styled-text-tracks.js
@@ -14,6 +14,9 @@ const styledTextTracks = (config, player) => {
     wordHighlightStyle: config.wordHighlightStyle
   };
 
+  const styleEl = document.createElement('style');
+  player.el_.appendChild(styleEl);
+
   // Class Names - Theme/Gravity
   const classNames = player.textTrackDisplay.el().classList;
   classNames.forEach(className => {
@@ -28,60 +31,66 @@ const styledTextTracks = (config, player) => {
     classNames.add(`cld-styled-text-tracks-gravity-${gravity}`);
   });
 
-  // Font
-  if (options.fontFace) {
-    fontFace(player.textTrackDisplay.el(), options.fontFace);
-  }
-
-  const applyImportantStyle = (style, selector) => {
-    const styleEl = document.createElement('style');
+  const applyStyle = (style, selector) => {
     if (Object.entries(style)) {
       const css = Object.entries(style).reduce((acc, [key, value]) => {
         return acc + `${key}: ${value} !important; `;
       }, '');
-      styleEl.innerHTML = `
-      .${playerClassPrefix(player)} ${selector} {
-          ${css}
-        }
-      `;
-      player.el_.appendChild(styleEl);
+      styleEl.innerHTML += `${selector} { ${css} } `;
     }
   };
 
+  const applyWrapperStyle = (style) => {
+    const selector = `
+      .${playerClassPrefix(player)} .vjs-text-track-display.cld-styled-text-tracks,
+      .${playerClassPrefix(player)} ::-webkit-media-text-track-display
+    `;
+    applyStyle(style, selector);
+  };
+
+  const applyCueStyle = (style) => {
+    const selector = `
+      .${playerClassPrefix(player)} .vjs-text-track-cue > div,
+      .${playerClassPrefix(player)} ::cue
+    `;
+    applyStyle(style, selector);
+  };
+
+  // Font
+  if (options.fontFace) {
+    fontFace(player.textTrackDisplay.el(), options.fontFace);
+    applyCueStyle({ 'font-family': options.fontFace });
+  }
+
   // Custom bounding box
   if (options.box) {
     const { x, y, width, height } = options.box;
-    applyImportantStyle(
-      {
-        translate: `${x ? x : 0} ${y ? y : 0}`,
-        ...(width ? { width } : undefined),
-        ...(height ? { height } : undefined)
-      },
-      '.vjs-text-track-display.cld-styled-text-tracks'
-    );
+    applyWrapperStyle({
+      translate: `${x ? x : 0} ${y ? y : 0}`,
+      ...(width ? { width } : undefined),
+      ...(height ? { height } : undefined)
+    });
   }
 
   // Custom font-size
   if (options.fontSize) {
-    applyImportantStyle(
-      { 'font-size': options.fontSize },
-      '.vjs-text-track-display.cld-styled-text-tracks .vjs-text-track-cue > div'
-    );
+    applyCueStyle({ 'font-size': options.fontSize });
   }
 
   // Custom styles
   if (options.style) {
-    applyImportantStyle(
-      options.style,
-      '.vjs-text-track-display.cld-styled-text-tracks .vjs-text-track-cue > div'
-    );
+    applyCueStyle(options.style);
   }
 
-  // Custom styles
+  // Word highlight styles
   if (options.wordHighlightStyle) {
-    applyImportantStyle(
+    applyStyle(
+      options.wordHighlightStyle,
+      `.${playerClassPrefix(player)} .cld-paced-text-tracks .vjs-text-track-cue b`
+    );
+    applyStyle(
       options.wordHighlightStyle,
-      '.vjs-text-track-display.cld-styled-text-tracks .vjs-text-track-cue b'
+      'video::cue(b)'
     );
   }
 };

diff --git a/src/plugins/styled-text-tracks/styled-text-tracks.scss b/src/plugins/styled-text-tracks/styled-text-tracks.scss
@@ -28,44 +28,32 @@
   }
 
   // Themes
-  .vjs-text-track-display {
-
-    &.cld-styled-text-tracks-theme-yellow-outlined {
-      div.vjs-text-track-cue {
-        & > div {
-          color: #FEF94A !important;
-          text-shadow:
-            -1px -1px 0 #000,
-            1px -1px 0 #000,
-            -1px 1px 0 #000,
-            1px 1px 0 #000;
-        }
-      }
-    }
+  div.vjs-text-track-display.cld-styled-text-tracks-theme-yellow-outlined div.vjs-text-track-cue > div,
+  &:has(.cld-styled-text-tracks-theme-yellow-outlined) ::cue {
+    color: #FEF94A !important;
+    text-shadow:
+      -1px -1px 0 #000,
+      1px -1px 0 #000,
+      -1px 1px 0 #000,
+      1px 1px 0 #000;
+  }
 
-    &.cld-styled-text-tracks-theme-3d {
-      div.vjs-text-track-cue {
-        & > div {
-          $base-size: 0.03em;
-          $base-color: #ff76ad;
-          color: lighten($base-color, 40%) !important;
-          text-shadow:
-            #{1*$base-size} #{1*$base-size} 0 darken($base-color, 10%),
-            #{2*$base-size} #{2*$base-size} 0 darken($base-color, 20%),
-            #{3*$base-size} #{3*$base-size} 0 darken($base-color, 30%),
-            #{4*$base-size} #{4*$base-size} 0 darken($base-color, 40%);
-        }
-      }
-    }
+  div.vjs-text-track-display.cld-styled-text-tracks-theme-3d div.vjs-text-track-cue > div,
+  &:has(.cld-styled-text-tracks-theme-3d) ::cue {
+    $base-size: 0.03em;
+    $base-color: #ff76ad;
+    color: lighten($base-color, 40%) !important;
+    text-shadow:
+      #{1*$base-size} #{1*$base-size} 0 darken($base-color, 10%),
+      #{2*$base-size} #{2*$base-size} 0 darken($base-color, 20%),
+      #{3*$base-size} #{3*$base-size} 0 darken($base-color, 30%),
+      #{4*$base-size} #{4*$base-size} 0 darken($base-color, 40%);
+  }
 
-    &.cld-styled-text-tracks-theme-player-colors {
-      div.vjs-text-track-cue {
-        & > div {
-          color: var(--color-text) !important;
-          background-color: var(--color-accent) !important;
-          text-shadow: 0 0 4px var(--color-base) !important;
-        }
-      }
-    }
+  div.vjs-text-track-display.cld-styled-text-tracks-theme-player-colors div.vjs-text-track-cue > div,
+  &:has(.cld-styled-text-tracks-theme-player-colors) ::cue {
+    color: var(--color-text) !important;
+    background-color: var(--color-accent) !important;
+    text-shadow: 0 0 4px var(--color-base);
   }
 }