Skip to content

Commit a1df375

Browse files
klopez4212Terp
andcommitted
Keep outbound Huddle cancellation available globally
Co-authored-by: Terp <5856f6900e8e0a4e0ea1f4f8d2ee33e4753d2119bc122f94ecafc660b46c0511@buzz.block.builderlab.xyz> Signed-off-by: klopez4212 <[email protected]>
1 parent 7831ac1 commit a1df375

2 files changed

Lines changed: 47 additions & 0 deletions

File tree

‎src/bundled/huddles/HuddleCapsule.tsx‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,26 @@ function HuddleCapsuleContent({
160160
</fieldset>
161161
);
162162
}
163+
if (call.phase === "connecting")
164+
return (
165+
<fieldset
166+
id="huddle-capsule"
167+
tabIndex={-1}
168+
className={`${styles.capsule} glass-primary`}
169+
ref={focus.requestRef}
170+
aria-label="Connecting to Huddle"
171+
>
172+
<span className={styles.callerName}>Connecting to Huddle…</span>
173+
<Button
174+
size="sm"
175+
variant="destructive"
176+
ref={focus.cancel}
177+
onClick={() => void huddles.leave()}
178+
>
179+
Cancel
180+
</Button>
181+
</fieldset>
182+
);
163183
if (call.phase !== "connected") return null;
164184
return (
165185
<div className={styles.capsuleWrap}>

‎src/bundled/huddles/HuddleLauncher.test.tsx‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import { createRelaySession } from "../../features/relay/session";
77
import type { RelayData } from "../../features/relay/service";
88
import { createHuddles } from "../../features/huddle/service";
99
import { MenuRoot, MenuPopup } from "../../shared/design-system/ui/Menu";
10+
import { HuddleCapsule } from "./HuddleCapsule";
1011
import { HuddleLauncher, SoloHuddleMenu } from "./HuddleLauncher";
1112

1213
afterEach(cleanup);
@@ -86,6 +87,32 @@ it("moves idle Solo huddles to the menu while preserving Team's header action",
8687
};
8788
vi.spyOn(huddles, "snapshot").mockReturnValue(connecting);
8889
const leave = vi.spyOn(huddles, "leave").mockResolvedValue();
90+
const presentation = { visible: false, failed: false };
91+
view.rerender(
92+
<>
93+
<HuddleCapsule
94+
relay={relay}
95+
huddles={huddles}
96+
companion={{
97+
snapshot: () => presentation,
98+
subscribe: () => () => {},
99+
open: async () => {},
100+
dispose: async () => {},
101+
dismissError: () => {},
102+
}}
103+
/>
104+
<MenuRoot open>
105+
<MenuPopup>
106+
<SoloHuddleMenu {...props} session={session} channelId="chat" />
107+
</MenuPopup>
108+
</MenuRoot>
109+
</>,
110+
);
111+
// Sidebar starts must remain cancellable without any channel header.
112+
expect(screen.queryByRole("menuitem")).toBeNull();
113+
await userEvent.click(screen.getByRole("button", { name: "Cancel" }));
114+
expect(leave).toHaveBeenCalledOnce();
115+
leave.mockClear();
89116
view.rerender(<HuddleLauncher {...props} />);
90117
await userEvent.click(
91118
screen.getByRole("button", { name: "Cancel Huddle connection" }),

0 commit comments

Comments
 (0)