From 113881ad52a3e6bca131dc125600e4e77c98d564 Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Fri, 1 Nov 2024 16:25:47 +0900 Subject: [PATCH] [bugfix] Config Page: Device Tab. Add disabled behavior when the device is 'NoDevice'. --- .../setting_section/setting_box/device/Device.jsx | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src-ui/app/config_page/setting_section/setting_box/device/Device.jsx b/src-ui/app/config_page/setting_section/setting_box/device/Device.jsx index 877dc019..7417c562 100644 --- a/src-ui/app/config_page/setting_section/setting_box/device/Device.jsx +++ b/src-ui/app/config_page/setting_section/setting_box/device/Device.jsx @@ -38,23 +38,21 @@ const Mic_Container = () => { const { currentEnableAutoMicSelect, toggleEnableAutoMicSelect } = useEnableAutoMicSelect(); const { currentSelectedMicHost, setSelectedMicHost } = useSelectedMicHost(); const { currentMicHostList } = useMicHostList(); + const { currentSelectedMicDevice, setSelectedMicDevice } = useSelectedMicDevice(); + const { currentMicDeviceList } = useMicDeviceList(); const { onMouseLeaveFunction } = useOnMouseLeaveDropdownMenu(); const { currentEnableAutomaticMicThreshold, toggleEnableAutomaticMicThreshold } = useMicThreshold(); - const selectFunction_host = (selected_data) => { setSelectedMicHost(selected_data.selected_id); }; - const is_disabled_selector = currentEnableAutoMicSelect.data === true || currentEnableAutoMicSelect.data === "pending"; - - const { currentSelectedMicDevice, setSelectedMicDevice } = useSelectedMicDevice(); - const { currentMicDeviceList } = useMicDeviceList(); - const selectFunction_device = (selected_data) => { setSelectedMicDevice(selected_data.selected_id); }; + const is_disabled_selector = currentEnableAutoMicSelect.data === true || currentEnableAutoMicSelect.data === "pending" || currentSelectedMicHost.data === "NoHost" || currentSelectedMicDevice.data === "NoDevice"; + const getLabels = () => { if (currentEnableAutomaticMicThreshold.data === true) { return { @@ -143,7 +141,7 @@ const Speaker_Container = () => { setSelectedSpeakerDevice(selected_data.selected_id); }; - const is_disabled_selector = currentEnableAutoSpeakerSelect.data === true || currentEnableAutoSpeakerSelect.data === "pending"; + const is_disabled_selector = currentEnableAutoSpeakerSelect.data === true || currentEnableAutoSpeakerSelect.data === "pending" || currentSelectedSpeakerDevice.data === "NoDevice"; const getLabels = () => { if (currentEnableAutomaticSpeakerThreshold.data === true) {