diff --git a/src/apps/experimental/components/library/ViewSettingsButton.tsx b/src/apps/experimental/components/library/ViewSettingsButton.tsx index b1ca1679e0..8c91e1fb88 100644 --- a/src/apps/experimental/components/library/ViewSettingsButton.tsx +++ b/src/apps/experimental/components/library/ViewSettingsButton.tsx @@ -16,9 +16,16 @@ import Popover from '@mui/material/Popover'; import ViewComfyIcon from '@mui/icons-material/ViewComfy'; import globalize from 'scripts/globalize'; -import { LibraryViewSettings, ViewMode } from 'types/library'; +import { LibraryViewSettings } from 'types/library'; import { LibraryTab } from 'types/libraryTab'; +const excludedViewType = [ + LibraryTab.Episodes, + LibraryTab.Artists, + LibraryTab.AlbumArtists, + LibraryTab.Albums +]; + const imageTypesOptions = [ { label: 'Primary', value: ImageType.Primary }, { label: 'Banner', value: ImageType.Banner }, @@ -30,7 +37,9 @@ const imageTypesOptions = [ interface ViewSettingsButtonProps { viewType: LibraryTab; libraryViewSettings: LibraryViewSettings; - setLibraryViewSettings: React.Dispatch>; + setLibraryViewSettings: React.Dispatch< + React.SetStateAction + >; } const ViewSettingsButton: FC = ({ @@ -72,27 +81,7 @@ const ViewSettingsButton: FC = ({ [setLibraryViewSettings] ); - const getVisibleImageType = () => { - const visibleImageType: ImageType[] = [ImageType.Primary]; - - if ( - viewType !== LibraryTab.Episodes - && viewType !== LibraryTab.Artists - && viewType !== LibraryTab.AlbumArtists - && viewType !== LibraryTab.Albums - ) { - visibleImageType.push(ImageType.Banner); - visibleImageType.push(ImageType.Disc); - visibleImageType.push(ImageType.Logo); - visibleImageType.push(ImageType.Thumb); - } - - return visibleImageType; - }; - - const isViewSettingsEnabled = () => { - return libraryViewSettings.ViewMode !== ViewMode.ListView; - }; + const isVisible = !excludedViewType.includes(viewType); return ( @@ -122,20 +111,19 @@ const ViewSettingsButton: FC = ({ '& .MuiFormControl-root': { m: 1, width: 220 } }} > - - - - {globalize.translate('LabelImageType')} - - - + {imageTypesOptions.map((imageType) => ( = ({ ))} - - - {isViewSettingsEnabled() && ( - <> - - - - - } - label={globalize.translate('ShowTitle')} - /> - - } - label={globalize.translate('ShowYear')} - /> - - } - label={globalize.translate( - 'EnableCardLayout' - )} - /> - - - + + )} + + + + + } + label={globalize.translate('ShowTitle')} + /> + {isVisible && ( + + } + label={globalize.translate('ShowYear')} + /> + )} + + } + label={globalize.translate('EnableCardLayout')} + /> + + );