fix(overlay): Linux X11/XWayland stacking, stale pause state, multi-copy selector (#101)

2026-09-23 05:16:23 -07:00 · 2026-05-31 20:59:18 -07:00
parent b46b8dfa41
commit e1ea464bc9
103 changed files with 6314 additions and 353 deletions
@@ -15,17 +15,30 @@ function createClassList() {
  };
 }

+function replaceGlobalProperty(key: 'window' | 'document', value: unknown): () => void {
+  const original = Object.getOwnPropertyDescriptor(globalThis, key);
+  Object.defineProperty(globalThis, key, {
+    configurable: true,
+    writable: true,
+    value,
+  });
+  return () => {
+    if (original) {
+      Object.defineProperty(globalThis, key, original);
+      return;
+    }
+    delete (globalThis as Record<string, unknown>)[key];
+  };
+}
+
 test('idle visible overlay starts click-through on platforms that toggle mouse ignore', () => {
  const classList = createClassList();
  const ignoreCalls: Array<{ ignore: boolean; forward?: boolean }> = [];
-  const originalWindow = globalThis.window;

-  Object.assign(globalThis, {
-    window: {
-      electronAPI: {
-        setIgnoreMouseEvents: (ignore: boolean, options?: { forward?: boolean }) => {
-          ignoreCalls.push({ ignore, forward: options?.forward });
-        },
+  const restoreWindow = replaceGlobalProperty('window', {
+    electronAPI: {
+      setIgnoreMouseEvents: (ignore: boolean, options?: { forward?: boolean }) => {
+        ignoreCalls.push({ ignore, forward: options?.forward });
      },
    },
  });
@@ -58,21 +71,18 @@ test('idle visible overlay starts click-through on platforms that toggle mouse i
    assert.equal(classList.contains('interactive'), false);
    assert.deepEqual(ignoreCalls, [{ ignore: true, forward: true }]);
  } finally {
-    Object.assign(globalThis, { window: originalWindow });
+    restoreWindow();
  }
 });

 test('youtube picker keeps overlay interactive even when subtitle hover is inactive', () => {
  const classList = createClassList();
  const ignoreCalls: Array<{ ignore: boolean; forward?: boolean }> = [];
-  const originalWindow = globalThis.window;

-  Object.assign(globalThis, {
-    window: {
-      electronAPI: {
-        setIgnoreMouseEvents: (ignore: boolean, options?: { forward?: boolean }) => {
-          ignoreCalls.push({ ignore, forward: options?.forward });
-        },
+  const restoreWindow = replaceGlobalProperty('window', {
+    electronAPI: {
+      setIgnoreMouseEvents: (ignore: boolean, options?: { forward?: boolean }) => {
+        ignoreCalls.push({ ignore, forward: options?.forward });
      },
    },
  });
@@ -105,36 +115,32 @@ test('youtube picker keeps overlay interactive even when subtitle hover is inact
    assert.equal(classList.contains('interactive'), true);
    assert.deepEqual(ignoreCalls, [{ ignore: false, forward: undefined }]);
  } finally {
-    Object.assign(globalThis, { window: originalWindow });
+    restoreWindow();
  }
 });

 test('visible yomitan popup host keeps overlay interactive even when cached popup state is false', () => {
  const classList = createClassList();
  const ignoreCalls: Array<{ ignore: boolean; forward?: boolean }> = [];
-  const originalWindow = globalThis.window;
-  const originalDocument = globalThis.document;

-  Object.assign(globalThis, {
-    window: {
-      electronAPI: {
-        setIgnoreMouseEvents: (ignore: boolean, options?: { forward?: boolean }) => {
-          ignoreCalls.push({ ignore, forward: options?.forward });
-        },
+  const restoreWindow = replaceGlobalProperty('window', {
+    electronAPI: {
+      setIgnoreMouseEvents: (ignore: boolean, options?: { forward?: boolean }) => {
+        ignoreCalls.push({ ignore, forward: options?.forward });
      },
-      getComputedStyle: () => ({
-        visibility: 'visible',
-        display: 'block',
-        opacity: '1',
-      }),
-    },
-    document: {
-      querySelectorAll: (selector: string) =>
-        selector ===
-        '[data-subminer-yomitan-popup-host="true"][data-subminer-yomitan-popup-visible="true"]'
-          ? [{ getAttribute: () => 'true' }]
-          : [],
    },
+    getComputedStyle: () => ({
+      visibility: 'visible',
+      display: 'block',
+      opacity: '1',
+    }),
+  });
+  const restoreDocument = replaceGlobalProperty('document', {
+    querySelectorAll: (selector: string) =>
+      selector ===
+      '[data-subminer-yomitan-popup-host="true"][data-subminer-yomitan-popup-visible="true"]'
+        ? [{ getAttribute: () => 'true' }]
+        : [],
  });

  try {
@@ -165,6 +171,97 @@ test('visible yomitan popup host keeps overlay interactive even when cached popu
    assert.equal(classList.contains('interactive'), true);
    assert.deepEqual(ignoreCalls, [{ ignore: false, forward: undefined }]);
  } finally {
-    Object.assign(globalThis, { window: originalWindow, document: originalDocument });
+    restoreDocument();
+    restoreWindow();
+  }
+});
+
+test('Linux subtitle hover keeps root passive and does not report whole-window interactive hint', () => {
+  const classList = createClassList();
+  const interactiveHints: boolean[] = [];
+
+  const restoreWindow = replaceGlobalProperty('window', {
+    electronAPI: {
+      reportOverlayInteractive: (interactive: boolean) => {
+        interactiveHints.push(interactive);
+      },
+    },
+  });
+
+  try {
+    syncOverlayMouseIgnoreState({
+      dom: {
+        overlay: { classList },
+      },
+      platform: {
+        isLinuxPlatform: true,
+        shouldToggleMouseIgnore: false,
+      },
+      state: {
+        isOverSubtitle: true,
+        isOverSubtitleSidebar: false,
+        yomitanPopupVisible: false,
+        controllerSelectModalOpen: false,
+        controllerDebugModalOpen: false,
+        jimakuModalOpen: false,
+        youtubePickerModalOpen: false,
+        kikuModalOpen: false,
+        runtimeOptionsModalOpen: false,
+        subsyncModalOpen: false,
+        sessionHelpModalOpen: false,
+        subtitleSidebarModalOpen: false,
+        subtitleSidebarConfig: null,
+      },
+    } as never);
+
+    assert.equal(classList.contains('interactive'), false);
+    assert.deepEqual(interactiveHints, [false]);
+  } finally {
+    restoreWindow();
+  }
+});
+
+test('Linux modal state reports whole-window interactive hint', () => {
+  const classList = createClassList();
+  const interactiveHints: boolean[] = [];
+
+  const restoreWindow = replaceGlobalProperty('window', {
+    electronAPI: {
+      reportOverlayInteractive: (interactive: boolean) => {
+        interactiveHints.push(interactive);
+      },
+    },
+  });
+
+  try {
+    syncOverlayMouseIgnoreState({
+      dom: {
+        overlay: { classList },
+      },
+      platform: {
+        isLinuxPlatform: true,
+        shouldToggleMouseIgnore: false,
+      },
+      state: {
+        isOverSubtitle: false,
+        isOverSubtitleSidebar: false,
+        yomitanPopupVisible: false,
+        controllerSelectModalOpen: false,
+        controllerDebugModalOpen: false,
+        jimakuModalOpen: false,
+        youtubePickerModalOpen: false,
+        kikuModalOpen: false,
+        runtimeOptionsModalOpen: true,
+        subsyncModalOpen: false,
+        sessionHelpModalOpen: false,
+        subtitleSidebarModalOpen: false,
+        subtitleSidebarConfig: null,
+      },
+    } as never);
+
+    assert.equal(classList.contains('interactive'), true);
+    assert.deepEqual(interactiveHints, [true]);
+  } finally {
+    restoreWindow();
  }
 });