@ericchen1990/pano-view 3.1.1 → 3.1.2

package/dist/index.mjs

@@ -2297,6 +2297,22 @@ function cn(...values) {
 
 // src/audio/howl.ts
 var import_howler = __toESM(require_howler());
+
+// src/media-activation-event.ts
+function isMediaActivationEvent(event) {
+  switch (event.type) {
+    case "keydown":
+      return event instanceof KeyboardEvent && event.key !== "Escape";
+    case "pointerdown":
+      return event instanceof PointerEvent && event.pointerType === "mouse";
+    case "pointerup":
+      return event instanceof PointerEvent && event.pointerType !== "mouse";
+    default:
+      return false;
+  }
+}
+
+// src/audio/howl.ts
 import_howler.Howler.autoUnlock = true;
 function resumePanoAudio() {
   if (!import_howler.Howler.ctx || import_howler.Howler.ctx.state === "running") {
@@ -2304,6 +2320,9 @@ function resumePanoAudio() {
   }
   return import_howler.Howler.ctx.resume();
 }
+function isPanoAudioUnlocked() {
+  return !import_howler.Howler.ctx || import_howler.Howler.ctx.state === "running";
+}
 function sourceList(src) {
   if (src == null) {
     return [];
@@ -2369,7 +2388,10 @@ function createUnlockingHowl({
         blockedNotified = true;
         onPlayError?.(error);
       }
-      const retry = () => {
+      const retry = (event) => {
+        if (!isMediaActivationEvent(event)) {
+          return;
+        }
         removeUnlockListeners();
         if (!disposed && isActive() && shouldRetryPlay()) {
           void resumePanoAudio();
@@ -2378,8 +2400,10 @@ function createUnlockingHowl({
       };
       removeUnlockListeners();
       unlockListeners.push({ type: "pointerdown", listener: retry });
+      unlockListeners.push({ type: "pointerup", listener: retry });
       unlockListeners.push({ type: "keydown", listener: retry });
       window.addEventListener("pointerdown", retry, { capture: true });
+      window.addEventListener("pointerup", retry, { capture: true });
       window.addEventListener("keydown", retry, { capture: true });
     }
   });
@@ -7150,12 +7174,15 @@ var PanoViewer = forwardRef2(
       }),
       [bgmHost, videoHost]
     );
-    const activateMedia = useCallback6(() => {
-      setMediaActivated(true);
+    const runMediaActivation = useCallback6(() => {
       const resume = mediaActivationControls.resumeAudio();
       mediaActivationOptions?.onActivate?.(mediaActivationControls);
       return resume;
     }, [mediaActivationControls, mediaActivationOptions]);
+    const activateMedia = useCallback6(() => {
+      setMediaActivated(true);
+      return runMediaActivation();
+    }, [runMediaActivation]);
     const hasMediaActivationIntent = mediaActivationRevision >= 0 && hasPanoMediaActivationIntent(mediaActivationHost);
     const shouldActivateMedia = mediaActivationOptions !== null && hasMediaActivationIntent && !mediaActivated;
     useEffect13(() => {
@@ -7166,18 +7193,39 @@ var PanoViewer = forwardRef2(
         void activateMedia();
         return;
       }
-      const handleGesture = () => {
-        removeListeners();
-        void activateMedia();
-      };
+      let cancelled = false;
+      let activating = false;
       const removeListeners = () => {
         window.removeEventListener("pointerdown", handleGesture, true);
+        window.removeEventListener("pointerup", handleGesture, true);
         window.removeEventListener("keydown", handleGesture, true);
       };
+      const handleGesture = (event) => {
+        if (!isMediaActivationEvent(event) || activating || cancelled) {
+          return;
+        }
+        activating = true;
+        try {
+          const resume = runMediaActivation();
+          void resume.then(() => {
+            if (cancelled || !isPanoAudioUnlocked()) {
+              return;
+            }
+            removeListeners();
+            setMediaActivated(true);
+          });
+        } finally {
+          activating = false;
+        }
+      };
       window.addEventListener("pointerdown", handleGesture, { capture: true });
+      window.addEventListener("pointerup", handleGesture, { capture: true });
       window.addEventListener("keydown", handleGesture, { capture: true });
-      return removeListeners;
-    }, [activateMedia, shouldActivateMedia]);
+      return () => {
+        cancelled = true;
+        removeListeners();
+      };
+    }, [activateMedia, runMediaActivation, shouldActivateMedia]);
     const fallbackViewRef = useRef13(DEFAULT_VIEW);
     const normalizedMinFov = Math.max(1, Math.min(minFov, maxFov - 1));
     const normalizedMaxFov = Math.min(