Skip to content

Prevent disabled device menus from opening #2624

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shomix merged 2 commits into from
Aug 5, 2026
+125 −88
Merged

Prevent disabled device menus from opening #2624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae6d2b4
Prevent disabled device menus from opening
Aug 4, 2026
75fb7bd
feedback
Aug 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
193 changes: 106 additions & 87 deletions templates/clips/desktop/src/components/MediaDeviceRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,114 +104,133 @@ export function MediaDeviceRow({
const { open, setOpen, rowRef } = useRowMenu();

const disabled = !on;
const canOpenMenu = !disabled || (kind === "mic" && !!onSystemAudioToggle);
const canOpenMenu = on || (kind === "mic" && !!onSystemAudioToggle);
const defaultLabel = kind === "camera" ? "Default camera" : "Default mic";
const accessLabel =
kind === "camera" ? "Allow camera access" : "Allow microphone access";
const refreshLabel =
kind === "camera" ? "Refresh cameras" : "Refresh microphones";

return (
<div className={`row ${on ? "row-on" : "row-off"}`} ref={rowRef}>
<span className="row-icon">
<Icon />
</span>
<button
type="button"
className="row-button"
onClick={() => {
if (canOpenMenu) setOpen((v) => !v);
}}
disabled={!canOpenMenu}
title={label}
>
<span className="row-label">{label}</span>
{kind === "mic" && on ? (
<MicWave deviceId={selectedId} active={on && meterActive} />
) : (
<span className="row-flex" aria-hidden />
)}
<span className="row-chev" aria-hidden>
<ChevronDown />
<div className="media-device-row" ref={rowRef}>
<div className={`row ${on ? "row-on" : "row-off"}`}>
<span className="row-icon">
<Icon />
</span>
</button>
<Toggle
on={on}
onChange={(v) => {
if (!v) setOpen(false);
onToggle(v);
}}
label={kind === "camera" ? "Camera" : "Microphone"}
/>
{open ? (
<div className="row-menu" role="menu">
<button
type="button"
className="row-button"
onClick={() => setOpen((v) => !v)}
disabled={disabled}
title={label}
>
<span className="row-label">{label}</span>
{kind === "mic" && on ? (
<MicWave deviceId={selectedId} active={on && meterActive} />
) : (
<span className="row-flex" aria-hidden />
)}
</button>
{canOpenMenu ? (
<button
type="button"
className={`row-menu-item ${!selectedId ? "selected" : ""}`}
role="menuitemradio"
aria-checked={!selectedId}
onClick={() => {
onSelect("", "");
setOpen(false);
}}
className="row-menu-trigger"
onClick={() => setOpen((value) => !value)}
aria-label={on ? `Choose ${kind}` : "System audio settings"}
aria-expanded={open}
aria-haspopup="menu"
>
<span className="row-menu-check" aria-hidden>
{!selectedId ? <CheckIcon /> : null}
</span>
<span className="row-menu-label">{defaultLabel}</span>
<ChevronDown />
</button>
{devices.length === 0 ? (
<button
type="button"
className="row-menu-item row-menu-action"
role="menuitem"
onClick={() => {
onRefresh();
setOpen(false);
}}
>
<span className="row-menu-check" aria-hidden />
<span className="row-menu-label">{accessLabel}</span>
</button>
) : (
) : (
<span className="row-chev" aria-hidden>
<ChevronDown />
</span>
)}
<Toggle
on={on}
onChange={(v) => {
if (!v) setOpen(false);
onToggle(v);
}}
label={kind === "camera" ? "Camera" : "Microphone"}
/>
</div>
{open && canOpenMenu ? (
<div className="row-menu" role="menu">
{on ? (
<>
{devices.map((d) => {
const isSelected = !!selectedId && d.deviceId === selectedId;
return (
<button
key={d.deviceId}
type="button"
className={`row-menu-item ${isSelected ? "selected" : ""}`}
role="menuitemradio"
aria-checked={isSelected}
onClick={() => {
onSelect(d.deviceId, d.label);
setOpen(false);
}}
>
<span className="row-menu-check" aria-hidden>
{isSelected ? <CheckIcon /> : null}
</span>
<span className="row-menu-label">
{d.label || (kind === "camera" ? "Camera" : "Microphone")}
</span>
</button>
);
})}
<button
type="button"
className="row-menu-item row-menu-action"
role="menuitem"
className={`row-menu-item ${!selectedId ? "selected" : ""}`}
role="menuitemradio"
aria-checked={!selectedId}
onClick={() => {
onRefresh();
onSelect("", "");
setOpen(false);
}}
>
<span className="row-menu-check" aria-hidden />
<span className="row-menu-label">{refreshLabel}</span>
<span className="row-menu-check" aria-hidden>
{!selectedId ? <CheckIcon /> : null}
</span>
<span className="row-menu-label">{defaultLabel}</span>
</button>
{devices.length === 0 ? (
<button
type="button"
className="row-menu-item row-menu-action"
role="menuitem"
onClick={() => {
onRefresh();
setOpen(false);
}}
>
<span className="row-menu-check" aria-hidden />
<span className="row-menu-label">{accessLabel}</span>
</button>
) : (
<>
{devices.map((d) => {
const isSelected =
!!selectedId && d.deviceId === selectedId;
return (
<button
key={d.deviceId}
type="button"
className={`row-menu-item ${isSelected ? "selected" : ""}`}
role="menuitemradio"
aria-checked={isSelected}
onClick={() => {
onSelect(d.deviceId, d.label);
setOpen(false);
}}
>
<span className="row-menu-check" aria-hidden>
{isSelected ? <CheckIcon /> : null}
</span>
<span className="row-menu-label">
{d.label ||
(kind === "camera" ? "Camera" : "Microphone")}
</span>
</button>
);
})}
<button
type="button"
className="row-menu-item row-menu-action"
role="menuitem"
onClick={() => {
onRefresh();
setOpen(false);
}}
>
<span className="row-menu-check" aria-hidden />
<span className="row-menu-label">{refreshLabel}</span>
</button>
</>
)}
</>
)}
) : null}
{kind === "mic" && onSystemAudioToggle ? (
<div className="row-menu-toggle">
<span className="row-menu-toggle-label">Record System audio</span>
Expand Down
20 changes: 19 additions & 1 deletion templates/clips/desktop/src/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,6 +605,10 @@ body[data-clips-route="recording-pill"] #root {
}

/* Popover menu rendered below a device row. */
.media-device-row {
position: relative;
}

.row-menu {
position: absolute;
top: calc(100% + 4px);
Expand Down Expand Up @@ -645,7 +649,21 @@ body[data-clips-route="recording-pill"] #root {
background: var(--surface-hover);
}

/* System-audio toggle sits below the device list, separated by a divider. */
.row-menu-trigger {
display: inline-flex;
align-items: center;
padding: 0;
border: none;
background: transparent;
color: var(--fg-muted);
cursor: pointer;
}

.row-menu-trigger:focus-visible {
box-shadow: 0 0 0 2px var(--brand-ring);
border-radius: 4px;
}

.row-menu-toggle {
display: flex;
align-items: center;
Expand Down
Loading