xmj/element-call
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #449 from Johennes/feature/no-empty-labels

Browse source 
Prevent empty device labels
This commit is contained in:
David Baker 2022-07-07 12:16:18 +01:00 • committed by GitHub
commit 4dcec504ca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/settings/SettingsModal.tsx
View file

@ -77,8 +77,12 @@ export const SettingsModal = (props: Props) => {
selectedKey={audioInput} selectedKey={audioInput}
onSelectionChange={setAudioInput} onSelectionChange={setAudioInput}
> >
{audioInputs.map(({ deviceId, label }) => ( {audioInputs.map(({ deviceId, label }, index) => (
<Item key={deviceId}>{label}</Item> <Item key={deviceId}>
{!!label && label.trim().length > 0
? label
: `Microphone ${index + 1}`}
</Item>
))} ))}
</SelectInput> </SelectInput>
{audioOutputs.length > 0 && ( {audioOutputs.length > 0 && (
@ -87,8 +91,12 @@ export const SettingsModal = (props: Props) => {
selectedKey={audioOutput} selectedKey={audioOutput}
onSelectionChange={setAudioOutput} onSelectionChange={setAudioOutput}
> >
{audioOutputs.map(({ deviceId, label }) => ( {audioOutputs.map(({ deviceId, label }, index) => (
<Item key={deviceId}>{label}</Item> <Item key={deviceId}>
{!!label && label.trim().length > 0
? label
: `Speaker ${index + 1}`}
</Item>
))} ))}
</SelectInput> </SelectInput>
)} )}
@ -118,8 +126,12 @@ export const SettingsModal = (props: Props) => {
selectedKey={videoInput} selectedKey={videoInput}
onSelectionChange={setVideoInput} onSelectionChange={setVideoInput}
> >
{videoInputs.map(({ deviceId, label }) => ( {videoInputs.map(({ deviceId, label }, index) => (
<Item key={deviceId}>{label}</Item> <Item key={deviceId}>
{!!label && label.trim().length > 0
? label
: `Camera ${index + 1}`}
</Item>
))} ))}
</SelectInput> </SelectInput>
</TabItem> </TabItem>