From f49a243009e227ea5ba673cd79a0f3b520f76862 Mon Sep 17 00:00:00 2001
From: "Timothy Z." <timothy@stremio.com>
Date: Tue, 24 Jun 2025 13:01:11 +0300
Subject: [PATCH] refactor(Settings): simplify handling for langs

---
 src/common/index.js                           |  2 ++
 .../Dropdown => common}/useLanguageSorting.ts |  4 +---
 .../MultiselectMenu/Dropdown/Dropdown.tsx     |  6 ++---
 .../Dropdown/Option/Option.less               |  4 ----
 .../Dropdown/Option/Option.tsx                | 11 +--------
 .../Settings/General/useGeneralOptions.ts     | 15 ++++++++----
 .../Settings/Player/usePlayerOptions.ts       | 24 ++++++++++---------
 7 files changed, 29 insertions(+), 37 deletions(-)
 rename src/{components/MultiselectMenu/Dropdown => common}/useLanguageSorting.ts (90%)

diff --git a/src/common/index.js b/src/common/index.js
index 55ccfe045..3354a64e4 100644
--- a/src/common/index.js
+++ b/src/common/index.js
@@ -26,6 +26,7 @@ const useStreamingServer = require('./useStreamingServer');
 const useTorrent = require('./useTorrent');
 const useTranslate = require('./useTranslate');
 const { default: useOrientation } = require('./useOrientation');
