Skip to content

Commit 15dacc4

Browse files
steve-cooksclaude
andcommitted
fix(desktop): keep sign-in Cancel clickable and stop a stale launch failure from ending a new flow
Render the pending bar under body so Clerk's inert #root cannot disable it, let clicks through its full-width wrapper, and only dispose the pending OAuth flow on a launch failure when it still owns it. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 50b741e commit 15dacc4

3 files changed

Lines changed: 38 additions & 10 deletions

File tree

‎apps/web/src/components/clerk/ClerkOAuthPendingBar.tsx‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { useSyncExternalStore } from "react";
2+
import { createPortal } from "react-dom";
23

34
import { Button } from "../ui/button";
45

@@ -13,11 +14,11 @@ function readClerkOAuthPending(): boolean {
1314
export function ClerkOAuthPendingBar() {
1415
const pending = useSyncExternalStore(subscribeToClerkOAuthPending, readClerkOAuthPending);
1516
if (!pending) return null;
16-
return (
17-
<div className="fixed inset-x-0 bottom-6 z-10001 flex justify-center px-4">
17+
return createPortal(
18+
<div className="pointer-events-none fixed inset-x-0 bottom-6 z-10001 flex justify-center px-4">
1819
<div
1920
role="status"
20-
className="flex items-center gap-3 rounded-lg border bg-popover py-2 pr-2 pl-4 text-sm text-popover-foreground shadow-xl"
21+
className="pointer-events-auto flex items-center gap-3 rounded-lg border bg-popover py-2 pr-2 pl-4 text-sm text-popover-foreground shadow-xl"
2122
>
2223
Finish signing in in your browser.
2324
<Button
@@ -28,6 +29,7 @@ export function ClerkOAuthPendingBar() {
2829
Cancel
2930
</Button>
3031
</div>
31-
</div>
32+
</div>,
33+
document.body,
3234
);
3335
}

‎patches/@[email protected]‎

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/dist/cjs/index.js b/dist/cjs/index.js
2-
index 97a5a25d58584c9bf04997fcec67e29923a0cf76..f830912f5b2900f2f96018b723a86c27e105954e 100644
2+
index 97a5a25d58584c9bf04997fcec67e29923a0cf76..89a09e487f213c90057779b1670345eb3203e87e 100644
33
--- a/dist/cjs/index.js
44
+++ b/dist/cjs/index.js
55
@@ -95,7 +95,7 @@ function setupOAuthTransportIpcHandlers(options) {
@@ -11,6 +11,19 @@ index 97a5a25d58584c9bf04997fcec67e29923a0cf76..f830912f5b2900f2f96018b723a86c27
1111
assertExternalOAuthUrl(url);
1212
const window = electron.BrowserWindow.fromWebContents(event.sender);
1313
const callbackPromise = new Promise((resolve, reject) => {
14+
@@ -109,10 +109,11 @@ function setupOAuthTransportIpcHandlers(options) {
15+
window
16+
};
17+
});
18+
+ const flow = pendingOAuthFlow;
19+
try {
20+
await electron.shell.openExternal(url);
21+
} catch (err) {
22+
- disposePendingOAuthFlow(err instanceof Error ? err : new Error(String(err)));
23+
+ if (pendingOAuthFlow === flow) disposePendingOAuthFlow(err instanceof Error ? err : new Error(String(err)));
24+
}
25+
return callbackPromise;
26+
});
1427
diff --git a/dist/cjs/preload/index.js b/dist/cjs/preload/index.js
1528
index 310c21a720e7b5da06ee301f6b51597f081a8179..3518d29e786258065bc5ab92b664ea06dc99b659 100644
1629
--- a/dist/cjs/preload/index.js
@@ -25,7 +38,7 @@ index 310c21a720e7b5da06ee301f6b51597f081a8179..3518d29e786258065bc5ab92b664ea06
2538
};
2639
if (process.contextIsolated) electron.contextBridge.exposeInMainWorld("__clerk_internal_electron", bridge);
2740
diff --git a/dist/esm/index.js b/dist/esm/index.js
28-
index 29284ea0e6325afc72024ec8c2e69ab3cb78ad00..e17ac66a597afce4273aa8bdd308a794504a8340 100644
41+
index 29284ea0e6325afc72024ec8c2e69ab3cb78ad00..091dc64206c0331b0e3663ee08da1d586b16a08d 100644
2942
--- a/dist/esm/index.js
3043
+++ b/dist/esm/index.js
3144
@@ -94,7 +94,7 @@ function setupOAuthTransportIpcHandlers(options) {
@@ -37,6 +50,19 @@ index 29284ea0e6325afc72024ec8c2e69ab3cb78ad00..e17ac66a597afce4273aa8bdd308a794
3750
assertExternalOAuthUrl(url);
3851
const window = BrowserWindow.fromWebContents(event.sender);
3952
const callbackPromise = new Promise((resolve, reject) => {
53+
@@ -108,10 +108,11 @@ function setupOAuthTransportIpcHandlers(options) {
54+
window
55+
};
56+
});
57+
+ const flow = pendingOAuthFlow;
58+
try {
59+
await shell.openExternal(url);
60+
} catch (err) {
61+
- disposePendingOAuthFlow(err instanceof Error ? err : new Error(String(err)));
62+
+ if (pendingOAuthFlow === flow) disposePendingOAuthFlow(err instanceof Error ? err : new Error(String(err)));
63+
}
64+
return callbackPromise;
65+
});
4066
diff --git a/dist/esm/preload/index.js b/dist/esm/preload/index.js
4167
index 4a131a7d148fb402fe5e04336ccf7398723501b4..110dab808a7c6a1a7664dc5d9ab254af2fa4c4bc 100644
4268
--- a/dist/esm/preload/index.js

‎pnpm-lock.yaml‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)