From 57e22dc7b6677beb281ccd26134e502ffca619ec Mon Sep 17 00:00:00 2001
From: Huang Xin <chrox.huang@gmail.com>
Date: Thu, 5 Jun 2025 14:19:24 +0800
Subject: [PATCH] layout: use system select widget for language selection,
 closes #1339 (#1342)

---
 .../components/annotator/TranslatorPopup.tsx  |  3 ++
 .../reader/components/settings/LangPanel.tsx  | 50 +++++++++----------
 apps/readest-app/src/components/Select.tsx    | 12 ++++-
 apps/readest-app/src/services/constants.ts    |  2 +-
 4 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/apps/readest-app/src/app/reader/components/annotator/TranslatorPopup.tsx b/apps/readest-app/src/app/reader/components/annotator/TranslatorPopup.tsx
index 3cc6444a..8069188e 100644
--- a/apps/readest-app/src/app/reader/components/annotator/TranslatorPopup.tsx
+++ b/apps/readest-app/src/app/reader/components/annotator/TranslatorPopup.tsx
@@ -142,6 +142,7 @@ const TranslatorPopup: React.FC<TranslatorPopupProps> = ({
           <div className='mb-2 flex items-center justify-between'>
             <h1 className='text-sm font-normal'>{_('Original Text')}</h1>
             <Select
+              className='bg-gray-600 text-white/75'
               value={sourceLang}
               onChange={handleSourceLangChange}
               options={[
@@ -168,6 +169,7 @@ const TranslatorPopup: React.FC<TranslatorPopupProps> = ({
           <div className='mb-2 flex items-center justify-between'>
             <h2 className='text-sm font-normal'>{_('Translated Text')}</h2>
             <Select
+              className='bg-gray-600 text-white/75'
               value={targetLang}
               onChange={handleTargetLangChange}
               options={Object.entries(TRANSLATOR_LANGS)
@@ -201,6 +203,7 @@ const TranslatorPopup: React.FC<TranslatorPopupProps> = ({
           )}
           <div className='ml-auto'>
             <Select
+              className='bg-gray-600 text-white/75'
               value={provider}
               onChange={handleProviderChange}
               options={providers.map(({ name: value, label }) => ({ value, label }))}
diff --git a/apps/readest-app/src/app/reader/components/settings/LangPanel.tsx b/apps/readest-app/src/app/reader/components/settings/LangPanel.tsx
index 1899f1ec..8bef1bc0 100644
--- a/apps/readest-app/src/app/reader/components/settings/LangPanel.tsx
+++ b/apps/readest-app/src/app/reader/components/settings/LangPanel.tsx
@@ -7,7 +7,7 @@ import { useTranslation } from '@/hooks/useTranslation';
 import { saveViewSettings } from '../../utils/viewSettingsHelper';
 import { getTranslators } from '@/services/translators';
 import { TRANSLATED_LANGS } from '@/services/constants';
-import DropDown from './DropDown';
+import Select from '@/components/Select';
 
 const LangPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
   const _ = useTranslation();
@@ -22,7 +22,7 @@ const LangPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
   const getCurrentUILangOption = () => {
     const uiLanguage = viewSettings.uiLanguage;
     return {
-      option: uiLanguage,
+      value: uiLanguage,
       label:
         uiLanguage === ''
           ? _('Auto')
@@ -32,13 +32,14 @@ const LangPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
 
   const getLangOptions = () => {
     const langs = TRANSLATED_LANGS as Record<string, string>;
-    const options = Object.entries(langs).map(([option, label]) => ({ option, label }));
+    const options = Object.entries(langs).map(([value, label]) => ({ value, label }));
     options.sort((a, b) => a.label.localeCompare(b.label));
-    options.unshift({ option: '', label: _('System Language') });
+    options.unshift({ value: '', label: _('System Language') });
     return options;
   };
 
-  const handleSelectUILang = (option: string) => {
+  const handleSelectUILang = (event: React.ChangeEvent<HTMLSelectElement>) => {
+    const option = event.target.value;
     saveViewSettings(envConfig, bookKey, 'uiLanguage', option, false, false);
     i18n.changeLanguage(option ? option : navigator.language);
   };
@@ -46,18 +47,19 @@ const LangPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
   const getTranslationProviderOptions = () => {
     const translators = getTranslators();
     const availableProviders = translators.map((t) => {
-      return { option: t.name, label: t.label };
+      return { value: t.name, label: t.label };
     });
     return availableProviders;
   };
 
   const getCurrentTranslationProviderOption = () => {
-    const option = translationProvider;
+    const value = translationProvider;
     const availableProviders = getTranslationProviderOptions();
-    return availableProviders.find((p) => p.option === option) || availableProviders[0]!;
+    return availableProviders.find((p) => p.value === value) || availableProviders[0]!;
   };
 
-  const handleSelectTranslationProvider = (option: string) => {
+  const handleSelectTranslationProvider = (event: React.ChangeEvent<HTMLSelectElement>) => {
+    const option = event.target.value;
     setTranslationProvider(option);
     saveViewSettings(envConfig, bookKey, 'translationProvider', option, false, false);
     viewSettings.translationProvider = option;
@@ -65,12 +67,13 @@ const LangPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
   };
 
   const getCurrentTargetLangOption = () => {
-    const option = translateTargetLang;
+    const value = translateTargetLang;
     const availableOptions = getLangOptions();
-    return availableOptions.find((o) => o.option === option) || availableOptions[0]!;
+    return availableOptions.find((o) => o.value === value) || availableOptions[0]!;
   };
 
-  const handleSelectTargetLang = (option: string) => {
+  const handleSelectTargetLang = (event: React.ChangeEvent<HTMLSelectElement>) => {
+    const option = event.target.value;
     setTranslateTargetLang(option);
     saveViewSettings(envConfig, bookKey, 'translateTargetLang', option, false, false);
     viewSettings.translateTargetLang = option;
@@ -93,12 +96,10 @@ const LangPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
           <div className='divide-base-200 divide-y'>
             <div className='config-item'>
               <span className=''>{_('Interface Language')}</span>
-              <DropDown
+              <Select
+                value={getCurrentUILangOption().value}
+                onChange={handleSelectUILang}
                 options={getLangOptions()}
-                selected={getCurrentUILangOption()}
-                onSelect={handleSelectUILang}
-                className='dropdown-bottom'
-                listClassName='!max-h-60'
               />
             </div>
           </div>
@@ -121,24 +122,21 @@ const LangPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
 
             <div className='config-item'>
               <span className=''>{_('Translation Service')}</span>
-              <DropDown
-                selected={getCurrentTranslationProviderOption()}
+              <Select
+                value={getCurrentTranslationProviderOption().value}
+                onChange={handleSelectTranslationProvider}
                 options={getTranslationProviderOptions()}
-                onSelect={handleSelectTranslationProvider}
                 disabled={!translationEnabled}
-                className='dropdown-top'
               />
             </div>
 
             <div className='config-item'>
               <span className=''>{_('Translate To')}</span>
-              <DropDown
+              <Select
+                value={getCurrentTargetLangOption().value}
+                onChange={handleSelectTargetLang}
                 options={getLangOptions()}
-                selected={getCurrentTargetLangOption()}
-                onSelect={handleSelectTargetLang}
                 disabled={!translationEnabled}
-                className='dropdown-top'
-                listClassName='!max-h-60'
               />
             </div>
           </div>
diff --git a/apps/readest-app/src/components/Select.tsx b/apps/readest-app/src/components/Select.tsx
index 76583669..2f266864 100644
--- a/apps/readest-app/src/components/Select.tsx
+++ b/apps/readest-app/src/components/Select.tsx
@@ -10,19 +10,27 @@ type SelectProps = {
   value: string;
   onChange: (e: React.ChangeEvent<HTMLSelectElement>) => void;
   options: Option[];
+  disabled?: boolean;
   className?: string;
 };
 
-export default function Select({ value, onChange, options, className }: SelectProps) {
+export default function Select({
+  value,
+  onChange,
+  options,
+  className,
+  disabled = false,
+}: SelectProps) {
   return (
     <select
       value={value}
       onChange={onChange}
       className={clsx(
         'select h-8 min-h-8 rounded-md border-none text-end text-sm',
-        'bg-gray-600 text-white/75 focus:outline-none focus:ring-0',
+        'focus:outline-none focus:ring-0',
         className,
       )}
+      disabled={disabled}
       style={{
         textAlignLast: 'end',
       }}
diff --git a/apps/readest-app/src/services/constants.ts b/apps/readest-app/src/services/constants.ts
index 115b3126..75f3097f 100644
--- a/apps/readest-app/src/services/constants.ts
+++ b/apps/readest-app/src/services/constants.ts
@@ -624,7 +624,7 @@ export const TRANSLATED_LANGS = {
   pl: 'Polski',
   tr: 'Türkçe',
   hi: 'हिन्दी',
-  id: 'Bahasa Indonesia',
+  id: 'Indonesia',
   vi: 'Tiếng Việt',
   'zh-CN': '简体中文',
   'zh-TW': '正體中文',