Skip to content

fix(desktop): use unique identifier for window focus restoration #5898

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

Closed
mohamedmastouri-hue wants to merge 1 commit into from
Closed

fix(desktop): use unique identifier for window focus restoration #5898

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
25 changes: 25 additions & 0 deletions apps/desktop/src/preview/Manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3008,6 +3008,7 @@ const makeNativeOperations = Effect.fn("PreviewManager.makeOperations")(function
() => webContents.getFocusedWebContents(),
);
let keyDownAttempted = false;
const focusRestoreId = `__t3_focus_${Math.random().toString(36).slice(2)}`;
const releaseInput = Effect.gen(function* () {
if (keyDownAttempted) {
yield* sendCleanup("Input.dispatchKeyEvent", keySequence.keyUp).pipe(Effect.ignore);
Expand All @@ -3024,6 +3025,17 @@ const makeNativeOperations = Effect.fn("PreviewManager.makeOperations")(function
},
() => previouslyFocused.focus(),
).pipe(Effect.ignore);
yield* attemptPromise(
{
operation: "automationPress.restoreActiveElement",
tabId,
webContentsId: previouslyFocused.id,
},
() =>
previouslyFocused.executeJavaScript(
`if (window['${focusRestoreId}'] && typeof window['${focusRestoreId}'].focus === 'function') { window['${focusRestoreId}'].focus(); } delete window['${focusRestoreId}'];`,
),
).pipe(Effect.ignore);
}
});

Expand All @@ -3032,6 +3044,19 @@ const makeNativeOperations = Effect.fn("PreviewManager.makeOperations")(function
// changing which thread is mounted in the UI. Restore the previous renderer
// after dispatch so automation never leaves the app's input focus behind.
yield* Effect.gen(function* () {
if (previouslyFocused && previouslyFocused.id !== wc.id && !previouslyFocused.isDestroyed()) {
yield* attemptPromise(
{
operation: "automationPress.saveActiveElement",
tabId,
webContentsId: previouslyFocused.id,
},
() =>
previouslyFocused.executeJavaScript(
`if (document.activeElement && document.activeElement !== document.body) { window['${focusRestoreId}'] = document.activeElement; }`,
),
).pipe(Effect.ignore);
}
yield* attempt(
{ operation: "automationPress.focusWebContents", tabId, webContentsId: wc.id },
() => wc.focus(),
Expand Down
Loading