Skip to content

Commit b07696a

Browse files
juliusmarmingeRakshithBhat03claude
authored
fix(web): dismiss removed usage popups without a corner jump (#21879)
Co-authored-by: Rakshith Bhat <[email protected]> Co-authored-by: Claude Opus 5.5 <[email protected]>
1 parent 46aa37b commit b07696a

2 files changed

Lines changed: 55 additions & 11 deletions

File tree

‎apps/web/src/components/usage/UsageLimitsPooled.browser.test.tsx‎

Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,28 @@ async function click(label: string) {
100100
await act(() => userEvent.click(button!));
101101
}
102102

103+
/**
104+
* Runs `change`, which takes the open popup's trigger out of the page, then watches the popup
105+
* leave. A detached trigger has no rect, so a popup that keeps positioning against it slides
106+
* to the viewport origin on its way out.
107+
*/
108+
async function expectDismissedInPlace(change: () => Promise<void> | void) {
109+
const positioner = () => document.querySelector('[data-slot="popover-positioner"]');
110+
const place = (node: Element) => {
111+
const rect = node.getBoundingClientRect();
112+
return [rect.left, rect.top];
113+
};
114+
const before = place(positioner()!);
115+
await change();
116+
const seen: number[][] = [];
117+
for (let frame = 0; frame < 60 && positioner(); frame += 1) {
118+
seen.push(place(positioner()!));
119+
await new Promise(requestAnimationFrame);
120+
}
121+
expect(positioner()).toBeNull();
122+
expect(seen).toEqual(seen.map(() => before));
123+
}
124+
103125
it.each([
104126
{
105127
label: "success",
@@ -221,8 +243,9 @@ it("moves the one limit popover between windows on hover", async () => {
221243
await act(() => userEvent.hover(session, { position: { x: 4, y: 4 } }));
222244
await expect.poll(popups).toEqual([expect.stringContaining("Left60%")]);
223245

224-
await act(() => root.render(<UsageLimitsPooled presentations={new Map()} now={0} />));
225-
await expect.poll(popups).toEqual([]);
246+
await expectDismissedInPlace(() =>
247+
act(() => root.render(<UsageLimitsPooled presentations={new Map()} now={0} />)),
248+
);
226249
await act(() => userEvent.hover(container, { position: { x: 4, y: 4 } }));
227250

228251
await act(() => root.render(<UsageLimitsPooled presentations={twoWindows} now={0} />));
@@ -272,13 +295,15 @@ it("closes an open source-account popover when reset availability replaces its t
272295
await click("Alpha: 60%");
273296
await expect.poll(() => popup()?.textContent).toContain("Use reset");
274297

275-
await act(() => root.render(<UsageLimitsPooled presentations={source()} now={0} />));
276-
await expect.poll(popup).toBeNull();
298+
await expectDismissedInPlace(() =>
299+
act(() => root.render(<UsageLimitsPooled presentations={source()} now={0} />)),
300+
);
277301
await click("Alpha: 60%");
278302
await expect.poll(() => popup()?.textContent).toContain("Left60%");
279303

280-
await act(() => root.render(<UsageLimitsPooled presentations={source("credit-2")} now={0} />));
281-
await expect.poll(popup).toBeNull();
304+
await expectDismissedInPlace(() =>
305+
act(() => root.render(<UsageLimitsPooled presentations={source("credit-2")} now={0} />)),
306+
);
282307
await click("Alpha: 60%");
283308
await expect.poll(() => popup()?.textContent).toContain("Use reset");
284309
await click("Use reset");

‎apps/web/src/components/usage/UsageLimitsPooled.tsx‎

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,18 @@ import {
1414
paceRemainingPercent,
1515
remainingPercent,
1616
} from "@t3tools/shared/usageLimits";
17+
import type { Popover as PopoverPrimitive } from "@base-ui/react/popover";
1718
import { AlertTriangleIcon, ExternalLinkIcon, TicketIcon } from "lucide-react";
18-
import { createContext, Fragment, type ReactNode, use, useEffect, useState } from "react";
19+
import {
20+
createContext,
21+
Fragment,
22+
type ReactNode,
23+
type RefObject,
24+
use,
25+
useLayoutEffect,
26+
useRef,
27+
useState,
28+
} from "react";
1929

2030
import { ensureLocalApi } from "../../localApi";
2131
import { usePrimarySettings } from "../../hooks/useSettings";
@@ -216,11 +226,13 @@ const SegmentPopoverContext = createContext<ReturnType<
216226

217227
function ActiveSegmentPopover({
218228
handle,
229+
actions,
219230
payload,
220231
pools,
221232
now,
222233
}: {
223234
readonly handle: ReturnType<typeof PopoverCreateHandle<SegmentPayload>>;
235+
readonly actions: RefObject<PopoverPrimitive.Root.Actions | null>;
224236
readonly payload: SegmentPayload;
225237
readonly pools: readonly LimitPool[];
226238
readonly now: number;
@@ -236,9 +248,14 @@ function ActiveSegmentPopover({
236248
),
237249
),
238250
);
239-
useEffect(() => {
240-
if (!available) handle.close();
241-
}, [available, handle]);
251+
// The trigger is gone, so the popup has nothing to anchor to: an exit transition would
252+
// slide it to the viewport origin. Unmount it outright, which also clears Base UI's
253+
// active-trigger bookkeeping so the segment can open again when it comes back.
254+
useLayoutEffect(() => {
255+
if (available) return;
256+
handle.close();
257+
actions.current?.unmount();
258+
}, [available, handle, actions]);
242259
return (
243260
<PopoverPopup side="top" sideOffset={6}>
244261
<SegmentPopover
@@ -582,6 +599,7 @@ export function UsageLimitsPooled({
582599
readonly cursorPrompt?: ReactNode;
583600
}) {
584601
const [segmentPopover] = useState(() => PopoverCreateHandle<SegmentPayload>());
602+
const segmentPopoverActions = useRef<PopoverPrimitive.Root.Actions | null>(null);
585603
const pools = collectLimitPools(collectLimitAccounts(presentations), now);
586604
const notices = collectLimitNotices(presentations);
587605
const externalLinks = collectExternalUsageLinks(presentations);
@@ -605,11 +623,12 @@ export function UsageLimitsPooled({
605623
</Fragment>
606624
))}
607625
</SegmentPopoverContext>
608-
<Popover handle={segmentPopover}>
626+
<Popover handle={segmentPopover} actionsRef={segmentPopoverActions}>
609627
{({ payload }) =>
610628
payload ? (
611629
<ActiveSegmentPopover
612630
handle={segmentPopover}
631+
actions={segmentPopoverActions}
613632
payload={payload}
614633
pools={pools}
615634
now={now}

0 commit comments

Comments
 (0)