From 9674b45cf0bd0e3556854d0bddc955fda485f170 Mon Sep 17 00:00:00 2001
From: Huang Xin <chrox.huang@gmail.com>
Date: Thu, 22 May 2025 13:03:10 +0800
Subject: [PATCH] layout: align text end for select labels on safari (#1219)

---
 .../components/annotator/TranslatorPopup.tsx  | 69 +++++++------------
 apps/readest-app/src/components/Select.tsx    | 37 ++++++++++
 2 files changed, 60 insertions(+), 46 deletions(-)
 create mode 100644 apps/readest-app/src/components/Select.tsx

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 c8ac049b..866bd49e 100644
--- a/apps/readest-app/src/app/reader/components/annotator/TranslatorPopup.tsx
+++ b/apps/readest-app/src/app/reader/components/annotator/TranslatorPopup.tsx
@@ -1,4 +1,3 @@
-import clsx from 'clsx';
 import React, { useEffect, useState } from 'react';
 import Popup from '@/components/Popup';
 import { Position } from '@/utils/sel';
@@ -8,6 +7,7 @@ import { useTranslation } from '@/hooks/useTranslation';
 import { useTranslator } from '@/hooks/useTranslator';
 import { TRANSLATED_LANGS } from '@/services/constants';
 import { TranslatorName } from '@/services/translators';
+import Select from '@/components/Select';
 
 const notSupportedLangs = ['hi', 'vi'];
 
@@ -147,28 +147,23 @@ const TranslatorPopup: React.FC<TranslatorPopupProps> = ({
         <div className='overflow-y-auto p-4 font-sans'>
           <div className='mb-2 flex items-center justify-between'>
             <h1 className='text-sm font-normal'>{_('Original Text')}</h1>
-            <select
+            <Select
               value={sourceLang}
               onChange={handleSourceLangChange}
-              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',
-              )}
-            >
-              {[
-                ['AUTO', _('Auto Detect')],
-                ...Object.entries(TRANSLATOR_LANGS).sort((a, b) => a[1].localeCompare(b[1])),
-              ].map(([code, name]) => {
-                return (
-                  <option key={code} value={code}>
-                    {detectedSourceLang && sourceLang === 'AUTO' && code === 'AUTO'
-                      ? `${TRANSLATOR_LANGS[detectedSourceLang] || detectedSourceLang} ` +
-                        _('(detected)')
-                      : name}
-                  </option>
-                );
-              })}
-            </select>
+              options={[
+                { value: 'AUTO', label: _('Auto Detect') },
+                ...Object.entries(TRANSLATOR_LANGS)
+                  .sort((a, b) => a[1].localeCompare(b[1]))
+                  .map(([code, name]) => {
+                    const label =
+                      detectedSourceLang && sourceLang === 'AUTO' && code === 'AUTO'
+                        ? `${TRANSLATOR_LANGS[detectedSourceLang] || detectedSourceLang} ` +
+                          _('(detected)')
+                        : name;
+                    return { value: code, label };
+                  }),
+              ]}
+            />
           </div>
           <p className='text-base text-white/90'>{text}</p>
         </div>
@@ -178,22 +173,13 @@ const TranslatorPopup: React.FC<TranslatorPopupProps> = ({
         <div className='overflow-y-auto px-4 pt-4 font-sans'>
           <div className='mb-2 flex items-center justify-between'>
             <h2 className='text-sm font-normal'>{_('Translated Text')}</h2>
-            <select
+            <Select
               value={targetLang}
               onChange={handleTargetLangChange}
-              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',
-              )}
-            >
-              {Object.entries(TRANSLATOR_LANGS)
+              options={Object.entries(TRANSLATOR_LANGS)
                 .sort((a, b) => a[1].localeCompare(b[1]))
-                .map(([code, name]) => (
-                  <option key={code} value={code}>
-                    {name}
-                  </option>
-                ))}
-            </select>
+                .map(([code, name]) => ({ value: code, label: name }))}
+            />
           </div>
 
           {loading ? (
@@ -217,20 +203,11 @@ const TranslatorPopup: React.FC<TranslatorPopupProps> = ({
                         })}
                   </div>
                 )}
-                <select
+                <Select
                   value={provider}
                   onChange={handleProviderChange}
-                  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',
-                  )}
-                >
-                  {providers.map(({ name, label }) => (
-                    <option key={name} value={name}>
-                      {label}
-                    </option>
-                  ))}
-                </select>
+                  options={providers.map(({ name: value, label }) => ({ value, label }))}
+                />
               </div>
             </div>
           )}
diff --git a/apps/readest-app/src/components/Select.tsx b/apps/readest-app/src/components/Select.tsx
new file mode 100644
index 00000000..76583669
--- /dev/null
+++ b/apps/readest-app/src/components/Select.tsx
@@ -0,0 +1,37 @@
+import clsx from 'clsx';
+import React from 'react';
+
+type Option = {
+  value: string;
+  label: string;
+};
+
+type SelectProps = {
+  value: string;
+  onChange: (e: React.ChangeEvent<HTMLSelectElement>) => void;
+  options: Option[];
+  className?: string;
+};
+
+export default function Select({ value, onChange, options, className }: 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',
+        className,
+      )}
+      style={{
+        textAlignLast: 'end',
+      }}
+    >
+      {options.map(({ value, label }) => (
+        <option key={value} value={value}>
+          {label}
+        </option>
+      ))}
+    </select>
+  );
+}