@cqa-lib/cqa-ui 1.1.226 → 1.1.227

package/fesm2020/cqa-lib-cqa-ui.mjs

@@ -15003,12 +15003,11 @@ class SimulatorComponent {
         this.playerState = 'paused';
         this.videoPause.emit();
         this.isVideoPlayingChange.emit(false);
-        // Switch to next video and reset to 0
+        // Switch to next video and auto-play it
         if (this.hasMultipleVideos && this.videoUrls && this.currentVideoIndex < this.videoUrls.length - 1) {
-            this.currentVideoIndex += 1;
+            const nextIndex = this.currentVideoIndex + 1;
             this.enqueueOperation(async () => {
-                await this.resetVideoStateInternal();
-                await new Promise(resolve => setTimeout(resolve, 100));
+                await this.switchToVideoAndResetInternal(nextIndex);
                 if (this.vplayer?.nativeElement && this.currentVideoUrl) {
                     await this.playVideoInternal();
                 }
@@ -15518,31 +15517,23 @@ class SimulatorComponent {
             this.playPromise = null;
             this.videoPause.emit();
             this.isVideoPlayingChange.emit(false);
-            this.currentVideoIndex = targetVideoIndex;
-            await new Promise((resolve, reject) => {
-                let resolved = false;
-                const cleanup = () => {
-                    if (resolved)
+            const metadataLoaded = new Promise((resolve, reject) => {
+                let settled = false;
+                const settle = (fn) => {
+                    if (settled)
                         return;
-                    resolved = true;
+                    settled = true;
                     video.removeEventListener('loadedmetadata', onLoadedMetadata);
                     video.removeEventListener('error', onError);
+                    fn();
                 };
-                const onLoadedMetadata = () => {
-                    cleanup();
-                    resolve();
-                };
-                const onError = () => {
-                    cleanup();
-                    reject(new Error('Failed to load video'));
-                };
-                setTimeout(() => {
-                    if (resolved)
-                        return;
-                    video.addEventListener('loadedmetadata', onLoadedMetadata, { once: true });
-                    video.addEventListener('error', onError, { once: true });
-                }, 100);
+                const onLoadedMetadata = () => settle(resolve);
+                const onError = () => settle(() => reject(new Error('Failed to load video')));
+                video.addEventListener('loadedmetadata', onLoadedMetadata, { once: true });
+                video.addEventListener('error', onError, { once: true });
             });
+            this.currentVideoIndex = targetVideoIndex;
+            await metadataLoaded;
             video.currentTime = 0;
             this.progress = 0;
             this.playPromise = null;
@@ -15590,31 +15581,23 @@ class SimulatorComponent {
             this.playPromise = null;
             this.videoPause.emit();
             this.isVideoPlayingChange.emit(false);
-            this.currentVideoIndex = targetVideoIndex;
-            await new Promise((resolve, reject) => {
-                let resolved = false;
-                const cleanup = () => {
-                    if (resolved)
+            const metadataLoaded = new Promise((resolve, reject) => {
+                let settled = false;
+                const settle = (fn) => {
+                    if (settled)
                         return;
-                    resolved = true;
+                    settled = true;
                     video.removeEventListener('loadedmetadata', onLoadedMetadata);
                     video.removeEventListener('error', onError);
+                    fn();
                 };
-                const onLoadedMetadata = () => {
-                    cleanup();
-                    resolve();
-                };
-                const onError = () => {
-                    cleanup();
-                    reject(new Error('Failed to load video'));
-                };
-                setTimeout(() => {
-                    if (resolved)
-                        return;
-                    video.addEventListener('loadedmetadata', onLoadedMetadata, { once: true });
-                    video.addEventListener('error', onError, { once: true });
-                }, 100);
+                const onLoadedMetadata = () => settle(resolve);
+                const onError = () => settle(() => reject(new Error('Failed to load video')));
+                video.addEventListener('loadedmetadata', onLoadedMetadata, { once: true });
+                video.addEventListener('error', onError, { once: true });
             });
+            this.currentVideoIndex = targetVideoIndex;
+            await metadataLoaded;
             const seekSeconds = relativeTimestamp / 1000;
             const targetTime = Math.max(0, Math.min(seekSeconds, video.duration || seekSeconds));
             await new Promise((resolve) => {