@grfzhl/vue-hls-player 1.1.23 → 1.1.25

package/README.md

@@ -207,6 +207,14 @@ At the moment the following attribute are supported:
 ```
 
 ### Last release:
+v1.1.25
+  - Decouple audio language switching from subtitle selection.
+  - Preserve user-selected subtitle language across audio changes and HLS source reloads.
+  - Prevent unintended subtitle resets caused by audio language updates.
+v1.1.24
+  - Add user-initiated language-changed emit.
+  - Fix unwanted language re-sync on player init.
+  - Improve audio/subtitle switch stability.
 v1.1.23
   - Fix missing property for subtitles in vue definition
   - Clean up code

package/dist/VideoPlayer/BasePlayer.vue

@@ -71,7 +71,7 @@
   <slot name="between-video-and-transcript"></slot> 
   <slot name="before-transcripts"></slot>
   <SubtitleBlock
-    :key="currentLang"
+    :key="`${currentLang}-${currentSubtitleLang}`"
     ref="transcriptRef"
     :subtitle="currentSubtitle"
     :cursor="videoCursor"
@@ -167,7 +167,7 @@ const props = defineProps({
   }
 })
 
-const emit = defineEmits(['pause', 'video-ended', 'video-fullscreen-change', 'pointer-update'])
+const emit = defineEmits(['pause', 'video-ended', 'video-fullscreen-change', 'pointer-update', 'language-changed'])
 const video = ref(null)
 const subtitlesContainer = ref(null)
 const currentSubtitleLang = ref(null)
@@ -185,11 +185,50 @@ let currentTime = 0
 let hls = null
 let buttonElement = null
 // --- lang switcher ---
-const currentLang = ref(props.defaultLang || 'en')
+const currentAudioLang = ref(props.defaultLang || 'en')
+
+const sessionSubtitleLang = 'vp_subtitle_lang'
+function initSubtitleLang() {
+  const stored = sessionStorage.getItem(sessionSubtitleLang)
+
+  if (stored && props.subtitles.some(s => s.lang === stored)) {
+    currentSubtitleLang.value = stored
+  } else {
+    currentSubtitleLang.value =
+      props.subtitles.find(s => s.lang === props.defaultLang)?.lang
+      || props.subtitles[0]?.lang
+  }
+
+  applySubtitleTrack(currentSubtitleLang.value)
+}
+
+function applySubtitleTrack(lang) {
+  Array.from(video.value?.textTracks || []).forEach(track => {
+    const tLang = (track.language || track.srclang || '').toLowerCase()
+    track.mode = tLang === lang.toLowerCase() ? 'showing' : 'disabled'
+  })
+}
+
+
+
+const isUserInitiatedLangChange = ref(false)
+
+let initialLoad = true;
+let defaultApplied = false
+
+watch(
+  () => props.defaultLang,
+  (lang) => {
+    if (defaultApplied) return
+    currentAudioLang.value = lang
+    defaultApplied = true
+  }
+)
+
 // --- Remember and restore last subtitle language ---
 async function selectLang(lang) {
   if (!video.value || !hls) return;
-  if (lang === currentLang.value) return;
+  if (lang === currentAudioLang.value) return;
 
   const newSource = props.multiLangSources?.find(s => s.lang === lang);
   if (!newSource?.file_url) {
@@ -203,7 +242,7 @@ async function selectLang(lang) {
   const wasMuted = video.value.muted;
   const rate = video.value.playbackRate;
 
-  currentLang.value = lang;
+  currentAudioLang.value = lang;
   // Switching to ${lang}...
 
   try {
@@ -225,13 +264,17 @@ async function selectLang(lang) {
       // Matching subtitles for matchLang
       Array.from(video.value?.textTracks || []).forEach(track => {
         const tLang = (track.language || track.srclang || '').toLowerCase();
-        console.log('[LangSwitch] Track', tLang, 'current mode:', track.mode);
         track.mode = tLang === matchLang ? 'showing' : 'disabled';
-        console.log('[LangSwitch] Track', tLang, '→ new mode:', track.mode);
       });
 
       currentSubtitleLang.value = lang;
-      console.log('[LangSwitch] currentSubtitleLang set to', currentSubtitleLang.value);
+      // Emit ONLY if user initiated the change
+      setTimeout(() => {
+        if (isUserInitiatedLangChange.value) {
+          emit('language-changed', lang);
+          isUserInitiatedLangChange.value = false; // Reset flag
+        }
+      }, 100);
     });
     // Attach HLS
     await hls.loadSource(newSource.file_url);
@@ -256,7 +299,7 @@ function updateLangMenuState() {
     const langElement = li.querySelector('span[data-lang]')
     const liLang = langElement?.dataset?.lang;
     // const liLang = li.textContent.trim().toLowerCase();
-    li.classList.toggle('active', liLang === currentLang.value.toLowerCase());
+    li.classList.toggle('active', liLang === currentAudioLang.value.toLowerCase());
   });
 
   // --- Subtitles ---
@@ -325,18 +368,20 @@ const mutedAttr = computed(() => {
   return (props.autoplay || props.isMuted);
 })
 
+
 const currentSubtitle = computed(() => {
-  if(props.subtitles) {
-    const current = props.subtitles.filter((subt) => {
-      if(currentSubtitleLang.value) {
-        return subt.lang === currentSubtitleLang.value
-      } else {
-        return subt.lang === "en"
-      }
-    })
-    return current.length ? current[0] : null
+  if (!props.subtitles?.length) return null;
+  
+  if (currentSubtitleLang.value) {
+    const match = props.subtitles.find(s => s.lang === currentSubtitleLang.value);
+    if (match) return match;
   }
-  return null
+  
+  // Fallback 
+  const defaultMatch = props.subtitles.find(s => s.lang === props.defaultLang);
+  if (defaultMatch) return defaultMatch;
+  
+  return props.subtitles[0];
 })
 
 watch(() => props.autoplay, (a) => {
@@ -559,16 +604,10 @@ function prepareVideoPlayer(link) {
 
   // Initialize subtitles
   if (props.subtitles?.length > 0) {
-    const defaultSub = props.subtitles.find(s => s.lang === props.defaultLang);
-    currentSubtitleLang.value = defaultSub ? defaultSub.lang : props.subtitles[0].lang;
-    Array.from(video.value?.textTracks || []).forEach(track => {
-      const tLang = (track.language || track.srclang || '').toLowerCase();
-      console.log('[SubtitleInit] Track found:', tLang, '->', tLang === currentSubtitleLang.value.toLowerCase() ? 'showing' : 'disabled');
-      track.mode = tLang === currentSubtitleLang.value.toLowerCase() ? 'showing' : 'disabled';
-    });
+    initSubtitleLang();
   }
 
-selectLang(props.defaultLang);
+  selectLang(props.defaultLang);
   // HLS attached to <video>
   hls.recoverMediaError();
 
@@ -844,10 +883,11 @@ const mutationObserver = (mutationsList, observer) => {
             <span data-lang="${ src.lang }">${src.label || src.lang.toUpperCase()}</span>
             <span class="icon">${renderIcon()}</span>
           `;
