The best way to control Claude Code, Codex and more from any computer or phone
Mirrored from https://github.com/Camo67/t3code.git
Synced Nov 22, 08:15 UTC
fix(web): PR merge buttons stay in place while the stack loads (#26077)
Co-authored-by: maria-rcks <maria@kuuro.net>
Gerardo Torres committed
Nov 1, 2026 at 17:59 UTC
5b5bd169e0c1a9581c3003fb0181c6452b62ab72
4 files changed
+95
-45
apps/web/src/components/pullRequest/PullRequestDetailActions.tsx
+27
-18
@@ -191,6 +191,7 @@ export function PullRequestResolveConflictsButton({
191
export function PullRequestPrimaryAction({
192
pullRequestKey,
193
primaryAction,
194
+ mergeBlockedReason,
195
autoMergeArmed,
196
armedAutoMergeLabel,
197
pendingAutoMergeLabel,
@@ -203,6 +204,7 @@ export function PullRequestPrimaryAction({
204
}: {
205
pullRequestKey: string;
206
primaryAction: ReturnType<typeof resolvePullRequestPrimaryControl> | null;
207
+ mergeBlockedReason: string | null;
208
autoMergeArmed: boolean;
209
armedAutoMergeLabel: string;
210
pendingAutoMergeLabel: string;
@@ -263,10 +265,14 @@ export function PullRequestPrimaryAction({
265
size="xs"
266
variant="default"
267
disabled={actionPending}
266
- {...inlineConfirm.props(
267
- "enable-auto-merge",
268
- () => void perform("enable-auto-merge", selectedMergeMethod),
269
- )}
268
+ aria-disabled={mergeBlockedReason !== null || undefined}
269
+ aria-description={mergeBlockedReason ?? undefined}
270
+ {...(mergeBlockedReason === null
271
+ ? inlineConfirm.props(
272
+ "enable-auto-merge",
273
+ () => void perform("enable-auto-merge", selectedMergeMethod),
274
+ )
275
+ : {})}
276
aria-label={
277
pendingAction === "enable-auto-merge"
278
? "Enabling..."
@@ -299,11 +305,12 @@ export function PullRequestPrimaryAction({
305
}
306
/>
307
<TooltipPopup side="top">
302
- {pendingAction === "enable-auto-merge"
303
- ? "Enabling..."
304
- : inlineConfirm.isArmed("enable-auto-merge")
305
- ? "Confirm auto-merge?"
306
- : pendingAutoMergeLabel}
308
+ {mergeBlockedReason ??
309
+ (pendingAction === "enable-auto-merge"
310
+ ? "Enabling..."
311
+ : inlineConfirm.isArmed("enable-auto-merge")
312
+ ? "Confirm auto-merge?"
313
+ : pendingAutoMergeLabel)}
314
</TooltipPopup>
315
</Tooltip>
316
) : primaryAction === "auto-merge-armed" ? (
@@ -329,10 +336,11 @@ export function PullRequestPrimaryAction({
336
size="xs"
337
variant="default"
338
disabled={actionPending}
332
- {...inlineConfirm.props(
333
- "merge",
334
- () => void perform("merge", selectedMergeMethod),
335
- )}
339
+ aria-disabled={mergeBlockedReason !== null || undefined}
340
+ aria-description={mergeBlockedReason ?? undefined}
341
+ {...(mergeBlockedReason === null
342
+ ? inlineConfirm.props("merge", () => void perform("merge", selectedMergeMethod))
343
+ : {})}
344
aria-label={
345
pendingAction === "merge"
346
? "Merging..."
@@ -365,11 +373,12 @@ export function PullRequestPrimaryAction({
373
}
374
/>
375
<TooltipPopup side="top">
368
- {pendingAction === "merge"
369
- ? "Merging..."
370
- : inlineConfirm.isArmed("merge")
371
- ? "Confirm merge?"
372
- : selectedMergeMethodLabel}
376
+ {mergeBlockedReason ??
377
+ (pendingAction === "merge"
378
+ ? "Merging..."
379
+ : inlineConfirm.isArmed("merge")
380
+ ? "Confirm merge?"
381
+ : selectedMergeMethodLabel)}
382
</TooltipPopup>
383
</Tooltip>
384
) : (primaryAction === "merged" || primaryAction === "closed") &&
apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx
+21
-22
@@ -553,6 +553,12 @@ export function PullRequestDetailPanel({
553
stackPending: !nativeStackQuery.isFresh,
554
stackError: nativeStackQuery.error,
555
});
556
+ const stackOwnsMerge = supportsStackActions && nativeStack !== null;
557
+ const mergeBlockedReason = canMergeSinglePullRequest
558
+ ? null
559
+ : nativeStackQuery.error
560
+ ? "Couldn't check stack membership"
561
+ : "Checking stack membership…";
562
const activityPending = activityQuery.isPending && activity === null;
563
const activityError = activity === null ? activityQuery.error : null;
564
const refreshDetail = () => {
@@ -1143,9 +1149,9 @@ export function PullRequestDetailPanel({
1149
checksState,
1150
autoMergeEnabled: detail.autoMergeEnabled,
1151
hasMergeMethod: allowedMergeMethods.length > 0,
1146
- canMerge: canMergeSinglePullRequest && can("merge"),
1152
+ canMerge: !stackOwnsMerge && can("merge"),
1153
canMarkReady: can("ready"),
1148
- canEnableAutoMerge: canMergeSinglePullRequest && can("enable-auto-merge"),
1154
+ canEnableAutoMerge: !stackOwnsMerge && can("enable-auto-merge"),
1155
})
1156
: null;
1157
const showsDraftToggle =
@@ -1291,6 +1297,15 @@ export function PullRequestDetailPanel({
1297
<div className="mr-4 flex h-7 shrink-0 select-none items-center justify-end gap-1">
1298
{detail ? (
1299
<TooltipProvider delay={150} closeDelay={150} timeout={400}>
1300
+ {context === "page" ? (
1301
+ <PullRequestThreadLinks
1302
+ display="count"
1303
+ environmentId={environmentId}
1304
+ reference={reference}
1305
+ url={detail.url}
1306
+ threadRef={null}
1307
+ />
1308
+ ) : null}
1309
{!nativeStack && supportsStackActions && nativeStackQuery.error ? (
1310
<Button variant="ghost" size="xs" onClick={nativeStackQuery.refresh}>
1311
Retry stack lookup
@@ -1307,33 +1322,17 @@ export function PullRequestDetailPanel({
1322
environmentId={environmentId}
1323
onSelect={onSelectPullRequest}
1324
mergeMethod={selectedMergeMethod}
1310
- canMerge={
1311
- nativeStackQuery.isFresh &&
1312
- supportsStackActions &&
1313
- can("merge") &&
1314
- allowedMergeMethods.length > 0
1315
- }
1316
- canRebase={
1317
- nativeStackQuery.isFresh &&
1318
- supportsStackActions &&
1319
- detail.viewerPermissions.stackRebase === true
1320
- }
1325
+ stale={!nativeStackQuery.isFresh}
1326
+ canMerge={supportsStackActions && can("merge") && allowedMergeMethods.length > 0}
1327
+ canRebase={supportsStackActions && detail.viewerPermissions.stackRebase === true}
1328
onActed={() => {
1329
refreshDetail();
1330
onActed?.();
1331
}}
1332
/>
1333
) : null}
1327
- {context === "page" ? (
1328
- <PullRequestThreadLinks
1329
- display="count"
1330
- environmentId={environmentId}
1331
- reference={reference}
1332
- url={detail.url}
1333
- threadRef={null}
1334
- />
1335
- ) : null}
1334
<PullRequestPrimaryAction
1335
+ mergeBlockedReason={mergeBlockedReason}
1336
pullRequestKey={pullRequestKey}
1337
primaryAction={primaryAction}
1338
autoMergeArmed={autoMergeArmed}
apps/web/src/components/pullRequest/PullRequestStackMenu.tsx
+11
-5
@@ -35,6 +35,7 @@ export function PullRequestStackMenu({
35
stack,
36
reference,
37
environmentId,
38
+ stale,
39
canMerge,
40
canRebase,
41
mergeMethod,
@@ -50,6 +51,7 @@ export function PullRequestStackMenu({
51
stack: PullRequestStack;
52
reference: PullRequestRef;
53
environmentId: EnvironmentId;
54
+ stale: boolean;
55
canMerge: boolean;
56
canRebase: boolean;
57
mergeMethod: PullRequestMergeMethod;
@@ -73,12 +75,13 @@ export function PullRequestStackMenu({
75
const hasUnknownHead = expectedStackHeads.length !== unmerged.length;
76
const mergeDisabled =
77
pending ||
78
+ stale ||
79
selectedLayer?.state !== "open" ||
80
mergeLayers.some((layer) => !layer.headSha) ||
81
mergeHasClosed ||
82
mergeLayers.length === 0 ||
83
mergeLayers.some((layer) => layer.isDraft);
81
- const rebaseDisabled = pending || hasUnknownHead || hasClosed || unmerged.length === 0;
84
+ const rebaseDisabled = pending || stale || hasUnknownHead || hasClosed || unmerged.length === 0;
85
const run = async () => {
86
if (
87
pending ||
@@ -213,8 +216,10 @@ export function PullRequestStackMenu({
216
<Button
217
variant="default"
218
size="xs"
216
- disabled={mergeDisabled}
217
- onClick={() => setConfirmation("merge")}
219
+ disabled={mergeDisabled && !stale}
220
+ aria-disabled={mergeDisabled || undefined}
221
+ aria-description={stale ? (notice ?? undefined) : undefined}
222
+ onClick={mergeDisabled ? undefined : () => setConfirmation("merge")}
223
>
224
<PullRequestGlyph.merged aria-hidden className="size-3.5" />
225
Merge stack
@@ -223,8 +228,9 @@ export function PullRequestStackMenu({
228
}
229
/>
230
<TooltipPopup>
226
- Merge stack through #{reference.number} into {stack.base} ({mergeLayers.length}{" "}
227
- {mergeLayers.length === 1 ? terminology.singular : terminology.plural})
231
+ {stale
232
+ ? notice
233
+ : `Merge stack through #${reference.number} into ${stack.base} (${mergeLayers.length} ${mergeLayers.length === 1 ? terminology.singular : terminology.plural})`}
234
</TooltipPopup>
235
</Tooltip>
236
) : null}
apps/web/src/components/pullRequest/useInlineActionConfirm.browser.test.tsx
+36
@@ -76,3 +76,39 @@ it("stops swallowing Escape once the armed button unmounts", async () => {
76
await screen.rerender(<ToolbarWithMergeButton shown />);
77
await expect.element(screen.getByRole("button")).toHaveTextContent("Merge");
78
});
79
+
80
+it.each(["merge", "enable-auto-merge"] as const)(
81
+ "keeps a blocked %s action reachable without arming or performing it",
82
+ async (primaryAction) => {
83
+ const perform = vi.fn(async () => true);
84
+ const { PullRequestPrimaryAction } = await import("./PullRequestDetailActions");
85
+ const control = (mergeBlockedReason: string | null) => (
86
+ <PullRequestPrimaryAction
87
+ pullRequestKey="owner/repo/7"
88
+ primaryAction={primaryAction}
89
+ mergeBlockedReason={mergeBlockedReason}
90
+ autoMergeArmed={false}
91
+ armedAutoMergeLabel="Auto-merge enabled"
92
+ pendingAutoMergeLabel="Auto-merge (squash)"
93
+ selectedMergeMethod="squash"
94
+ selectedMergeMethodLabel="Squash and merge"
95
+ statePresentation={null}
96
+ pendingAction={null}
97
+ perform={perform}
98
+ resolveConflicts={null}
99
+ />
100
+ );
101
+ await using screen = await render(control("Checking stack membership…"));
102
+ const button = screen.getByRole("button");
103
+ await userEvent.tab();
104
+ await expect.element(button).toHaveFocus();
105
+ await expect.element(button).toHaveAccessibleDescription("Checking stack membership…");
106
+ await userEvent.keyboard("{Enter}{Enter} ");
107
+ expect(perform).not.toHaveBeenCalled();
108
+ await screen.rerender(control(null));
109
+ await userEvent.click(button);
110
+ expect(perform).not.toHaveBeenCalled();
111
+ await userEvent.click(button);
112
+ expect(perform).toHaveBeenCalledExactlyOnceWith(primaryAction, "squash");
113
+ },
114
+);