Skip to content
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

Jump to bottom

Bug #1211 When click Open Devtools turns already-opened devtools white #1215

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Bug #1211 When click Open Devtools turns already-opened devtools white #1215

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 8 additions & 3 deletions desktop-app/src/renderer/components/Previewer/Device/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,10 +205,15 @@ const Device = ({ isPrimary, device, setIndividualDevice }: Props) => {
return;
}
const webview = ref.current as Electron.WebviewTag;

if (webview == null) {
const isOpenedCurrentDevTool =
devtoolsOpenForWebviewId === webview.getWebContentsId();
if (webview == null || isOpenedCurrentDevTool) {
return;
}
if (!isOpenedCurrentDevTool && devtoolsOpenForWebviewId !== -1) {
await window.electron.ipcRenderer.invoke('close-devtools');
dispatch(setDevtoolsClose());
}
await window.electron.ipcRenderer.invoke<
OpenDevtoolsArgs,
OpenDevtoolsResult
Expand All @@ -217,7 +222,7 @@ const Device = ({ isPrimary, device, setIndividualDevice }: Props) => {
dockPosition,
});
dispatch(setDevtoolsOpen(webview.getWebContentsId()));
}, [dispatch, dockPosition]);
}, [devtoolsOpenForWebviewId, dispatch, dockPosition]);

const inspectElement = useCallback(
async (deviceX: number, deviceY: number) => {
Expand Down
Loading