@ericchen1990/pano-view 2.5.0 → 2.5.1

package/dist/index.mjs

@@ -2274,6 +2274,20 @@ function subscribeBackgroundAudioHost(host, listener) {
     host.listeners.delete(listener);
   };
 }
+function subscribeBackgroundAudioStore(host, onStoreChange) {
+  let unsubscribeController = host.controller?.subscribe(onStoreChange) ?? (() => {
+  });
+  const unsubscribeHost = subscribeBackgroundAudioHost(host, () => {
+    unsubscribeController();
+    unsubscribeController = host.controller?.subscribe(onStoreChange) ?? (() => {
+    });
+    onStoreChange();
+  });
+  return () => {
+    unsubscribeController();
+    unsubscribeHost();
+  };
+}
 
 // src/cn.ts
 function cn(...values) {
@@ -5022,6 +5036,20 @@ function subscribePanoVideoHost(host, onStoreChange) {
     host.listeners.delete(onStoreChange);
   };
 }
+function subscribePanoVideoStore(host, onStoreChange) {
+  let unsubscribeController = host.controller?.subscribe(onStoreChange) ?? (() => {
+  });
+  const unsubscribeHost = subscribePanoVideoHost(host, () => {
+    unsubscribeController();
+    unsubscribeController = host.controller?.subscribe(onStoreChange) ?? (() => {
+    });
+    onStoreChange();
+  });
+  return () => {
+    unsubscribeController();
+    unsubscribeHost();
+  };
+}
 function getPanoVideoHostRevision(host) {
   return host.revision;
 }
@@ -6953,7 +6981,7 @@ var PanoViewer = forwardRef2(
         requestVRPermission: () => webVRHost.controller?.requestPermission() ?? Promise.resolve(false),
         // -- Video --
         getVideo: () => videoHost.controller,
-        subscribeVideo: (onStoreChange) => subscribePanoVideoHost(videoHost, onStoreChange),
+        subscribeVideo: (onStoreChange) => subscribePanoVideoStore(videoHost, onStoreChange),
         playVideo: () => videoHost.controller?.play() ?? Promise.resolve(),
         pauseVideo: () => videoHost.controller?.pause(),
         toggleVideo: () => videoHost.controller?.togglePlay(),
@@ -6963,7 +6991,7 @@ var PanoViewer = forwardRef2(
         toggleVideoMuted: () => videoHost.controller?.toggleMuted(),
         // -- Background Audio --
         getBackgroundAudio: () => bgmHost.controller,
-        subscribeBackgroundAudio: (onStoreChange) => subscribeBackgroundAudioHost(bgmHost, onStoreChange),
+        subscribeBackgroundAudio: (onStoreChange) => subscribeBackgroundAudioStore(bgmHost, onStoreChange),
         playBackgroundAudio: () => {
           bgmHost.controller?.play();
           return Promise.resolve();
@@ -7327,6 +7355,8 @@ function BackgroundAudio({
   const loopRef = useRef13(loop);
   const mutedRef = useRef13(muted);
   const volumeRef = useRef13(volume);
+  const mutedPropRef = useRef13(muted);
+  const volumePropRef = useRef13(volume);
   const fadeMsRef = useRef13(resolveFadeMs(fadeMs));
   const onPlaybackStateChangeRef = useRef13(onPlaybackStateChange);
   const onPlaybackErrorRef = useRef13(onPlaybackError);
@@ -7334,9 +7364,15 @@ function BackgroundAudio({
   const onErrorRef = useRef13(onError);
   playingRef.current = playing;
   loopRef.current = loop;
-  mutedRef.current = muted;
-  volumeRef.current = volume;
   fadeMsRef.current = resolveFadeMs(fadeMs);
+  if (mutedPropRef.current !== muted) {
+    mutedPropRef.current = muted;
+    mutedRef.current = muted;
+  }
+  if (volumePropRef.current !== volume) {
+    volumePropRef.current = volume;
+    volumeRef.current = volume;
+  }
   onPlaybackStateChangeRef.current = onPlaybackStateChange;
   onPlaybackErrorRef.current = onPlaybackError;
   onEndedRef.current = onEnded;
@@ -7390,20 +7426,17 @@ function BackgroundAudio({
         if (isControlledRef.current) {
           return;
         }
-        const howl = currentRef.current?.handle.howl;
-        if (howl) {
-          howl.volume(clampAudioVolume(vol));
-        }
-        notifySnapshot({ volume: clampAudioVolume(vol) });
+        const next = clampAudioVolume(vol);
+        volumeRef.current = next;
+        currentRef.current?.handle.howl.volume(next);
+        notifySnapshot({ volume: next });
       },
       setMuted: (m) => {
         if (isControlledRef.current) {
           return;
         }
-        const howl = currentRef.current?.handle.howl;
-        if (howl) {
-          howl.mute(m);
-        }
+        mutedRef.current = m;
+        currentRef.current?.handle.howl.mute(m);
         notifySnapshot({ muted: m });
       },
       toggleMuted: () => {
@@ -7411,10 +7444,8 @@ function BackgroundAudio({
           return;
         }
         const next = !snapshotRef.current.muted;
-        const howl = currentRef.current?.handle.howl;
-        if (howl) {
-          howl.mute(next);
-        }
+        mutedRef.current = next;
+        currentRef.current?.handle.howl.mute(next);
         notifySnapshot({ muted: next });
       }
     }),
@@ -7481,6 +7512,9 @@ function BackgroundAudio({
           shouldRetryPlay: () => currentRef.current?.key === trackKey && playingRef.current,
           onEnded: () => {
             notifySnapshot({ playing: false, ended: true });
+            if (!isControlledRef.current) {
+              setInternalPlaying(false);
+            }
             onPlaybackStateChangeRef.current?.("ended");
             onEndedRef.current?.();
           },
@@ -7553,7 +7587,9 @@ function BackgroundAudio({
     }
     if (!playing) {
       fadingInRef.current = false;
-      howl.pause();
+      if (howl.playing()) {
+        howl.pause();
+      }
       for (const slot of outgoingRef.current) {
         slot.handle.dispose();
       }
@@ -7568,11 +7604,14 @@ function BackgroundAudio({
       return;
     }
     slot.handle.howl.loop(loop);
-    slot.handle.howl.mute(muted);
+    slot.handle.howl.mute(mutedRef.current);
     if (!fadingInRef.current) {
-      slot.handle.howl.volume(clampAudioVolume(volume));
+      slot.handle.howl.volume(clampAudioVolume(volumeRef.current));
     }
-    notifySnapshot({ muted, volume: clampAudioVolume(volume) });
+    notifySnapshot({
+      muted: mutedRef.current,
+      volume: clampAudioVolume(volumeRef.current)
+    });
   }, [loop, muted, trackKey, volume]);
   useEffect13(() => {
     if (!pauseWhenHidden) {