-          if (src.lang === currentLang.value) li.classList.add('active');
+          if (src.lang === currentAudioLang.value) li.classList.add('active');
           li.addEventListener('click', () => {
             audioCol.querySelectorAll('li').forEach(el => el.classList.remove('active'));
             li.classList.add('active');
+            isUserInitiatedLangChange.value = true;
             selectLang(src.lang);
             menu.style.display = 'none';
           });
@@ -862,14 +902,10 @@ const mutationObserver = (mutationsList, observer) => {
 
           if (sub.lang === currentSubtitleLang.value) li.classList.add('active');
           li.addEventListener('click', () => {
-            Array.from(video.value?.textTracks || []).forEach(track => {
-              const tLang = (track.language || track.srclang || '').toLowerCase();
-              track.mode = tLang === sub.lang.toLowerCase() ? 'showing' : 'disabled';
-            });
-            subCol.querySelectorAll('li').forEach(el => el.classList.remove('active'));
-            li.classList.add('active');
-            menu.style.display = 'none';
-            currentSubtitleLang.value = sub.lang;
+            currentSubtitleLang.value = sub.lang
+            sessionStorage.setItem(sessionSubtitleLang, sub.lang)
+            applySubtitleTrack(sub.lang)
+            menu.style.display = 'none'
           });
           subCol.appendChild(li);
         });

package/dist/VideoPlayer/VDefaultVideoPlayer.vue

@@ -17,6 +17,7 @@
     @pause="pause"
     @video-ended="onVideoEnd"
     @video-fullscreen-change="onFullscreenChange"
+    @language-changed="onLanguageChanged"
     v-model="videoElement"
     ref="childRef"
   >
@@ -32,7 +33,7 @@
 import BasePlayer from './BasePlayer.vue'
 import { ref, toRef } from 'vue'
 
-const emit = defineEmits(['pause', 'video-ended', 'video-fullscreen-change'])
+const emit = defineEmits(['pause', 'video-ended', 'video-fullscreen-change', 'language-changed'])
 
 const videoElement = ref(null);
 const childRef = ref(null)
@@ -114,6 +115,9 @@ function onFullscreenChange(data) {
   emit('video-fullscreen-change', data);
 }
 
+function onLanguageChanged(data) {
+  emit('language-changed', data);
+}
 function startFullscreen() {
   childRef.value.startFullscreen();
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@grfzhl/vue-hls-player",
   "private": false,
-  "version": "1.1.23",
+  "version": "1.1.25",
   "type": "module",
   "files": [
     "dist"