ChoChoX/suwayomi-material-you-webui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix source language filter

Browse Source 
In case the saved "selected languages" contained languages that did not have any installed source, they caused TypeErrors when trying to access them in e.g. "sourcesByLanguage".
This commit is contained in:
schroda
2026-01-25 03:22:15 +01:00
parent 01ce4a8ded
commit 742a02c5cf
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/features/source/components/SourceLanguageSelect.tsx
View File

@@ -68,37 +68,38 @@ export const SourceLanguageSelect = ({
const languagesSortedBySelectState = useMemo( const languagesSortedBySelectState = useMemo(
() => () =>
toUniqueLanguageCodes([ toUniqueLanguageCodes([
...tmpSelectedLanguages.toSorted(languageSortComparator), ...tmpSelectedLanguages
.filter((language) => languages.includes(language))
.toSorted(languageSortComparator),
...languages.toSorted(languageSortComparator), ...languages.toSorted(languageSortComparator),
]), ]),
[languages, tmpSelectedLanguages], [languages, tmpSelectedLanguages],
); );
const flattenedSourcesByLanguages = useMemo( const flattenedSourcesByLanguages = useMemo(
() => Object.values(languagesSortedBySelectState.map((language) => sourcesByLanguage[language])).flat(), () => languagesSortedBySelectState.map((language) => sourcesByLanguage[language] ?? []).flat(),
[languagesSortedBySelectState, sourcesByLanguage], [languagesSortedBySelectState, sourcesByLanguage],
); );
const groupCounts = useMemo( const groupCounts = useMemo(
() => () =>
languagesSortedBySelectState.map((language) => { languagesSortedBySelectState.map((language) => {
const isEnabled = tmpSelectedLanguages.includes(language); const isEnabled = tmpSelectedLanguages
.filter((selectedLanguage) => languages.includes(selectedLanguage))
.includes(language);
if (!isEnabled) { if (!isEnabled) {
return 0; return 0;
} }
return sourcesByLanguage[language]?.length ?? 0; return sourcesByLanguage[language].length;
}), }),
[sourcesByLanguage, languagesSortedBySelectState], [sourcesByLanguage, languagesSortedBySelectState, languages],
); );
const computeItemKey = VirtuosoUtil.useCreateGroupedComputeItemKey( const computeItemKey = VirtuosoUtil.useCreateGroupedComputeItemKey(
groupCounts, groupCounts,
useCallback((index) => languagesSortedBySelectState[index], [languagesSortedBySelectState]), useCallback((index) => languagesSortedBySelectState[index], [languagesSortedBySelectState]),
useCallback( useCallback((index) => flattenedSourcesByLanguages[index].id, [flattenedSourcesByLanguages]),
(index) => flattenedSourcesByLanguages[index].id,
[sourcesByLanguage, languagesSortedBySelectState],
),
); );
const handleCancel = () => { const handleCancel = () => {