Skip to content

Commit 7856908

Browse files
authored
fix(web): keep checkout stable while pr actions load (pingdotgg#16625)
Co-authored-by: maria-rcks <[email protected]>
1 parent ecfb734 commit 7856908

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1648,10 +1648,10 @@ export function PullRequestDetailPanel({
16481648
actions={
16491649
handoffSummary ? (
16501650
<TooltipProvider delay={150} closeDelay={150} timeout={400}>
1651-
{checkoutControl}
16521651
{handoffSummary.state === "open" && handoffSummary.mergeability === "conflicting"
16531652
? resolveConflictsControl
16541653
: null}
1654+
{checkoutControl}
16551655
</TooltipProvider>
16561656
) : undefined
16571657
}
@@ -1864,7 +1864,6 @@ export function PullRequestDetailPanel({
18641864
threadRef={null}
18651865
/>
18661866
) : null}
1867-
{checkoutControl}
18681867
{/* Said where the Merge button is, because it is the answer to why nobody has
18691868
pressed it: the merge is already asked for, and the host is holding it. */}
18701869
{autoMergeArmed && primaryAction !== "auto-merge-armed" ? (
@@ -1997,6 +1996,9 @@ export function PullRequestDetailPanel({
19971996
</span>
19981997
</Badge>
19991998
) : null}
1999+
{/* Keep checkout beside the menu so host actions arriving on its left cannot
2000+
move a different action under the reader's pointer. */}
2001+
{checkoutControl}
20002002
<Menu>
20012003
<Tooltip>
20022004
<TooltipTrigger

0 commit comments

Comments
 (0)