+const { default: useLanguageSorting } = require('./useLanguageSorting');
 
 module.exports = {
     FileDropProvider,
@@ -59,4 +60,5 @@ module.exports = {
     useTorrent,
     useTranslate,
     useOrientation,
+    useLanguageSorting,
 };
diff --git a/src/components/MultiselectMenu/Dropdown/useLanguageSorting.ts b/src/common/useLanguageSorting.ts
similarity index 90%
rename from src/components/MultiselectMenu/Dropdown/useLanguageSorting.ts
rename to src/common/useLanguageSorting.ts
index 3f1ed39d0..44c8927bd 100644
--- a/src/components/MultiselectMenu/Dropdown/useLanguageSorting.ts
+++ b/src/common/useLanguageSorting.ts
@@ -1,7 +1,7 @@
 import { useMemo } from 'react';
 import interfaceLanguages from 'stremio/common/interfaceLanguages.json';
 
-const useLanguageSorting = (options?: MultiselectMenuOption[]) => {
+const useLanguageSorting = (options: MultiselectMenuOption[]) => {
     const userLangCode = useMemo(() => {
         const lang = interfaceLanguages.find((l) => l.codes.includes(navigator.language || 'en-US'));
         if (lang) {
@@ -17,8 +17,6 @@ const useLanguageSorting = (options?: MultiselectMenuOption[]) => {
     }, [options]);
 
     const sortedOptions = useMemo(() => {
-        if (!isLanguageDropdown || !options) return options;
-
         const matchingIndex = options.findIndex((opt) => {
             const lang = interfaceLanguages.find((l) => l.name === opt.label);
             return userLangCode.some((code) => lang?.codes.includes(code));
diff --git a/src/components/MultiselectMenu/Dropdown/Dropdown.tsx b/src/components/MultiselectMenu/Dropdown/Dropdown.tsx
index ecc0800cb..00fd3ff6a 100644
--- a/src/components/MultiselectMenu/Dropdown/Dropdown.tsx
+++ b/src/components/MultiselectMenu/Dropdown/Dropdown.tsx
@@ -7,7 +7,6 @@ import classNames from 'classnames';
 import Option from './Option';
 import Icon from '@stremio/stremio-icons/react';
 import styles from './Dropdown.less';
-import useLanguageSorting from './useLanguageSorting';
 
 type Props = {
     options: MultiselectMenuOption[];
@@ -20,7 +19,6 @@ type Props = {
 
 const Dropdown = ({ level, setLevel, options, onSelect, value, menuOpen }: Props) => {
     const { t } = useTranslation();
-    const { isLanguageDropdown, sortedOptions } = useLanguageSorting(options);
     const optionsRef = useRef(new Map());
     const containerRef = useRef(null);
 
@@ -63,8 +61,8 @@ const Dropdown = ({ level, setLevel, options, onSelect, value, menuOpen }: Props
                 </Button>
                 : null
             }
-            {(isLanguageDropdown ? sortedOptions : options)
-                ?.filter((option: MultiselectMenuOption) => !option.hidden)
+            {options
+                .filter((option: MultiselectMenuOption) => !option.hidden)
                 .map((option: MultiselectMenuOption) => (
                     <Option
                         key={option.value}
diff --git a/src/components/MultiselectMenu/Dropdown/Option/Option.less b/src/components/MultiselectMenu/Dropdown/Option/Option.less
index ea69df18d..a0ee1743f 100644
--- a/src/components/MultiselectMenu/Dropdown/Option/Option.less
+++ b/src/components/MultiselectMenu/Dropdown/Option/Option.less
@@ -23,10 +23,6 @@
         opacity: 1;
     }
 
-    &.separator {
-        border-bottom: thin solid var(--overlay-color);
-    }
-
     &:hover {
         background-color: rgba(255, 255, 255, 0.15);
     }
diff --git a/src/components/MultiselectMenu/Dropdown/Option/Option.tsx b/src/components/MultiselectMenu/Dropdown/Option/Option.tsx
index 0abd6d3c7..5d43fb45b 100644
--- a/src/components/MultiselectMenu/Dropdown/Option/Option.tsx
+++ b/src/components/MultiselectMenu/Dropdown/Option/Option.tsx
@@ -5,8 +5,6 @@ import classNames from 'classnames';
 import { Button } from 'stremio/components';
 import styles from './Option.less';
 import Icon from '@stremio/stremio-icons/react';
-import useLanguageSorting from '../useLanguageSorting';
-import interfaceLanguages from 'stremio/common/interfaceLanguages.json';
 
 type Props = {
     option: MultiselectMenuOption;
@@ -15,15 +13,8 @@ type Props = {
 };
 
 const Option = forwardRef<HTMLButtonElement, Props>(({ option, selectedValue, onSelect }, ref) => {
-    const { userLangCode } = useLanguageSorting();
-
     const selected = useMemo(() => option?.value === selectedValue, [option, selectedValue]);
 
-    const separator = useMemo(() => {
-        const lang = interfaceLanguages.find((l) => l.name === option?.label);
-        return lang ? userLangCode.some((code) => lang.codes.includes(code)) : false;
-    }, [option, userLangCode]);
-
     const handleClick = useCallback(() => {
         onSelect(option.value);
     }, [onSelect, option.value]);
@@ -31,7 +22,7 @@ const Option = forwardRef<HTMLButtonElement, Props>(({ option, selectedValue, on
     return (
         <Button
             ref={ref}
-            className={classNames(styles['option'], { [styles['selected']]: selected }, { [styles['separator']]: separator })}
+            className={classNames(styles['option'], { [styles['selected']]: selected })}
             key={option.id}
             onClick={handleClick}
             aria-selected={selected}
diff --git a/src/routes/Settings/General/useGeneralOptions.ts b/src/routes/Settings/General/useGeneralOptions.ts
index 59e7b40c1..efe9a1330 100644
--- a/src/routes/Settings/General/useGeneralOptions.ts
+++ b/src/routes/Settings/General/useGeneralOptions.ts
@@ -1,15 +1,20 @@
 import { useMemo } from 'react';
-import { interfaceLanguages } from 'stremio/common';
+import { interfaceLanguages, useLanguageSorting } from 'stremio/common';
 import { useServices } from 'stremio/services';
 
 const useGeneralOptions = (profile: Profile) => {
     const { core } = useServices();
 
-    const interfaceLanguageSelect = useMemo(() => ({
-        options: interfaceLanguages.map(({ name, codes }) => ({
+    const interfaceLanguageOptions = useMemo(() => 
+        interfaceLanguages.map(({ name, codes }) => ({
             value: codes[0],
             label: name,
-        })),
+        })), []);
+
+    const { sortedOptions } = useLanguageSorting(interfaceLanguageOptions);
+
+    const interfaceLanguageSelect = useMemo(() => ({
+        options: sortedOptions,
         value: interfaceLanguages.find(({ codes }) => codes[1] === profile.settings.interfaceLanguage)?.codes?.[0] || profile.settings.interfaceLanguage,
         onSelect: (value: string) => {
             core.transport.dispatch({
@@ -23,7 +28,7 @@ const useGeneralOptions = (profile: Profile) => {
                 }
             });
         }
-    }), [profile.settings]);
+    }), [profile.settings, sortedOptions]);
 
     const escExitFullscreenToggle = useMemo(() => ({
         checked: profile.settings.escExitFullscreen,
diff --git a/src/routes/Settings/Player/usePlayerOptions.ts b/src/routes/Settings/Player/usePlayerOptions.ts
index 04c263d54..7c417079c 100644
--- a/src/routes/Settings/Player/usePlayerOptions.ts
+++ b/src/routes/Settings/Player/usePlayerOptions.ts
@@ -1,7 +1,7 @@
 import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useServices } from 'stremio/services';
-import { CONSTANTS, languageNames, usePlatform } from 'stremio/common';
+import { CONSTANTS, languageNames, usePlatform, useLanguageSorting } from 'stremio/common';
 
 const LANGUAGES_NAMES: Record<string, string> = languageNames;
 
@@ -10,13 +10,18 @@ const usePlayerOptions = (profile: Profile) => {
     const { core } = useServices();
     const platform = usePlatform();
 
+    const languageOptions = useMemo(() => 
+        Object.keys(LANGUAGES_NAMES).map((code) => ({
+            value: code,
+            label: LANGUAGES_NAMES[code]
+        })), []);
+
+    const { sortedOptions: sortedLanguageOptions } = useLanguageSorting(languageOptions);
+
     const subtitlesLanguageSelect = useMemo(() => ({
         options: [
             { value: null, label: t('NONE') },
-            ...Object.keys(LANGUAGES_NAMES).map((code) => ({
-                value: code,
-                label: LANGUAGES_NAMES[code]
-            }))
+            ...sortedLanguageOptions
         ],
         value: profile.settings.subtitlesLanguage,
         onSelect: (value: string) => {
@@ -31,7 +36,7 @@ const usePlayerOptions = (profile: Profile) => {
                 }
             });
         }
-    }), [profile.settings]);
+    }), [profile.settings, sortedLanguageOptions, t]);
 
     const subtitlesSizeSelect = useMemo(() => ({
         options: CONSTANTS.SUBTITLES_SIZES.map((size) => ({
@@ -105,10 +110,7 @@ const usePlayerOptions = (profile: Profile) => {
     }), [profile.settings]);
 
     const audioLanguageSelect = useMemo(() => ({
-        options: Object.keys(LANGUAGES_NAMES).map((code) => ({
-            value: code,
-            label: LANGUAGES_NAMES [code]
-        })),
+        options: sortedLanguageOptions,
         value: profile.settings.audioLanguage,
         onSelect: (value: string) => {
             core.transport.dispatch({
@@ -122,7 +124,7 @@ const usePlayerOptions = (profile: Profile) => {
                 }
             });
         }
-    }), [profile.settings]);
+    }), [profile.settings, sortedLanguageOptions]);
 
     const surroundSoundToggle = useMemo(() => ({
         checked: profile.settings.surroundSound,