|
1 | 1 | 'use client'; |
2 | 2 |
|
| 3 | +import { useLayoutEffect, useState } from 'react'; |
3 | 4 | import { cva } from 'class-variance-authority'; |
4 | 5 | import { LocalAudioTrack, LocalVideoTrack } from 'livekit-client'; |
5 | 6 | import { useMaybeRoomContext, useMediaDeviceSelect } from '@livekit/components-react'; |
@@ -53,27 +54,46 @@ export function DeviceSelect({ |
53 | 54 | }: DeviceSelectProps) { |
54 | 55 | const size = props.size || 'default'; |
55 | 56 |
|
| 57 | + const [open, setOpen] = useState(false); |
| 58 | + const [requestPermissionsState, setRequestPermissionsState] = useState(requestPermissions); |
| 59 | + |
56 | 60 | const room = useMaybeRoomContext(); |
57 | 61 | const { devices, activeDeviceId, setActiveMediaDevice } = useMediaDeviceSelect({ |
58 | 62 | kind, |
59 | 63 | room, |
60 | 64 | track, |
61 | | - requestPermissions, |
| 65 | + requestPermissions: requestPermissionsState, |
62 | 66 | onError: onMediaDeviceError, |
63 | 67 | }); |
| 68 | + |
| 69 | + // When the select opens, ensure that media devices are re-requested in case when they were last |
| 70 | + // requested, permissions were not granted |
| 71 | + useLayoutEffect(() => { |
| 72 | + if (open) { |
| 73 | + setRequestPermissionsState(true); |
| 74 | + } |
| 75 | + }, [open]); |
| 76 | + |
64 | 77 | return ( |
65 | | - <Select value={activeDeviceId} onValueChange={setActiveMediaDevice}> |
| 78 | + <Select |
| 79 | + value={activeDeviceId} |
| 80 | + onValueChange={setActiveMediaDevice} |
| 81 | + open={open} |
| 82 | + onOpenChange={setOpen} |
| 83 | + > |
66 | 84 | <SelectTrigger className={cn(selectVariants({ size }), props.className)}> |
67 | 85 | {size !== 'sm' && ( |
68 | 86 | <SelectValue className="font-mono text-sm" placeholder={`Select a ${kind}`} /> |
69 | 87 | )} |
70 | 88 | </SelectTrigger> |
71 | 89 | <SelectContent> |
72 | | - {devices.map((device) => ( |
73 | | - <SelectItem key={device.deviceId} value={device.deviceId} className="font-mono text-xs"> |
74 | | - {device.label} |
75 | | - </SelectItem> |
76 | | - ))} |
| 90 | + {devices |
| 91 | + .filter((d) => d.deviceId !== '') |
| 92 | + .map((device) => ( |
| 93 | + <SelectItem key={device.deviceId} value={device.deviceId} className="font-mono text-xs"> |
| 94 | + {device.label} |
| 95 | + </SelectItem> |
| 96 | + ))} |
77 | 97 | </SelectContent> |
78 | 98 | </Select> |
79 | 99 | ); |
|
0 commit comments