Skip to content

minor, fix double sub in webview giveFocus #3110

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
sawka merged 2 commits into from
Mar 24, 2026
Merged

minor, fix double sub in webview giveFocus #3110

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
697b959
minor, fix double sub in webview giveFocus
sawka Mar 24, 2026
8d5ef8f
dispose
sawka Mar 24, 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
15 changes: 12 additions & 3 deletions frontend/app/view/webview/webview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ export class WebViewModel implements ViewModel {
partitionOverride: PrimitiveAtom<string> | null;
userAgentType: Atom<string>;
env: WebViewEnv;
ctrlShiftUnsubFn: (() => void) | null = null;

constructor({ blockId, nodeModel, tabModel, waveEnv }: ViewModelInitType) {
this.nodeModel = nodeModel;
Expand Down Expand Up @@ -211,6 +212,11 @@ export class WebViewModel implements ViewModel {
});
}

dispose() {
this.ctrlShiftUnsubFn?.();
this.ctrlShiftUnsubFn = null;
}

get viewComponent(): ViewComponent {
return WebView;
}
Expand Down Expand Up @@ -508,18 +514,21 @@ export class WebViewModel implements ViewModel {
return true;
}
const ctrlShiftState = globalStore.get(getSimpleControlShiftAtom());
if (ctrlShiftState) {
if (ctrlShiftState && !this.ctrlShiftUnsubFn) {
// this is really weird, we don't get keyup events from webview
const unsubFn = globalStore.sub(getSimpleControlShiftAtom(), () => {
this.ctrlShiftUnsubFn = globalStore.sub(getSimpleControlShiftAtom(), () => {
const state = globalStore.get(getSimpleControlShiftAtom());
if (!state) {
unsubFn();
this.ctrlShiftUnsubFn?.();
this.ctrlShiftUnsubFn = null;
const isStillFocused = globalStore.get(this.nodeModel.isFocused);
if (isStillFocused) {
this.webviewRef.current?.focus();
}
}
});
}
if (ctrlShiftState) {
return false;
}
this.webviewRef.current?.focus();
Expand Down
Loading