diff --git a/apps/web/src/components/AnimatedWidth.tsx b/apps/web/src/components/AnimatedWidth.tsx index d893f2b6aff68a1a774b6d335b7764568e776935..ef152402d6dc7c810db1940adda3ce636fadbe20 100644 --- a/apps/web/src/components/AnimatedWidth.tsx +++ b/apps/web/src/components/AnimatedWidth.tsx @@ -16,8 +16,8 @@ export function AnimatedWidth({ useLayoutEffect(() => { const element = contentRef.current; if (!element) return; - return observeResize(element, () => { - const nextWidth = Math.ceil(element.getBoundingClientRect().width); + return observeResize(element, (entries) => { + const nextWidth = Math.ceil(entries.at(-1)?.contentRect.width ?? 0); if (nextWidth > 0) setWidth(nextWidth); }); }, []); diff --git a/apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx b/apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx index 009205404d10ee7203835b05c394c56e58522c7c..92dd64d298ed395f45abb886c7dc230eb3dd2c7b 100644 --- a/apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx +++ b/apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx @@ -2050,21 +2050,20 @@ export function PullRequestDetailPanel({ ) : ( )} - - - {pendingAutoMergeLabel} + + + + {pendingAutoMergeLabel} + + + {pendingAction === "enable-auto-merge" + ? "Enabling..." + : inlineConfirm.isArmed("enable-auto-merge") + ? "Confirm auto-merge?" + : pendingAutoMergeLabel} + - - Confirm auto-merge? - - - {pendingAction === "enable-auto-merge" - ? "Enabling..." - : inlineConfirm.isArmed("enable-auto-merge") - ? "Confirm auto-merge?" - : pendingAutoMergeLabel} - - + }