Skip to content

Commit 6f8f7cc

Browse files
committed
fix(web): explain blocked merge actions to keyboard users
1 parent 8aeb640 commit 6f8f7cc

3 files changed

Lines changed: 55 additions & 12 deletions

File tree

‎apps/web/src/components/pullRequest/PullRequestDetailActions.tsx‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -264,11 +264,15 @@ export function PullRequestPrimaryAction({
264264
<Button
265265
size="xs"
266266
variant="default"
267-
disabled={actionPending || mergeBlockedReason !== null}
268-
{...inlineConfirm.props(
269-
"enable-auto-merge",
270-
() => void perform("enable-auto-merge", selectedMergeMethod),
271-
)}
267+
disabled={actionPending}
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+
: {})}
272276
aria-label={
273277
pendingAction === "enable-auto-merge"
274278
? "Enabling..."
@@ -331,11 +335,12 @@ export function PullRequestPrimaryAction({
331335
<Button
332336
size="xs"
333337
variant="default"
334-
disabled={actionPending || mergeBlockedReason !== null}
335-
{...inlineConfirm.props(
336-
"merge",
337-
() => void perform("merge", selectedMergeMethod),
338-
)}
338+
disabled={actionPending}
339+
aria-disabled={mergeBlockedReason !== null || undefined}
340+
aria-description={mergeBlockedReason ?? undefined}
341+
{...(mergeBlockedReason === null
342+
? inlineConfirm.props("merge", () => void perform("merge", selectedMergeMethod))
343+
: {})}
339344
aria-label={
340345
pendingAction === "merge"
341346
? "Merging..."

‎apps/web/src/components/pullRequest/PullRequestStackMenu.tsx‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,10 @@ export function PullRequestStackMenu({
210210
<Button
211211
variant="default"
212212
size="xs"
213-
disabled={mergeDisabled}
214-
onClick={() => setConfirmation("merge")}
213+
disabled={mergeDisabled && !stale}
214+
aria-disabled={mergeDisabled || undefined}
215+
aria-description={stale ? (notice ?? undefined) : undefined}
216+
onClick={mergeDisabled ? undefined : () => setConfirmation("merge")}
215217
>
216218
<PullRequestGlyph.merged aria-hidden className="size-3.5" />
217219
Merge stack

‎apps/web/src/components/pullRequest/useInlineActionConfirm.browser.test.tsx‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,3 +76,39 @@ it("stops swallowing Escape once the armed button unmounts", async () => {
7676
await screen.rerender(<ToolbarWithMergeButton shown />);
7777
await expect.element(screen.getByRole("button")).toHaveTextContent("Merge");
7878
});
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+
);

0 commit comments

Comments
 (0)