Keep inactive webviews from stealing shortcuts

Author: mehmetozguldev

src-tauri/src/commands/ui/window.rs

@@ -791,6 +791,9 @@ pub async fn set_webview_visible(
          webview
             .hide()
             .map_err(|e| format!("Failed to hide webview: {e}"))?;
+         if let Some(main_webview) = app.get_webview_window("main") {
+            let _ = main_webview.set_focus();
+         }
       }
    } else {
       return Err(format!("Webview not found: {webview_label}"));

src/features/panes/components/pane-container.tsx

@@ -1041,12 +1041,8 @@ export function PaneContainer({ pane }: PaneContainerProps) {
                             isVisible={true}
                           />
                         </div>
-                      ) : buffer.type === "webViewer" ? (
-                        <div
-                          className={
-                            isActiveBuffer ? "h-full w-full" : "pointer-events-none h-full w-full"
-                          }
-                        >
+                      ) : buffer.type === "webViewer" && isActiveBuffer ? (
+                        <div className="h-full w-full">
                           <WebViewer
                             url={buffer.url}
                             bufferId={buffer.id}

src/features/web-viewer/hooks/use-embedded-webview.ts

@@ -2,6 +2,7 @@ import { invoke } from "@tauri-apps/api/core";
 import { getCurrentWebview } from "@tauri-apps/api/webview";
 import { useCallback, useEffect, useRef, useState, type RefObject } from "react";
 import { hasOverlayCoveringWebview } from "../utils/web-viewer-overlay";
+import { shouldShowEmbeddedWebview } from "../utils/embedded-webview-visibility";
 
 interface UseEmbeddedWebviewOptions {
   bufferId: string;
@@ -110,9 +111,16 @@ export function useEmbeddedWebview({
 
   const syncWebviewVisibility = useCallback(
     async (label: string) => {
-      await setWebviewVisible(label, isVisible && !overlayHiddenRef.current);
+      await setWebviewVisible(
+        label,
+        shouldShowEmbeddedWebview({
+          isActive,
+          isVisible,
+          overlayHidden: overlayHiddenRef.current,
+        }),
+      );
     },
-    [isVisible, setWebviewVisible],
+    [isActive, isVisible, setWebviewVisible],
   );
 
   useEffect(() => {

src/features/web-viewer/tests/embedded-webview-visibility.test.ts

@@ -0,0 +1,34 @@
+import { describe, expect, it } from "vite-plus/test";
+import { shouldShowEmbeddedWebview } from "../utils/embedded-webview-visibility";
+
+describe("embedded webview visibility", () => {
+  it("shows only the active visible webview", () => {
+    expect(
+      shouldShowEmbeddedWebview({
+        isActive: true,
+        isVisible: true,
+        overlayHidden: false,
+      }),
+    ).toBe(true);
+  });
+
+  it("hides inactive webviews even when their pane content is visible", () => {
+    expect(
+      shouldShowEmbeddedWebview({
+        isActive: false,
+        isVisible: true,
+        overlayHidden: false,
+      }),
+    ).toBe(false);
+  });
+
+  it("hides active webviews behind app overlays", () => {
+    expect(
+      shouldShowEmbeddedWebview({
+        isActive: true,
+        isVisible: true,
+        overlayHidden: true,
+      }),
+    ).toBe(false);
+  });
+});

src/features/web-viewer/utils/embedded-webview-visibility.ts

@@ -0,0 +1,13 @@
+interface EmbeddedWebviewVisibilityState {
+  isActive: boolean;
+  isVisible: boolean;
+  overlayHidden: boolean;
+}
+
+export function shouldShowEmbeddedWebview({
+  isActive,
+  isVisible,
+  overlayHidden,
+}: EmbeddedWebviewVisibilityState): boolean {
+  return isActive && isVisible && !overlayHidden;
+}