every_holiday/VRCT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'ui' into for_webui

Browse Source
This commit is contained in:
Sakamoto Shiina
2024-11-19 17:10:27 +09:00
parent bec6578778 3d054e4d72
commit c05b5d18fa
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src-ui/app/config_page/setting_section/setting_box/_components/radio_button/RadioButton.jsx
View File

@@ -16,7 +16,7 @@ export const RadioButton = (props) => {
const labelClass = clsx(styles.radio_button_wrapper, { const labelClass = clsx(styles.radio_button_wrapper, {
[styles.is_selected]: props.checked_variable.data === option.id, [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 ( return (
@@ -29,7 +29,7 @@ export const RadioButton = (props) => {
value={option.id} value={option.id}
onChange={() => props.selectFunction(option.id)} onChange={() => props.selectFunction(option.id)}
checked={props.checked_variable.data === option.id} checked={props.checked_variable.data === option.id}
disabled={option.disabled === true} disabled={option.disabled === true || props.checked_variable.state === "pending"}
/> />
<p className={styles.radio_button_label}>{option.label}</p> <p className={styles.radio_button_label}>{option.label}</p>
</label> </label>

6
src-ui/app/main_page/sidebar_section/language_settings/translator_selector_open_button/TranslatorSelectorOpenButton.jsx
View File

@@ -19,8 +19,10 @@ export const TranslatorSelectorOpenButton = () => {
const translation_engines = updateLabelsById(currentTranslationEngines.data, new_labels); const translation_engines = updateLabelsById(currentTranslationEngines.data, new_labels);
const selected_engine_id = currentSelectedTranslationEngines.data[currentSelectedPresetTabNumber.data];
const getSelectedLabel = () => { const getSelectedLabel = () => {
const selected_engine_id = currentSelectedTranslationEngines.data[currentSelectedPresetTabNumber.data];
const selected_engine = translation_engines.find( const selected_engine = translation_engines.find(
d => d.id === selected_engine_id d => d.id === selected_engine_id
); );
@@ -45,7 +47,7 @@ export const TranslatorSelectorOpenButton = () => {
</div> </div>
{currentIsOpenedTranslatorSelector.data && {currentIsOpenedTranslatorSelector.data &&
<TranslatorSelector <TranslatorSelector
selected_id={currentSelectedTranslationEngines} selected_id={selected_engine_id}
translation_engines={translation_engines} translation_engines={translation_engines}
/> />
} }

10
src-ui/app/main_page/sidebar_section/language_settings/translator_selector_open_button/translator_selector/TranslatorSelector.jsx
View File

@@ -30,17 +30,19 @@ export const TranslatorSelector = ({selected_id, translation_engines}) => {
}; };
const TranslatorBox = (props) => { const TranslatorBox = (props) => {
const { currentSelectedPresetTabNumber, currentSelectedTranslationEngines, setSelectedTranslationEngines} = useLanguageSettings(); const { setSelectedTranslationEngines} = useLanguageSettings();
const { updateIsOpenedTranslatorSelector} = useStore_IsOpenedTranslatorSelector(); const { updateIsOpenedTranslatorSelector} = useStore_IsOpenedTranslatorSelector();
const box_class_name = clsx( const box_class_name = clsx(
styles.box, styles.box,
{ [styles["is_selected"]]: (currentSelectedTranslationEngines.data[currentSelectedPresetTabNumber.data] === props.id) ? true : false }, { [styles.is_selected]: props.is_selected },
{ [styles["is_available"]]: (props.is_available === true) ? true : false } { [styles.is_available]: props.is_available }
); );
const selectTranslator = () => { const selectTranslator = () => {
setSelectedTranslationEngines(props.id); if (props.is_selected === false) {
setSelectedTranslationEngines(props.id);
}
updateIsOpenedTranslatorSelector(false); updateIsOpenedTranslatorSelector(false);
}; };
return ( return (