Open source video conferencing app powered by LiveKit. Built with Django and React.
✨(front) option to hide menu on SelectToggleDevice
Nathan Vassec380ff5e1d50
diff --git a/src/frontend/src/features/rooms/livekit/components/controls/SelectToggleDevice.tsx b/src/frontend/src/features/rooms/livekit/components/controls/SelectToggleDevice.tsxindex 9d940f66..f336c711 100644--- a/src/frontend/src/features/rooms/livekit/components/controls/SelectToggleDevice.tsx+++ b/src/frontend/src/features/rooms/livekit/components/controls/SelectToggleDevice.tsx@@ -67,11 +67,13 @@ type SelectToggleDeviceProps<T extends ToggleSource> =UseTrackToggleProps<T> & {onActiveDeviceChange: (deviceId: string) => voidsource: SelectToggleSource+ hideMenu?: booleanvariant?: 'dark' | 'light'}export const SelectToggleDevice = <T extends ToggleSource>({onActiveDeviceChange,+ hideMenu,variant = 'light',...props}: SelectToggleDeviceProps<T>) => {@@ -94,30 +96,42 @@ export const SelectToggleDevice = <T extends ToggleSource>({gap: '1px',})}>- <ToggleDevice {...trackProps} config={config} />- <Menu variant={variant}>- <Button- tooltip={selectLabel}- aria-label={selectLabel}- groupPosition="right"- square- variant={trackProps.enabled ? 'primaryDark' : 'error2'}- >- <RiArrowDownSLine />- </Button>- <MenuList- items={devices.map((d) => ({- value: d.deviceId,- label: d.label,- }))}- selectedItem={activeDeviceId}- onAction={(value) => {- setActiveMediaDevice(value as string)- onActiveDeviceChange(value as string)- }}- variant={variant}- />- </Menu>+ <ToggleDevice+ {...trackProps}+ config={config}+ toggleButtonProps={{+ ...(hideMenu+ ? {+ groupPosition: undefined,+ }+ : {}),+ }}+ />+ {!hideMenu && (+ <Menu variant={variant}>+ <Button+ tooltip={selectLabel}+ aria-label={selectLabel}+ groupPosition="right"+ square+ variant={trackProps.enabled ? 'primaryDark' : 'error2'}+ >+ <RiArrowDownSLine />+ </Button>+ <MenuList+ items={devices.map((d) => ({+ value: d.deviceId,+ label: d.label,+ }))}+ selectedItem={activeDeviceId}+ onAction={(value) => {+ setActiveMediaDevice(value as string)+ onActiveDeviceChange(value as string)+ }}+ variant={variant}+ />+ </Menu>+ )}</div>)}diff --git a/src/frontend/src/features/rooms/livekit/components/controls/ToggleDevice.tsx b/src/frontend/src/features/rooms/livekit/components/controls/ToggleDevice.tsxindex 9ea69cfe..9930a2ef 100644--- a/src/frontend/src/features/rooms/livekit/components/controls/ToggleDevice.tsx+++ b/src/frontend/src/features/rooms/livekit/components/controls/ToggleDevice.tsx@@ -7,17 +7,20 @@ import { SelectToggleDeviceConfig } from './SelectToggleDevice'import useLongPress from '@/features/shortcuts/useLongPress'import { ActiveSpeaker } from '@/features/rooms/components/ActiveSpeaker'import { useIsSpeaking, useLocalParticipant } from '@livekit/components-react'+import { ToggleButtonProps } from '@/primitives/ToggleButton'export type ToggleDeviceProps = {enabled: booleantoggle: () => voidconfig: SelectToggleDeviceConfig+ toggleButtonProps?: Partial<ToggleButtonProps>}export const ToggleDevice = ({config,enabled,toggle,+ toggleButtonProps,}: ToggleDeviceProps) => {const { t } = useTranslation('rooms', { keyPrefix: 'join' })@@ -64,6 +67,7 @@ export const ToggleDevice = ({aria-label={toggleLabel}tooltip={toggleLabel}groupPosition="left"+ {...toggleButtonProps}><Icon /></ToggleButton>diff --git a/src/frontend/src/features/rooms/livekit/prefabs/ControlBar/MobileControlBar.tsx b/src/frontend/src/features/rooms/livekit/prefabs/ControlBar/MobileControlBar.tsxindex a4648f12..636a23b9 100644--- a/src/frontend/src/features/rooms/livekit/prefabs/ControlBar/MobileControlBar.tsx+++ b/src/frontend/src/features/rooms/livekit/prefabs/ControlBar/MobileControlBar.tsx@@ -55,7 +55,7 @@ export function MobileControlBar({className={css({display: 'flex',justifyContent: 'space-between',- width: '422px',+ width: '330px',})}><LeaveButton />@@ -68,6 +68,7 @@ export function MobileControlBar({onActiveDeviceChange={(deviceId) =>saveAudioInputDeviceId(deviceId ?? '')}+ hideMenu={true}/><SelectToggleDevicesource={Track.Source.Camera}@@ -78,6 +79,7 @@ export function MobileControlBar({onActiveDeviceChange={(deviceId) =>saveVideoInputDeviceId(deviceId ?? '')}+ hideMenu={true}/><HandToggle /><Button