Skip to content

Commit e84748d

Browse files
shivamhwpclaude
andcommitted
fix(web): discovery Details open in a popover instead of pushing the list down
The raw discovery error expanded inline in the device panel and filled the Settings row, shifting the layout below it. Both now show the short label with a Details popover that holds the error. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 6f0bae1 commit e84748d

3 files changed

Lines changed: 61 additions & 54 deletions

File tree

‎apps/web/src/components/device/DevicePanel.browser.test.tsx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import {
66
} from "@t3tools/contracts";
77
import type { ReactNode } from "react";
88
import { describe, expect, it, vi } from "vite-plus/test";
9+
import { page } from "vite-plus/test/browser";
910

1011
import type { RightPanelSurface } from "~/rightPanelStore";
1112

@@ -229,11 +230,11 @@ describe("DevicePanel discovery warning", () => {
229230
await using screen = await render(devicePanel(threadA), { container });
230231

231232
await screen.getByRole("button", { name: "Details for This Mac" }).click();
232-
await expect.element(screen.getByText("first cause")).toBeVisible();
233+
await expect.element(page.getByText("first cause")).toBeVisible();
233234

234235
currentState = withCause("second cause");
235236
await screen.rerender(devicePanel(threadA));
236-
await expect.element(screen.getByText("second cause")).toBeVisible();
237+
await expect.element(page.getByText("second cause")).toBeVisible();
237238

238239
await screen.getByRole("button", { name: "Dismiss device warning for This Mac" }).click();
239240
await screen.rerender(devicePanel(threadA));

‎apps/web/src/components/device/DevicePanel.tsx‎

Lines changed: 46 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ import {
1616
type RightPanelSurface,
1717
} from "~/rightPanelStore";
1818
import { Button } from "~/components/ui/button";
19-
import { Collapsible, CollapsiblePanel, CollapsibleTrigger } from "~/components/ui/collapsible";
2019
import { DiscoveryList } from "~/components/ui/discovery-list";
2120
import { Dialog } from "~/components/ui/dialog";
21+
import { Popover, PopoverPopup, PopoverTrigger } from "~/components/ui/popover";
2222
import { WizardPopup } from "~/components/ui/wizard";
2323
import { Spinner } from "~/components/ui/spinner";
2424
import { cn } from "~/lib/utils";
@@ -428,62 +428,59 @@ function DeviceDiscoveryWarning(props: {
428428
platform === "ios" ? "iOS" : "Android",
429429
);
430430
return (
431-
<Collapsible open={open} onOpenChange={setOpen}>
432-
<div
433-
role="status"
434-
className="flex flex-wrap items-center gap-x-2 gap-y-0.5 border-b px-3 py-1 text-xs text-muted-foreground"
435-
>
436-
<span className="flex min-w-0 flex-1 basis-56 items-start gap-2">
437-
<CircleAlert className="mt-px size-3.5 shrink-0 text-warning-foreground" />
438-
<span className="min-w-0">
439-
{platforms.length > 0
440-
? `${platforms.join(" and ")} ${platforms.length > 1 ? "lists" : "list"} on ${props.label} may be incomplete.`
441-
: `Device discovery on ${props.label} reported a warning.`}
442-
</span>
431+
<div
432+
role="status"
433+
className="flex flex-wrap items-center gap-x-2 gap-y-0.5 border-b px-3 py-1 text-xs text-muted-foreground"
434+
>
435+
<span className="flex min-w-0 flex-1 basis-56 items-start gap-2">
436+
<CircleAlert className="mt-px size-3.5 shrink-0 text-warning-foreground" />
437+
<span className="min-w-0">
438+
{platforms.length > 0
439+
? `${platforms.join(" and ")} ${platforms.length > 1 ? "lists" : "list"} on ${props.label} may be incomplete.`
440+
: `Device discovery on ${props.label} reported a warning.`}
443441
</span>
444-
<span className="ml-auto flex shrink-0 items-center gap-0.5">
445-
{platforms.length > 0 ? (
446-
<Button
447-
size="micro"
448-
variant="ghost"
449-
disabled={retrying}
450-
aria-label={`Retry device discovery on ${props.label}`}
451-
onClick={() => {
452-
setRetrying(true);
453-
void props.onRetry().finally(() => setRetrying(false));
454-
}}
455-
>
456-
{retrying ? "Retrying…" : "Retry"}
457-
</Button>
458-
) : null}
459-
<CollapsibleTrigger
460-
aria-label={`Details for ${props.label}`}
461-
render={<Button size="micro" variant="ghost" />}
462-
>
463-
Details
464-
</CollapsibleTrigger>
442+
</span>
443+
<span className="ml-auto flex shrink-0 items-center gap-0.5">
444+
{platforms.length > 0 ? (
465445
<Button
466-
size="icon-micro"
446+
size="micro"
467447
variant="ghost"
468-
aria-label={`Dismiss device warning for ${props.label}`}
448+
disabled={retrying}
449+
aria-label={`Retry device discovery on ${props.label}`}
469450
onClick={() => {
470-
setOpen(false);
471-
setDismissedCause(cause);
451+
setRetrying(true);
452+
void props.onRetry().finally(() => setRetrying(false));
472453
}}
473454
>
474-
<X />
455+
{retrying ? "Retrying…" : "Retry"}
475456
</Button>
476-
</span>
477-
</div>
478-
<CollapsiblePanel>
479-
<div
480-
className="max-h-32 overflow-y-auto whitespace-pre-wrap break-words border-b bg-warning-surface px-3 py-2 font-mono text-xs text-warning-foreground"
481-
tabIndex={0}
457+
) : null}
458+
<Popover open={open} onOpenChange={setOpen}>
459+
<PopoverTrigger
460+
aria-label={`Details for ${props.label}`}
461+
render={<Button size="micro" variant="ghost" />}
462+
>
463+
Details
464+
</PopoverTrigger>
465+
<PopoverPopup side="bottom" align="end" width="lg" padding="compact">
466+
<p className="whitespace-pre-wrap break-words font-mono text-xs text-muted-foreground">
467+
{props.detail}
468+
</p>
469+
</PopoverPopup>
470+
</Popover>
471+
<Button
472+
size="icon-micro"
473+
variant="ghost"
474+
aria-label={`Dismiss device warning for ${props.label}`}
475+
onClick={() => {
476+
setOpen(false);
477+
setDismissedCause(cause);
478+
}}
482479
>
483-
{props.detail}
484-
</div>
485-
</CollapsiblePanel>
486-
</Collapsible>
480+
<X />
481+
</Button>
482+
</span>
483+
</div>
487484
);
488485
}
489486

‎apps/web/src/components/settings/DeviceSourcesSettings.tsx‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,7 @@ function hostStatus(
120120
const incomplete = incompleteListings(status);
121121
if (incomplete.length === 0) return undefined;
122122
const list = incomplete.length > 1 ? "Device" : incomplete[0] === "ios" ? "iOS" : "Android";
123-
const label = `${list} list may be incomplete`;
124-
return { tone: "warning", label, detail: status.detail && `${label}: ${status.detail}` };
123+
return { tone: "warning", label: `${list} list may be incomplete`, detail: status.detail };
125124
}
126125
case "installing":
127126
case "starting":
@@ -775,10 +774,20 @@ function DeviceSourceRow(props: { row: SourceRow }) {
775774
>
776775
<span className="min-w-0 break-words">
777776
{several ? `${environment.label}: ` : ""}
778-
{!several && environment.status.detail
777+
{environment.status.tone === "error" && !several && environment.status.detail
779778
? environment.status.detail
780779
: environment.status.label}
781780
</span>
781+
{environment.status.tone === "warning" && environment.status.detail ? (
782+
<Popover>
783+
<PopoverTrigger render={<InlineButton />}>Details</PopoverTrigger>
784+
<PopoverPopup side="bottom" align="start" width="lg" padding="compact">
785+
<p className="whitespace-pre-wrap break-words font-mono text-xs text-muted-foreground">
786+
{environment.status.detail}
787+
</p>
788+
</PopoverPopup>
789+
</Popover>
790+
) : null}
782791
{environment.status.action ? (
783792
<InlineButton onClick={environment.status.action.run}>
784793
{environment.status.action.label}

0 commit comments

Comments
 (0)