Skip to content

fix(desktop): guard WebView getWebContentsId against detached DOM #152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MocA-Love merged 2 commits into from
Apr 12, 2026
Merged

fix(desktop): guard WebView getWebContentsId against detached DOM #152

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f0860d
fix(desktop): guard WebView getWebContentsId against detached DOM
MocA-Love Apr 11, 2026
1f23f93
fix(desktop): drain pending navigation even when WebView is detached
MocA-Love Apr 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions ...ntView/TabsContent/TabView/BrowserPane/hooks/usePersistentWebview/usePersistentWebview.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,12 +280,21 @@ export function usePersistentWebview({

const handleDomReady = () => {
markPersistentWebviewDomReady(paneId);
const webContentsId = wv.getWebContentsId();
const previousId = getRegisteredWebContentsId(paneId);
// Register on first load, or re-register if webContentsId changed
if (previousId !== webContentsId) {
setRegisteredWebContentsId(paneId, webContentsId);
registerBrowserRef.current({ paneId, webContentsId });

if (wv.isConnected) {
try {
const webContentsId = wv.getWebContentsId();
const previousId = getRegisteredWebContentsId(paneId);
// Register on first load, or re-register if webContentsId changed
if (previousId !== webContentsId) {
setRegisteredWebContentsId(paneId, webContentsId);
registerBrowserRef.current({ paneId, webContentsId });
}
} catch {
// WebView was detached between the isConnected check and
// getWebContentsId call — skip registration but still
// attempt to drain the pending navigation below.
}
}

const pendingUrl = getPendingPersistentWebviewNavigation(paneId);
Expand Down
Loading