@kkcompany/player 2.25.0-canary.18 → 2.25.0-canary.19

package/CHANGELOG.md

@@ -2,100 +2,40 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-## [2.25.0-canary.18](https://gitlab.kkinternal.com/playback/web-playcraft/compare/v2.25.0-canary.17...v2.25.0-canary.18) (2025-12-18)
-
-
-### Features
-
-* **text:** for VTT region support, add customized parser ([c0ead67](https://gitlab.kkinternal.com/playback/web-playcraft/commit/c0ead6777a6887f20ba9b4da7ba89921c5c14356))
-
-## [2.25.0-canary.17](https://gitlab.kkinternal.com/playback/web-playcraft/compare/v2.25.0-canary.16...v2.25.0-canary.17) (2025-12-15)
-
-
-### Features
-
-* add language menu button tooltip ([ad0d0ae](https://gitlab.kkinternal.com/playback/web-playcraft/commit/ad0d0aeaaea3a25cb63df30ffcf9d6a6864d2c97))
-
-## [2.25.0-canary.16](https://gitlab.kkinternal.com/playback/web-playcraft/compare/v2.25.0-canary.9...v2.25.0-canary.16) (2025-12-15)
-
-
-### Features
-
-* add export OverlayPanel ([f76f508](https://gitlab.kkinternal.com/playback/web-playcraft/commit/f76f50836a3a55ee23ee910c0f310a66a25f29e5))
-* override track display name in language menu ([338f5cc](https://gitlab.kkinternal.com/playback/web-playcraft/commit/338f5cc232d488eb36a07cdc339402cb9bd5d886))
-
-## [2.25.0-canary.9](https://gitlab.kkinternal.com/playback/web-playcraft/compare/v2.25.0-canary.8...v2.25.0-canary.9) (2025-12-04)
-
-
-### Features
-
-* **premium:** enable audio/text track control ([41d7dd3](https://gitlab.kkinternal.com/playback/web-playcraft/commit/41d7dd3776ab1b5e82b4612605394bb98e22e3b0))
-* subtitle off option is changed to 'none' ([029a41a](https://gitlab.kkinternal.com/playback/web-playcraft/commit/029a41a6e6f69847c01665ca4bd31f9ef77073a7))
-
-## [2.25.0-canary.8](https://gitlab.kkinternal.com/playback/web-playcraft/compare/v2.25.0-canary.7...v2.25.0-canary.8) (2025-11-28)
-
-## [2.25.0-canary.7](https://gitlab.kkinternal.com/playback/web-playcraft/compare/v2.25.0-canary.6...v2.25.0-canary.7) (2025-11-28)
-
-## [2.25.0-canary.6](https://gitlab.kkinternal.com/playback/web-playcraft/compare/v2.25.0-canary.5...v2.25.0-canary.6) (2025-11-28)
-
-
-### Features
-
-* add back other sections ([a4d8961](https://gitlab.kkinternal.com/playback/web-playcraft/commit/a4d8961b2985cb0811f619529c92302dde73d9ad))
-
-## [2.25.0-canary.5](https://gitlab.kkinternal.com/playback/web-playcraft/compare/v2.25.0-canary.3...v2.25.0-canary.5) (2025-11-25)
-
-
-### Bug Fixes
-
-* playback api response handling ([dfe5a5f](https://gitlab.kkinternal.com/playback/web-playcraft/commit/dfe5a5fd60ee7dc0155e63a796df6afe337c4a3d))
-
-## [2.25.0-canary.3](https://gitlab.kkinternal.com/playback/web-playcraft/compare/v2.25.0-canary.2...v2.25.0-canary.3) (2025-11-21)
-
-
-### Features
-
-* display language menu only when options are available ([f02fbc7](https://gitlab.kkinternal.com/playback/web-playcraft/commit/f02fbc775f351dff406139f2e9f2c2451441de31))
-
-
-### Bug Fixes
-
-* undefined audio setting options ([3e4e5ab](https://gitlab.kkinternal.com/playback/web-playcraft/commit/3e4e5ab521b56ba349d7be8416cc98f70ca404ed))
-
-## [2.25.0-canary.2](https://gitlab.kkinternal.com/playback/web-playcraft/compare/v2.25.0-canary.1...v2.25.0-canary.2) (2025-11-21)
-
-
-### Features
-
-* add change setting support to new audio/subtitle menu ([97728db](https://gitlab.kkinternal.com/playback/web-playcraft/commit/97728dbdc5f223cfccc18818cb5afa3b17be36d3))
-* custom language menu item order ([6bba6dc](https://gitlab.kkinternal.com/playback/web-playcraft/commit/6bba6dc3c137c292eb890ebefcdc49cf1d155d21))
-* display audio / subtitle options even if there's only 1 ([2e23915](https://gitlab.kkinternal.com/playback/web-playcraft/commit/2e23915d7aa7d084b65c9729c8ac468690852eb3))
-* enable custom language menu ([fb2038d](https://gitlab.kkinternal.com/playback/web-playcraft/commit/fb2038da7fc3ea399bad3fbb4b7e1eb1c7bb49f0))
-* export MenuItem + styles of LanguageMenu for custom menu component ([4f37d2e](https://gitlab.kkinternal.com/playback/web-playcraft/commit/4f37d2ed793287885e69dead576ceb1cecbe3320))
-* **ui:** add close button to mobile language menu ([6704ce1](https://gitlab.kkinternal.com/playback/web-playcraft/commit/6704ce14b13e8e5f344615ca43220b3b8f79b5f8))
-* enable custom setting menu sections with slotProps ([013fb63](https://gitlab.kkinternal.com/playback/web-playcraft/commit/013fb6393d7cc17502db6ef36b8b6d9492787529))
-* integrate new audio/subtitle menu to player UI ([d0944cb](https://gitlab.kkinternal.com/playback/web-playcraft/commit/d0944cb469342ae5eb84cd212a17835559e25115))
-* **ui:** add LanguageMenu component ([3ec5456](https://gitlab.kkinternal.com/playback/web-playcraft/commit/3ec5456eb1003b9374505e53bde56d967fef0b68))
-* **ui:** add OverlayPanel for custom setting menu ([dede035](https://gitlab.kkinternal.com/playback/web-playcraft/commit/dede03515b414c7e4afe7b6cb9c687097d46e920))
-* **ui:** add subtitles icon ([e771220](https://gitlab.kkinternal.com/playback/web-playcraft/commit/e7712208a8594aaf7211d55445fb5d4519e776e3))
-
-## [2.25.0-canary.1](https://gitlab.kkinternal.com/playback/web-playcraft/compare/v2.9.20...v2.25.0-canary.1) (2025-11-21)
+## [2.25.0-canary.19](https://gitlab.kkinternal.com/playback/web-playcraft/compare/v2.9.20...v2.25.0-canary.19) (2025-12-19)
 
 
 ### Features
 
+* **text:** for VTT region support, add customized parser ([7b33f9d](https://gitlab.kkinternal.com/playback/web-playcraft/commit/7b33f9d0518e83041caf9d55137b321d3aee024f))
+* add back other sections ([9776273](https://gitlab.kkinternal.com/playback/web-playcraft/commit/977627336de3a0d02ea14ec389ea400d90bee1dc))
+* add castMedia export with error handling added ([82aa0b6](https://gitlab.kkinternal.com/playback/web-playcraft/commit/82aa0b608aad2f2e5c638b20ca3254298ec77291))
+* add change setting support to new audio/subtitle menu ([ddc2219](https://gitlab.kkinternal.com/playback/web-playcraft/commit/ddc2219119087bae58aa2140cba4439b4464098a))
+* add export OverlayPanel ([56c5cd6](https://gitlab.kkinternal.com/playback/web-playcraft/commit/56c5cd643b35cf3583ce674adafa3825a365a018))
+* add language menu button tooltip ([004d36c](https://gitlab.kkinternal.com/playback/web-playcraft/commit/004d36c64e415e96df283a08db4b5828097c5dcf))
 * add support of external text track / subtitle ([2d2aa9f](https://gitlab.kkinternal.com/playback/web-playcraft/commit/2d2aa9f8b624749795b76f80551dbeca40359a79))
+* basic HLS on MSE ([b02c6f0](https://gitlab.kkinternal.com/playback/web-playcraft/commit/b02c6f0f44a89000aed9f279c1715bb4d0d115dc))
+* custom language menu item order ([a6acb81](https://gitlab.kkinternal.com/playback/web-playcraft/commit/a6acb8149536898ed467643405fcadf9194f3dc4))
+* display audio / subtitle options even if there's only 1 ([8f8cb87](https://gitlab.kkinternal.com/playback/web-playcraft/commit/8f8cb87c5bbce87fde4f074d5f7c2eed0560e035))
+* enable custom language menu ([730c305](https://gitlab.kkinternal.com/playback/web-playcraft/commit/730c305fbc3405ea8879f3611f2951403cf60b4e))
+* enable custom setting menu sections with slotProps ([9283113](https://gitlab.kkinternal.com/playback/web-playcraft/commit/9283113be0116cc78e8eab506c1e08539fa04862))
+* enable Shaka player built-in text/subtitle display ([47375d6](https://gitlab.kkinternal.com/playback/web-playcraft/commit/47375d639a94df07e0919a79560f0202540f46fa))
+* export MenuItem + styles of LanguageMenu for custom menu component ([24b3df8](https://gitlab.kkinternal.com/playback/web-playcraft/commit/24b3df896ecbff2118ff506e15b4109c68be6acb))
+* integrate new audio/subtitle menu to player UI ([6d0c0a2](https://gitlab.kkinternal.com/playback/web-playcraft/commit/6d0c0a2215284634ac948cf50e44a8cf4e1b42bf))
+* subtitle off option is changed to 'none' ([db214a4](https://gitlab.kkinternal.com/playback/web-playcraft/commit/db214a4fd7fef5df1997a4bb9f7841155bb07da5))
+* **cast:** add CastSessionControl for non-context integration ([4749ec0](https://gitlab.kkinternal.com/playback/web-playcraft/commit/4749ec0d62771bc73abcf231fc6e58672508e1b5))
+* **premium:** add cast prop for non-context integration ([7a3307f](https://gitlab.kkinternal.com/playback/web-playcraft/commit/7a3307f35c691b77d83b6181670fb76f21187476))
+* **premium:** enable audio/text track control ([b52a7fd](https://gitlab.kkinternal.com/playback/web-playcraft/commit/b52a7fd46663c37cdc4749dab968751b3327a571))
 * **text:** add style for shaka player text display container ([39e62ec](https://gitlab.kkinternal.com/playback/web-playcraft/commit/39e62eccf99f394d12d682cd3b4a1a5ad1a398b3))
 * **text:** patch vertical text display style ([7725796](https://gitlab.kkinternal.com/playback/web-playcraft/commit/7725796e0d5ef77a6728c88296519eb809f090c5))
 * **text:** remove extra styles from ruby/rt to display properly ([4c77c61](https://gitlab.kkinternal.com/playback/web-playcraft/commit/4c77c61436a28fbdcc69e2bde0cd670681f7fadb))
-* add castMedia export with error handling added ([82aa0b6](https://gitlab.kkinternal.com/playback/web-playcraft/commit/82aa0b608aad2f2e5c638b20ca3254298ec77291))
-* basic HLS on MSE ([b02c6f0](https://gitlab.kkinternal.com/playback/web-playcraft/commit/b02c6f0f44a89000aed9f279c1715bb4d0d115dc))
-* enable Shaka player built-in text/subtitle display ([47375d6](https://gitlab.kkinternal.com/playback/web-playcraft/commit/47375d639a94df07e0919a79560f0202540f46fa))
+* **ui:** add close button to mobile language menu ([90b4ef4](https://gitlab.kkinternal.com/playback/web-playcraft/commit/90b4ef4f5561f17ce4786e4d9421ec9b758278a5))
+* **ui:** add LanguageMenu component ([49d4e0b](https://gitlab.kkinternal.com/playback/web-playcraft/commit/49d4e0b6930b25f8d464cc1f08f14ad9a997a67f))
+* **ui:** add OverlayPanel for custom setting menu ([09a0d01](https://gitlab.kkinternal.com/playback/web-playcraft/commit/09a0d015676ead39865f3144acfaed79138c268a))
+* **ui:** add subtitles icon ([0e045b3](https://gitlab.kkinternal.com/playback/web-playcraft/commit/0e045b385740a4d44afaac3dbfc3c3ddb66c8a80))
 * expose audio track info ([87426d7](https://gitlab.kkinternal.com/playback/web-playcraft/commit/87426d710262baaa347e07ef7c21cd129671d834))
 * give subtitle a bottom magin while controller is hidden ([6444f6a](https://gitlab.kkinternal.com/playback/web-playcraft/commit/6444f6a5bfe9ed6a040c78e8317a67bcf136fa41))
 * select preferred text track after switching video ([e380825](https://gitlab.kkinternal.com/playback/web-playcraft/commit/e3808255ced22c7bdbe3ace169e33b1c9b9b176b))
-* **cast:** add CastSessionControl for non-context integration ([4749ec0](https://gitlab.kkinternal.com/playback/web-playcraft/commit/4749ec0d62771bc73abcf231fc6e58672508e1b5))
-* **premium:** add cast prop for non-context integration ([7a3307f](https://gitlab.kkinternal.com/playback/web-playcraft/commit/7a3307f35c691b77d83b6181670fb76f21187476))
 * upgrade shaka-player and limit version range to 4.15.x ([48c5ec8](https://gitlab.kkinternal.com/playback/web-playcraft/commit/48c5ec81bd8adec74b8415cf101e12617c1d1f07))
 
 
@@ -111,8 +51,10 @@ All notable changes to this project will be documented in this file. See [standa
 * load sender framework only while the application id exists ([0b0caa9](https://gitlab.kkinternal.com/playback/web-playcraft/commit/0b0caa9e1546af4e2bb5ad6fbed1170dcfe460bd))
 * maintain text track / subtitle setting after Safari quality switch ([74837cc](https://gitlab.kkinternal.com/playback/web-playcraft/commit/74837cc7ec3c7ec7d93f46d37e73e00810878985))
 * match subtitle value as off while subtitle is undefined ([4f8ebd2](https://gitlab.kkinternal.com/playback/web-playcraft/commit/4f8ebd2bfbde374215ec08ff4e3594c78f382799))
+* playback api response handling ([8ce9553](https://gitlab.kkinternal.com/playback/web-playcraft/commit/8ce95530da3f100ea7a3d0536d3d0b226d24d338))
 * select DASH/HLS base on DRM key system availablity ([623e1e2](https://gitlab.kkinternal.com/playback/web-playcraft/commit/623e1e2ca77b7313e1ec845b391e4c92166686b8))
 * turn off subtitles when starting playback in iOS browsers ([9afbbf1](https://gitlab.kkinternal.com/playback/web-playcraft/commit/9afbbf1516b0007435153311418c1afc2bcba3df))
+* undefined audio setting options ([5ad4808](https://gitlab.kkinternal.com/playback/web-playcraft/commit/5ad48080110b079699b7a5275827508dc5d157c7))
 * **core:** provide audio tracks without duplicate variantTracks ([799525d](https://gitlab.kkinternal.com/playback/web-playcraft/commit/799525d8b2e7af4417849ac6517ba194644dd720))
 * should use track.label instead of .name ([249b606](https://gitlab.kkinternal.com/playback/web-playcraft/commit/249b6064d8ed444917aaa0d0465269f7610f111d))
 * use text tracks only if have valid language ([b126b7c](https://gitlab.kkinternal.com/playback/web-playcraft/commit/b126b7c545a0782e19d91fa2a72030ab5acdb7f2))

package/dist/core.mjs

@@ -37,7 +37,7 @@ const waitFor = (check, handler) => {
 function getVersion() {
   try {
     // eslint-disable-next-line no-undef
-    return "2.25.0-canary.18";
+    return "2.25.0-canary.19";
   } catch (e) {
     return undefined;
   }
@@ -948,6 +948,16 @@ class VttTextParser {
       return null;
     }
 
+    const skipIndex = text.findIndex(line => /^#/.test(line.trim()));
+
+    if (skipIndex > 0) {
+      text = text.slice(skipIndex);
+    }
+
+    if (text.length < 2) {
+      return;
+    }
+
     let id = null;
 
     if (!text[0].includes('-->')) {

package/dist/index.js

@@ -5746,7 +5746,7 @@ $$5({ target: 'Array', proto: true, forced: FORCED }, {
 function getVersion() {
   try {
     // eslint-disable-next-line no-undef
-    return "2.25.0-canary.18";
+    return "2.25.0-canary.19";
   } catch (e) {
     return undefined;
   }
@@ -6052,7 +6052,22 @@ const getSettingsData = _ref8 => {
 const matchTracks = (tracks, sorted) => {
   var _tracks$;
 
-  return ((_tracks$ = tracks[0]) === null || _tracks$ === void 0 ? void 0 : _tracks$.type) === 'audio' && (sorted === null || sorted === void 0 ? void 0 : sorted.length) === 1 ? [_objectSpread$p(_objectSpread$p({}, tracks[0]), sorted[0])] : (sorted === null || sorted === void 0 ? void 0 : sorted.map(track => _objectSpread$p(_objectSpread$p({}, tracks.find(t => t.language === track.language)), track)).filter(Boolean)) || tracks;
+  const lookup = {};
+  tracks.forEach(track => {
+    lookup["".concat(track.language, "|").concat(track.label)] = track;
+    lookup["".concat(track.language, "|")] = track;
+    lookup["|".concat(track.label)] = track;
+  });
+  const matched = sorted.map(info => {
+    const track = lookup["".concat(info.language, "|").concat(info.label)] || lookup["".concat(info.language, "|")];
+    return track && _objectSpread$p(_objectSpread$p({}, track), info);
+  }).filter(Boolean);
+
+  if (((_tracks$ = tracks[0]) === null || _tracks$ === void 0 ? void 0 : _tracks$.type) === 'audio' && matched.length === 0) {
+    return [_objectSpread$p(_objectSpread$p({}, tracks[0]), sorted[0])];
+  }
+
+  return matched;
 };
 
 const getLanguageOptions = (player, sorted) => {
@@ -8668,7 +8683,7 @@ var PropTypes = propTypes.exports;var en = {
 	"KKS.QUALITY": "解像度",
 	"KKS.AUDIO": "音声",
 	"KKS.SETTING.OFF": "オフ",
-	"KKS.SETTING.none": "オフ",
+	"KKS.SETTING.none": "なし",
 	"KKS.SETTING.ja": "日本語",
 	"KKS.SETTING.en": "英語",
 	"KKS.SUBTITLES": "字幕",
@@ -9722,13 +9737,10 @@ const TitleBarExtension = _ref4 => {
 };
 const customTextStyle = {
   '.shaka-text-container': {
+    boxSizing: 'border-box',
     padding: '2cqmin',
     font: '3cqmin/1 sans-serif',
     color: '#ffffff',
-    fontFamily: 'system-ui-monospaced',
-    'unicode-bidi': 'plaintext',
-    'overflow-wrap': 'break-word',
-    textWrap: 'balance',
     textShadow: '1px 1px 0.2cqmin #000'
   },
   '.shaka-text-container > .shaka-cue-horizontal-tb': {
@@ -15826,6 +15838,16 @@ class VttTextParser {
       return null;
     }
 
+    const skipIndex = text.findIndex(line => /^#/.test(line.trim()));
+
+    if (skipIndex > 0) {
+      text = text.slice(skipIndex);
+    }
+
+    if (text.length < 2) {
+      return;
+    }
+
     let id = null;
 
     if (!text[0].includes('-->')) {

package/dist/index.mjs

@@ -812,7 +812,7 @@ function convertToSeconds(timeString) {
 function getVersion() {
   try {
     // eslint-disable-next-line no-undef
-    return "2.25.0-canary.18";
+    return "2.25.0-canary.19";
   } catch (e) {
     return undefined;
   }
@@ -1106,11 +1106,26 @@ const getSettingsData = ({
 const matchTracks = (tracks, sorted) => {
   var _tracks$;
 
-  return ((_tracks$ = tracks[0]) === null || _tracks$ === void 0 ? void 0 : _tracks$.type) === 'audio' && (sorted === null || sorted === void 0 ? void 0 : sorted.length) === 1 ? [{ ...tracks[0],
-    ...sorted[0]
-  }] : (sorted === null || sorted === void 0 ? void 0 : sorted.map(track => ({ ...tracks.find(t => t.language === track.language),
-    ...track
-  })).filter(Boolean)) || tracks;
+  const lookup = {};
+  tracks.forEach(track => {
+    lookup[`${track.language}|${track.label}`] = track;
+    lookup[`${track.language}|`] = track;
+    lookup[`|${track.label}`] = track;
+  });
+  const matched = sorted.map(info => {
+    const track = lookup[`${info.language}|${info.label}`] || lookup[`${info.language}|`];
+    return track && { ...track,
+      ...info
+    };
+  }).filter(Boolean);
+
+  if (((_tracks$ = tracks[0]) === null || _tracks$ === void 0 ? void 0 : _tracks$.type) === 'audio' && matched.length === 0) {
+    return [{ ...tracks[0],
+      ...sorted[0]
+    }];
+  }
+
+  return matched;
 };
 
 const getLanguageOptions = (player, sorted) => {
@@ -2331,7 +2346,7 @@ var ja = {
 	"KKS.QUALITY": "解像度",
 	"KKS.AUDIO": "音声",
 	"KKS.SETTING.OFF": "オフ",
-	"KKS.SETTING.none": "オフ",
+	"KKS.SETTING.none": "なし",
 	"KKS.SETTING.ja": "日本語",
 	"KKS.SETTING.en": "英語",
 	"KKS.SUBTITLES": "字幕",
@@ -3132,13 +3147,10 @@ const nativeTextStyle = {
 };
 const customTextStyle = {
   '.shaka-text-container': {
+    boxSizing: 'border-box',
     padding: '2cqmin',
     font: '3cqmin/1 sans-serif',
     color: '#ffffff',
-    fontFamily: 'system-ui-monospaced',
-    'unicode-bidi': 'plaintext',
-    'overflow-wrap': 'break-word',
-    textWrap: 'balance',
     textShadow: '1px 1px 0.2cqmin #000'
   },
   '.shaka-text-container > .shaka-cue-horizontal-tb': {
@@ -6825,6 +6837,16 @@ class VttTextParser {
       return null;
     }
 
+    const skipIndex = text.findIndex(line => /^#/.test(line.trim()));
+
+    if (skipIndex > 0) {
+      text = text.slice(skipIndex);
+    }
+
+    if (text.length < 2) {
+      return;
+    }
+
     let id = null;
 
     if (!text[0].includes('-->')) {

package/dist/modules.mjs

@@ -991,7 +991,7 @@ const mapLogEvents$1 = ({
 function getVersion() {
   try {
     // eslint-disable-next-line no-undef
-    return "2.25.0-canary.18";
+    return "2.25.0-canary.19";
   } catch (e) {
     return undefined;
   }
@@ -1413,7 +1413,7 @@ const createAnalytics = ({
   const logTarget = mapLogEvents({
     video,
     playerName: 'shaka',
-    version: "2.25.0-canary.18"
+    version: "2.25.0-canary.19"
   });
   logTarget.all((type, data) => {
     const payload = {

package/dist/react.mjs

@@ -1992,7 +1992,7 @@ var ja = {
 	"KKS.QUALITY": "解像度",
 	"KKS.AUDIO": "音声",
 	"KKS.SETTING.OFF": "オフ",
-	"KKS.SETTING.none": "オフ",
+	"KKS.SETTING.none": "なし",
 	"KKS.SETTING.ja": "日本語",
 	"KKS.SETTING.en": "英語",
 	"KKS.SUBTITLES": "字幕",
@@ -2420,7 +2420,7 @@ function convertToSeconds(timeString) {
 function getVersion() {
   try {
     // eslint-disable-next-line no-undef
-    return "2.25.0-canary.18";
+    return "2.25.0-canary.19";
   } catch (e) {
     return undefined;
   }
@@ -2870,13 +2870,10 @@ const nativeTextStyle = {
 };
 const customTextStyle = {
   '.shaka-text-container': {
+    boxSizing: 'border-box',
     padding: '2cqmin',
     font: '3cqmin/1 sans-serif',
     color: '#ffffff',
-    fontFamily: 'system-ui-monospaced',
-    'unicode-bidi': 'plaintext',
-    'overflow-wrap': 'break-word',
-    textWrap: 'balance',
     textShadow: '1px 1px 0.2cqmin #000'
   },
   '.shaka-text-container > .shaka-cue-horizontal-tb': {
@@ -7040,6 +7037,16 @@ class VttTextParser {
       return null;
     }
 
+    const skipIndex = text.findIndex(line => /^#/.test(line.trim()));
+
+    if (skipIndex > 0) {
+      text = text.slice(skipIndex);
+    }
+
+    if (text.length < 2) {
+      return;
+    }
+
     let id = null;
 
     if (!text[0].includes('-->')) {
@@ -9071,11 +9078,26 @@ const getSettingsData = ({
 const matchTracks = (tracks, sorted) => {
   var _tracks$;
 
-  return ((_tracks$ = tracks[0]) === null || _tracks$ === void 0 ? void 0 : _tracks$.type) === 'audio' && (sorted === null || sorted === void 0 ? void 0 : sorted.length) === 1 ? [{ ...tracks[0],
-    ...sorted[0]
-  }] : (sorted === null || sorted === void 0 ? void 0 : sorted.map(track => ({ ...tracks.find(t => t.language === track.language),
-    ...track
-  })).filter(Boolean)) || tracks;
+  const lookup = {};
+  tracks.forEach(track => {
+    lookup[`${track.language}|${track.label}`] = track;
+    lookup[`${track.language}|`] = track;
+    lookup[`|${track.label}`] = track;
+  });
+  const matched = sorted.map(info => {
+    const track = lookup[`${info.language}|${info.label}`] || lookup[`${info.language}|`];
+    return track && { ...track,
+      ...info
+    };
+  }).filter(Boolean);
+
+  if (((_tracks$ = tracks[0]) === null || _tracks$ === void 0 ? void 0 : _tracks$.type) === 'audio' && matched.length === 0) {
+    return [{ ...tracks[0],
+      ...sorted[0]
+    }];
+  }
+
+  return matched;
 };
 
 const getLanguageOptions = (player, sorted) => {
@@ -11811,7 +11833,7 @@ const PremiumPlusPlayer = ({
     const restPlayerName = ['shaka', 'bitmovin'].find(name => name in rest);
     logTarget.current = mapLogEvents({
       playerName: restPlayerName || 'shaka',
-      version: "2.25.0-canary.18",
+      version: "2.25.0-canary.19",
       video: videoRef.current,
       getPlaybackStatus: () => getMediaTime(videoRef.current, {
         player: corePlayerRef.current,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kkcompany/player",
-  "version": "2.25.0-canary.18",
+  "version": "2.25.0-canary.19",
   "module": "dist/index.mjs",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",