@ericchen1990/pano-view 3.1.2 → 3.1.3

package/dist/index.mjs

@@ -2311,6 +2311,9 @@ function isMediaActivationEvent(event) {
       return false;
   }
 }
+function isAutoplayPolicyError(error) {
+  return typeof error === "object" && error !== null && "name" in error && error.name === "NotAllowedError";
+}
 
 // src/audio/howl.ts
 import_howler.Howler.autoUnlock = true;
@@ -3856,7 +3859,7 @@ function hasPanoMediaActivationIntent(host) {
   return host.intents.size > 0;
 }
 function needsMediaGesture() {
-  if (typeof navigator !== "undefined" && navigator.userActivation?.hasBeenActive) {
+  if (typeof navigator !== "undefined" && navigator.userActivation?.isActive) {
     return false;
   }
   if (import_howler2.Howler.ctx?.state === "running") {
@@ -7189,10 +7192,6 @@ var PanoViewer = forwardRef2(
       if (!shouldActivateMedia) {
         return;
       }
-      if (!needsMediaGesture()) {
-        void activateMedia();
-        return;
-      }
       let cancelled = false;
       let activating = false;
       const removeListeners = () => {
@@ -7200,32 +7199,69 @@ var PanoViewer = forwardRef2(
         window.removeEventListener("pointerup", handleGesture, true);
         window.removeEventListener("keydown", handleGesture, true);
       };
-      const handleGesture = (event) => {
-        if (!isMediaActivationEvent(event) || activating || cancelled) {
+      const completeIfUnlocked = (requestedVideo, videoOk) => {
+        if (cancelled || !isPanoAudioUnlocked()) {
+          return;
+        }
+        if (requestedVideo && videoHost.controller && !videoOk) {
+          return;
+        }
+        removeListeners();
+        setMediaActivated(true);
+      };
+      const tryActivate = () => {
+        if (activating || cancelled) {
           return;
         }
         activating = true;
+        let videoPlay;
+        const controls2 = {
+          resumeAudio: mediaActivationControls.resumeAudio,
+          playVideo: (options) => {
+            const result = mediaActivationControls.playVideo(options);
+            videoPlay = result;
+            return result;
+          },
+          playBackgroundAudio: mediaActivationControls.playBackgroundAudio
+        };
         try {
-          const resume = runMediaActivation();
-          void resume.then(() => {
-            if (cancelled || !isPanoAudioUnlocked()) {
-              return;
+          const resume = controls2.resumeAudio();
+          mediaActivationOptions?.onActivate?.(controls2);
+          const requestedVideo = videoPlay !== void 0;
+          void Promise.all([resume, videoPlay ?? Promise.resolve(true)]).then(
+            ([, videoOk]) => {
+              completeIfUnlocked(requestedVideo, videoOk);
+            },
+            () => {
+              completeIfUnlocked(requestedVideo, false);
             }
-            removeListeners();
-            setMediaActivated(true);
-          });
+          );
         } finally {
           activating = false;
         }
       };
+      const handleGesture = (event) => {
+        if (!isMediaActivationEvent(event)) {
+          return;
+        }
+        tryActivate();
+      };
       window.addEventListener("pointerdown", handleGesture, { capture: true });
       window.addEventListener("pointerup", handleGesture, { capture: true });
       window.addEventListener("keydown", handleGesture, { capture: true });
+      if (!needsMediaGesture()) {
+        tryActivate();
+      }
       return () => {
         cancelled = true;
         removeListeners();
       };
-    }, [activateMedia, runMediaActivation, shouldActivateMedia]);
+    }, [
+      mediaActivationControls,
+      mediaActivationOptions,
+      shouldActivateMedia,
+      videoHost
+    ]);
     const fallbackViewRef = useRef13(DEFAULT_VIEW);
     const normalizedMinFov = Math.max(1, Math.min(minFov, maxFov - 1));
     const normalizedMaxFov = Math.min(
@@ -10574,8 +10610,10 @@ function PanoVideo({
         try {
           await video.play();
         } catch (error) {
-          blockedRef.current = true;
-          onPlaybackStateChangeRef.current?.("blocked");
+          if (isAutoplayPolicyError(error)) {
+            blockedRef.current = true;
+            onPlaybackStateChangeRef.current?.("blocked");
+          }
           onErrorRef.current?.({ source: "video", error });
           emitSnapshot();
         }