feat: add GM.openInTab.options.setParent close #121

magicdawn · Oct 7, 2024 · 1540f14 · 1540f14
1 parent e2c6229
commit 1540f14
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/src/components/VideoCard/index.tsx b/src/components/VideoCard/index.tsx
@@ -410,7 +410,7 @@ const VideoCardInner = memo(function VideoCardInner({
 
     function openInNewWindow() {
       const u = `/?dyn-mid=${authorMid}`
-      GM.openInTab(u, { insert: true, active: true })
+      GM.openInTab(u, { insert: true, active: true, setParent: true })
     }
 
     // newWindow ??= tab !== ETab.DynamicFeed

diff --git a/src/components/VideoCard/top-marks.tsx b/src/components/VideoCard/top-marks.tsx
@@ -126,6 +126,7 @@ export function RankingNumMark({ item }: { item: RankingItemExtend }) {
                       GM.openInTab(new URL(`/video/${x.bvid}`, location.href).href, {
                         active: true,
                         insert: true,
+                        setParent: true,
                       })
                     },
                   }

diff --git a/src/components/VideoCard/use/_pip-window.tsx b/src/components/VideoCard/use/_pip-window.tsx
@@ -156,7 +156,7 @@ function CloseThenOpenButton({ newHref, pipWindow }: { pipWindow: Window; newHre
     const u = new URL(newHref)
     u.searchParams.delete(QueryKey.PlayerScreenMode)
     u.searchParams.delete(QueryKey.ForceAutoPlay)
-    GM.openInTab(u.href, { active: true })
+    GM.openInTab(u.href, { active: true, insert: true, setParent: true })
   }
 
   return (

diff --git a/src/components/VideoCard/use/useOpenRelated.tsx b/src/components/VideoCard/use/useOpenRelated.tsx
@@ -75,10 +75,7 @@ export function useOpenRelated({
 
     const handleCommon = () => {
       const active = mode !== Mode.Background
-      GM.openInTab(newHref, {
-        insert: true,
-        active,
-      })
+      GM.openInTab(newHref, { insert: true, active, setParent: true })
     }
 
     const handlers: Record<Mode, () => void> = {

diff --git a/src/vite-env.d.ts b/src/vite-env.d.ts
@@ -15,3 +15,10 @@ declare global {
       | undefined
   }
 }
+
+declare global {
+  interface VMScriptGMTabOptions {
+    /** tempermonkey only, https://www.tampermonkey.net/documentation.php?locale=en#api:GM_openInTab */
+    setParent?: boolean
+  }
+}