refactor: unify voice user context menus into single VoiceUserContextMenu

Both the channel sidebar (VoiceChannel.tsx) and voice panel (VoiceUser.tsx)
now share one context menu with volume slider + conditional mod items,
eliminating duplicated portal/positioning/click-outside code from VoiceUser.
This commit is contained in:
Jannis Braun
2026-03-10 01:42:53 +01:00
parent f3b3c249ca
commit 3cef9cef32
3 changed files with 68 additions and 134 deletions
+10 -116
View File
@@ -1,12 +1,9 @@
import React, { useRef, useEffect, useLayoutEffect, useState, useCallback } from 'react';
import ReactDOM from 'react-dom';
import React, { useRef, useEffect, useState, useCallback } from 'react';
import { Avatar } from '../ui/Avatar';
import { useVoiceStore } from '../../stores/voiceStore';
import { VoiceModMenuItems } from './VoiceModContextMenu';
import { VoiceUserContextMenu } from './VoiceUserContextMenu';
import { useSpaceStore } from '../../stores/spaceStore';
import { hasPermissionBit, PermissionBits } from '../../utils/permissions';
import type { UserTile } from '../../hooks/useLiveKit';
import { getChannelOrigin } from '../../stores/spaceStore';
interface VoiceUserProps {
tile: UserTile;
@@ -19,7 +16,6 @@ export function VoiceUser({ tile, large }: VoiceUserProps) {
const { participant } = tile;
const isDeafened = useVoiceStore((s) => s.isDeafened);
const currentVoiceChannelId = useVoiceStore((s) => s.currentVoiceChannelId);
const participantVolumes = useVoiceStore((s) => s.participantVolumes);
const isSpeaking = useVoiceStore((s) => s.speakingParticipantIds.has(participant.identity));
const serverMutedUserIds = useVoiceStore((s) => s.serverMutedUserIds);
const serverDeafenedUserIds = useVoiceStore((s) => s.serverDeafenedUserIds);
@@ -27,7 +23,6 @@ export function VoiceUser({ tile, large }: VoiceUserProps) {
const [, forceUpdate] = useState(0);
const perUserVolume = participantVolumes.get(participant.userId) ?? 100;
const isLocal = participant.isLocal;
const avatarUserId = participant.homeUserId ?? participant.userId;
@@ -59,12 +54,10 @@ export function VoiceUser({ tile, large }: VoiceUserProps) {
}, [tile.lkVideoTrack]);
// Context Menu
const menuRef = useRef<HTMLDivElement>(null);
const [volumeMenu, setVolumeMenu] = useState<{
x: number;
y: number;
} | null>(null);
const setParticipantVolume = useVoiceStore((s) => s.setParticipantVolume);
const handleContextMenu = useCallback(
(e: React.MouseEvent) => {
@@ -75,33 +68,6 @@ export function VoiceUser({ tile, large }: VoiceUserProps) {
[isLocal],
);
// Click-outside dismissal — mousedown + contains check
useEffect(() => {
if (!volumeMenu) return;
const handler = (e: MouseEvent) => {
if (menuRef.current && !menuRef.current.contains(e.target as Node)) {
setVolumeMenu(null);
}
};
document.addEventListener('mousedown', handler);
return () => document.removeEventListener('mousedown', handler);
}, [volumeMenu]);
// Viewport-aware positioning — direct DOM mutation, no state churn
useLayoutEffect(() => {
const el = menuRef.current;
if (!volumeMenu || !el) return;
const rect = el.getBoundingClientRect();
let x = volumeMenu.x;
let y = volumeMenu.y;
if (rect.right > window.innerWidth) x = window.innerWidth - rect.width - 8;
if (rect.bottom > window.innerHeight) y = window.innerHeight - rect.height - 8;
if (x < 8) x = 8;
if (y < 8) y = 8;
el.style.left = `${x}px`;
el.style.top = `${y}px`;
}, [volumeMenu]);
return (
<div
className={`relative bg-surface-base rounded-xl overflow-hidden flex items-center justify-center group transition-all duration-200 ${
@@ -194,87 +160,15 @@ export function VoiceUser({ tile, large }: VoiceUserProps) {
</div>
</div>
{volumeMenu && !isLocal && ReactDOM.createPortal(
<div
ref={menuRef}
className="fixed z-[200] bg-surface-elevated rounded-md shadow-elevation-high min-w-[200px] animate-fade-in"
style={{ left: volumeMenu.x, top: volumeMenu.y }}
>
{/* Moderation options (renders nothing if no perms) */}
{currentVoiceChannelId && (
<VoiceModSection
targetUserId={participant.userId}
channelId={currentVoiceChannelId}
onAction={() => setVolumeMenu(null)}
/>
)}
{/* Volume slider */}
<div className="p-3">
<div className="text-xs text-txt-tertiary mb-2 font-medium uppercase tracking-wider">
User Volume
</div>
<div className="flex items-center gap-2">
<svg
width="16"
height="16"
viewBox="0 0 24 24"
fill="currentColor"
className="text-txt-tertiary flex-shrink-0"
>
<path d="M3 9v6h4l5 5V4L7 9H3z" />
</svg>
<input
type="range"
min="0"
max="200"
value={perUserVolume}
onChange={(e) =>
setParticipantVolume(
participant.userId,
parseInt(e.target.value),
)
}
className="flex-1 accent-accent-primary h-1"
/>
<span className="text-xs text-txt-secondary min-w-[32px] text-right">
{perUserVolume}%
</span>
</div>
</div>
</div>,
document.body,
{volumeMenu && currentVoiceChannelId && (
<VoiceUserContextMenu
targetUserId={participant.userId}
channelId={currentVoiceChannelId}
position={volumeMenu}
onClose={() => setVolumeMenu(null)}
isLocal={isLocal}
/>
)}
</div>
);
}
/** Renders moderation items + divider only when the user has mod perms. */
function VoiceModSection({ targetUserId, channelId, onAction }: {
targetUserId: string;
channelId: string;
onAction: () => void;
}) {
const spacePermissions = useSpaceStore((s) => s.spacePermissions);
const currentSpaceId = useSpaceStore((s) => s.currentSpaceId);
const myPerms = currentSpaceId ? spacePermissions.get(currentSpaceId) : undefined;
const hasMod =
hasPermissionBit(myPerms, PermissionBits.MUTE_MEMBERS) ||
hasPermissionBit(myPerms, PermissionBits.DEAFEN_MEMBERS) ||
hasPermissionBit(myPerms, PermissionBits.MOVE_MEMBERS);
if (!hasMod) return null;
return (
<>
<div className="py-1.5">
<VoiceModMenuItems
targetUserId={targetUserId}
channelId={channelId}
onAction={onAction}
/>
</div>
<div className="h-px bg-white/[0.06] mx-1.5" />
</>
);
}