Skip to content

Commit 9c9ae43

Browse files
authored
fix(web): auto-merge button fits its label and animates width changes (pingdotgg#19111)
1 parent 5e5abc9 commit 9c9ae43

2 files changed

Lines changed: 15 additions & 16 deletions

File tree

‎apps/web/src/components/AnimatedWidth.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ export function AnimatedWidth({
1616
useLayoutEffect(() => {
1717
const element = contentRef.current;
1818
if (!element) return;
19-
return observeResize(element, () => {
20-
const nextWidth = Math.ceil(element.getBoundingClientRect().width);
19+
return observeResize(element, (entries) => {
20+
const nextWidth = Math.ceil(entries.at(-1)?.contentRect.width ?? 0);
2121
if (nextWidth > 0) setWidth(nextWidth);
2222
});
2323
}, []);

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

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2050,21 +2050,20 @@ export function PullRequestDetailPanel({
20502050
) : (
20512051
<PullRequestGlyph.merged aria-hidden className="size-3.5" />
20522052
)}
2053-
<span className="inline-grid @max-[30rem]/pr-header:hidden">
2054-
<span aria-hidden className="invisible col-start-1 row-start-1">
2055-
{pendingAutoMergeLabel}
2056-
</span>
2057-
<span aria-hidden className="invisible col-start-1 row-start-1">
2058-
Confirm auto-merge?
2059-
</span>
2060-
<span className="col-start-1 row-start-1">
2061-
{pendingAction === "enable-auto-merge"
2062-
? "Enabling..."
2063-
: inlineConfirm.isArmed("enable-auto-merge")
2064-
? "Confirm auto-merge?"
2065-
: pendingAutoMergeLabel}
2053+
<AnimatedWidth className="@max-[30rem]/pr-header:hidden">
2054+
<span className="grid">
2055+
<span aria-hidden className="invisible col-start-1 row-start-1">
2056+
{pendingAutoMergeLabel}
2057+
</span>
2058+
<span className="col-start-1 row-start-1">
2059+
{pendingAction === "enable-auto-merge"
2060+
? "Enabling..."
2061+
: inlineConfirm.isArmed("enable-auto-merge")
2062+
? "Confirm auto-merge?"
2063+
: pendingAutoMergeLabel}
2064+
</span>
20662065
</span>
2067-
</span>
2066+
</AnimatedWidth>
20682067
</Button>
20692068
</span>
20702069
}

0 commit comments

Comments
 (0)