From ba408af32a50db5533001cd836f0cda2c1f4f200 Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Tue, 19 Nov 2024 13:10:26 +0900 Subject: [PATCH 1/2] [bugfix] Config Page: RadioButton components. to disabled while it's pending. --- .../setting_box/_components/radio_button/RadioButton.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src-ui/app/config_page/setting_section/setting_box/_components/radio_button/RadioButton.jsx b/src-ui/app/config_page/setting_section/setting_box/_components/radio_button/RadioButton.jsx index f3efdae4..c0278a07 100644 --- a/src-ui/app/config_page/setting_section/setting_box/_components/radio_button/RadioButton.jsx +++ b/src-ui/app/config_page/setting_section/setting_box/_components/radio_button/RadioButton.jsx @@ -16,7 +16,7 @@ export const RadioButton = (props) => { const labelClass = clsx(styles.radio_button_wrapper, { [styles.is_selected]: props.checked_variable.data === option.id, - [styles.disabled]: option.disabled === true, + [styles.disabled]: option.disabled === true || props.checked_variable.state === "pending", }); return ( @@ -29,7 +29,7 @@ export const RadioButton = (props) => { value={option.id} onChange={() => props.selectFunction(option.id)} checked={props.checked_variable.data === option.id} - disabled={option.disabled === true} + disabled={option.disabled === true || props.checked_variable.state === "pending"} />

{option.label}

From 3d054e4d728ad67a42fa64aed27b6551f7f1cc9c Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Tue, 19 Nov 2024 16:57:56 +0900 Subject: [PATCH 2/2] [Update/Refactor] Main Page: When the translation engine is already selected, to not send the data and just close translation engine selector. --- .../TranslatorSelectorOpenButton.jsx | 6 ++++-- .../translator_selector/TranslatorSelector.jsx | 10 ++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src-ui/app/main_page/sidebar_section/language_settings/translator_selector_open_button/TranslatorSelectorOpenButton.jsx b/src-ui/app/main_page/sidebar_section/language_settings/translator_selector_open_button/TranslatorSelectorOpenButton.jsx index 13708b1c..3c830f13 100644 --- a/src-ui/app/main_page/sidebar_section/language_settings/translator_selector_open_button/TranslatorSelectorOpenButton.jsx +++ b/src-ui/app/main_page/sidebar_section/language_settings/translator_selector_open_button/TranslatorSelectorOpenButton.jsx @@ -19,8 +19,10 @@ export const TranslatorSelectorOpenButton = () => { const translation_engines = updateLabelsById(currentTranslationEngines.data, new_labels); + const selected_engine_id = currentSelectedTranslationEngines.data[currentSelectedPresetTabNumber.data]; + const getSelectedLabel = () => { - const selected_engine_id = currentSelectedTranslationEngines.data[currentSelectedPresetTabNumber.data]; + const selected_engine = translation_engines.find( d => d.id === selected_engine_id ); @@ -45,7 +47,7 @@ export const TranslatorSelectorOpenButton = () => { {currentIsOpenedTranslatorSelector.data && } diff --git a/src-ui/app/main_page/sidebar_section/language_settings/translator_selector_open_button/translator_selector/TranslatorSelector.jsx b/src-ui/app/main_page/sidebar_section/language_settings/translator_selector_open_button/translator_selector/TranslatorSelector.jsx index 77f945f6..fe39877e 100644 --- a/src-ui/app/main_page/sidebar_section/language_settings/translator_selector_open_button/translator_selector/TranslatorSelector.jsx +++ b/src-ui/app/main_page/sidebar_section/language_settings/translator_selector_open_button/translator_selector/TranslatorSelector.jsx @@ -30,17 +30,19 @@ export const TranslatorSelector = ({selected_id, translation_engines}) => { }; const TranslatorBox = (props) => { - const { currentSelectedPresetTabNumber, currentSelectedTranslationEngines, setSelectedTranslationEngines} = useLanguageSettings(); + const { setSelectedTranslationEngines} = useLanguageSettings(); const { updateIsOpenedTranslatorSelector} = useStore_IsOpenedTranslatorSelector(); const box_class_name = clsx( styles.box, - { [styles["is_selected"]]: (currentSelectedTranslationEngines.data[currentSelectedPresetTabNumber.data] === props.id) ? true : false }, - { [styles["is_available"]]: (props.is_available === true) ? true : false } + { [styles.is_selected]: props.is_selected }, + { [styles.is_available]: props.is_available } ); const selectTranslator = () => { - setSelectedTranslationEngines(props.id); + if (props.is_selected === false) { + setSelectedTranslationEngines(props.id); + } updateIsOpenedTranslatorSelector(false); }; return (