Merge pull request #5166 from grafixeyehero/Convert-list&Card-view-to-react

package-lock.json

@@ -25,6 +25,7 @@
         "@react-hook/resize-observer": "1.2.6",
         "@tanstack/react-query": "4.36.1",
         "@tanstack/react-query-devtools": "4.36.1",
+        "@types/react-lazy-load-image-component": "1.6.3",
         "abortcontroller-polyfill": "1.7.5",
         "blurhash": "2.0.5",
         "classlist.js": "https://github.com/eligrey/classList.js/archive/1.2.20180112.tar.gz",
@@ -52,7 +53,9 @@
         "native-promise-only": "0.8.1",
         "pdfjs-dist": "3.11.174",
         "react": "17.0.2",
+        "react-blurhash": "0.3.0",
         "react-dom": "17.0.2",
+        "react-lazy-load-image-component": "1.6.0",
         "react-router-dom": "6.21.3",
         "resize-observer-polyfill": "1.5.1",
         "screenfull": "6.0.2",
@@ -4706,6 +4709,15 @@
         "@types/react": "^17"
       }
     },
+    "node_modules/@types/react-lazy-load-image-component": {
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/@types/react-lazy-load-image-component/-/react-lazy-load-image-component-1.6.3.tgz",
+      "integrity": "sha512-HsIsYz7yWWTh/bftdzGnijKD26JyofLRqM/RM80sxs7Gk13G83ew8R/ra2XzXuiZfjNEjAq/Va+NBHFF9ciwxA==",
+      "dependencies": {
+        "@types/react": "*",
+        "csstype": "^3.0.2"
+      }
+    },
     "node_modules/@types/react-transition-group": {
       "version": "4.4.10",
       "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.10.tgz",
@@ -12686,6 +12698,11 @@
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "dev": true
     },
+    "node_modules/lodash.throttle": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz",
+      "integrity": "sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ=="
+    },
     "node_modules/lodash.truncate": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
@@ -16202,6 +16219,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/react-blurhash": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/react-blurhash/-/react-blurhash-0.3.0.tgz",
+      "integrity": "sha512-XlKr4Ns1iYFRnk6DkAblNbAwN/bTJvxTVoxMvmTcURdc5oLoXZwqAF9N3LZUh/HT+QFlq5n6IS6VsDGsviYAiQ==",
+      "peerDependencies": {
+        "blurhash": "^2.0.3",
+        "react": ">=15"
+      }
+    },
     "node_modules/react-dom": {
       "version": "17.0.2",
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-17.0.2.tgz",
@@ -16220,6 +16246,19 @@
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
       "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
     },
+    "node_modules/react-lazy-load-image-component": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/react-lazy-load-image-component/-/react-lazy-load-image-component-1.6.0.tgz",
+      "integrity": "sha512-8KFkDTgjh+0+PVbH+cx0AgxLGbdTsxWMnxXzU5HEUztqewk9ufQAu8cstjZhyvtMIPsdMcPZfA0WAa7HtjQbBQ==",
+      "dependencies": {
+        "lodash.debounce": "^4.0.8",
+        "lodash.throttle": "^4.1.1"
+      },
+      "peerDependencies": {
+        "react": "^15.x.x || ^16.x.x || ^17.x.x || ^18.x.x",
+        "react-dom": "^15.x.x || ^16.x.x || ^17.x.x || ^18.x.x"
+      }
+    },
     "node_modules/react-router": {
       "version": "6.21.3",
       "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.21.3.tgz",
@@ -25950,6 +25989,15 @@
         "@types/react": "^17"
       }
     },
+    "@types/react-lazy-load-image-component": {
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/@types/react-lazy-load-image-component/-/react-lazy-load-image-component-1.6.3.tgz",
+      "integrity": "sha512-HsIsYz7yWWTh/bftdzGnijKD26JyofLRqM/RM80sxs7Gk13G83ew8R/ra2XzXuiZfjNEjAq/Va+NBHFF9ciwxA==",
+      "requires": {
+        "@types/react": "*",
+        "csstype": "^3.0.2"
+      }
+    },
     "@types/react-transition-group": {
       "version": "4.4.10",
       "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.10.tgz",
@@ -31887,6 +31935,11 @@
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "dev": true
     },
+    "lodash.throttle": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz",
+      "integrity": "sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ=="
+    },
     "lodash.truncate": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
@@ -34301,6 +34354,12 @@
         "object-assign": "^4.1.1"
       }
     },
+    "react-blurhash": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/react-blurhash/-/react-blurhash-0.3.0.tgz",
+      "integrity": "sha512-XlKr4Ns1iYFRnk6DkAblNbAwN/bTJvxTVoxMvmTcURdc5oLoXZwqAF9N3LZUh/HT+QFlq5n6IS6VsDGsviYAiQ==",
+      "requires": {}
+    },
     "react-dom": {
       "version": "17.0.2",
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-17.0.2.tgz",
@@ -34316,6 +34375,15 @@
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
       "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
     },
+    "react-lazy-load-image-component": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/react-lazy-load-image-component/-/react-lazy-load-image-component-1.6.0.tgz",
+      "integrity": "sha512-8KFkDTgjh+0+PVbH+cx0AgxLGbdTsxWMnxXzU5HEUztqewk9ufQAu8cstjZhyvtMIPsdMcPZfA0WAa7HtjQbBQ==",
+      "requires": {
+        "lodash.debounce": "^4.0.8",
+        "lodash.throttle": "^4.1.1"
+      }
+    },
     "react-router": {
       "version": "6.21.3",
       "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.21.3.tgz",

package.json

@@ -86,6 +86,7 @@
     "@react-hook/resize-observer": "1.2.6",
     "@tanstack/react-query": "4.36.1",
     "@tanstack/react-query-devtools": "4.36.1",
+    "@types/react-lazy-load-image-component": "1.6.3",
     "abortcontroller-polyfill": "1.7.5",
     "blurhash": "2.0.5",
     "classlist.js": "https://github.com/eligrey/classList.js/archive/1.2.20180112.tar.gz",
@@ -113,7 +114,9 @@
     "native-promise-only": "0.8.1",
     "pdfjs-dist": "3.11.174",
     "react": "17.0.2",
+    "react-blurhash": "0.3.0",
     "react-dom": "17.0.2",
+    "react-lazy-load-image-component": "1.6.0",
     "react-router-dom": "6.21.3",
     "resize-observer-polyfill": "1.5.1",
     "screenfull": "6.0.2",

src/apps/experimental/components/library/GenresItemsContainer.tsx

@@ -1,11 +1,11 @@
-import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
+import type { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
+import type { CollectionType } from '@jellyfin/sdk/lib/generated-client/models/collection-type';
 import React, { FC } from 'react';
 import { useGetGenres } from 'hooks/useFetchItems';
 import globalize from 'scripts/globalize';
 import Loading from 'components/loading/LoadingComponent';
 import GenresSectionContainer from './GenresSectionContainer';
-import { CollectionType } from '@jellyfin/sdk/lib/generated-client/models/collection-type';
+import type { ParentId } from 'types/library';
-import { ParentId } from 'types/library';
 
 interface GenresItemsContainerProps {
     parentId: ParentId;

src/apps/experimental/components/library/GenresSectionContainer.tsx

@@ -1,18 +1,17 @@
 import type { BaseItemDto } from '@jellyfin/sdk/lib/generated-client';
+import { CollectionType } from '@jellyfin/sdk/lib/generated-client/models/collection-type';
 import { ItemFields } from '@jellyfin/sdk/lib/generated-client/models/item-fields';
 import { ImageType } from '@jellyfin/sdk/lib/generated-client/models/image-type';
 import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
 import { ItemSortBy } from '@jellyfin/sdk/lib/models/api/item-sort-by';
 import { SortOrder } from '@jellyfin/sdk/lib/generated-client/models/sort-order';
-import escapeHTML from 'escape-html';
+import React, { type FC } from 'react';
-import React, { FC } from 'react';
-
 import { useGetItems } from 'hooks/useFetchItems';
 import Loading from 'components/loading/LoadingComponent';
 import { appRouter } from 'components/router/appRouter';
 import SectionContainer from './SectionContainer';
-import { CollectionType } from '@jellyfin/sdk/lib/generated-client/models/collection-type';
+import { CardShape } from 'utils/card';
-import { ParentId } from 'types/library';
+import type { ParentId } from 'types/library';
 
 interface GenresSectionContainerProps {
     parentId: ParentId;
@@ -60,7 +59,7 @@ const GenresSectionContainer: FC<GenresSectionContainerProps> = ({
     }
 
     return <SectionContainer
-        sectionTitle={escapeHTML(genre.Name)}
+        sectionTitle={genre.Name || ''}
         items={itemsResult?.Items || []}
         url={getRouteUrl(genre)}
         cardOptions={{
@@ -69,7 +68,7 @@ const GenresSectionContainer: FC<GenresSectionContainerProps> = ({
             showTitle: true,
             centerText: true,
             cardLayout: false,
-            shape: collectionType === CollectionType.Music ? 'overflowSquare' : 'overflowPortrait',
+            shape: collectionType === CollectionType.Music ? CardShape.SquareOverflow : CardShape.PortraitOverflow,
             showParentTitle: collectionType === CollectionType.Music,
             showYear: collectionType !== CollectionType.Music
         }}

src/apps/experimental/components/library/GenresView.tsx

@@ -1,8 +1,8 @@
-import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
+import type { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
+import type { CollectionType } from '@jellyfin/sdk/lib/generated-client/models/collection-type';
 import React, { FC } from 'react';
 import GenresItemsContainer from './GenresItemsContainer';
-import { ParentId } from 'types/library';
+import type { ParentId } from 'types/library';
-import { CollectionType } from '@jellyfin/sdk/lib/generated-client/models/collection-type';
 
 interface GenresViewProps {
     parentId: ParentId;

src/apps/experimental/components/library/ItemsView.tsx

@@ -1,17 +1,16 @@
 import type { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
+import { CollectionType } from '@jellyfin/sdk/lib/generated-client/models/collection-type';
 import { ImageType } from '@jellyfin/sdk/lib/generated-client';
 import { ItemSortBy } from '@jellyfin/sdk/lib/models/api/item-sort-by';
-import React, { FC, useCallback } from 'react';
+import React, { type FC, useCallback } from 'react';
 import Box from '@mui/material/Box';
 import classNames from 'classnames';
 import { useLocalStorage } from 'hooks/useLocalStorage';
 import { useGetItem, useGetItemsViewByType } from 'hooks/useFetchItems';
 import { getDefaultLibraryViewSettings, getSettingsKey } from 'utils/items';
+import { CardShape } from 'utils/card';
 import Loading from 'components/loading/LoadingComponent';
-import listview from 'components/listview/listview';
-import cardBuilder from 'components/cardbuilder/cardBuilder';
 import { playbackManager } from 'components/playback/playbackmanager';
-import globalize from 'scripts/globalize';
 import ItemsContainer from 'elements/emby-itemscontainer/ItemsContainer';
 import AlphabetPicker from './AlphabetPicker';
 import FilterButton from './filter/FilterButton';
@@ -22,12 +21,13 @@ import QueueButton from './QueueButton';
 import ShuffleButton from './ShuffleButton';
 import SortButton from './SortButton';
 import GridListViewButton from './GridListViewButton';
-import { LibraryViewSettings, ParentId, ViewMode } from 'types/library';
+import NoItemsMessage from 'components/common/NoItemsMessage';
-import { CollectionType } from '@jellyfin/sdk/lib/generated-client/models/collection-type';
+import Lists from 'components/listview/List/Lists';
+import Cards from 'components/cardbuilder/Card/Cards';
 import { LibraryTab } from 'types/libraryTab';
-
+import { type LibraryViewSettings, type ParentId, ViewMode } from 'types/library';
-import { CardOptions } from 'types/cardOptions';
+import type { CardOptions } from 'types/cardOptions';
-import { ListOptions } from 'types/listOptions';
+import type { ListOptions } from 'types/listOptions';
 
 interface ItemsViewProps {
     viewType: LibraryTab;
@@ -110,18 +110,18 @@ const ItemsView: FC<ItemsViewProps> = ({
         let preferLogo;
 
         if (libraryViewSettings.ImageType === ImageType.Banner) {
-            shape = 'banner';
+            shape = CardShape.Banner;
         } else if (libraryViewSettings.ImageType === ImageType.Disc) {
-            shape = 'square';
+            shape = CardShape.Square;
             preferDisc = true;
         } else if (libraryViewSettings.ImageType === ImageType.Logo) {
-            shape = 'backdrop';
+            shape = CardShape.Backdrop;
             preferLogo = true;
         } else if (libraryViewSettings.ImageType === ImageType.Thumb) {
-            shape = 'backdrop';
+            shape = CardShape.Backdrop;
             preferThumb = true;
         } else {
-            shape = 'auto';
+            shape = CardShape.Auto;
         }
 
         const cardOptions: CardOptions = {
@@ -135,9 +135,9 @@ const ItemsView: FC<ItemsViewProps> = ({
             preferThumb: preferThumb,
             preferDisc: preferDisc,
             preferLogo: preferLogo,
-            overlayPlayButton: false,
+            overlayText: !libraryViewSettings.ShowTitle,
-            overlayMoreButton: true,
+            imageType: libraryViewSettings.ImageType,
-            overlayText: !libraryViewSettings.ShowTitle
+            queryKey: ['ItemsViewByType']
         };
 
         if (
@@ -146,20 +146,26 @@ const ItemsView: FC<ItemsViewProps> = ({
             || viewType === LibraryTab.Episodes
         ) {
             cardOptions.showParentTitle = libraryViewSettings.ShowTitle;
+            cardOptions.overlayPlayButton = true;
         } else if (viewType === LibraryTab.Artists) {
             cardOptions.lines = 1;
             cardOptions.showYear = false;
+            cardOptions.overlayPlayButton = true;
         } else if (viewType === LibraryTab.Channels) {
-            cardOptions.shape = 'square';
+            cardOptions.shape = CardShape.Square;
             cardOptions.showDetailsMenu = true;
             cardOptions.showCurrentProgram = true;
             cardOptions.showCurrentProgramTime = true;
         } else if (viewType === LibraryTab.SeriesTimers) {
-            cardOptions.defaultShape = 'portrait';
+            cardOptions.shape = CardShape.Backdrop;
-            cardOptions.preferThumb = 'auto';
             cardOptions.showSeriesTimerTime = true;
             cardOptions.showSeriesTimerChannel = true;
+            cardOptions.overlayMoreButton = true;
             cardOptions.lines = 3;
+        } else if (viewType === LibraryTab.Movies) {
+            cardOptions.overlayPlayButton = true;
+        } else if (viewType === LibraryTab.Series || viewType === LibraryTab.Networks) {
+            cardOptions.overlayMoreButton = true;
         }
 
         return cardOptions;
@@ -172,27 +178,32 @@ const ItemsView: FC<ItemsViewProps> = ({
         viewType
     ]);
 
-    const getItemsHtml = useCallback(() => {
+    const getItems = useCallback(() => {
-        let html = '';
+        if (!itemsResult?.Items?.length) {
+            return <NoItemsMessage noItemsMessage={noItemsMessage} />;
+        }
 
         if (libraryViewSettings.ViewMode === ViewMode.ListView) {
-            html = listview.getListViewHtml(getListOptions());
+            return (
-        } else {
+                <Lists
-            html = cardBuilder.getCardsHtml(
+                    items={itemsResult?.Items ?? []}
-                itemsResult?.Items ?? [],
+                    listOptions={getListOptions()}
-                getCardOptions()
+                />
             );
         }
-
+        return (
-        if (!itemsResult?.Items?.length) {
+            <Cards
-            html += '<div class="noItemsMessage centerMessage">';
+                items={itemsResult?.Items ?? []}
-            html += '<h1>' + globalize.translate('MessageNothingHere') + '</h1>';
+                cardOptions={getCardOptions()}
-            html += '<p>' + globalize.translate(noItemsMessage) + '</p>';
+            />
-            html += '</div>';
+        );
-        }
+    }, [
-
+        libraryViewSettings.ViewMode,
-        return html;
+        itemsResult?.Items,
-    }, [libraryViewSettings.ViewMode, itemsResult?.Items, getListOptions, getCardOptions, noItemsMessage]);
+        getListOptions,
+        getCardOptions,
+        noItemsMessage
+    ]);
 
     const totalRecordCount = itemsResult?.TotalRecordCount ?? 0;
     const items = itemsResult?.Items ?? [];
@@ -289,8 +300,10 @@ const ItemsView: FC<ItemsViewProps> = ({
                     className={itemsContainerClass}
                     parentId={parentId}
                     reloadItems={refetch}
-                    getItemsHtml={getItemsHtml}
+                    queryKey={['ItemsViewByType']}
-                />
+                >
+                    {getItems()}
+                </ItemsContainer>
             )}
 
             {isPaginationEnabled && (

src/apps/experimental/components/library/PageTabContent.tsx

@@ -1,13 +1,13 @@
-import React, { FC } from 'react';
+import React, { type FC } from 'react';
 import SuggestionsSectionView from './SuggestionsSectionView';
 import UpcomingView from './UpcomingView';
 import GenresView from './GenresView';
 import ItemsView from './ItemsView';
-import { LibraryTab } from 'types/libraryTab';
-import { ParentId } from 'types/library';
-import { LibraryTabContent } from 'types/libraryTabContent';
 import GuideView from './GuideView';
 import ProgramsSectionView from './ProgramsSectionView';
+import { LibraryTab } from 'types/libraryTab';
+import type { ParentId } from 'types/library';
+import type { LibraryTabContent } from 'types/libraryTabContent';
 
 interface PageTabContentProps {
     parentId: ParentId;

src/apps/experimental/components/library/ProgramsSectionView.tsx

@@ -1,11 +1,12 @@
-import React, { FC } from 'react';
+import React, { type FC } from 'react';
 import { useGetProgramsSectionsWithItems, useGetTimers } from 'hooks/useFetchItems';
 import { appRouter } from 'components/router/appRouter';
 import globalize from 'scripts/globalize';
 import Loading from 'components/loading/LoadingComponent';
 import SectionContainer from './SectionContainer';
-import { ParentId } from 'types/library';
+import { CardShape } from 'utils/card';
-import { Section, SectionType } from 'types/sections';
+import type { ParentId } from 'types/library';
+import type { Section, SectionType } from 'types/sections';
 
 interface ProgramsSectionViewProps {
     parentId: ParentId;
@@ -18,7 +19,7 @@ const ProgramsSectionView: FC<ProgramsSectionViewProps> = ({
     sectionType,
     isUpcomingRecordingsEnabled = false
 }) => {
-    const { isLoading, data: sectionsWithItems } = useGetProgramsSectionsWithItems(parentId, sectionType);
+    const { isLoading, data: sectionsWithItems, refetch } = useGetProgramsSectionsWithItems(parentId, sectionType);
     const {
         isLoading: isUpcomingRecordingsLoading,
         data: upcomingRecordings
@@ -60,8 +61,10 @@ const ProgramsSectionView: FC<ProgramsSectionViewProps> = ({
                     sectionTitle={globalize.translate(section.name)}
                     items={items ?? []}
                     url={getRouteUrl(section)}
+                    reloadItems={refetch}
                     cardOptions={{
-                        ...section.cardOptions
+                        ...section.cardOptions,
+                        queryKey: ['ProgramSectionWithItems']
                     }}
                 />
 
@@ -73,7 +76,8 @@ const ProgramsSectionView: FC<ProgramsSectionViewProps> = ({
                     sectionTitle={group.name}
                     items={group.timerInfo ?? []}
                     cardOptions={{
-                        shape: 'overflowBackdrop',
+                        queryKey: ['Timers'],
+                        shape: CardShape.BackdropOverflow,
                         showTitle: true,
                         showParentTitleOrTitle: true,
                         showAirTime: true,

src/apps/experimental/components/library/SectionContainer.tsx

@@ -1,43 +1,29 @@
 import type { BaseItemDto, TimerInfoDto } from '@jellyfin/sdk/lib/generated-client';
-import React, { FC, useEffect, useRef } from 'react';
+import React, { FC } from 'react';
 
-import cardBuilder from 'components/cardbuilder/cardBuilder';
 import ItemsContainer from 'elements/emby-itemscontainer/ItemsContainer';
 import Scroller from 'elements/emby-scroller/Scroller';
 import LinkButton from 'elements/emby-button/LinkButton';
-import imageLoader from 'components/images/imageLoader';
+import Cards from 'components/cardbuilder/Card/Cards';
-
+import type { CardOptions } from 'types/cardOptions';
-import { CardOptions } from 'types/cardOptions';
 
 interface SectionContainerProps {
     url?: string;
     sectionTitle: string;
     items: BaseItemDto[] | TimerInfoDto[];
     cardOptions: CardOptions;
+    reloadItems?: () => void;
 }
 
 const SectionContainer: FC<SectionContainerProps> = ({
     sectionTitle,
     url,
     items,
-    cardOptions
+    cardOptions,
+    reloadItems
 }) => {
-    const element = useRef<HTMLDivElement>(null);
-
-    useEffect(() => {
-        const itemsContainer = element.current?.querySelector('.itemsContainer');
-        cardBuilder.buildCards(items, {
-            itemsContainer: itemsContainer,
-            parentContainer: element.current,
-
-            ...cardOptions
-        });
-
-        imageLoader.lazyChildren(itemsContainer);
-    }, [cardOptions, items]);
-
     return (
-        <div ref={element} className='verticalSection hide'>
+        <div className='verticalSection'>
             <div className='sectionTitleContainer sectionTitleContainer-cards padded-left'>
                 {url && items.length > 5 ? (
                     <LinkButton
@@ -66,7 +52,11 @@ const SectionContainer: FC<SectionContainerProps> = ({
             >
                 <ItemsContainer
                     className='itemsContainer scrollSlider focuscontainer-x'
-                />
+                    reloadItems={reloadItems}
+                    queryKey={cardOptions.queryKey}
+                >
+                    <Cards items={items} cardOptions={cardOptions} />
+                </ItemsContainer>
             </Scroller>
         </div>
     );

src/apps/experimental/components/library/SuggestionsSectionView.tsx

@@ -1,9 +1,8 @@
 import {
-    RecommendationDto,
+    type RecommendationDto,
     RecommendationType
 } from '@jellyfin/sdk/lib/generated-client';
-import React, { FC } from 'react';
+import React, { type FC } from 'react';
-import escapeHTML from 'escape-html';
 import {
     useGetMovieRecommendations,
     useGetSuggestionSectionsWithItems
@@ -12,8 +11,9 @@ import { appRouter } from 'components/router/appRouter';
 import globalize from 'scripts/globalize';
 import Loading from 'components/loading/LoadingComponent';
 import SectionContainer from './SectionContainer';
-import { ParentId } from 'types/library';
+import { CardShape } from 'utils/card';
-import { Section, SectionType } from 'types/sections';
+import type { ParentId } from 'types/library';
+import type { Section, SectionType } from 'types/sections';
 
 interface SuggestionsSectionViewProps {
     parentId: ParentId;
@@ -89,7 +89,7 @@ const SuggestionsSectionView: FC<SuggestionsSectionViewProps> = ({
                 );
                 break;
         }
-        return escapeHTML(title);
+        return title;
     };
 
     return (
@@ -102,6 +102,7 @@ const SuggestionsSectionView: FC<SuggestionsSectionViewProps> = ({
                     url={getRouteUrl(section)}
                     cardOptions={{
                         ...section.cardOptions,
+                        queryKey: ['SuggestionSectionWithItems'],
                         showTitle: true,
                         centerText: true,
                         cardLayout: false,
@@ -117,7 +118,8 @@ const SuggestionsSectionView: FC<SuggestionsSectionViewProps> = ({
                     sectionTitle={getRecommendationTittle(recommendation)}
                     items={recommendation.Items ?? []}
                     cardOptions={{
-                        shape: 'overflowPortrait',
+                        queryKey: ['MovieRecommendations'],
+                        shape: CardShape.PortraitOverflow,
                         showYear: true,
                         scalable: true,
                         overlayPlayButton: true,

src/apps/experimental/components/library/UpcomingView.tsx

@@ -1,10 +1,11 @@
-import React, { FC } from 'react';
+import React, { type FC } from 'react';
 import Box from '@mui/material/Box';
 import { useGetGroupsUpcomingEpisodes } from 'hooks/useFetchItems';
 import Loading from 'components/loading/LoadingComponent';
 import globalize from 'scripts/globalize';
 import SectionContainer from './SectionContainer';
-import { LibraryViewProps } from 'types/library';
+import { CardShape } from 'utils/card';
+import type { LibraryViewProps } from 'types/library';
 
 const UpcomingView: FC<LibraryViewProps> = ({ parentId }) => {
     const { isLoading, data: groupsUpcomingEpisodes } = useGetGroupsUpcomingEpisodes(parentId);
@@ -29,7 +30,7 @@ const UpcomingView: FC<LibraryViewProps> = ({ parentId }) => {
                         sectionTitle={group.name}
                         items={group.items ?? []}
                         cardOptions={{
-                            shape: 'overflowBackdrop',
+                            shape: CardShape.BackdropOverflow,
                             showLocationTypeIndicator: false,
                             showParentTitle: true,
                             preferThumb: true,

src/components/cardbuilder/Card/Card.tsx

@@ -0,0 +1,25 @@
+import React, { type FC } from 'react';
+import useCard from './useCard';
+import CardWrapper from './CardWrapper';
+import CardBox from './CardBox';
+
+import type { CardOptions } from 'types/cardOptions';
+import type { ItemDto } from 'types/base/models/item-dto';
+
+interface CardProps {
+    item?: ItemDto;
+    cardOptions: CardOptions;
+}
+
+const Card: FC<CardProps> = ({ item = {}, cardOptions }) => {
+    const { getCardWrapperProps, getCardBoxProps } = useCard({ item, cardOptions } );
+    const cardWrapperProps = getCardWrapperProps();
+    const cardBoxProps = getCardBoxProps();
+    return (
+        <CardWrapper {...cardWrapperProps}>
+            <CardBox {...cardBoxProps} />
+        </CardWrapper>
+    );
+};
+
+export default Card;

src/components/cardbuilder/Card/CardBox.tsx

@@ -0,0 +1,78 @@
+import React, { type FC } from 'react';
+import layoutManager from 'components/layoutManager';
+
+import CardOverlayButtons from './CardOverlayButtons';
+import CardHoverMenu from './CardHoverMenu';
+import CardOuterFooter from './CardOuterFooter';
+import CardContent from './CardContent';
+import { CardShape } from 'utils/card';
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { CardOptions } from 'types/cardOptions';
+
+interface CardBoxProps {
+    item: ItemDto;
+    cardOptions: CardOptions;
+    className: string;
+    shape: CardShape | undefined;
+    imgUrl: string | undefined;
+    blurhash: string | undefined;
+    forceName: boolean;
+    coveredImage: boolean;
+    overlayText: boolean | undefined;
+}
+
+const CardBox: FC<CardBoxProps> = ({
+    item,
+    cardOptions,
+    className,
+    shape,
+    imgUrl,
+    blurhash,
+    forceName,
+    coveredImage,
+    overlayText
+}) => {
+    return (
+        <div className={className}>
+            <div className='cardScalable'>
+                <div className={`cardPadder cardPadder-${shape}`}></div>
+                <CardContent
+                    item={item}
+                    cardOptions={cardOptions}
+                    coveredImage={coveredImage}
+
+                    overlayText={overlayText}
+                    imgUrl={imgUrl}
+                    blurhash={blurhash}
+                    forceName={forceName}
+                />
+                {layoutManager.mobile && (
+                    <CardOverlayButtons
+                        item={item}
+                        cardOptions={cardOptions}
+                    />
+                )}
+
+                {layoutManager.desktop
+                        && !cardOptions.disableHoverMenu && (
+                    <CardHoverMenu
+                        item={item}
+                        cardOptions={cardOptions}
+                    />
+                )}
+            </div>
+            {!overlayText && (
+                <CardOuterFooter
+                    item={item}
+                    cardOptions={cardOptions}
+                    forceName={forceName}
+                    overlayText={overlayText}
+                    imgUrl={imgUrl}
+                />
+            )}
+        </div>
+    );
+};
+
+export default CardBox;
+

src/components/cardbuilder/Card/CardContent.tsx

@@ -0,0 +1,50 @@
+import React, { type FC } from 'react';
+import classNames from 'classnames';
+import { getDefaultBackgroundClass } from '../cardBuilderUtils';
+import CardImageContainer from './CardImageContainer';
+
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { CardOptions } from 'types/cardOptions';
+
+interface CardContentProps {
+    item: ItemDto;
+    cardOptions: CardOptions;
+    coveredImage: boolean;
+    overlayText: boolean | undefined;
+    imgUrl: string | undefined;
+    blurhash: string | undefined;
+    forceName: boolean;
+}
+
+const CardContent: FC<CardContentProps> = ({
+    item,
+    cardOptions,
+    coveredImage,
+    overlayText,
+    imgUrl,
+    blurhash,
+    forceName
+}) => {
+    const cardContentClass = classNames(
+        'cardContent',
+        { [getDefaultBackgroundClass(item.Name)]: !imgUrl }
+    );
+
+    return (
+        <div
+            className={cardContentClass}
+        >
+            <CardImageContainer
+                item={item}
+                cardOptions={cardOptions}
+                coveredImage={coveredImage}
+                overlayText={overlayText}
+                imgUrl={imgUrl}
+                blurhash={blurhash}
+                forceName={forceName}
+            />
+        </div>
+    );
+};
+
+export default CardContent;

src/components/cardbuilder/Card/CardFooterText.tsx

@@ -0,0 +1,81 @@
+import React, { type FC } from 'react';
+import Box from '@mui/material/Box';
+import useCardText from './useCardText';
+import layoutManager from 'components/layoutManager';
+import MoreVertIconButton from '../../common/MoreVertIconButton';
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { CardOptions } from 'types/cardOptions';
+
+const shouldShowDetailsMenu = (
+    cardOptions: CardOptions,
+    isOuterFooter: boolean
+) => {
+    return (
+        cardOptions.showDetailsMenu
+        && isOuterFooter
+        && cardOptions.cardLayout
+        && layoutManager.mobile
+        && cardOptions.cardFooterAside !== 'none'
+    );
+};
+
+interface LogoComponentProps {
+    logoUrl: string;
+}
+
+const LogoComponent: FC<LogoComponentProps> = ({ logoUrl }) => {
+    return <Box className='lazy cardFooterLogo' data-src={logoUrl} />;
+};
+
+interface CardFooterTextProps {
+    item: ItemDto;
+    cardOptions: CardOptions;
+    forceName: boolean;
+    overlayText: boolean | undefined;
+    imgUrl: string | undefined;
+    footerClass: string | undefined;
+    progressBar?: React.JSX.Element | null;
+    logoUrl?: string;
+    isOuterFooter: boolean;
+}
+
+const CardFooterText: FC<CardFooterTextProps> = ({
+    item,
+    cardOptions,
+    forceName,
+    imgUrl,
+    footerClass,
+    overlayText,
+    progressBar,
+    logoUrl,
+    isOuterFooter
+}) => {
+    const { cardTextLines } = useCardText({
+        item,
+        cardOptions,
+        forceName,
+        imgUrl,
+        overlayText,
+        isOuterFooter,
+        cssClass: cardOptions.centerText ?
+            'cardText cardTextCentered' :
+            'cardText',
+        forceLines: !cardOptions.overlayText,
+        maxLines: cardOptions.lines
+    });
+
+    return (
+        <Box className={footerClass}>
+            {logoUrl && <LogoComponent logoUrl={logoUrl} />}
+            {shouldShowDetailsMenu(cardOptions, isOuterFooter) && (
+                <MoreVertIconButton className='itemAction btnCardOptions' />
+            )}
+
+            {cardTextLines}
+
+            {progressBar}
+        </Box>
+    );
+};
+
+export default CardFooterText;

src/components/cardbuilder/Card/CardHoverMenu.tsx

@@ -0,0 +1,82 @@
+import React, { type FC } from 'react';
+import Box from '@mui/material/Box';
+import ButtonGroup from '@mui/material/ButtonGroup';
+import classNames from 'classnames';
+import { appRouter } from 'components/router/appRouter';
+import itemHelper from 'components/itemHelper';
+import { playbackManager } from 'components/playback/playbackmanager';
+
+import PlayedButton from 'elements/emby-playstatebutton/PlayedButton';
+import FavoriteButton from 'elements/emby-ratingbutton/FavoriteButton';
+import PlayArrowIconButton from '../../common/PlayArrowIconButton';
+import MoreVertIconButton from '../../common/MoreVertIconButton';
+
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { CardOptions } from 'types/cardOptions';
+
+interface CardHoverMenuProps {
+	item: ItemDto;
+	cardOptions: CardOptions;
+}
+
+const CardHoverMenu: FC<CardHoverMenuProps> = ({
+    item,
+    cardOptions
+}) => {
+    const url = appRouter.getRouteUrl(item, {
+        parentId: cardOptions.parentId
+    });
+    const btnCssClass =
+		'paper-icon-button-light cardOverlayButton cardOverlayButton-hover itemAction';
+
+    const centerPlayButtonClass = classNames(
+        btnCssClass,
+        'cardOverlayFab-primary'
+    );
+    const { IsFavorite, Played } = item.UserData ?? {};
+
+    return (
+        <Box
+            className='cardOverlayContainer'
+        >
+            <a
+                href={url}
+                aria-label={item.Name || ''}
+                className='cardImageContainer'
+            ></a>
+
+            {playbackManager.canPlay(item) && (
+                <PlayArrowIconButton
+                    className={centerPlayButtonClass}
+                    action='play'
+                    title='Play'
+                />
+            )}
+
+            <ButtonGroup className='cardOverlayButton-br flex'>
+                {itemHelper.canMarkPlayed(item) && cardOptions.enablePlayedButton !== false && (
+                    <PlayedButton
+                        className={btnCssClass}
+                        isPlayed={Played}
+                        itemId={item.Id}
+                        itemType={item.Type}
+                        queryKey={cardOptions.queryKey}
+                    />
+                )}
+
+                {itemHelper.canRate(item) && cardOptions.enableRatingButton !== false && (
+                    <FavoriteButton
+                        className={btnCssClass}
+                        isFavorite={IsFavorite}
+                        itemId={item.Id}
+                        queryKey={cardOptions.queryKey}
+                    />
+                )}
+
+                <MoreVertIconButton className={btnCssClass} />
+            </ButtonGroup>
+        </Box>
+    );
+};
+
+export default CardHoverMenu;

src/components/cardbuilder/Card/CardImageContainer.tsx

@@ -0,0 +1,83 @@
+import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
+import React, { type FC } from 'react';
+import Box from '@mui/material/Box';
+import classNames from 'classnames';
+import useIndicator from 'components/indicators/useIndicator';
+import RefreshIndicator from 'elements/emby-itemrefreshindicator/RefreshIndicator';
+import Media from '../../common/Media';
+import CardInnerFooter from './CardInnerFooter';
+
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { CardOptions } from 'types/cardOptions';
+
+interface CardImageContainerProps {
+    item: ItemDto;
+    cardOptions: CardOptions;
+    coveredImage: boolean;
+    overlayText: boolean | undefined;
+    imgUrl: string | undefined;
+    blurhash: string | undefined;
+    forceName: boolean;
+}
+
+const CardImageContainer: FC<CardImageContainerProps> = ({
+    item,
+    cardOptions,
+    coveredImage,
+    overlayText,
+    imgUrl,
+    blurhash,
+    forceName
+}) => {
+    const indicator = useIndicator(item);
+    const cardImageClass = classNames(
+        'cardImageContainer',
+        { coveredImage: coveredImage },
+        { 'coveredImage-contain': coveredImage && item.Type === BaseItemKind.TvChannel }
+    );
+
+    return (
+        <div className={cardImageClass}>
+            {cardOptions.disableIndicators !== true && (
+                <Box className='indicators'>
+                    {indicator.getMediaSourceIndicator()}
+
+                    <Box className='cardIndicators'>
+                        {cardOptions.missingIndicator !== false
+                            && indicator.getMissingIndicator()}
+
+                        {indicator.getTimerIndicator()}
+                        {indicator.getTypeIndicator()}
+
+                        {cardOptions.showGroupCount ?
+                            indicator.getChildCountIndicator() :
+                            indicator.getPlayedIndicator()}
+
+                        {(item.Type === BaseItemKind.CollectionFolder
+                            || item.CollectionType)
+                            && item.RefreshProgress && (
+                            <RefreshIndicator item={item} />
+                        )}
+                    </Box>
+                </Box>
+            )}
+
+            <Media item={item} imgUrl={imgUrl} blurhash={blurhash} imageType={cardOptions.imageType} />
+
+            {overlayText && (
+                <CardInnerFooter
+                    item={item}
+                    cardOptions={cardOptions}
+                    forceName={forceName}
+                    overlayText={overlayText}
+                    imgUrl={imgUrl}
+                    progressBar={indicator.getProgressBar()}
+                />
+            )}
+
+            {!overlayText && indicator.getProgressBar()}
+        </div>
+    );
+};
+
+export default CardImageContainer;

src/components/cardbuilder/Card/CardInnerFooter.tsx

@@ -0,0 +1,42 @@
+import React, { type FC } from 'react';
+import classNames from 'classnames';
+import CardFooterText from './CardFooterText';
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { CardOptions } from 'types/cardOptions';
+
+interface CardInnerFooterProps {
+    item: ItemDto;
+    cardOptions: CardOptions;
+    imgUrl: string | undefined;
+    progressBar?: React.JSX.Element | null;
+    forceName: boolean;
+    overlayText: boolean | undefined;
+}
+
+const CardInnerFooter: FC<CardInnerFooterProps> = ({
+    item,
+    cardOptions,
+    imgUrl,
+    overlayText,
+    progressBar,
+    forceName
+}) => {
+    const footerClass = classNames('innerCardFooter', {
+        fullInnerCardFooter: progressBar
+    });
+
+    return (
+        <CardFooterText
+            item={item}
+            cardOptions={cardOptions}
+            forceName={forceName}
+            overlayText={overlayText}
+            imgUrl={imgUrl}
+            footerClass={footerClass}
+            progressBar={progressBar}
+            isOuterFooter={false}
+        />
+    );
+};
+
+export default CardInnerFooter;

src/components/cardbuilder/Card/CardOuterFooter.tsx

@@ -0,0 +1,45 @@
+import React, { type FC } from 'react';
+import classNames from 'classnames';
+import { useApi } from 'hooks/useApi';
+import { getCardLogoUrl } from './cardHelper';
+import CardFooterText from './CardFooterText';
+
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { CardOptions } from 'types/cardOptions';
+
+interface CardOuterFooterProps {
+    item: ItemDto
+    cardOptions: CardOptions;
+    imgUrl: string | undefined;
+    forceName: boolean;
+    overlayText: boolean | undefined
+}
+
+const CardOuterFooter: FC<CardOuterFooterProps> = ({ item, cardOptions, overlayText, imgUrl, forceName }) => {
+    const { api } = useApi();
+    const logoInfo = getCardLogoUrl(item, api, cardOptions);
+    const logoUrl = logoInfo.logoUrl;
+
+    const footerClass = classNames(
+        'cardFooter',
+        { 'cardFooter-transparent': cardOptions.cardLayout },
+        { 'cardFooter-withlogo': logoUrl }
+    );
+
+    return (
+        <CardFooterText
+            item={item}
+            cardOptions={cardOptions}
+            forceName={forceName}
+            overlayText={overlayText}
+            imgUrl={imgUrl}
+            footerClass={footerClass}
+            progressBar={undefined}
+            logoUrl={logoUrl}
+            isOuterFooter={true}
+        />
+
+    );
+};
+
+export default CardOuterFooter;

src/components/cardbuilder/Card/CardOverlayButtons.tsx

@@ -0,0 +1,104 @@
+import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
+import { LocationType } from '@jellyfin/sdk/lib/generated-client/models/location-type';
+import React, { type FC } from 'react';
+import ButtonGroup from '@mui/material/ButtonGroup';
+import classNames from 'classnames';
+import { appRouter } from 'components/router/appRouter';
+import PlayArrowIconButton from '../../common/PlayArrowIconButton';
+import MoreVertIconButton from '../../common/MoreVertIconButton';
+
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { CardOptions } from 'types/cardOptions';
+
+const sholudShowOverlayPlayButton = (
+    overlayPlayButton: boolean | undefined,
+    item: ItemDto
+) => {
+    return (
+        overlayPlayButton
+        && !item.IsPlaceHolder
+        && (item.LocationType !== LocationType.Virtual
+            || !item.MediaType
+            || item.Type === BaseItemKind.Program)
+        && item.Type !== BaseItemKind.Person
+    );
+};
+
+interface CardOverlayButtonsProps {
+    item: ItemDto;
+    cardOptions: CardOptions;
+}
+
+const CardOverlayButtons: FC<CardOverlayButtonsProps> = ({
+    item,
+    cardOptions
+}) => {
+    let overlayPlayButton = cardOptions.overlayPlayButton;
+
+    if (
+        overlayPlayButton == null
+        && !cardOptions.overlayMoreButton
+        && !cardOptions.overlayInfoButton
+        && !cardOptions.cardLayout
+    ) {
+        overlayPlayButton = item.MediaType === 'Video';
+    }
+
+    const url = appRouter.getRouteUrl(item, {
+        parentId: cardOptions.parentId
+    });
+
+    const btnCssClass = classNames(
+        'paper-icon-button-light',
+        'cardOverlayButton',
+        'itemAction'
+    );
+
+    const centerPlayButtonClass = classNames(
+        btnCssClass,
+        'cardOverlayButton-centered'
+    );
+
+    return (
+        <a
+            href={url}
+            aria-label={item.Name || ''}
+            style={{
+                position: 'absolute',
+                top: 0,
+                left: 0,
+                bottom: 0,
+                right: 0,
+                userSelect: 'none',
+                borderRadius: '0.2em'
+            }}
+        >
+
+            {cardOptions.centerPlayButton && (
+                <PlayArrowIconButton
+                    className={centerPlayButtonClass}
+                    action='play'
+                    title='Play'
+                />
+            )}
+
+            <ButtonGroup className='cardOverlayButton-br'>
+                {sholudShowOverlayPlayButton(overlayPlayButton, item) && (
+                    <PlayArrowIconButton
+                        className={btnCssClass}
+                        action='play'
+                        title='Play'
+                    />
+                )}
+
+                {cardOptions.overlayMoreButton && (
+                    <MoreVertIconButton
+                        className={btnCssClass}
+                    />
+                )}
+            </ButtonGroup>
+        </a>
+    );
+};
+
+export default CardOverlayButtons;

src/components/cardbuilder/Card/CardText.tsx

@@ -0,0 +1,32 @@
+import React, { type FC } from 'react';
+import Box from '@mui/material/Box';
+import type { TextLine } from './cardHelper';
+
+interface CardTextProps {
+    className?: string;
+    textLine: TextLine;
+}
+
+const CardText: FC<CardTextProps> = ({ className, textLine }) => {
+    const { title, titleAction } = textLine;
+    const renderCardText = () => {
+        if (titleAction) {
+            return (
+                <a
+                    className='itemAction textActionButton'
+                    href={titleAction.url}
+                    title={titleAction.title}
+                    {...titleAction.dataAttributes}
+                >
+                    {titleAction.title}
+                </a>
+            );
+        } else {
+            return title;
+        }
+    };
+
+    return <Box className={className}>{renderCardText()}</Box>;
+};
+
+export default CardText;

src/components/cardbuilder/Card/CardWrapper.tsx

@@ -0,0 +1,30 @@
+import React, { type FC } from 'react';
+import layoutManager from 'components/layoutManager';
+import type { DataAttributes } from 'types/dataAttributes';
+
+interface CardWrapperProps {
+    className: string;
+    dataAttributes: DataAttributes;
+}
+
+const CardWrapper: FC<CardWrapperProps> = ({
+    className,
+    dataAttributes,
+    children
+}) => {
+    if (layoutManager.tv) {
+        return (
+            <button className={className} {...dataAttributes}>
+                {children}
+            </button>
+        );
+    } else {
+        return (
+            <div className={className} {...dataAttributes}>
+                {children}
+            </div>
+        );
+    }
+};
+
+export default CardWrapper;

src/components/cardbuilder/Card/Cards.tsx

@@ -0,0 +1,24 @@
+import React, { type FC } from 'react';
+import { setCardData } from '../cardBuilder';
+import Card from './Card';
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { CardOptions } from 'types/cardOptions';
+import '../card.scss';
+
+interface CardsProps {
+    items: ItemDto[];
+    cardOptions: CardOptions;
+}
+
+const Cards: FC<CardsProps> = ({ items, cardOptions }) => {
+    setCardData(items, cardOptions);
+
+    const renderCards = () =>
+        items.map((item) => (
+            <Card key={item.Id} item={item} cardOptions={cardOptions} />
+        ));
+
+    return <>{renderCards()}</>;
+};
+
+export default Cards;

src/components/cardbuilder/Card/cardHelper.ts

@@ -0,0 +1,723 @@
+import {
+    BaseItemDto,
+    BaseItemKind,
+    BaseItemPerson,
+    ImageType
+} from '@jellyfin/sdk/lib/generated-client';
+import { Api } from '@jellyfin/sdk';
+import { getImageApi } from '@jellyfin/sdk/lib/utils/api/image-api';
+import escapeHTML from 'escape-html';
+
+import { appRouter } from 'components/router/appRouter';
+import layoutManager from 'components/layoutManager';
+import itemHelper from 'components/itemHelper';
+import globalize from 'scripts/globalize';
+import datetime from 'scripts/datetime';
+
+import { isUsingLiveTvNaming } from '../cardBuilderUtils';
+
+import type { NullableNumber, NullableString } from 'types/base/common/shared/types';
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { CardOptions } from 'types/cardOptions';
+import type { DataAttributes } from 'types/dataAttributes';
+import { getDataAttributes } from 'utils/items';
+
+export function getCardLogoUrl(
+    item: ItemDto,
+    api: Api | undefined,
+    cardOptions: CardOptions
+) {
+    let imgType;
+    let imgTag;
+    let itemId;
+    const logoHeight = 40;
+
+    if (cardOptions.showChannelLogo && item.ChannelPrimaryImageTag) {
+        imgType = ImageType.Primary;
+        imgTag = item.ChannelPrimaryImageTag;
+        itemId = item.ChannelId;
+    } else if (cardOptions.showLogo && item.ParentLogoImageTag) {
+        imgType = ImageType.Logo;
+        imgTag = item.ParentLogoImageTag;
+        itemId = item.ParentLogoItemId;
+    }
+
+    if (!itemId) {
+        itemId = item.Id;
+    }
+
+    if (api && imgTag && imgType && itemId) {
+        const response = getImageApi(api).getItemImageUrlById(itemId, imgType, {
+            height: logoHeight,
+            tag: imgTag
+        });
+
+        return {
+            logoUrl: response
+        };
+    }
+
+    return {
+        logoUrl: undefined
+    };
+}
+
+interface TextAction {
+    url: string;
+    title: string;
+    dataAttributes: DataAttributes
+}
+
+export interface TextLine {
+    title?: NullableString;
+    titleAction?: TextAction;
+}
+
+export function getTextActionButton(
+    item: ItemDto,
+    text?: NullableString,
+    serverId?: NullableString
+): TextLine {
+    if (!text) {
+        text = itemHelper.getDisplayName(item);
+    }
+
+    text = escapeHTML(text);
+
+    if (layoutManager.tv) {
+        return {
+            title: text
+        };
+    }
+
+    const url = appRouter.getRouteUrl(item);
+
+    const dataAttributes = getDataAttributes(
+        {
+            action: 'link',
+            itemServerId: serverId ?? item.ServerId,
+            itemId: item.Id,
+            itemChannelId: item.ChannelId,
+            itemType: item.Type,
+            itemMediaType: item.MediaType,
+            itemCollectionType: item.CollectionType,
+            itemIsFolder: item.IsFolder
+        }
+    );
+
+    return {
+        titleAction: {
+            url,
+            title: text,
+            dataAttributes
+        }
+    };
+}
+
+export function getAirTimeText(
+    item: ItemDto,
+    showAirDateTime: boolean | undefined,
+    showAirEndTime: boolean | undefined
+) {
+    let airTimeText = '';
+
+    if (item.StartDate) {
+        try {
+            let date = datetime.parseISO8601Date(item.StartDate);
+
+            if (showAirDateTime) {
+                airTimeText
+                    += datetime.toLocaleDateString(date, {
+                        weekday: 'short',
+                        month: 'short',
+                        day: 'numeric'
+                    }) + ' ';
+            }
+
+            airTimeText += datetime.getDisplayTime(date);
+
+            if (item.EndDate && showAirEndTime) {
+                date = datetime.parseISO8601Date(item.EndDate);
+                airTimeText += ' - ' + datetime.getDisplayTime(date);
+            }
+        } catch (e) {
+            console.error('error parsing date: ' + item.StartDate);
+        }
+    }
+    return airTimeText;
+}
+
+function isGenreOrStudio(itemType: NullableString) {
+    return itemType === BaseItemKind.Genre || itemType === BaseItemKind.Studio;
+}
+
+function isMusicGenreOrMusicArtist(
+    itemType: NullableString,
+    context: NullableString
+) {
+    return itemType === BaseItemKind.MusicGenre || context === 'MusicArtist';
+}
+
+function getMovieCount(itemMovieCount: NullableNumber) {
+    if (itemMovieCount) {
+        return itemMovieCount === 1 ?
+            globalize.translate('ValueOneMovie') :
+            globalize.translate('ValueMovieCount', itemMovieCount);
+    }
+}
+
+function getSeriesCount(itemSeriesCount: NullableNumber) {
+    if (itemSeriesCount) {
+        return itemSeriesCount === 1 ?
+            globalize.translate('ValueOneSeries') :
+            globalize.translate('ValueSeriesCount', itemSeriesCount);
+    }
+}
+
+function getEpisodeCount(itemEpisodeCount: NullableNumber) {
+    if (itemEpisodeCount) {
+        return itemEpisodeCount === 1 ?
+            globalize.translate('ValueOneEpisode') :
+            globalize.translate('ValueEpisodeCount', itemEpisodeCount);
+    }
+}
+
+function getAlbumCount(itemAlbumCount: NullableNumber) {
+    if (itemAlbumCount) {
+        return itemAlbumCount === 1 ?
+            globalize.translate('ValueOneAlbum') :
+            globalize.translate('ValueAlbumCount', itemAlbumCount);
+    }
+}
+
+function getSongCount(itemSongCount: NullableNumber) {
+    if (itemSongCount) {
+        return itemSongCount === 1 ?
+            globalize.translate('ValueOneSong') :
+            globalize.translate('ValueSongCount', itemSongCount);
+    }
+}
+
+function getMusicVideoCount(itemMusicVideoCount: NullableNumber) {
+    if (itemMusicVideoCount) {
+        return itemMusicVideoCount === 1 ?
+            globalize.translate('ValueOneMusicVideo') :
+            globalize.translate('ValueMusicVideoCount', itemMusicVideoCount);
+    }
+}
+
+function getRecursiveItemCount(itemRecursiveItemCount: NullableNumber) {
+    return itemRecursiveItemCount === 1 ?
+        globalize.translate('ValueOneEpisode') :
+        globalize.translate('ValueEpisodeCount', itemRecursiveItemCount);
+}
+
+function getParentTitle(
+    isOuterFooter: boolean,
+    serverId: NullableString,
+    item: ItemDto
+) {
+    if (isOuterFooter && item.AlbumArtists?.length) {
+        (item.AlbumArtists[0] as BaseItemDto).Type = BaseItemKind.MusicArtist;
+        (item.AlbumArtists[0] as BaseItemDto).IsFolder = true;
+        return getTextActionButton(item.AlbumArtists[0], null, serverId);
+    } else {
+        return {
+            title: isUsingLiveTvNaming(item.Type) ?
+                item.Name :
+                item.SeriesName
+                  || item.Series
+                  || item.Album
+                  || item.AlbumArtist
+                  || ''
+        };
+    }
+}
+
+function getRunTimeTicks(itemRunTimeTicks: NullableNumber) {
+    if (itemRunTimeTicks) {
+        let minutes = itemRunTimeTicks / 600000000;
+
+        minutes = minutes || 1;
+
+        return globalize.translate('ValueMinutes', Math.round(minutes));
+    } else {
+        return globalize.translate('ValueMinutes', 0);
+    }
+}
+
+export function getItemCounts(cardOptions: CardOptions, item: ItemDto) {
+    const counts: string[] = [];
+
+    const addCount = (text: NullableString) => {
+        if (text) {
+            counts.push(text);
+        }
+    };
+
+    if (item.Type === BaseItemKind.Playlist) {
+        const runTimeTicksText = getRunTimeTicks(item.RunTimeTicks);
+        addCount(runTimeTicksText);
+    } else if (isGenreOrStudio(item.Type)) {
+        const movieCountText = getMovieCount(item.MovieCount);
+        addCount(movieCountText);
+
+        const seriesCountText = getSeriesCount(item.SeriesCount);
+        addCount(seriesCountText);
+
+        const episodeCountText = getEpisodeCount(item.EpisodeCount);
+        addCount(episodeCountText);
+    } else if (isMusicGenreOrMusicArtist(item.Type, cardOptions.context)) {
+        const albumCountText = getAlbumCount(item.AlbumCount);
+        addCount(albumCountText);
+
+        const songCountText = getSongCount(item.SongCount);
+        addCount(songCountText);
+
+        const musicVideoCountText = getMusicVideoCount(item.MusicVideoCount);
+        addCount(musicVideoCountText);
+    } else if (item.Type === BaseItemKind.Series) {
+        const recursiveItemCountText = getRecursiveItemCount(
+            item.RecursiveItemCount
+        );
+        addCount(recursiveItemCountText);
+    }
+
+    return counts.join(', ');
+}
+
+export function shouldShowTitle(
+    showTitle: boolean | string | undefined,
+    itemType: NullableString
+) {
+    return (
+        Boolean(showTitle)
+        || itemType === BaseItemKind.PhotoAlbum
+        || itemType === BaseItemKind.Folder
+    );
+}
+
+export function shouldShowOtherText(
+    isOuterFooter: boolean,
+    overlayText: boolean | undefined
+) {
+    return isOuterFooter ? !overlayText : overlayText;
+}
+
+export function shouldShowParentTitleUnderneath(
+    itemType: NullableString
+) {
+    return (
+        itemType === BaseItemKind.MusicAlbum
+        || itemType === BaseItemKind.Audio
+        || itemType === BaseItemKind.MusicVideo
+    );
+}
+
+function shouldShowMediaTitle(
+    titleAdded: boolean,
+    showTitle: boolean,
+    forceName: boolean,
+    cardOptions: CardOptions,
+    textLines: TextLine[]
+) {
+    let showMediaTitle =
+        (showTitle && !titleAdded)
+        || (cardOptions.showParentTitleOrTitle && !textLines.length);
+    if (!showMediaTitle && !titleAdded && (showTitle || forceName)) {
+        showMediaTitle = true;
+    }
+    return showMediaTitle;
+}
+
+function shouldShowExtraType(itemExtraType: NullableString) {
+    return itemExtraType && itemExtraType !== 'Unknown';
+}
+
+function shouldShowSeriesYearOrYear(
+    showYear: string | boolean | undefined,
+    showSeriesYear: boolean | undefined
+) {
+    return Boolean(showYear) || showSeriesYear;
+}
+
+function shouldShowCurrentProgram(
+    showCurrentProgram: boolean | undefined,
+    itemType: NullableString
+) {
+    return showCurrentProgram && itemType === BaseItemKind.TvChannel;
+}
+
+function shouldShowCurrentProgramTime(
+    showCurrentProgramTime: boolean | undefined,
+    itemType: NullableString
+) {
+    return showCurrentProgramTime && itemType === BaseItemKind.TvChannel;
+}
+
+function shouldShowPersonRoleOrType(
+    showPersonRoleOrType: boolean | undefined,
+    item: ItemDto
+) {
+    return showPersonRoleOrType && (item as BaseItemPerson).Role;
+}
+
+function shouldShowParentTitle(
+    showParentTitle: boolean | undefined,
+    parentTitleUnderneath: boolean
+) {
+    return showParentTitle && parentTitleUnderneath;
+}
+
+function addOtherText(
+    cardOptions: CardOptions,
+    parentTitleUnderneath: boolean,
+    isOuterFooter: boolean,
+    item: ItemDto,
+    addTextLine: (val: TextLine) => void,
+    serverId: NullableString
+) {
+    if (
+        shouldShowParentTitle(
+            cardOptions.showParentTitle,
+            parentTitleUnderneath
+        )
+    ) {
+        addTextLine(getParentTitle(isOuterFooter, serverId, item));
+    }
+
+    if (shouldShowExtraType(item.ExtraType)) {
+        addTextLine({ title: globalize.translate(item.ExtraType) });
+    }
+
+    if (cardOptions.showItemCounts) {
+        addTextLine({ title: getItemCounts(cardOptions, item) });
+    }
+
+    if (cardOptions.textLines) {
+        addTextLine({ title: getAdditionalLines(cardOptions.textLines, item) });
+    }
+
+    if (cardOptions.showSongCount) {
+        addTextLine({ title: getSongCount(item.SongCount) });
+    }
+
+    if (cardOptions.showPremiereDate) {
+        addTextLine({ title: getPremiereDate(item.PremiereDate) });
+    }
+
+    if (
+        shouldShowSeriesYearOrYear(
+            cardOptions.showYear,
+            cardOptions.showSeriesYear
+        )
+    ) {
+        addTextLine({ title: getProductionYear(item) });
+    }
+
+    if (cardOptions.showRuntime) {
+        addTextLine({ title: getRunTime(item.RunTimeTicks) });
+    }
+
+    if (cardOptions.showAirTime) {
+        addTextLine({
+            title: getAirTimeText(
+                item,
+                cardOptions.showAirDateTime,
+                cardOptions.showAirEndTime
+            )
+        });
+    }
+
+    if (cardOptions.showChannelName) {
+        addTextLine(getChannelName(item));
+    }
+
+    if (shouldShowCurrentProgram(cardOptions.showCurrentProgram, item.Type)) {
+        addTextLine({ title: getCurrentProgramName(item.CurrentProgram) });
+    }
+
+    if (
+        shouldShowCurrentProgramTime(
+            cardOptions.showCurrentProgramTime,
+            item.Type
+        )
+    ) {
+        addTextLine({ title: getCurrentProgramTime(item.CurrentProgram) });
+    }
+
+    if (cardOptions.showSeriesTimerTime) {
+        addTextLine({ title: getSeriesTimerTime(item) });
+    }
+
+    if (cardOptions.showSeriesTimerChannel) {
+        addTextLine({ title: getSeriesTimerChannel(item) });
+    }
+
+    if (shouldShowPersonRoleOrType(cardOptions.showCurrentProgramTime, item)) {
+        addTextLine({
+            title: globalize.translate(
+                'PersonRole',
+                (item as BaseItemPerson).Role
+            )
+        });
+    }
+}
+
+function getSeriesTimerChannel(item: ItemDto) {
+    if (item.RecordAnyChannel) {
+        return globalize.translate('AllChannels');
+    } else {
+        return item.ChannelName || '' || globalize.translate('OneChannel');
+    }
+}
+
+function getSeriesTimerTime(item: ItemDto) {
+    if (item.RecordAnyTime) {
+        return globalize.translate('Anytime');
+    } else {
+        return datetime.getDisplayTime(item.StartDate);
+    }
+}
+
+function getCurrentProgramTime(CurrentProgram: BaseItemDto | undefined) {
+    if (CurrentProgram) {
+        return getAirTimeText(CurrentProgram, false, true) || '';
+    } else {
+        return '';
+    }
+}
+
+function getCurrentProgramName(CurrentProgram: BaseItemDto | undefined) {
+    if (CurrentProgram) {
+        return CurrentProgram.Name;
+    } else {
+        return '';
+    }
+}
+
+function getChannelName(item: ItemDto) {
+    if (item.ChannelId) {
+        return getTextActionButton(
+            {
+                Id: item.ChannelId,
+                ServerId: item.ServerId,
+                Name: item.ChannelName,
+                Type: BaseItemKind.TvChannel,
+                MediaType: item.MediaType,
+                IsFolder: false
+            },
+            item.ChannelName
+        );
+    } else {
+        return { title: item.ChannelName || '' || ' ' };
+    }
+}
+
+function getRunTime(itemRunTimeTicks: NullableNumber) {
+    if (itemRunTimeTicks) {
+        return datetime.getDisplayRunningTime(itemRunTimeTicks);
+    } else {
+        return '';
+    }
+}
+
+function getPremiereDate(PremiereDate: string | null | undefined) {
+    if (PremiereDate) {
+        try {
+            return datetime.toLocaleDateString(
+                datetime.parseISO8601Date(PremiereDate),
+                { weekday: 'long', month: 'long', day: 'numeric' }
+            );
+        } catch (err) {
+            return '';
+        }
+    } else {
+        return '';
+    }
+}
+
+function getAdditionalLines(
+    textLines: (item: ItemDto) => (string | undefined)[],
+    item: ItemDto
+) {
+    const additionalLines = textLines(item);
+    for (const additionalLine of additionalLines) {
+        return additionalLine;
+    }
+}
+
+function getProductionYear(item: ItemDto) {
+    const productionYear =
+        item.ProductionYear
+        && datetime.toLocaleString(item.ProductionYear, {
+            useGrouping: false
+        });
+    if (item.Type === BaseItemKind.Series) {
+        if (item.Status === 'Continuing') {
+            return globalize.translate(
+                'SeriesYearToPresent',
+                productionYear || ''
+            );
+        } else if (item.EndDate && item.ProductionYear) {
+            const endYear = datetime.toLocaleString(
+                datetime.parseISO8601Date(item.EndDate).getFullYear(),
+                { useGrouping: false }
+            );
+            return (
+                productionYear
+                + (endYear === productionYear ? '' : ' - ' + endYear)
+            );
+        } else {
+            return productionYear || '';
+        }
+    } else {
+        return productionYear || '';
+    }
+}
+
+function getMediaTitle(cardOptions: CardOptions, item: ItemDto): TextLine {
+    const name =
+        cardOptions.showTitle === 'auto'
+        && !item.IsFolder
+        && item.MediaType === 'Photo' ?
+            '' :
+            itemHelper.getDisplayName(item, {
+                includeParentInfo: cardOptions.includeParentInfoInTitle
+            });
+
+    return getTextActionButton({
+        Id: item.Id,
+        ServerId: item.ServerId,
+        Name: name,
+        Type: item.Type,
+        CollectionType: item.CollectionType,
+        IsFolder: item.IsFolder
+    });
+}
+
+function getParentTitleOrTitle(
+    isOuterFooter: boolean,
+    item: ItemDto,
+    setTitleAdded: (val: boolean) => void,
+    showTitle: boolean
+): TextLine {
+    if (
+        isOuterFooter
+        && item.Type === BaseItemKind.Episode
+        && item.SeriesName
+    ) {
+        if (item.SeriesId) {
+            return getTextActionButton({
+                Id: item.SeriesId,
+                ServerId: item.ServerId,
+                Name: item.SeriesName,
+                Type: BaseItemKind.Series,
+                IsFolder: true
+            });
+        } else {
+            return { title: item.SeriesName };
+        }
+    } else if (isUsingLiveTvNaming(item.Type)) {
+        if (!item.EpisodeTitle && !item.IndexNumber) {
+            setTitleAdded(true);
+        }
+        return { title: item.Name };
+    } else {
+        const parentTitle =
+            item.SeriesName
+            || item.Series
+            || item.Album
+            || item.AlbumArtist
+            || '';
+
+        if (parentTitle || showTitle) {
+            return { title: parentTitle };
+        }
+
+        return { title: '' };
+    }
+}
+
+interface TextLinesOpts {
+    isOuterFooter: boolean;
+    overlayText: boolean | undefined;
+    forceName: boolean;
+    item: ItemDto;
+    cardOptions: CardOptions;
+    imgUrl: string | undefined;
+}
+
+export function getCardTextLines({
+    isOuterFooter,
+    overlayText,
+    forceName,
+    item,
+    cardOptions,
+    imgUrl
+}: TextLinesOpts) {
+    const showTitle = shouldShowTitle(cardOptions.showTitle, item.Type);
+    const showOtherText = shouldShowOtherText(isOuterFooter, overlayText);
+    const serverId = item.ServerId || cardOptions.serverId;
+    let textLines: TextLine[] = [];
+    const parentTitleUnderneath = shouldShowParentTitleUnderneath(item.Type);
+
+    let titleAdded = false;
+    const addTextLine = (val: TextLine) => {
+        textLines.push(val);
+    };
+
+    const setTitleAdded = (val: boolean) => {
+        titleAdded = val;
+    };
+
+    if (
+        showOtherText
+        && (cardOptions.showParentTitle || cardOptions.showParentTitleOrTitle)
+        && !parentTitleUnderneath
+    ) {
+        addTextLine(
+            getParentTitleOrTitle(isOuterFooter, item, setTitleAdded, showTitle)
+        );
+    }
+
+    const showMediaTitle = shouldShowMediaTitle(
+        titleAdded,
+        showTitle,
+        forceName,
+        cardOptions,
+        textLines
+    );
+
+    if (showMediaTitle) {
+        addTextLine(getMediaTitle(cardOptions, item));
+    }
+
+    if (showOtherText) {
+        addOtherText(
+            cardOptions,
+            parentTitleUnderneath,
+            isOuterFooter,
+            item,
+            addTextLine,
+            serverId
+        );
+    }
+
+    if (
+        (showTitle || !imgUrl)
+        && forceName
+        && overlayText
+        && textLines.length === 1
+    ) {
+        textLines = [];
+    }
+
+    if (overlayText && showTitle) {
+        textLines = [{ title: item.Name }];
+    }
+
+    return {
+        textLines
+    };
+}

src/components/cardbuilder/Card/useCard.ts

@@ -0,0 +1,123 @@
+import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
+import classNames from 'classnames';
+import useCardImageUrl from './useCardImageUrl';
+import {
+    resolveAction,
+    resolveMixedShapeByAspectRatio
+} from '../cardBuilderUtils';
+import { getDataAttributes } from 'utils/items';
+import { CardShape } from 'utils/card';
+import layoutManager from 'components/layoutManager';
+
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { CardOptions } from 'types/cardOptions';
+
+interface UseCardProps {
+    item: ItemDto;
+    cardOptions: CardOptions;
+}
+
+function useCard({ item, cardOptions }: UseCardProps) {
+    const action = resolveAction({
+        defaultAction: cardOptions.action ?? 'link',
+        isFolder: item.IsFolder ?? false,
+        isPhoto: item.MediaType === 'Photo'
+    });
+
+    let shape = cardOptions.shape;
+
+    if (shape === CardShape.Mixed) {
+        shape = resolveMixedShapeByAspectRatio(item.PrimaryImageAspectRatio);
+    }
+
+    const imgInfo = useCardImageUrl({
+        item: item.ProgramInfo ?? item,
+        cardOptions,
+        shape
+    });
+    const imgUrl = imgInfo.imgUrl;
+    const blurhash = imgInfo.blurhash;
+    const forceName = imgInfo.forceName;
+    const coveredImage = cardOptions.coverImage ?? imgInfo.coverImage;
+    const overlayText = cardOptions.overlayText;
+
+    const nameWithPrefix = item.SortName ?? item.Name ?? '';
+    let prefix = nameWithPrefix.substring(
+        0,
+        Math.min(3, nameWithPrefix.length)
+    );
+
+    if (prefix) {
+        prefix = prefix.toUpperCase();
+    }
+
+    const dataAttributes = getDataAttributes(
+        {
+            action,
+            itemServerId: item.ServerId ?? cardOptions.serverId,
+            context: cardOptions.context,
+            parentId: cardOptions.parentId,
+            collectionId: cardOptions.collectionId,
+            playlistId: cardOptions.playlistId,
+            itemId: item.Id,
+            itemTimerId: item.TimerId,
+            itemSeriesTimerId: item.SeriesTimerId,
+            itemChannelId: item.ChannelId,
+            itemType: item.Type,
+            itemMediaType: item.MediaType,
+            itemCollectionType: item.CollectionType,
+            itemIsFolder: item.IsFolder,
+            itemPath: item.Path,
+            itemStartDate: item.StartDate,
+            itemEndDate: item.EndDate,
+            itemUserData: item.UserData,
+            prefix
+        }
+    );
+
+    const cardClass = classNames(
+        'card',
+        { [`${shape}Card`]: shape },
+        cardOptions.cardCssClass,
+        cardOptions.cardClass,
+        { 'card-hoverable': layoutManager.desktop },
+        { groupedCard: cardOptions.showChildCountIndicator && item.ChildCount },
+        {
+            'card-withuserdata':
+                item.Type !== BaseItemKind.MusicAlbum
+                && item.Type !== BaseItemKind.MusicArtist
+                && item.Type !== BaseItemKind.Audio
+        },
+        { itemAction: layoutManager.tv }
+    );
+
+    const cardBoxClass = classNames(
+        'cardBox',
+        { visualCardBox: cardOptions.cardLayout },
+        { 'cardBox-bottompadded': !cardOptions.cardLayout }
+    );
+
+    const getCardWrapperProps = () => ({
+        className: cardClass,
+        dataAttributes
+    });
+
+    const getCardBoxProps = () => ({
+        item,
+        cardOptions,
+        className: cardBoxClass,
+        shape,
+        imgUrl,
+        blurhash,
+        forceName,
+        coveredImage,
+        overlayText
+    });
+
+    return {
+        getCardWrapperProps,
+        getCardBoxProps
+    };
+}
+
+export default useCard;

src/components/cardbuilder/Card/useCardImageUrl.ts

@@ -0,0 +1,298 @@
+import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
+import { ImageType } from '@jellyfin/sdk/lib/generated-client/models/image-type';
+import { getImageApi } from '@jellyfin/sdk/lib/utils/api/image-api';
+import { useApi } from 'hooks/useApi';
+import { getDesiredAspect } from '../cardBuilderUtils';
+import { CardShape } from 'utils/card';
+import type { NullableNumber, NullableString } from 'types/base/common/shared/types';
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { CardOptions } from 'types/cardOptions';
+
+function getPreferThumbInfo(item: ItemDto, cardOptions: CardOptions) {
+    let imgType;
+    let itemId;
+    let imgTag;
+    let forceName = false;
+
+    if (item.ImageTags?.Thumb) {
+        imgType = ImageType.Thumb;
+        imgTag = item.ImageTags.Thumb;
+        itemId = item.Id;
+    } else if (item.SeriesThumbImageTag && cardOptions.inheritThumb !== false) {
+        imgType = ImageType.Thumb;
+        imgTag = item.SeriesThumbImageTag;
+        itemId = item.SeriesId;
+    } else if (
+        item.ParentThumbItemId
+        && cardOptions.inheritThumb !== false
+        && item.MediaType !== 'Photo'
+    ) {
+        imgType = ImageType.Thumb;
+        imgTag = item.ParentThumbImageTag;
+        itemId = item.ParentThumbItemId;
+    } else if (item.BackdropImageTags?.length) {
+        imgType = ImageType.Backdrop;
+        imgTag = item.BackdropImageTags[0];
+        itemId = item.Id;
+        forceName = true;
+    } else if (
+        item.ParentBackdropImageTags?.length
+        && cardOptions.inheritThumb !== false
+        && item.Type === BaseItemKind.Episode
+    ) {
+        imgType = ImageType.Backdrop;
+        imgTag = item.ParentBackdropImageTags[0];
+        itemId = item.ParentBackdropItemId;
+    }
+    return {
+        itemId: itemId,
+        imgTag: imgTag,
+        imgType: imgType,
+        forceName: forceName
+    };
+}
+
+function getPreferLogoInfo(item: ItemDto) {
+    let imgType;
+    let itemId;
+    let imgTag;
+
+    if (item.ImageTags?.Logo) {
+        imgType = ImageType.Logo;
+        imgTag = item.ImageTags.Logo;
+        itemId = item.Id;
+    } else if (item.ParentLogoImageTag && item.ParentLogoItemId) {
+        imgType = ImageType.Logo;
+        imgTag = item.ParentLogoImageTag;
+        itemId = item.ParentLogoItemId;
+    }
+    return {
+        itemId: itemId,
+        imgTag: imgTag,
+        imgType: imgType
+    };
+}
+
+function getCalculatedHeight(
+    itemWidth: NullableNumber,
+    itemPrimaryImageAspectRatio: NullableNumber
+) {
+    if (itemWidth && itemPrimaryImageAspectRatio) {
+        return Math.round(itemWidth / itemPrimaryImageAspectRatio);
+    }
+}
+
+function isForceName(cardOptions: CardOptions) {
+    return !!(cardOptions.preferThumb && cardOptions.showTitle !== false);
+}
+
+function isCoverImage(
+    itemPrimaryImageAspectRatio: NullableNumber,
+    uiAspect: NullableNumber
+) {
+    if (itemPrimaryImageAspectRatio && uiAspect) {
+        return Math.abs(itemPrimaryImageAspectRatio - uiAspect) / uiAspect <= 0.2;
+    }
+
+    return false;
+}
+
+function shouldShowPreferBanner(
+    imageTagsBanner: NullableString,
+    cardOptions: CardOptions,
+    shape: CardShape | undefined
+): boolean {
+    return (
+        (cardOptions.preferBanner || shape === CardShape.Banner)
+        && Boolean(imageTagsBanner)
+    );
+}
+
+function shouldShowPreferDisc(
+    imageTagsDisc: string | undefined,
+    cardOptions: CardOptions
+): boolean {
+    return cardOptions.preferDisc === true && Boolean(imageTagsDisc);
+}
+
+function shouldShowImageTagsPrimary(item: ItemDto): boolean {
+    return (
+        Boolean(item.ImageTags?.Primary) && (item.Type !== BaseItemKind.Episode || item.ChildCount !== 0)
+    );
+}
+
+function shouldShowImageTagsThumb(item: ItemDto): boolean {
+    return item.Type === BaseItemKind.Season && Boolean(item.ImageTags?.Thumb);
+}
+
+function shouldShowSeriesThumbImageTag(
+    itemSeriesThumbImageTag: NullableString,
+    cardOptions: CardOptions
+): boolean {
+    return (
+        Boolean(itemSeriesThumbImageTag) && cardOptions.inheritThumb !== false
+    );
+}
+
+function shouldShowParentThumbImageTag(
+    itemParentThumbItemId: NullableString,
+    cardOptions: CardOptions
+): boolean {
+    return (
+        Boolean(itemParentThumbItemId) && cardOptions.inheritThumb !== false
+    );
+}
+
+function shouldShowParentBackdropImageTags(item: ItemDto): boolean {
+    return Boolean(item.AlbumId) && Boolean(item.AlbumPrimaryImageTag);
+}
+
+function shouldShowPreferThumb(itemType: NullableString, cardOptions: CardOptions): boolean {
+    return Boolean(cardOptions.preferThumb) && !(itemType === BaseItemKind.Program || itemType === BaseItemKind.Episode);
+}
+
+function getCardImageInfo(
+    item: ItemDto,
+    cardOptions: CardOptions,
+    shape: CardShape | undefined
+) {
+    const width = cardOptions.width;
+    let height;
+    const primaryImageAspectRatio = item.PrimaryImageAspectRatio;
+    let forceName = false;
+    let imgTag;
+    let coverImage = false;
+    const uiAspect = getDesiredAspect(shape);
+    let imgType;
+    let itemId;
+
+    if (shouldShowPreferThumb(item.Type, cardOptions)) {
+        const preferThumbInfo = getPreferThumbInfo(item, cardOptions);
+        imgType = preferThumbInfo.imgType;
+        imgTag = preferThumbInfo.imgTag;
+        itemId = preferThumbInfo.itemId;
+        forceName = preferThumbInfo.forceName;
+    } else if (shouldShowPreferBanner(item.ImageTags?.Banner, cardOptions, shape)) {
+        imgType = ImageType.Banner;
+        imgTag = item.ImageTags?.Banner;
+        itemId = item.Id;
+    } else if (shouldShowPreferDisc(item.ImageTags?.Disc, cardOptions)) {
+        imgType = ImageType.Disc;
+        imgTag = item.ImageTags?.Disc;
+        itemId = item.Id;
+    } else if (cardOptions.preferLogo) {
+        const preferLogoInfo = getPreferLogoInfo(item);
+        imgType = preferLogoInfo.imgType;
+        imgTag = preferLogoInfo.imgType;
+        itemId = preferLogoInfo.itemId;
+    } else if (shouldShowImageTagsPrimary(item)) {
+        imgType = ImageType.Primary;
+        imgTag = item.ImageTags?.Primary;
+        itemId = item.Id;
+        height = getCalculatedHeight(width, primaryImageAspectRatio);
+        forceName = isForceName(cardOptions);
+        coverImage = isCoverImage(primaryImageAspectRatio, uiAspect);
+    } else if (item.SeriesPrimaryImageTag) {
+        imgType = ImageType.Primary;
+        imgTag = item.SeriesPrimaryImageTag;
+        itemId = item.SeriesId;
+    } else if (item.PrimaryImageTag) {
+        imgType = ImageType.Primary;
+        imgTag = item.PrimaryImageTag;
+        itemId = item.PrimaryImageItemId;
+        height = getCalculatedHeight(width, primaryImageAspectRatio);
+        forceName = isForceName(cardOptions);
+        coverImage = isCoverImage(primaryImageAspectRatio, uiAspect);
+    } else if (item.ParentPrimaryImageTag) {
+        imgType = ImageType.Primary;
+        imgTag = item.ParentPrimaryImageTag;
+        itemId = item.ParentPrimaryImageItemId;
+    } else if (shouldShowParentBackdropImageTags(item)) {
+        imgType = ImageType.Primary;
+        imgTag = item.AlbumPrimaryImageTag;
+        itemId = item.AlbumId;
+        height = getCalculatedHeight(width, primaryImageAspectRatio);
+        forceName = isForceName(cardOptions);
+        coverImage = isCoverImage(primaryImageAspectRatio, uiAspect);
+    } else if (shouldShowImageTagsThumb(item)) {
+        imgType = ImageType.Thumb;
+        imgTag = item.ImageTags?.Thumb;
+        itemId = item.Id;
+    } else if (item.BackdropImageTags?.length) {
+        imgType = ImageType.Backdrop;
+        imgTag = item.BackdropImageTags[0];
+        itemId = item.Id;
+    } else if (shouldShowSeriesThumbImageTag(item.SeriesThumbImageTag, cardOptions)) {
+        imgType = ImageType.Thumb;
+        imgTag = item.SeriesThumbImageTag;
+        itemId = item.SeriesId;
+    } else if (shouldShowParentThumbImageTag(item.ParentThumbItemId, cardOptions)) {
+        imgType = ImageType.Thumb;
+        imgTag = item.ParentThumbImageTag;
+        itemId = item.ParentThumbItemId;
+    } else if (
+        item.ParentBackdropImageTags?.length
+        && cardOptions.inheritThumb !== false
+    ) {
+        imgType = ImageType.Backdrop;
+        imgTag = item.ParentBackdropImageTags[0];
+        itemId = item.ParentBackdropItemId;
+    }
+
+    return {
+        imgType,
+        imgTag,
+        itemId,
+        width,
+        height,
+        forceName,
+        coverImage
+    };
+}
+
+interface UseCardImageUrlProps {
+    item: ItemDto;
+    cardOptions: CardOptions;
+    shape: CardShape | undefined;
+}
+
+function useCardImageUrl({ item, cardOptions, shape }: UseCardImageUrlProps) {
+    const { api } = useApi();
+    const imgInfo = getCardImageInfo(item, cardOptions, shape);
+
+    let width = imgInfo.width;
+    let height = imgInfo.height;
+    const imgTag = imgInfo.imgTag;
+    const imgType = imgInfo.imgType;
+    const itemId = imgInfo.itemId;
+    const ratio = window.devicePixelRatio || 1;
+    let imgUrl;
+    let blurhash;
+
+    if (api && imgTag && imgType && itemId) {
+        if (width) {
+            width = Math.round(width * ratio);
+        }
+
+        if (height) {
+            height = Math.round(height * ratio);
+        }
+        imgUrl = getImageApi(api).getItemImageUrlById(itemId, imgType, {
+            quality: 96,
+            fillWidth: width,
+            fillHeight: height,
+            tag: imgTag
+        });
+
+        blurhash = item?.ImageBlurHashes?.[imgType]?.[imgTag];
+    }
+
+    return {
+        imgUrl: imgUrl,
+        blurhash: blurhash,
+        forceName: imgInfo.forceName,
+        coverImage: imgInfo.coverImage
+    };
+}
+
+export default useCardImageUrl;

src/components/cardbuilder/Card/useCardText.tsx

@@ -0,0 +1,113 @@
+import React from 'react';
+import Box from '@mui/material/Box';
+import classNames from 'classnames';
+import layoutManager from 'components/layoutManager';
+import CardText from './CardText';
+import { getCardTextLines } from './cardHelper';
+
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { CardOptions } from 'types/cardOptions';
+
+const enableRightMargin = (
+    isOuterFooter: boolean,
+    cardLayout: boolean | null | undefined,
+    centerText: boolean | undefined,
+    cardFooterAside: string | undefined
+) => {
+    return (
+        isOuterFooter
+        && cardLayout
+        && !centerText
+        && cardFooterAside !== 'none'
+        && layoutManager.mobile
+    );
+};
+
+interface UseCardTextProps {
+    item: ItemDto;
+    cardOptions: CardOptions;
+    forceName: boolean;
+    overlayText: boolean | undefined;
+    imgUrl: string | undefined;
+    isOuterFooter: boolean;
+    cssClass: string;
+    forceLines: boolean;
+    maxLines: number | undefined;
+}
+
+function useCardText({
+    item,
+    cardOptions,
+    forceName,
+    imgUrl,
+    overlayText,
+    isOuterFooter,
+    cssClass,
+    forceLines,
+    maxLines
+}: UseCardTextProps) {
+    const { textLines } = getCardTextLines({
+        isOuterFooter,
+        overlayText,
+        forceName,
+        item,
+        cardOptions,
+        imgUrl
+    });
+
+    const addRightMargin = enableRightMargin(
+        isOuterFooter,
+        cardOptions.cardLayout,
+        cardOptions.centerText,
+        cardOptions.cardFooterAside
+    );
+
+    const renderCardTextLines = () => {
+        const components: React.ReactNode[] = [];
+        let valid = 0;
+        for (const textLine of textLines) {
+            const currentCssClass = classNames(
+                cssClass,
+                {
+                    'cardText-secondary':
+                    valid > 0 && isOuterFooter
+                },
+                { 'cardText-first': valid === 0 && isOuterFooter },
+                { 'cardText-rightmargin': addRightMargin }
+            );
+
+            if (textLine) {
+                components.push(
+                    <CardText key={valid} className={currentCssClass} textLine={textLine} />
+                );
+
+                valid++;
+                if (maxLines && valid >= maxLines) {
+                    break;
+                }
+            }
+        }
+
+        if (forceLines) {
+            const linesLength = maxLines ?? Math.min(textLines.length, maxLines ?? textLines.length);
+            while (valid < linesLength) {
+                components.push(
+                    <Box key={valid} className={cssClass}>
+                        &nbsp;
+                    </Box>
+                );
+                valid++;
+            }
+        }
+
+        return components;
+    };
+
+    const cardTextLines = renderCardTextLines();
+
+    return {
+        cardTextLines
+    };
+}
+
+export default useCardText;

src/components/cardbuilder/card.scss

@@ -378,7 +378,7 @@ button::-moz-focus-inner {
     margin-right: 2em;
 }
 
-.cardDefaultText {
+.cardImageContainer > .cardDefaultText {
     white-space: normal;
     text-align: center;
     font-size: 2em;
@@ -408,6 +408,7 @@ button::-moz-focus-inner {
     display: flex;
     align-items: center;
     contain: layout style;
+    z-index: 1;
 
     [dir="ltr"] & {
         right: 0.225em;
@@ -852,7 +853,7 @@ button::-moz-focus-inner {
     opacity: 1;
 }
 
-.cardOverlayFab-primary {
+.cardOverlayContainer > .cardOverlayFab-primary {
     background-color: rgba(0, 0, 0, 0.7);
     font-size: 130%;
     padding: 0;
@@ -865,7 +866,7 @@ button::-moz-focus-inner {
     left: 50%;
 }
 
-.cardOverlayFab-primary:hover {
+.cardOverlayContainer > .cardOverlayFab-primary:hover {
     transform: scale(1.4, 1.4);
     transition: 0.2s;
 }

src/components/cardbuilder/cardBuilder.js

@@ -73,7 +73,7 @@ function getImageWidth(shape, screenWidth, isOrientationLandscape) {
  * @param {Object} items - A set of items.
  * @param {Object} options - Options for handling the items.
  */
-function setCardData(items, options) {
+export function setCardData(items, options) {
     options.shape = options.shape || 'auto';
 
     const primaryImageAspectRatio = imageLoader.getPrimaryImageAspectRatio(items);

src/components/cardbuilder/cardBuilderUtils.ts

@@ -1,3 +1,4 @@
+import { CardShape } from '../../utils/card';
 import { randomInt } from '../../utils/number';
 import classNames from 'classnames';
 
@@ -10,10 +11,10 @@ const ASPECT_RATIOS = {
 
 /**
  * Determines if the item is live TV.
- * @param {string} itemType - Item type to use for the check.
+ * @param {string | null | undefined} itemType - Item type to use for the check.
  * @returns {boolean} Flag showing if the item is live TV.
  */
-export const isUsingLiveTvNaming = (itemType: string): boolean => itemType === 'Program' || itemType === 'Timer' || itemType === 'Recording';
+export const isUsingLiveTvNaming = (itemType: string | null | undefined): boolean => itemType === 'Program' || itemType === 'Timer' || itemType === 'Recording';
 
 /**
  * Resolves Card action to display
@@ -54,15 +55,15 @@ export const isResizable = (windowWidth: number): boolean => {
  */
 export const resolveMixedShapeByAspectRatio = (primaryImageAspectRatio: number | null | undefined) => {
     if (primaryImageAspectRatio === undefined || primaryImageAspectRatio === null) {
-        return 'mixedSquare';
+        return CardShape.MixedSquare;
     }
 
     if (primaryImageAspectRatio >= 1.33) {
-        return 'mixedBackdrop';
+        return CardShape.MixedBackdrop;
     } else if (primaryImageAspectRatio > 0.71) {
-        return 'mixedSquare';
+        return CardShape.MixedSquare;
     } else {
-        return 'mixedPortrait';
+        return CardShape.MixedPortrait;
     }
 };
 

src/components/common/DefaultIconText.tsx

@@ -0,0 +1,56 @@
+import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
+import React, { type FC } from 'react';
+import Icon from '@mui/material/Icon';
+import imageHelper from 'utils/image';
+import DefaultName from './DefaultName';
+import type { ItemDto } from 'types/base/models/item-dto';
+
+interface DefaultIconTextProps {
+    item: ItemDto;
+    defaultCardImageIcon?: string;
+}
+
+const DefaultIconText: FC<DefaultIconTextProps> = ({
+    item,
+    defaultCardImageIcon
+}) => {
+    if (item.CollectionType) {
+        return (
+            <Icon
+                className='cardImageIcon'
+                sx={{ color: 'inherit', fontSize: '5em' }}
+                aria-hidden='true'
+            >
+                {imageHelper.getLibraryIcon(item.CollectionType)}
+            </Icon>
+        );
+    }
+
+    if (item.Type && !(item.Type === BaseItemKind.TvChannel || item.Type === BaseItemKind.Studio )) {
+        return (
+            <Icon
+                className='cardImageIcon'
+                sx={{ color: 'inherit', fontSize: '5em' }}
+                aria-hidden='true'
+            >
+                {imageHelper.getItemTypeIcon(item.Type)}
+            </Icon>
+        );
+    }
+
+    if (defaultCardImageIcon) {
+        return (
+            <Icon
+                className='cardImageIcon'
+                sx={{ color: 'inherit', fontSize: '5em' }}
+                aria-hidden='true'
+            >
+                {defaultCardImageIcon}
+            </Icon>
+        );
+    }
+
+    return <DefaultName item={item} />;
+};
+
+export default DefaultIconText;

src/components/common/DefaultName.tsx

@@ -0,0 +1,22 @@
+import React, { type FC } from 'react';
+import Box from '@mui/material/Box';
+import itemHelper from 'components/itemHelper';
+import { isUsingLiveTvNaming } from '../cardbuilder/cardBuilderUtils';
+import type { ItemDto } from 'types/base/models/item-dto';
+
+interface DefaultNameProps {
+    item: ItemDto;
+}
+
+const DefaultName: FC<DefaultNameProps> = ({ item }) => {
+    const defaultName = isUsingLiveTvNaming(item.Type) ?
+        item.Name :
+        itemHelper.getDisplayName(item);
+    return (
+        <Box className='cardText cardDefaultText'>
+            {defaultName}
+        </Box>
+    );
+};
+
+export default DefaultName;

src/components/common/Image.tsx

@@ -0,0 +1,67 @@
+import React, { type FC, useCallback, useState } from 'react';
+import { BlurhashCanvas } from 'react-blurhash';
+import { LazyLoadImage } from 'react-lazy-load-image-component';
+
+const imageStyle: React.CSSProperties = {
+    position: 'absolute',
+    top: 0,
+    bottom: 0,
+    left: 0,
+    right: 0,
+    width: '100%',
+    height: '100%',
+    zIndex: 0
+};
+
+interface ImageProps {
+    imgUrl: string;
+    blurhash?: string;
+    containImage: boolean;
+}
+
+const Image: FC<ImageProps> = ({
+    imgUrl,
+    blurhash,
+    containImage
+}) => {
+    const [isLoaded, setIsLoaded] = useState(false);
+    const [isLoadStarted, setIsLoadStarted] = useState(false);
+    const handleLoad = useCallback(() => {
+        setIsLoaded(true);
+    }, []);
+
+    const handleLoadStarted = useCallback(() => {
+        setIsLoadStarted(true);
+    }, []);
+
+    return (
+        <div>
+            {!isLoaded && isLoadStarted && blurhash && (
+                <BlurhashCanvas
+                    hash={blurhash}
+                    width= {20}
+                    height={20}
+                    punch={1}
+                    style={{
+                        ...imageStyle,
+                        borderRadius: '0.2em',
+                        pointerEvents: 'none'
+                    }}
+                />
+            )}
+            <LazyLoadImage
+                key={imgUrl}
+                src={imgUrl}
+                style={{
+                    ...imageStyle,
+                    objectFit: containImage ? 'contain' : 'cover'
+                }}
+                onLoad={handleLoad}
+                beforeLoad={handleLoadStarted}
+            />
+
+        </div>
+    );
+};
+
+export default Image;

src/components/common/InfoIconButton.tsx

@@ -0,0 +1,22 @@
+import React, { type FC } from 'react';
+import IconButton from '@mui/material/IconButton';
+import InfoIcon from '@mui/icons-material/Info';
+import globalize from 'scripts/globalize';
+
+interface InfoIconButtonProps {
+    className?: string;
+}
+
+const InfoIconButton: FC<InfoIconButtonProps> = ({ className }) => {
+    return (
+        <IconButton
+            className={className}
+            data-action='link'
+            title={globalize.translate('ButtonInfo')}
+        >
+            <InfoIcon />
+        </IconButton>
+    );
+};
+
+export default InfoIconButton;

src/components/common/Media.tsx

@@ -0,0 +1,36 @@
+import { BaseItemKind, ImageType } from '@jellyfin/sdk/lib/generated-client';
+import React, { type FC } from 'react';
+import Image from './Image';
+import DefaultIconText from './DefaultIconText';
+import type { ItemDto } from 'types/base/models/item-dto';
+
+interface MediaProps {
+    item: ItemDto;
+    imgUrl: string | undefined;
+    blurhash: string | undefined;
+    imageType?: ImageType
+    defaultCardImageIcon?: string
+}
+
+const Media: FC<MediaProps> = ({
+    item,
+    imgUrl,
+    blurhash,
+    imageType,
+    defaultCardImageIcon
+}) => {
+    return imgUrl ? (
+        <Image
+            imgUrl={imgUrl}
+            blurhash={blurhash}
+            containImage={item.Type === BaseItemKind.TvChannel || imageType === ImageType.Logo}
+        />
+    ) : (
+        <DefaultIconText
+            item={item}
+            defaultCardImageIcon={defaultCardImageIcon}
+        />
+    );
+};
+
+export default Media;

src/components/common/MoreVertIconButton.tsx

@@ -0,0 +1,23 @@
+import React, { type FC } from 'react';
+import IconButton from '@mui/material/IconButton';
+import MoreVertIcon from '@mui/icons-material/MoreVert';
+import globalize from 'scripts/globalize';
+
+interface MoreVertIconButtonProps {
+    className?: string;
+    iconClassName?: string;
+}
+
+const MoreVertIconButton: FC<MoreVertIconButtonProps> = ({ className, iconClassName }) => {
+    return (
+        <IconButton
+            className={className}
+            data-action='menu'
+            title={globalize.translate('ButtonMore')}
+        >
+            <MoreVertIcon className={iconClassName} />
+        </IconButton>
+    );
+};
+
+export default MoreVertIconButton;

src/components/common/NoItemsMessage.tsx

@@ -0,0 +1,25 @@
+import React, { type FC } from 'react';
+import Box from '@mui/material/Box';
+import Typography from '@mui/material/Typography';
+import globalize from 'scripts/globalize';
+
+interface NoItemsMessageProps {
+    noItemsMessage?: string;
+}
+
+const NoItemsMessage: FC<NoItemsMessageProps> = ({
+    noItemsMessage = 'MessageNoItemsAvailable'
+}) => {
+    return (
+        <Box className='noItemsMessage centerMessage'>
+            <Typography variant='h2'>
+                {globalize.translate('MessageNothingHere')}
+            </Typography>
+            <Typography paragraph variant='h2'>
+                {globalize.translate(noItemsMessage)}
+            </Typography>
+        </Box>
+    );
+};
+
+export default NoItemsMessage;

src/components/common/PlayArrowIconButton.tsx

@@ -0,0 +1,25 @@
+import React, { type FC } from 'react';
+import IconButton from '@mui/material/IconButton';
+import PlayArrowIcon from '@mui/icons-material/PlayArrow';
+import globalize from 'scripts/globalize';
+
+interface PlayArrowIconButtonProps {
+    className: string;
+    action: string;
+    title: string;
+    iconClassName?: string;
+}
+
+const PlayArrowIconButton: FC<PlayArrowIconButtonProps> = ({ className, action, title, iconClassName }) => {
+    return (
+        <IconButton
+            className={className}
+            data-action={action}
+            title={globalize.translate(title)}
+        >
+            <PlayArrowIcon className={iconClassName} />
+        </IconButton>
+    );
+};
+
+export default PlayArrowIconButton;

src/components/common/PlaylistAddIconButton.tsx

@@ -0,0 +1,22 @@
+import React, { type FC } from 'react';
+import IconButton from '@mui/material/IconButton';
+import PlaylistAddIcon from '@mui/icons-material/PlaylistAdd';
+import globalize from 'scripts/globalize';
+
+interface PlaylistAddIconButtonProps {
+    className?: string;
+}
+
+const PlaylistAddIconButton: FC<PlaylistAddIconButtonProps> = ({ className }) => {
+    return (
+        <IconButton
+            className={className}
+            data-action='addtoplaylist'
+            title={globalize.translate('AddToPlaylist')}
+        >
+            <PlaylistAddIcon />
+        </IconButton>
+    );
+};
+
+export default PlaylistAddIconButton;

src/components/common/RightIconButtons.tsx

@@ -0,0 +1,24 @@
+import React, { type FC } from 'react';
+import IconButton from '@mui/material/IconButton';
+
+interface RightIconButtonsProps {
+    className?: string;
+    id: string;
+    icon: string;
+    title: string;
+}
+
+const RightIconButtons: FC<RightIconButtonsProps> = ({ className, id, title, icon }) => {
+    return (
+        <IconButton
+            className={className}
+            data-action='custom'
+            data-customaction={id}
+            title={title}
+        >
+            {icon}
+        </IconButton>
+    );
+};
+
+export default RightIconButtons;

src/components/indicators/indicators.scss

@@ -5,6 +5,14 @@
     height: 0.28em;
 }
 
+.itemLinearProgress {
+    width: 100%;
+    position: absolute;
+    left: 0;
+    bottom: 0;
+    border-radius: 100px;
+}
+
 .itemProgressBarForeground {
     position: absolute;
     top: 0;

src/components/indicators/useIndicator.tsx

@@ -0,0 +1,261 @@
+import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
+import { LocationType } from '@jellyfin/sdk/lib/generated-client/models/location-type';
+import React from 'react';
+import Box from '@mui/material/Box';
+import LinearProgress, {
+    linearProgressClasses
+} from '@mui/material/LinearProgress';
+import FiberSmartRecordIcon from '@mui/icons-material/FiberSmartRecord';
+import FiberManualRecordIcon from '@mui/icons-material/FiberManualRecord';
+import CheckIcon from '@mui/icons-material/Check';
+import VideocamIcon from '@mui/icons-material/Videocam';
+import FolderIcon from '@mui/icons-material/Folder';
+import PhotoAlbumIcon from '@mui/icons-material/PhotoAlbum';
+import PhotoIcon from '@mui/icons-material/Photo';
+import classNames from 'classnames';
+import datetime from 'scripts/datetime';
+import itemHelper from 'components/itemHelper';
+import AutoTimeProgressBar from 'elements/emby-progressbar/AutoTimeProgressBar';
+import type { NullableString } from 'types/base/common/shared/types';
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { ProgressOptions } from 'types/progressOptions';
+
+const TypeIcon = {
+    Video: <VideocamIcon className='indicatorIcon' />,
+    Folder: <FolderIcon className='indicatorIcon' />,
+    PhotoAlbum: <PhotoAlbumIcon className='indicatorIcon' />,
+    Photo: <PhotoIcon className='indicatorIcon' />
+};
+
+const getTypeIcon = (itemType: NullableString) => {
+    return TypeIcon[itemType as keyof typeof TypeIcon];
+};
+
+const enableProgressIndicator = (
+    itemType: NullableString,
+    itemMediaType: NullableString
+) => {
+    return (
+        (itemMediaType === 'Video' && itemType !== BaseItemKind.TvChannel)
+        || itemType === BaseItemKind.AudioBook
+        || itemType === 'AudioPodcast'
+    );
+};
+
+const enableAutoTimeProgressIndicator = (
+    itemType: NullableString,
+    itemStartDate: NullableString,
+    itemEndDate: NullableString
+) => {
+    return (
+        (itemType === BaseItemKind.Program
+            || itemType === 'Timer'
+            || itemType === BaseItemKind.Recording)
+        && Boolean(itemStartDate)
+        && Boolean(itemEndDate)
+    );
+};
+
+const enablePlayedIndicator = (item: ItemDto) => {
+    return itemHelper.canMarkPlayed(item);
+};
+
+const useIndicator = (item: ItemDto) => {
+    const getMediaSourceIndicator = () => {
+        const mediaSourceCount = item.MediaSourceCount ?? 0;
+        if (mediaSourceCount > 1) {
+            return <Box className='mediaSourceIndicator'>{mediaSourceCount}</Box>;
+        }
+
+        return null;
+    };
+
+    const getMissingIndicator = () => {
+        if (
+            item.Type === BaseItemKind.Episode
+            && item.LocationType === LocationType.Virtual
+        ) {
+            if (item.PremiereDate) {
+                try {
+                    const premiereDate = datetime
+                        .parseISO8601Date(item.PremiereDate)
+                        .getTime();
+                    if (premiereDate > new Date().getTime()) {
+                        return <Box className='unairedIndicator'>Unaired</Box>;
+                    }
+                } catch (err) {
+                    console.error(err);
+                }
+            }
+            return <Box className='missingIndicator'>Missing</Box>;
+        }
+
+        return null;
+    };
+
+    const getTimerIndicator = (className?: string) => {
+        const indicatorIconClass = classNames('timerIndicator', className);
+
+        let status;
+
+        if (item.Type === 'SeriesTimer') {
+            return <FiberSmartRecordIcon className={indicatorIconClass} />;
+        } else if (item.TimerId || item.SeriesTimerId) {
+            status = item.Status || 'Cancelled';
+        } else if (item.Type === 'Timer') {
+            status = item.Status;
+        } else {
+            return null;
+        }
+
+        if (item.SeriesTimerId) {
+            return (
+                <FiberSmartRecordIcon
+                    className={`${indicatorIconClass} ${
+                        status === 'Cancelled' ? 'timerIndicator-inactive' : ''
+                    }`}
+                />
+            );
+        }
+
+        return <FiberManualRecordIcon className={indicatorIconClass} />;
+    };
+
+    const getTypeIndicator = () => {
+        const icon = getTypeIcon(item.Type);
+        if (icon) {
+            return <Box className='indicator videoIndicator'>{icon}</Box>;
+        }
+        return null;
+    };
+
+    const getChildCountIndicator = () => {
+        const childCount = item.ChildCount ?? 0;
+
+        if (childCount > 1) {
+            return (
+                <Box className='countIndicator indicator childCountIndicator'>
+                    {datetime.toLocaleString(item.ChildCount)}
+                </Box>
+            );
+        }
+
+        return null;
+    };
+
+    const getPlayedIndicator = () => {
+        if (enablePlayedIndicator(item)) {
+            const userData = item.UserData || {};
+            if (userData.UnplayedItemCount) {
+                return (
+                    <Box className='countIndicator indicator unplayedItemCount'>
+                        {datetime.toLocaleString(userData.UnplayedItemCount)}
+                    </Box>
+                );
+            }
+
+            if (
+                (userData.PlayedPercentage
+                    && userData.PlayedPercentage >= 100)
+                || userData.Played
+            ) {
+                return (
+                    <Box className='playedIndicator indicator'>
+                        <CheckIcon className='indicatorIcon' />
+                    </Box>
+                );
+            }
+        }
+
+        return null;
+    };
+
+    const getProgress = (pct: number, progressOptions?: ProgressOptions) => {
+        const progressBarClass = classNames(
+            'itemLinearProgress',
+            progressOptions?.containerClass
+        );
+
+        return (
+            <LinearProgress
+                className={progressBarClass}
+                variant='determinate'
+                value={pct}
+                sx={{
+                    [`& .${linearProgressClasses.bar}`]: {
+                        borderRadius: 5,
+                        backgroundColor: '#00a4dc'
+                    }
+                }}
+            />
+        );
+    };
+
+    const getProgressBar = (progressOptions?: ProgressOptions) => {
+        if (
+            enableProgressIndicator(item.Type, item.MediaType)
+            && item.Type !== BaseItemKind.Recording
+        ) {
+            const playedPercentage = progressOptions?.userData?.PlayedPercentage ?
+                progressOptions.userData.PlayedPercentage :
+                item?.UserData?.PlayedPercentage;
+            if (playedPercentage && playedPercentage < 100) {
+                return getProgress(playedPercentage);
+            }
+        }
+
+        if (
+            enableAutoTimeProgressIndicator(
+                item.Type,
+                item.StartDate,
+                item.EndDate
+            )
+        ) {
+            let startDate = 0;
+            let endDate = 1;
+
+            try {
+                startDate = datetime.parseISO8601Date(item.StartDate).getTime();
+                endDate = datetime.parseISO8601Date(item.EndDate).getTime();
+            } catch (err) {
+                console.error(err);
+            }
+
+            const now = new Date().getTime();
+            const total = endDate - startDate;
+            const pct = 100 * ((now - startDate) / total);
+
+            if (pct > 0 && pct < 100) {
+                const isRecording =
+                    item.Type === 'Timer'
+                    || item.Type === BaseItemKind.Recording
+                    || Boolean(item.TimerId);
+                return (
+                    <AutoTimeProgressBar
+                        pct={pct}
+                        progressOptions={progressOptions}
+                        isRecording={isRecording}
+                        starTtime={startDate}
+                        endTtime={endDate}
+                        dataAutoMode='time'
+                    />
+                );
+            }
+        }
+
+        return null;
+    };
+
+    return {
+        getProgress,
+        getProgressBar,
+        getMediaSourceIndicator,
+        getMissingIndicator,
+        getTimerIndicator,
+        getTypeIndicator,
+        getChildCountIndicator,
+        getPlayedIndicator
+    };
+};
+
+export default useIndicator;

src/components/listview/List/List.tsx

@@ -0,0 +1,32 @@
+import React, { type FC } from 'react';
+import useList from './useList';
+import ListContent from './ListContent';
+import ListWrapper from './ListWrapper';
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { ListOptions } from 'types/listOptions';
+import '../../mediainfo/mediainfo.scss';
+import '../../guide/programs.scss';
+
+interface ListProps {
+    index: number;
+    item: ItemDto;
+    listOptions?: ListOptions;
+}
+
+const List: FC<ListProps> = ({ index, item, listOptions = {} }) => {
+    const { getListdWrapperProps, getListContentProps } = useList({ item, listOptions } );
+    const listWrapperProps = getListdWrapperProps();
+    const listContentProps = getListContentProps();
+
+    return (
+        <ListWrapper
+            key={index}
+            index={index}
+            {...listWrapperProps}
+        >
+            <ListContent {...listContentProps} />
+        </ListWrapper>
+    );
+};
+
+export default List;

src/components/listview/List/ListContent.tsx

@@ -0,0 +1,106 @@
+import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
+import React, { type FC } from 'react';
+import DragHandleIcon from '@mui/icons-material/DragHandle';
+import Box from '@mui/material/Box';
+
+import useIndicator from 'components/indicators/useIndicator';
+import PrimaryMediaInfo from '../../mediainfo/PrimaryMediaInfo';
+import ListContentWrapper from './ListContentWrapper';
+import ListItemBody from './ListItemBody';
+import ListImageContainer from './ListImageContainer';
+import ListViewUserDataButtons from './ListViewUserDataButtons';
+
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { ListOptions } from 'types/listOptions';
+
+interface ListContentProps {
+    item: ItemDto;
+    listOptions: ListOptions;
+    enableContentWrapper?: boolean;
+    enableOverview?: boolean;
+    enableSideMediaInfo?: boolean;
+    clickEntireItem?: boolean;
+    action?: string;
+    isLargeStyle: boolean;
+    downloadWidth?: number;
+}
+
+const ListContent: FC<ListContentProps> = ({
+    item,
+    listOptions,
+    enableContentWrapper,
+    enableOverview,
+    enableSideMediaInfo,
+    clickEntireItem,
+    action,
+    isLargeStyle,
+    downloadWidth
+}) => {
+    const indicator = useIndicator(item);
+    return (
+        <ListContentWrapper
+            itemOverview={item.Overview}
+            enableContentWrapper={enableContentWrapper}
+            enableOverview={enableOverview}
+        >
+
+            {!clickEntireItem && listOptions.dragHandle && (
+                <DragHandleIcon className='listViewDragHandle listItemIcon listItemIcon-transparent' />
+            )}
+
+            {listOptions.image !== false && (
+                <ListImageContainer
+                    item={item}
+                    listOptions={listOptions}
+                    action={action}
+                    isLargeStyle={isLargeStyle}
+                    clickEntireItem={clickEntireItem}
+                    downloadWidth={downloadWidth}
+                />
+            )}
+
+            {listOptions.showIndexNumberLeft && (
+                <Box className='listItem-indexnumberleft'>
+                    {item.IndexNumber ?? <span>&nbsp;</span>}
+                </Box>
+            )}
+
+            <ListItemBody
+                item={item}
+                listOptions={listOptions}
+                action={action}
+                enableContentWrapper={enableContentWrapper}
+                enableOverview={enableOverview}
+                enableSideMediaInfo={enableSideMediaInfo}
+                getMissingIndicator={indicator.getMissingIndicator}
+            />
+
+            {listOptions.mediaInfo !== false && enableSideMediaInfo && (
+                <PrimaryMediaInfo
+                    className='secondary listItemMediaInfo'
+                    item={item}
+                    isRuntimeEnabled={true}
+                    isStarRatingEnabled={true}
+                    isCaptionIndicatorEnabled={true}
+                    isEpisodeTitleEnabled={true}
+                    isOfficialRatingEnabled={true}
+                    getMissingIndicator={indicator.getMissingIndicator}
+                />
+            )}
+
+            {listOptions.recordButton
+                && (item.Type === 'Timer' || item.Type === BaseItemKind.Program) && (
+                indicator.getTimerIndicator('listItemAside')
+            )}
+
+            {!clickEntireItem && (
+                <ListViewUserDataButtons
+                    item={item}
+                    listOptions={listOptions}
+                />
+            )}
+        </ListContentWrapper>
+    );
+};
+
+export default ListContent;

src/components/listview/List/ListContentWrapper.tsx

@@ -0,0 +1,34 @@
+import React, { type FC } from 'react';
+import Box from '@mui/material/Box';
+
+interface ListContentWrapperProps {
+    itemOverview: string | null | undefined;
+    enableContentWrapper?: boolean;
+    enableOverview?: boolean;
+}
+
+const ListContentWrapper: FC<ListContentWrapperProps> = ({
+    itemOverview,
+    enableContentWrapper,
+    enableOverview,
+    children
+}) => {
+    if (enableContentWrapper) {
+        return (
+            <>
+                <Box className='listItem-content'>{children}</Box>
+
+                {enableOverview && itemOverview && (
+                    <Box className='listItem-bottomoverview secondary'>
+                        <bdi>{itemOverview}</bdi>
+                    </Box>
+                )}
+            </>
+        );
+    } else {
+        // eslint-disable-next-line react/jsx-no-useless-fragment
+        return <>{children}</>;
+    }
+};
+
+export default ListContentWrapper;

src/components/listview/List/ListGroupHeaderWrapper.tsx

@@ -0,0 +1,30 @@
+import React, { type FC } from 'react';
+import Typography from '@mui/material/Typography';
+
+interface ListGroupHeaderWrapperProps {
+    index?: number;
+}
+
+const ListGroupHeaderWrapper: FC<ListGroupHeaderWrapperProps> = ({
+    index,
+    children
+}) => {
+    if (index === 0) {
+        return (
+            <Typography
+                className='listGroupHeader listGroupHeader-first'
+                variant='h2'
+            >
+                {children}
+            </Typography>
+        );
+    } else {
+        return (
+            <Typography className='listGroupHeader' variant='h2'>
+                {children}
+            </Typography>
+        );
+    }
+};
+
+export default ListGroupHeaderWrapper;

src/components/listview/List/ListImageContainer.tsx

@@ -0,0 +1,103 @@
+import React, { type FC } from 'react';
+import classNames from 'classnames';
+import Box from '@mui/material/Box';
+import { useApi } from 'hooks/useApi';
+import useIndicator from '../../indicators/useIndicator';
+import layoutManager from '../../layoutManager';
+import { getDefaultBackgroundClass } from '../../cardbuilder/cardBuilderUtils';
+import {
+    canResume,
+    getChannelImageUrl,
+    getImageUrl
+} from './listHelper';
+
+import Media from 'components/common/Media';
+import PlayArrowIconButton from 'components/common/PlayArrowIconButton';
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { ListOptions } from 'types/listOptions';
+
+interface ListImageContainerProps {
+    item: ItemDto;
+    listOptions: ListOptions;
+    action?: string | null;
+    isLargeStyle: boolean;
+    clickEntireItem?: boolean;
+    downloadWidth?: number;
+}
+
+const ListImageContainer: FC<ListImageContainerProps> = ({
+    item = {},
+    listOptions,
+    action,
+    isLargeStyle,
+    clickEntireItem,
+    downloadWidth
+}) => {
+    const { api } = useApi();
+    const { getMediaSourceIndicator, getProgressBar, getPlayedIndicator } = useIndicator(item);
+    const imgInfo = listOptions.imageSource === 'channel' ?
+        getChannelImageUrl(item, api, downloadWidth) :
+        getImageUrl(item, api, downloadWidth);
+
+    const defaultCardImageIcon = listOptions.defaultCardImageIcon;
+    const disableIndicators = listOptions.disableIndicators;
+    const imgUrl = imgInfo?.imgUrl;
+    const blurhash = imgInfo.blurhash;
+
+    const imageClass = classNames(
+        'listItemImage',
+        { 'listItemImage-large': isLargeStyle },
+        { 'listItemImage-channel': listOptions.imageSource === 'channel' },
+        { 'listItemImage-large-tv': isLargeStyle && layoutManager.tv },
+        { itemAction: !clickEntireItem },
+        { [getDefaultBackgroundClass(item.Name)]: !imgUrl }
+    );
+
+    const playOnImageClick = listOptions.imagePlayButton && !layoutManager.tv;
+
+    const imageAction = playOnImageClick ? 'link' : action;
+
+    const btnCssClass =
+        'paper-icon-button-light listItemImageButton itemAction';
+
+    const mediaSourceIndicator = getMediaSourceIndicator();
+    const playedIndicator = getPlayedIndicator();
+    const progressBar = getProgressBar();
+    const playbackPositionTicks = item?.UserData?.PlaybackPositionTicks;
+
+    return (
+        <Box
+            data-action={imageAction}
+            className={imageClass}
+        >
+
+            <Media item={item} imgUrl={imgUrl} blurhash={blurhash} defaultCardImageIcon={defaultCardImageIcon} />
+
+            {disableIndicators !== true && mediaSourceIndicator}
+
+            {playedIndicator && (
+                <Box className='indicators listItemIndicators'>
+                    {playedIndicator}
+                </Box>
+            )}
+
+            {playOnImageClick && (
+                <PlayArrowIconButton
+                    className={btnCssClass}
+                    action={
+                        canResume(playbackPositionTicks) ? 'resume' : 'play'
+                    }
+                    title={
+                        canResume(playbackPositionTicks) ?
+                            'ButtonResume' :
+                            'Play'
+                    }
+                />
+            )}
+
+            {progressBar}
+        </Box>
+    );
+};
+
+export default ListImageContainer;

src/components/listview/List/ListItemBody.tsx

@@ -0,0 +1,65 @@
+import React, { type FC } from 'react';
+import classNames from 'classnames';
+import Box from '@mui/material/Box';
+import useListTextlines from './useListTextlines';
+import PrimaryMediaInfo from '../../mediainfo/PrimaryMediaInfo';
+
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { ListOptions } from 'types/listOptions';
+
+interface ListItemBodyProps {
+    item: ItemDto;
+    listOptions: ListOptions;
+    action?: string | null;
+    isLargeStyle?: boolean;
+    clickEntireItem?: boolean;
+    enableContentWrapper?: boolean;
+    enableOverview?: boolean;
+    enableSideMediaInfo?: boolean;
+    getMissingIndicator: () => React.JSX.Element | null
+}
+
+const ListItemBody: FC<ListItemBodyProps> = ({
+    item = {},
+    listOptions = {},
+    action,
+    isLargeStyle,
+    clickEntireItem,
+    enableContentWrapper,
+    enableOverview,
+    enableSideMediaInfo,
+    getMissingIndicator
+}) => {
+    const { listTextLines } = useListTextlines({ item, listOptions, isLargeStyle });
+    const cssClass = classNames(
+        'listItemBody',
+        { 'itemAction': !clickEntireItem },
+        { 'listItemBody-noleftpadding': listOptions.image === false }
+    );
+
+    return (
+        <Box data-action={action} className={cssClass}>
+
+            {listTextLines}
+
+            {listOptions.mediaInfo !== false && !enableSideMediaInfo && (
+                <PrimaryMediaInfo
+                    className='secondary listItemMediaInfo listItemBodyText'
+                    item={item}
+                    isEpisodeTitleEnabled={true}
+                    isOriginalAirDateEnabled={true}
+                    isCaptionIndicatorEnabled={true}
+                    getMissingIndicator={getMissingIndicator}
+                />
+            )}
+
+            {!enableContentWrapper && enableOverview && item.Overview && (
+                <Box className='secondary listItem-overview listItemBodyText'>
+                    <bdi>{item.Overview}</bdi>
+                </Box>
+            )}
+        </Box>
+    );
+};
+
+export default ListItemBody;

src/components/listview/List/ListTextWrapper.tsx

@@ -0,0 +1,30 @@
+import React, { type FC } from 'react';
+import Box from '@mui/material/Box';
+import Typography from '@mui/material/Typography';
+
+interface ListTextWrapperProps {
+    index?: number;
+    isLargeStyle?: boolean;
+}
+
+const ListTextWrapper: FC<ListTextWrapperProps> = ({
+    index,
+    isLargeStyle,
+    children
+}) => {
+    if (index === 0) {
+        if (isLargeStyle) {
+            return (
+                <Typography className='listItemBodyText' variant='h2'>
+                    {children}
+                </Typography>
+            );
+        } else {
+            return <Box className='listItemBodyText'>{children}</Box>;
+        }
+    } else {
+        return <Box className='secondary listItemBodyText'>{children}</Box>;
+    }
+};
+
+export default ListTextWrapper;

src/components/listview/List/ListViewUserDataButtons.tsx

@@ -0,0 +1,87 @@
+import React, { type FC } from 'react';
+import { Box } from '@mui/material';
+import itemHelper from '../../itemHelper';
+import PlayedButton from 'elements/emby-playstatebutton/PlayedButton';
+import FavoriteButton from 'elements/emby-ratingbutton/FavoriteButton';
+import PlaylistAddIconButton from '../../common/PlaylistAddIconButton';
+import InfoIconButton from '../../common/InfoIconButton';
+import RightIconButtons from '../../common/RightIconButtons';
+import MoreVertIconButton from '../../common/MoreVertIconButton';
+
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { ListOptions } from 'types/listOptions';
+
+interface ListViewUserDataButtonsProps {
+    item: ItemDto;
+    listOptions: ListOptions;
+}
+
+const ListViewUserDataButtons: FC<ListViewUserDataButtonsProps> = ({
+    item = {},
+    listOptions
+}) => {
+    const { IsFavorite, Played } = item.UserData ?? {};
+
+    const renderRightButtons = () => {
+        return listOptions.rightButtons?.map((button, index) => (
+            <RightIconButtons
+                // eslint-disable-next-line react/no-array-index-key
+                key={index}
+                className='listItemButton itemAction'
+                id={button.id}
+                title={button.title}
+                icon={button.icon}
+            />
+        ));
+    };
+
+    return (
+        <Box className='listViewUserDataButtons'>
+            {listOptions.addToListButton && (
+                <PlaylistAddIconButton
+                    className='paper-icon-button-light listItemButton itemAction'
+                />
+
+            )}
+            {listOptions.infoButton && (
+                <InfoIconButton
+                    className='paper-icon-button-light listItemButton itemAction'
+                />
+
+            ) }
+
+            {listOptions.rightButtons && renderRightButtons()}
+
+            {listOptions.enableUserDataButtons !== false && (
+                <>
+                    {itemHelper.canMarkPlayed(item)
+                        && listOptions.enablePlayedButton !== false && (
+                        <PlayedButton
+                            className='listItemButton'
+                            isPlayed={Played}
+                            itemId={item.Id}
+                            itemType={item.Type}
+                        />
+                    )}
+
+                    {itemHelper.canRate(item)
+                        && listOptions.enableRatingButton !== false && (
+                        <FavoriteButton
+                            className='listItemButton'
+                            isFavorite={IsFavorite}
+                            itemId={item.Id}
+                        />
+                    )}
+                </>
+            )}
+
+            {listOptions.moreButton !== false && (
+                <MoreVertIconButton
+                    className='paper-icon-button-light listItemButton itemAction'
+                />
+            )}
+        </Box>
+    );
+};
+
+export default ListViewUserDataButtons;

src/components/listview/List/ListWrapper.tsx

@@ -0,0 +1,48 @@
+import classNames from 'classnames';
+import React, { type FC } from 'react';
+import Box from '@mui/material/Box';
+import Button from '@mui/material/Button';
+import layoutManager from '../../layoutManager';
+import type { DataAttributes } from 'types/dataAttributes';
+
+interface ListWrapperProps {
+    index: number | undefined;
+    title?: string | null;
+    action?: string | null;
+    dataAttributes?: DataAttributes;
+    className?: string;
+}
+
+const ListWrapper: FC<ListWrapperProps> = ({
+    index,
+    action,
+    title,
+    className,
+    dataAttributes,
+    children
+}) => {
+    if (layoutManager.tv) {
+        return (
+            <Button
+                data-index={index}
+                className={classNames(
+                    className,
+                    'itemAction listItem-button listItem-focusscale'
+                )}
+                data-action={action}
+                aria-label={title || ''}
+                {...dataAttributes}
+            >
+                {children}
+            </Button>
+        );
+    } else {
+        return (
+            <Box data-index={index} className={className} {...dataAttributes}>
+                {children}
+            </Box>
+        );
+    }
+};
+
+export default ListWrapper;

src/components/listview/List/Lists.tsx

@@ -0,0 +1,56 @@
+import React, { type FC } from 'react';
+import { groupBy } from 'lodash-es';
+import Box from '@mui/material/Box';
+import { getIndex } from './listHelper';
+import ListGroupHeaderWrapper from './ListGroupHeaderWrapper';
+import List from './List';
+
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { ListOptions } from 'types/listOptions';
+import '../listview.scss';
+
+interface ListsProps {
+    items: ItemDto[];
+    listOptions?: ListOptions;
+}
+
+const Lists: FC<ListsProps> = ({ items = [], listOptions = {} }) => {
+    const groupedData = groupBy(items, (item) => {
+        if (listOptions.showIndex) {
+            return getIndex(item, listOptions);
+        }
+        return '';
+    });
+
+    const renderListItem = (item: ItemDto, index: number) => {
+        return (
+            <List
+                // eslint-disable-next-line react/no-array-index-key
+                key={`${item.Id}-${index}`}
+                index={index}
+                item={item}
+                listOptions={listOptions}
+            />
+        );
+    };
+
+    return (
+        <>
+            {Object.entries(groupedData).map(
+                ([itemGroupTitle, getItems], index) => (
+                    // eslint-disable-next-line react/no-array-index-key
+                    <Box key={index}>
+                        {itemGroupTitle && (
+                            <ListGroupHeaderWrapper index={index}>
+                                {itemGroupTitle}
+                            </ListGroupHeaderWrapper>
+                        )}
+                        {getItems.map((item) => renderListItem(item, index))}
+                    </Box>
+                )
+            )}
+        </>
+    );
+};
+
+export default Lists;

src/components/listview/List/listHelper.ts

@@ -0,0 +1,172 @@
+import { Api } from '@jellyfin/sdk';
+import { BaseItemKind, ImageType } from '@jellyfin/sdk/lib/generated-client';
+import { getImageApi } from '@jellyfin/sdk/lib/utils/api/image-api';
+import globalize from 'scripts/globalize';
+
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { ListOptions } from 'types/listOptions';
+
+const sortBySortName = (item: ItemDto): string => {
+    if (item.Type === BaseItemKind.Episode) {
+        return '';
+    }
+
+    // SortName
+    const name = (item.SortName ?? item.Name ?? '?')[0].toUpperCase();
+
+    const code = name.charCodeAt(0);
+    if (code < 65 || code > 90) {
+        return '#';
+    }
+
+    return name.toUpperCase();
+};
+
+const sortByOfficialrating = (item: ItemDto): string => {
+    return item.OfficialRating ?? globalize.translate('Unrated');
+};
+
+const sortByCommunityRating = (item: ItemDto): string => {
+    if (item.CommunityRating == null) {
+        return globalize.translate('Unrated');
+    }
+
+    return String(Math.floor(item.CommunityRating));
+};
+
+const sortByCriticRating = (item: ItemDto): string => {
+    if (item.CriticRating == null) {
+        return globalize.translate('Unrated');
+    }
+
+    return String(Math.floor(item.CriticRating));
+};
+
+const sortByAlbumArtist = (item: ItemDto): string => {
+    // SortName
+    if (!item.AlbumArtist) {
+        return '';
+    }
+
+    const name = item.AlbumArtist[0].toUpperCase();
+
+    const code = name.charCodeAt(0);
+    if (code < 65 || code > 90) {
+        return '#';
+    }
+
+    return name.toUpperCase();
+};
+
+export function getIndex(item: ItemDto, listOptions: ListOptions): string {
+    if (listOptions.index === 'disc') {
+        return item.ParentIndexNumber == null ?
+            '' :
+            globalize.translate('ValueDiscNumber', item.ParentIndexNumber);
+    }
+
+    const sortBy = (listOptions.sortBy ?? '').toLowerCase();
+
+    if (sortBy.startsWith('sortname')) {
+        return sortBySortName(item);
+    }
+    if (sortBy.startsWith('officialrating')) {
+        return sortByOfficialrating(item);
+    }
+    if (sortBy.startsWith('communityrating')) {
+        return sortByCommunityRating(item);
+    }
+    if (sortBy.startsWith('criticrating')) {
+        return sortByCriticRating(item);
+    }
+    if (sortBy.startsWith('albumartist')) {
+        return sortByAlbumArtist(item);
+    }
+    return '';
+}
+
+export function getImageUrl(
+    item: ItemDto,
+    api: Api | undefined,
+    size: number | undefined
+) {
+    let imgTag;
+    let itemId;
+    const fillWidth = size;
+    const fillHeight = size;
+    const imgType = ImageType.Primary;
+
+    if (item.ImageTags?.Primary) {
+        imgTag = item.ImageTags.Primary;
+        itemId = item.Id;
+    } else if (item.AlbumId && item.AlbumPrimaryImageTag) {
+        imgTag = item.AlbumPrimaryImageTag;
+        itemId = item.AlbumId;
+    } else if (item.SeriesId && item.SeriesPrimaryImageTag) {
+        imgTag = item.SeriesPrimaryImageTag;
+        itemId = item.SeriesId;
+    } else if (item.ParentPrimaryImageTag) {
+        imgTag = item.ParentPrimaryImageTag;
+        itemId = item.ParentPrimaryImageItemId;
+    }
+
+    if (api && imgTag && imgType && itemId) {
+        const response = getImageApi(api).getItemImageUrlById(itemId, imgType, {
+            fillWidth: fillWidth,
+            fillHeight: fillHeight,
+            tag: imgTag
+        });
+
+        return {
+            imgUrl: response,
+            blurhash: item.ImageBlurHashes?.[imgType]?.[imgTag]
+        };
+    }
+
+    return {
+        imgUrl: undefined,
+        blurhash: undefined
+    };
+}
+
+export function getChannelImageUrl(
+    item: ItemDto,
+    api: Api | undefined,
+    size: number | undefined
+) {
+    let imgTag;
+    let itemId;
+    const fillWidth = size;
+    const fillHeight = size;
+    const imgType = ImageType.Primary;
+
+    if (item.ChannelId && item.ChannelPrimaryImageTag) {
+        imgTag = item.ChannelPrimaryImageTag;
+        itemId = item.ChannelId;
+    }
+
+    if (api && imgTag && imgType && itemId) {
+        const response = api.getItemImageUrl(itemId, imgType, {
+            fillWidth: fillWidth,
+            fillHeight: fillHeight,
+            tag: imgTag
+        });
+
+        return {
+            imgUrl: response,
+            blurhash: item.ImageBlurHashes?.[imgType]?.[imgTag]
+        };
+    }
+
+    return {
+        imgUrl: undefined,
+        blurhash: undefined
+    };
+}
+
+export function canResume(PlaybackPositionTicks: number | undefined): boolean {
+    return Boolean(
+        PlaybackPositionTicks
+            && PlaybackPositionTicks > 0
+    );
+}

src/components/listview/List/useList.ts

@@ -0,0 +1,77 @@
+import classNames from 'classnames';
+import { getDataAttributes } from 'utils/items';
+import layoutManager from 'components/layoutManager';
+
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { ListOptions } from 'types/listOptions';
+
+interface UseListProps {
+    item: ItemDto;
+    listOptions: ListOptions;
+}
+
+function useList({ item, listOptions }: UseListProps) {
+    const action = listOptions.action ?? 'link';
+    const isLargeStyle = listOptions.imageSize === 'large';
+    const enableOverview = listOptions.enableOverview;
+    const clickEntireItem = !!layoutManager.tv;
+    const enableSideMediaInfo = listOptions.enableSideMediaInfo ?? true;
+    const enableContentWrapper =
+        listOptions.enableOverview && !layoutManager.tv;
+    const downloadWidth = isLargeStyle ? 500 : 80;
+
+    const dataAttributes = getDataAttributes(
+        {
+            action,
+            itemServerId: item.ServerId,
+            itemId: item.Id,
+            collectionId: listOptions.collectionId,
+            playlistId: listOptions.playlistId,
+            itemChannelId: item.ChannelId,
+            itemType: item.Type,
+            itemMediaType: item.MediaType,
+            itemCollectionType: item.CollectionType,
+            itemIsFolder: item.IsFolder,
+            itemPlaylistItemId: item.PlaylistItemId
+        }
+    );
+
+    const listWrapperClass = classNames(
+        'listItem',
+        {
+            'listItem-border':
+                listOptions.border
+                ?? (listOptions.highlight !== false && !layoutManager.tv)
+        },
+        { 'itemAction listItem-button': clickEntireItem },
+        { 'listItem-focusscale': layoutManager.tv },
+        { 'listItem-largeImage': isLargeStyle },
+        { 'listItem-withContentWrapper': enableContentWrapper }
+    );
+
+    const getListdWrapperProps = () => ({
+        className: listWrapperClass,
+        title: item.Name,
+        action,
+        dataAttributes
+    });
+
+    const getListContentProps = () => ({
+        item,
+        listOptions,
+        enableContentWrapper,
+        enableOverview,
+        enableSideMediaInfo,
+        clickEntireItem,
+        action,
+        isLargeStyle,
+        downloadWidth
+    });
+
+    return {
+        getListdWrapperProps,
+        getListContentProps
+    };
+}
+
+export default useList;

src/components/listview/List/useListTextlines.tsx

@@ -0,0 +1,167 @@
+import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
+import React from 'react';
+import itemHelper from '../../itemHelper';
+import datetime from 'scripts/datetime';
+import ListTextWrapper from './ListTextWrapper';
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { ListOptions } from 'types/listOptions';
+
+function getParentTitle(
+    showParentTitle: boolean | undefined,
+    item: ItemDto,
+    parentTitleWithTitle: boolean | undefined,
+    displayName: string | null | undefined
+) {
+    let parentTitle = null;
+    if (showParentTitle) {
+        if (item.Type === BaseItemKind.Episode) {
+            parentTitle = item.SeriesName;
+        } else if (item.IsSeries || (item.EpisodeTitle && item.Name)) {
+            parentTitle = item.Name;
+        }
+    }
+    if (showParentTitle && parentTitleWithTitle) {
+        if (displayName) {
+            parentTitle += ' - ';
+        }
+        parentTitle = (parentTitle ?? '') + displayName;
+    }
+    return parentTitle;
+}
+
+function getNameOrIndexWithName(
+    item: ItemDto,
+    listOptions: ListOptions,
+    showIndexNumber: boolean | undefined
+) {
+    let displayName = itemHelper.getDisplayName(item, {
+        includeParentInfo: listOptions.includeParentInfoInTitle
+    });
+
+    if (showIndexNumber && item.IndexNumber != null) {
+        displayName = `${item.IndexNumber}. ${displayName}`;
+    }
+    return displayName;
+}
+
+interface UseListTextlinesProps {
+    item: ItemDto;
+    listOptions?: ListOptions;
+    isLargeStyle?: boolean;
+}
+
+function useListTextlines({ item = {}, listOptions = {}, isLargeStyle }: UseListTextlinesProps) {
+    const {
+        showProgramDateTime,
+        showProgramTime,
+        showChannel,
+        showParentTitle,
+        showIndexNumber,
+        parentTitleWithTitle,
+        artist
+    } = listOptions;
+    const textLines: string[] = [];
+
+    const addTextLine = (text: string | null) => {
+        if (text) {
+            textLines.push(text);
+        }
+    };
+
+    const addProgramDateTime = () => {
+        if (showProgramDateTime) {
+            const programDateTime = datetime.toLocaleString(
+                datetime.parseISO8601Date(item.StartDate),
+                {
+                    weekday: 'long',
+                    month: 'short',
+                    day: 'numeric',
+                    hour: 'numeric',
+                    minute: '2-digit'
+                }
+            );
+            addTextLine(programDateTime);
+        }
+    };
+
+    const addProgramTime = () => {
+        if (showProgramTime) {
+            const programTime = datetime.getDisplayTime(
+                datetime.parseISO8601Date(item.StartDate)
+            );
+            addTextLine(programTime);
+        }
+    };
+
+    const addChannelName = () => {
+        if (showChannel && item.ChannelName) {
+            addTextLine(item.ChannelName);
+        }
+    };
+
+    const displayName = getNameOrIndexWithName(item, listOptions, showIndexNumber);
+
+    const parentTitle = getParentTitle(showParentTitle, item, parentTitleWithTitle, displayName );
+
+    const addParentTitle = () => {
+        addTextLine(parentTitle ?? '');
+    };
+
+    const addDisplayName = () => {
+        if (displayName && !parentTitleWithTitle) {
+            addTextLine(displayName);
+        }
+    };
+
+    const addAlbumArtistOrArtists = () => {
+        if (item.IsFolder && artist !== false) {
+            if (item.AlbumArtist && item.Type === BaseItemKind.MusicAlbum) {
+                addTextLine(item.AlbumArtist);
+            }
+        } else if (artist) {
+            const artistItems = item.ArtistItems;
+            if (artistItems && item.Type !== BaseItemKind.MusicAlbum) {
+                const artists = artistItems.map((a) => a.Name).join(', ');
+                addTextLine(artists);
+            }
+        }
+    };
+
+    const addCurrentProgram = () => {
+        if (item.Type === BaseItemKind.TvChannel && item.CurrentProgram) {
+            const currentProgram = itemHelper.getDisplayName(
+                item.CurrentProgram
+            );
+            addTextLine(currentProgram);
+        }
+    };
+
+    addProgramDateTime();
+    addProgramTime();
+    addChannelName();
+    addParentTitle();
+    addDisplayName();
+    addAlbumArtistOrArtists();
+    addCurrentProgram();
+
+    const renderTextlines = (text: string, index: number) => {
+        return (
+            <ListTextWrapper
+                // eslint-disable-next-line react/no-array-index-key
+                key={index}
+                index={index}
+                isLargeStyle={isLargeStyle}
+            >
+                <bdi>{text}</bdi>
+            </ListTextWrapper>
+        );
+    };
+
+    const listTextLines = textLines?.map((text, index) => renderTextlines(text, index));
+
+    return {
+        listTextLines
+    };
+}
+
+export default useListTextlines;

src/components/listview/listview.scss

@@ -183,6 +183,7 @@
 }
 
 .listItemImage .cardImageIcon {
+    margin: auto;
     font-size: 3em;
 }
 

src/components/mediainfo/CaptionMediaInfo.tsx

@@ -0,0 +1,25 @@
+import React, { type FC } from 'react';
+import classNames from 'classnames';
+import ClosedCaptionIcon from '@mui/icons-material/ClosedCaption';
+import Box from '@mui/material/Box';
+
+interface CaptionMediaInfoProps {
+    className?: string;
+}
+
+const CaptionMediaInfo: FC<CaptionMediaInfoProps> = ({ className }) => {
+    const cssClass = classNames(
+        'mediaInfoItem',
+        'mediaInfoText',
+        'closedCaptionMediaInfoText',
+        className
+    );
+
+    return (
+        <Box className={cssClass}>
+            <ClosedCaptionIcon fontSize={'small'} />
+        </Box>
+    );
+};
+
+export default CaptionMediaInfo;

src/components/mediainfo/CriticRatingMediaInfo.tsx

@@ -0,0 +1,25 @@
+import React, { type FC } from 'react';
+import classNames from 'classnames';
+import Box from '@mui/material/Box';
+
+interface CriticRatingMediaInfoProps {
+    className?: string;
+    criticRating: number;
+}
+
+const CriticRatingMediaInfo: FC<CriticRatingMediaInfoProps> = ({
+    className,
+    criticRating
+}) => {
+    const cssClass = classNames(
+        'mediaInfoCriticRating',
+        'mediaInfoItem',
+        criticRating >= 60 ?
+            'mediaInfoCriticRatingFresh' :
+            'mediaInfoCriticRatingRotten',
+        className
+    );
+    return <Box className={cssClass}>{criticRating}</Box>;
+};
+
+export default CriticRatingMediaInfo;

src/components/mediainfo/EndsAt.tsx

@@ -0,0 +1,31 @@
+import React, { type FC } from 'react';
+import classNames from 'classnames';
+import Box from '@mui/material/Box';
+import datetime from 'scripts/datetime';
+import globalize from 'scripts/globalize';
+
+interface EndsAtProps {
+    className?: string;
+    runTimeTicks: number
+}
+
+const EndsAt: FC<EndsAtProps> = ({ runTimeTicks, className }) => {
+    const cssClass = classNames(
+        'mediaInfoItem',
+        'mediaInfoText',
+        'endsAt',
+        className
+    );
+
+    const endTime = new Date().getTime() + (runTimeTicks / 10000);
+    const endDate = new Date(endTime);
+    const displayTime = datetime.getDisplayTime(endDate);
+
+    return (
+        <Box className={cssClass}>
+            {globalize.translate('EndsAtValue', displayTime)}
+        </Box>
+    );
+};
+
+export default EndsAt;

src/components/mediainfo/MediaInfoItem.tsx

@@ -0,0 +1,27 @@
+import React, { type FC } from 'react';
+import Box from '@mui/material/Box';
+import classNames from 'classnames';
+import type { MiscInfo } from 'types/mediaInfoItem';
+
+interface MediaInfoItemProps {
+    className?: string;
+    miscInfo?: MiscInfo ;
+
+}
+
+const MediaInfoItem: FC<MediaInfoItemProps> = ({ className, miscInfo }) => {
+    const cssClass = classNames(
+        'mediaInfoItem',
+        'mediaInfoText',
+        className,
+        miscInfo?.cssClass
+    );
+
+    return (
+        <Box className={cssClass}>
+            {miscInfo?.text}
+        </Box>
+    );
+};
+
+export default MediaInfoItem;

src/components/mediainfo/PrimaryMediaInfo.tsx

@@ -0,0 +1,103 @@
+import React, { type FC } from 'react';
+import classNames from 'classnames';
+import Box from '@mui/material/Box';
+import usePrimaryMediaInfo from './usePrimaryMediaInfo';
+
+import MediaInfoItem from './MediaInfoItem';
+import StarIcons from './StarIcons';
+import CaptionMediaInfo from './CaptionMediaInfo';
+import CriticRatingMediaInfo from './CriticRatingMediaInfo';
+import EndsAt from './EndsAt';
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { MiscInfo } from 'types/mediaInfoItem';
+
+interface PrimaryMediaInfoProps {
+    className?: string;
+    item: ItemDto;
+    isYearEnabled?: boolean;
+    isContainerEnabled?: boolean;
+    isEpisodeTitleEnabled?: boolean;
+    isCriticRatingEnabled?: boolean;
+    isEndsAtEnabled?: boolean;
+    isOriginalAirDateEnabled?: boolean;
+    isRuntimeEnabled?: boolean;
+    isProgramIndicatorEnabled?: boolean;
+    isEpisodeTitleIndexNumberEnabled?: boolean;
+    isOfficialRatingEnabled?: boolean;
+    isStarRatingEnabled?: boolean;
+    isCaptionIndicatorEnabled?: boolean;
+    isMissingIndicatorEnabled?: boolean;
+    getMissingIndicator: () => React.JSX.Element | null
+}
+
+const PrimaryMediaInfo: FC<PrimaryMediaInfoProps> = ({
+    className,
+    item,
+    isYearEnabled = false,
+    isContainerEnabled = false,
+    isEpisodeTitleEnabled = false,
+    isCriticRatingEnabled = false,
+    isEndsAtEnabled = false,
+    isOriginalAirDateEnabled = false,
+    isRuntimeEnabled = false,
+    isProgramIndicatorEnabled = false,
+    isEpisodeTitleIndexNumberEnabled = false,
+    isOfficialRatingEnabled = false,
+    isStarRatingEnabled = false,
+    isCaptionIndicatorEnabled = false,
+    isMissingIndicatorEnabled = false,
+    getMissingIndicator
+}) => {
+    const miscInfo = usePrimaryMediaInfo({
+        item,
+        isYearEnabled,
+        isContainerEnabled,
+        isEpisodeTitleEnabled,
+        isOriginalAirDateEnabled,
+        isRuntimeEnabled,
+        isProgramIndicatorEnabled,
+        isEpisodeTitleIndexNumberEnabled,
+        isOfficialRatingEnabled
+    });
+    const {
+        StartDate,
+        HasSubtitles,
+        MediaType,
+        RunTimeTicks,
+        CommunityRating,
+        CriticRating
+    } = item;
+
+    const cssClass = classNames(className);
+
+    const renderMediaInfo = (info: MiscInfo | undefined, index: number) => (
+        <MediaInfoItem key={index} miscInfo={info} />
+    );
+
+    return (
+        <Box className={cssClass}>
+            {miscInfo.map((info, index) => renderMediaInfo(info, index))}
+
+            {isStarRatingEnabled && CommunityRating && (
+                <StarIcons communityRating={CommunityRating} />
+            )}
+
+            {HasSubtitles && isCaptionIndicatorEnabled && <CaptionMediaInfo />}
+
+            {CriticRating && isCriticRatingEnabled && (
+                <CriticRatingMediaInfo criticRating={CriticRating} />
+            )}
+
+            {isEndsAtEnabled
+                && MediaType === 'Video'
+                && RunTimeTicks
+                && !StartDate && <EndsAt runTimeTicks={RunTimeTicks} />}
+
+            {isMissingIndicatorEnabled && (
+                getMissingIndicator()
+            )}
+        </Box>
+    );
+};
+
+export default PrimaryMediaInfo;

src/components/mediainfo/StarIcons.tsx

@@ -0,0 +1,31 @@
+import React, { type FC } from 'react';
+import classNames from 'classnames';
+import StarIcon from '@mui/icons-material/Star';
+import Box from '@mui/material/Box';
+import { useTheme } from '@mui/material/styles';
+
+interface StarIconsProps {
+    className?: string;
+    communityRating: number;
+}
+
+const StarIcons: FC<StarIconsProps> = ({ className, communityRating }) => {
+    const theme = useTheme();
+    const cssClass = classNames(
+        'mediaInfoItem',
+        'mediaInfoText',
+        'starRatingContainer',
+        className
+    );
+
+    return (
+        <Box className={cssClass}>
+            <StarIcon fontSize={'small'} sx={{
+                color: theme.palette.starIcon.main
+            }} />
+            {communityRating.toFixed(1)}
+        </Box>
+    );
+};
+
+export default StarIcons;

src/components/mediainfo/usePrimaryMediaInfo.tsx

@@ -0,0 +1,523 @@
+import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
+import * as userSettings from 'scripts/settings/userSettings';
+import datetime from 'scripts/datetime';
+import globalize from 'scripts/globalize';
+import itemHelper from '../itemHelper';
+import type { NullableNumber, NullableString } from 'types/base/common/shared/types';
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { MiscInfo } from 'types/mediaInfoItem';
+
+function shouldShowFolderRuntime(
+    itemType: NullableString,
+    itemMediaType: NullableString
+): boolean {
+    return (
+        itemType === BaseItemKind.MusicAlbum
+        || itemMediaType === 'MusicArtist'
+        || itemType === BaseItemKind.Playlist
+        || itemMediaType === 'Playlist'
+        || itemMediaType === 'MusicGenre'
+    );
+}
+
+function addTrackCountOrItemCount(
+    showFolderRuntime: boolean,
+    itemSongCount: NullableNumber,
+    itemChildCount: NullableNumber,
+    itemRunTimeTicks: NullableNumber,
+    itemType: NullableString,
+    addMiscInfo: (val: MiscInfo) => void
+): void {
+    if (showFolderRuntime) {
+        const count = itemSongCount ?? itemChildCount;
+        if (count) {
+            addMiscInfo({ text: globalize.translate('TrackCount', count) });
+        }
+
+        if (itemRunTimeTicks) {
+            addMiscInfo({ text: datetime.getDisplayDuration(itemRunTimeTicks) });
+        }
+    } else if (itemType === BaseItemKind.PhotoAlbum || itemType === BaseItemKind.BoxSet) {
+        const count = itemChildCount;
+        if (count) {
+            addMiscInfo({ text: globalize.translate('ItemCount', count) });
+        }
+    }
+}
+
+function addOriginalAirDateInfo(
+    itemType: NullableString,
+    itemMediaType: NullableString,
+    isOriginalAirDateEnabled: boolean,
+    itemPremiereDate: NullableString,
+    addMiscInfo: (val: MiscInfo) => void
+): void {
+    if (
+        itemPremiereDate
+        && (itemType === BaseItemKind.Episode || itemMediaType === 'Photo')
+        && isOriginalAirDateEnabled
+    ) {
+        try {
+            //don't modify date to locale if episode. Only Dates (not times) are stored, or editable in the edit metadata dialog
+            const date = datetime.parseISO8601Date(
+                itemPremiereDate,
+                itemType !== BaseItemKind.Episode
+            );
+            addMiscInfo({ text: datetime.toLocaleDateString(date) });
+        } catch (e) {
+            console.error('error parsing date:', itemPremiereDate);
+        }
+    }
+}
+
+function addSeriesTimerInfo(
+    itemType: NullableString,
+    itemRecordAnyTime: boolean | undefined,
+    itemStartDate: NullableString,
+    itemRecordAnyChannel: boolean | undefined,
+    itemChannelName: NullableString,
+    addMiscInfo: (val: MiscInfo) => void
+): void {
+    if (itemType === 'SeriesTimer') {
+        if (itemRecordAnyTime) {
+            addMiscInfo({ text: globalize.translate('Anytime') });
+        } else {
+            addMiscInfo({ text: datetime.getDisplayTime(itemStartDate) });
+        }
+
+        if (itemRecordAnyChannel) {
+            addMiscInfo({ text: globalize.translate('AllChannels') });
+        } else {
+            addMiscInfo({
+                text: itemChannelName ?? globalize.translate('OneChannel')
+            });
+        }
+    }
+}
+
+function addProgramIndicatorInfo(
+    program: ItemDto | undefined,
+    addMiscInfo: (val: MiscInfo) => void
+): void {
+    if (
+        program?.IsLive
+        && userSettings.get('guide-indicator-live', false) === 'true'
+    ) {
+        addMiscInfo({
+            text: globalize.translate('Live'),
+            cssClass: 'mediaInfoProgramAttribute liveTvProgram'
+        });
+    } else if (
+        program?.IsPremiere
+        && userSettings.get('guide-indicator-premiere', false) === 'true'
+    ) {
+        addMiscInfo({
+            text: globalize.translate('Premiere'),
+            cssClass: 'mediaInfoProgramAttribute premiereTvProgram'
+        });
+    } else if (
+        program?.IsSeries
+        && !program?.IsRepeat
+        && userSettings.get('guide-indicator-new', false) === 'true'
+    ) {
+        addMiscInfo({
+            text: globalize.translate('New'),
+            cssClass: 'mediaInfoProgramAttribute newTvProgram'
+        });
+    } else if (
+        program?.IsSeries
+        && program?.IsRepeat
+        && userSettings.get('guide-indicator-repeat', false) === 'true'
+    ) {
+        addMiscInfo({
+            text: globalize.translate('Repeat'),
+            cssClass: 'mediaInfoProgramAttribute repeatTvProgram'
+        });
+    }
+}
+
+function addProgramIndicators(
+    item: ItemDto,
+    isYearEnabled: boolean,
+    isEpisodeTitleEnabled: boolean,
+    isOriginalAirDateEnabled: boolean,
+    isProgramIndicatorEnabled: boolean,
+    isEpisodeTitleIndexNumberEnabled: boolean,
+    addMiscInfo: (val: MiscInfo) => void
+): void {
+    if (item.Type === BaseItemKind.Program || item.Type === 'Timer') {
+        let program = item;
+        if (item.Type === 'Timer' && item.ProgramInfo) {
+            program = item.ProgramInfo;
+        }
+
+        if (isProgramIndicatorEnabled !== false) {
+            addProgramIndicatorInfo(program, addMiscInfo);
+        }
+
+        addProgramTextInfo(
+            program,
+            isEpisodeTitleEnabled,
+            isEpisodeTitleIndexNumberEnabled,
+            isOriginalAirDateEnabled,
+            isYearEnabled,
+            addMiscInfo
+        );
+    }
+}
+
+function addProgramTextInfo(
+    program: ItemDto,
+    isEpisodeTitleEnabled: boolean,
+    isEpisodeTitleIndexNumberEnabled: boolean,
+    isOriginalAirDateEnabled: boolean,
+    isYearEnabled: boolean,
+    addMiscInfo: (val: MiscInfo) => void
+): void {
+    if ((program?.IsSeries || program?.EpisodeTitle)
+    && isEpisodeTitleEnabled !== false) {
+        const text = itemHelper.getDisplayName(program, {
+            includeIndexNumber: isEpisodeTitleIndexNumberEnabled
+        });
+
+        if (text) {
+            addMiscInfo({ text: text });
+        }
+    } else if (
+        program?.ProductionYear
+        && ((program?.IsMovie && isOriginalAirDateEnabled !== false)
+            || isYearEnabled !== false)
+    ) {
+        addMiscInfo({ text: program.ProductionYear });
+    } else if (program?.PremiereDate && isOriginalAirDateEnabled !== false) {
+        try {
+            const date = datetime.parseISO8601Date(program.PremiereDate);
+            const text = globalize.translate(
+                'OriginalAirDateValue',
+                datetime.toLocaleDateString(date)
+            );
+            addMiscInfo({ text: text });
+        } catch (e) {
+            console.error('error parsing date:', program.PremiereDate);
+        }
+    }
+}
+
+function addStartDateInfo(
+    itemStartDate: NullableString,
+    itemType: NullableString,
+    addMiscInfo: (val: MiscInfo) => void
+): void {
+    if (
+        itemStartDate
+        && itemType !== BaseItemKind.Program
+        && itemType !== 'SeriesTimer'
+        && itemType !== 'Timer'
+    ) {
+        try {
+            const date = datetime.parseISO8601Date(itemStartDate);
+            addMiscInfo({ text: datetime.toLocaleDateString(date) });
+
+            if (itemType !== BaseItemKind.Recording) {
+                addMiscInfo({ text: datetime.getDisplayTime(date) });
+            }
+        } catch (e) {
+            console.error('error parsing date:', itemStartDate);
+        }
+    }
+}
+
+function addSeriesProductionYearInfo(
+    itemProductionYear: NullableNumber,
+    itemType: NullableString,
+    isYearEnabled: boolean,
+    itemStatus: NullableString,
+    itemEndDate: NullableString,
+    addMiscInfo: (val: MiscInfo) => void
+): void {
+    if (itemProductionYear && isYearEnabled && itemType === BaseItemKind.Series) {
+        if (itemStatus === 'Continuing') {
+            addMiscInfo({
+                text: globalize.translate(
+                    'SeriesYearToPresent',
+                    datetime.toLocaleString(itemProductionYear, {
+                        useGrouping: false
+                    })
+                )
+            });
+        } else {
+            addproductionYearWithEndDate(itemProductionYear, itemEndDate, addMiscInfo);
+        }
+    }
+}
+
+function addproductionYearWithEndDate(
+    itemProductionYear: number,
+    itemEndDate: NullableString,
+    addMiscInfo: (val: MiscInfo) => void
+): void {
+    let productionYear = datetime.toLocaleString(itemProductionYear, {
+        useGrouping: false
+    });
+
+    if (itemEndDate) {
+        try {
+            const endYear = datetime.toLocaleString(
+                datetime.parseISO8601Date(itemEndDate).getFullYear(),
+                { useGrouping: false }
+            );
+            /* At this point, text will contain only the start year */
+            if (endYear !== itemProductionYear) {
+                productionYear += `-${endYear}`;
+            }
+        } catch (e) {
+            console.error('error parsing date:', itemEndDate);
+        }
+    }
+    addMiscInfo({ text: productionYear });
+}
+
+function addYearInfo(
+    isYearEnabled: boolean,
+    itemType: NullableString,
+    itemMediaType: NullableString,
+    itemProductionYear: NullableNumber,
+    itemPremiereDate: NullableString,
+    addMiscInfo: (val: MiscInfo) => void
+): void {
+    if (
+        isYearEnabled
+        && itemType !== BaseItemKind.Series
+        && itemType !== BaseItemKind.Episode
+        && itemType !== BaseItemKind.Person
+        && itemMediaType !== 'Photo'
+        && itemType !== BaseItemKind.Program
+        && itemType !== BaseItemKind.Season
+    ) {
+        if (itemProductionYear) {
+            addMiscInfo({ text: itemProductionYear });
+        } else if (itemPremiereDate) {
+            try {
+                const text = datetime.toLocaleString(
+                    datetime.parseISO8601Date(itemPremiereDate).getFullYear(),
+                    { useGrouping: false }
+                );
+                addMiscInfo({ text: text });
+            } catch (e) {
+                console.error('error parsing date:', itemPremiereDate);
+            }
+        }
+    }
+}
+
+function addVideo3DFormat(
+    itemVideo3DFormat: NullableString,
+    addMiscInfo: (val: MiscInfo) => void
+): void {
+    if (itemVideo3DFormat) {
+        addMiscInfo({ text: '3D' });
+    }
+}
+
+function addRunTimeInfo(
+    itemRunTimeTicks: NullableNumber,
+    itemType: NullableString,
+    showFolderRuntime: boolean,
+    isRuntimeEnabled: boolean,
+    addMiscInfo: (val: MiscInfo) => void
+): void {
+    if (
+        itemRunTimeTicks
+        && itemType !== BaseItemKind.Series
+        && itemType !== BaseItemKind.Program
+        && itemType !== 'Timer'
+        && itemType !== BaseItemKind.Book
+        && !showFolderRuntime
+        && isRuntimeEnabled
+    ) {
+        if (itemType === BaseItemKind.Audio) {
+            addMiscInfo({ text: datetime.getDisplayRunningTime(itemRunTimeTicks) });
+        } else {
+            addMiscInfo({ text: datetime.getDisplayDuration(itemRunTimeTicks) });
+        }
+    }
+}
+
+function addOfficialRatingInfo(
+    itemOfficialRating: NullableString,
+    itemType: NullableString,
+    isOfficialRatingEnabled: boolean,
+    addMiscInfo: (val: MiscInfo) => void
+): void {
+    if (
+        itemOfficialRating
+        && isOfficialRatingEnabled
+        && itemType !== BaseItemKind.Season
+        && itemType !== BaseItemKind.Episode
+    ) {
+        addMiscInfo({
+            text: itemOfficialRating,
+            cssClass: 'mediaInfoOfficialRating'
+        });
+    }
+}
+
+function addAudioContainer(
+    itemContainer: NullableString,
+    isContainerEnabled: boolean,
+    itemType: NullableString,
+    addMiscInfo: (val: MiscInfo) => void
+): void {
+    if (itemContainer && isContainerEnabled && itemType === BaseItemKind.Audio) {
+        addMiscInfo({ text: itemContainer });
+    }
+}
+
+function addPhotoSize(
+    itemMediaType: NullableString,
+    itemWidth: NullableNumber,
+    itemHeight: NullableNumber,
+    addMiscInfo: (val: MiscInfo) => void
+): void {
+    if (itemMediaType === 'Photo' && itemWidth && itemHeight) {
+        const size = `${itemWidth}x${itemHeight}`;
+
+        addMiscInfo({ text: size });
+    }
+}
+
+interface UsePrimaryMediaInfoProps {
+    item: ItemDto;
+    isYearEnabled: boolean;
+    isContainerEnabled: boolean;
+    isEpisodeTitleEnabled: boolean;
+    isOriginalAirDateEnabled: boolean;
+    isRuntimeEnabled: boolean;
+    isProgramIndicatorEnabled: boolean;
+    isEpisodeTitleIndexNumberEnabled: boolean;
+    isOfficialRatingEnabled: boolean;
+}
+
+function usePrimaryMediaInfo({
+    item,
+    isYearEnabled = false,
+    isContainerEnabled = false,
+    isEpisodeTitleEnabled = false,
+    isOriginalAirDateEnabled = false,
+    isRuntimeEnabled = false,
+    isProgramIndicatorEnabled = false,
+    isEpisodeTitleIndexNumberEnabled = false,
+    isOfficialRatingEnabled = false
+}: UsePrimaryMediaInfoProps) {
+    const {
+        EndDate,
+        Status,
+        StartDate,
+        ProductionYear,
+        Video3DFormat,
+        Type,
+        Width,
+        Height,
+        MediaType,
+        SongCount,
+        RecordAnyTime,
+        RecordAnyChannel,
+        ChannelName,
+        ChildCount,
+        RunTimeTicks,
+        PremiereDate,
+        OfficialRating,
+        Container
+    } = item;
+
+    const miscInfo: MiscInfo[] = [];
+
+    const addMiscInfo = (val: MiscInfo) => {
+        if (val) {
+            miscInfo.push(val);
+        }
+    };
+
+    const showFolderRuntime = shouldShowFolderRuntime(Type, MediaType);
+
+    addTrackCountOrItemCount(
+        showFolderRuntime,
+        SongCount,
+        ChildCount,
+        RunTimeTicks,
+        Type,
+        addMiscInfo
+    );
+
+    addOriginalAirDateInfo(
+        Type,
+        MediaType,
+        isOriginalAirDateEnabled,
+        PremiereDate,
+        addMiscInfo
+    );
+
+    addSeriesTimerInfo(
+        Type,
+        RecordAnyTime,
+        StartDate,
+        RecordAnyChannel,
+        ChannelName,
+        addMiscInfo
+    );
+
+    addStartDateInfo(StartDate, Type, addMiscInfo);
+
+    addSeriesProductionYearInfo(
+        ProductionYear,
+        Type,
+        isYearEnabled,
+        Status,
+        EndDate,
+        addMiscInfo
+    );
+
+    addProgramIndicators(
+        item,
+        isProgramIndicatorEnabled,
+        isEpisodeTitleEnabled,
+        isEpisodeTitleIndexNumberEnabled,
+        isOriginalAirDateEnabled,
+        isYearEnabled,
+        addMiscInfo
+    );
+
+    addYearInfo(
+        isYearEnabled,
+        Type,
+        MediaType,
+        ProductionYear,
+        PremiereDate,
+        addMiscInfo
+    );
+
+    addRunTimeInfo(
+        RunTimeTicks,
+        Type,
+        showFolderRuntime,
+        isRuntimeEnabled,
+        addMiscInfo
+    );
+
+    addOfficialRatingInfo(
+        OfficialRating,
+        Type,
+        isOfficialRatingEnabled,
+        addMiscInfo
+    );
+
+    addVideo3DFormat(Video3DFormat, addMiscInfo);
+
+    addPhotoSize(MediaType, Width, Height, addMiscInfo);
+
+    addAudioContainer(Container, isContainerEnabled, Type, addMiscInfo);
+
+    return miscInfo;
+}
+
+export default usePrimaryMediaInfo;

src/elements/emby-itemrefreshindicator/RefreshIndicator.tsx

@@ -0,0 +1,92 @@
+import React, { type FC, useCallback, useEffect, useState } from 'react';
+import Events, { Event } from 'utils/events';
+import serverNotifications from 'scripts/serverNotifications';
+import classNames from 'classnames';
+
+import CircularProgress, {
+    CircularProgressProps
+} from '@mui/material/CircularProgress';
+import Typography from '@mui/material/Typography';
+import Box from '@mui/material/Box';
+import { toPercent } from 'utils/number';
+import { getCurrentDateTimeLocale } from 'scripts/globalize';
+import type { ItemDto } from 'types/base/models/item-dto';
+
+function CircularProgressWithLabel(
+    props: CircularProgressProps & { value: number }
+) {
+    return (
+        <Box sx={{ position: 'relative', display: 'inline-flex' }}>
+            <CircularProgress variant='determinate' {...props} />
+            <Box
+                sx={{
+                    top: 0,
+                    left: 0,
+                    bottom: 0,
+                    right: 0,
+                    position: 'absolute',
+                    display: 'flex',
+                    alignItems: 'center',
+                    justifyContent: 'center'
+                }}
+            >
+                <Typography
+                    variant='caption'
+                    component='div'
+                    color='text.secondary'
+                >
+                    {toPercent(props.value / 100, getCurrentDateTimeLocale())}
+                </Typography>
+            </Box>
+        </Box>
+    );
+}
+
+interface RefreshIndicatorProps {
+    item: ItemDto;
+    className?: string;
+}
+
+const RefreshIndicator: FC<RefreshIndicatorProps> = ({ item, className }) => {
+    const [progress, setProgress] = useState(item.RefreshProgress || 0);
+
+    const onRefreshProgress = useCallback((_e: Event, apiClient, info) => {
+        if (info.ItemId === item?.Id) {
+            setProgress(parseFloat(info.Progress));
+        }
+    }, [item?.Id]);
+
+    const unbindEvents = useCallback(() => {
+        Events.off(serverNotifications, 'RefreshProgress', onRefreshProgress);
+    }, [onRefreshProgress]);
+
+    const bindEvents = useCallback(() => {
+        unbindEvents();
+
+        if (item?.Id) {
+            Events.on(serverNotifications, 'RefreshProgress', onRefreshProgress);
+        }
+    }, [item?.Id, onRefreshProgress, unbindEvents]);
+
+    useEffect(() => {
+        bindEvents();
+
+        return () => {
+            unbindEvents();
+        };
+    }, [bindEvents, item.Id, unbindEvents]);
+
+    const progressringClass = classNames(
+        'progressring',
+        className,
+        { 'hide': !progress || progress >= 100 }
+    );
+
+    return (
+        <div className={progressringClass}>
+            <CircularProgressWithLabel value={Math.floor(progress)} />
+        </div>
+    );
+};
+
+export default RefreshIndicator;

src/elements/emby-itemscontainer/ItemsContainer.tsx

@@ -1,13 +1,11 @@
 import type {
-    LibraryUpdateInfo,
+    LibraryUpdateInfo
-    SeriesTimerInfoDto,
-    TimerInfoDto,
-    UserItemDataDto
 } from '@jellyfin/sdk/lib/generated-client';
-import React, { FC, useCallback, useEffect, useRef } from 'react';
+import React, { type FC, useCallback, useEffect, useRef } from 'react';
 import classNames from 'classnames';
-import { Box } from '@mui/material';
+import Box from '@mui/material/Box';
 import Sortable from 'sortablejs';
+import { useQueryClient } from '@tanstack/react-query';
 import { usePlaylistsMoveItemMutation } from 'hooks/useFetchItems';
 import Events, { Event } from 'utils/events';
 import serverNotifications from 'scripts/serverNotifications';
@@ -21,7 +19,7 @@ import itemShortcuts from 'components/shortcuts';
 import MultiSelect from 'components/multiSelect/multiSelect';
 import loading from 'components/loading/loading';
 import focusManager from 'components/focusManager';
-import { ParentId } from 'types/library';
+import type { ParentId } from 'types/library';
 
 function disableEvent(e: MouseEvent) {
     e.preventDefault();
@@ -40,11 +38,11 @@ interface ItemsContainerProps {
     isContextMenuEnabled?: boolean;
     isMultiSelectEnabled?: boolean;
     isDragreOrderEnabled?: boolean;
-    dataMonitor?: string;
+    eventsToMonitor?: string[];
     parentId?: ParentId;
     reloadItems?: () => void;
     getItemsHtml?: () => string;
-    children?: React.ReactNode;
+    queryKey?: string[]
 }
 
 const ItemsContainer: FC<ItemsContainerProps> = ({
@@ -52,12 +50,14 @@ const ItemsContainer: FC<ItemsContainerProps> = ({
     isContextMenuEnabled,
     isMultiSelectEnabled,
     isDragreOrderEnabled,
-    dataMonitor,
+    eventsToMonitor = [],
     parentId,
+    queryKey,
     reloadItems,
     getItemsHtml,
     children
 }) => {
+    const queryClient = useQueryClient();
     const { mutateAsync: playlistsMoveItemMutation } = usePlaylistsMoveItemMutation();
     const itemsContainerRef = useRef<HTMLDivElement>(null);
     const multiSelectref = useRef<MultiSelect | null>(null);
@@ -172,6 +172,14 @@ const ItemsContainer: FC<ItemsContainerProps> = ({
         }
     }, []);
 
+    const invalidateQueries = useCallback(async () => {
+        await queryClient.invalidateQueries({
+            queryKey,
+            type: 'all',
+            refetchType: 'active'
+        });
+    }, [queryClient, queryKey]);
+
     const notifyRefreshNeeded = useCallback(
         (isInForeground: boolean) => {
             if (!reloadItems) return;
@@ -184,144 +192,37 @@ const ItemsContainer: FC<ItemsContainerProps> = ({
         [reloadItems]
     );
 
-    const getEventsToMonitor = useCallback(() => {
+    const onUserDataChanged = useCallback(async () => {
-        const monitor = dataMonitor;
+        await invalidateQueries();
-        if (monitor) {
-            return monitor.split(',');
-        }
-
-        return [];
-    }, [dataMonitor]);
-
-    const onUserDataChanged = useCallback(
-        (_e: Event, userData: UserItemDataDto) => {
-            const itemsContainer = itemsContainerRef.current as HTMLDivElement;
-
-            import('../../components/cardbuilder/cardBuilder')
-                .then((cardBuilder) => {
-                    cardBuilder.onUserDataChanged(userData, itemsContainer);
-                })
-                .catch((err) => {
-                    console.error(
-                        '[onUserDataChanged] failed to load onUserData Changed',
-                        err
-                    );
-                });
-
-            const eventsToMonitor = getEventsToMonitor();
-            if (
-                eventsToMonitor.indexOf('markfavorite') !== -1
-                || eventsToMonitor.indexOf('markplayed') !== -1
-            ) {
-                notifyRefreshNeeded(false);
-            }
     },
-        [getEventsToMonitor, notifyRefreshNeeded]
+    [invalidateQueries]
     );
 
-    const onTimerCreated = useCallback(
+    const onTimerCreated = useCallback(async () => {
-        (_e: Event, data: TimerInfoDto) => {
+        await invalidateQueries();
-            const itemsContainer = itemsContainerRef.current as HTMLDivElement;
-            const eventsToMonitor = getEventsToMonitor();
-            if (eventsToMonitor.indexOf('timers') !== -1) {
-                notifyRefreshNeeded(false);
-                return;
-            }
-
-            const programId = data.ProgramId;
-            // This could be null, not supported by all tv providers
-            const newTimerId = data.Id;
-            if (programId && newTimerId) {
-                import('../../components/cardbuilder/cardBuilder')
-                    .then((cardBuilder) => {
-                        cardBuilder.onTimerCreated(
-                            programId,
-                            newTimerId,
-                            itemsContainer
-                        );
-                    })
-                    .catch((err) => {
-                        console.error(
-                            '[onTimerCreated] failed to load onTimer Created',
-                            err
-                        );
-                    });
-            }
     },
-        [getEventsToMonitor, notifyRefreshNeeded]
+    [invalidateQueries]
     );
 
-    const onSeriesTimerCreated = useCallback(() => {
+    const onSeriesTimerCreated = useCallback(async () => {
-        const eventsToMonitor = getEventsToMonitor();
+        await invalidateQueries();
-        if (eventsToMonitor.indexOf('seriestimers') !== -1) {
+    }, [invalidateQueries]);
-            notifyRefreshNeeded(false);
-        }
-    }, [getEventsToMonitor, notifyRefreshNeeded]);
 
-    const onTimerCancelled = useCallback(
+    const onTimerCancelled = useCallback(async () => {
-        (_e: Event, data: TimerInfoDto) => {
+        await invalidateQueries();
-            const itemsContainer = itemsContainerRef.current as HTMLDivElement;
-            const eventsToMonitor = getEventsToMonitor();
-            if (eventsToMonitor.indexOf('timers') !== -1) {
-                notifyRefreshNeeded(false);
-                return;
-            }
-
-            const timerId = data.Id;
-
-            if (timerId) {
-                import('../../components/cardbuilder/cardBuilder')
-                    .then((cardBuilder) => {
-                        cardBuilder.onTimerCancelled(timerId, itemsContainer);
-                    })
-                    .catch((err) => {
-                        console.error(
-                            '[onTimerCancelled] failed to load onTimer Cancelled',
-                            err
-                        );
-                    });
-            }
     },
-        [getEventsToMonitor, notifyRefreshNeeded]
+    [invalidateQueries]
     );
 
-    const onSeriesTimerCancelled = useCallback(
+    const onSeriesTimerCancelled = useCallback(async () => {
-        (_e: Event, data: SeriesTimerInfoDto) => {
+        await invalidateQueries();
-            const itemsContainer = itemsContainerRef.current as HTMLDivElement;
-            const eventsToMonitor = getEventsToMonitor();
-            if (eventsToMonitor.indexOf('seriestimers') !== -1) {
-                notifyRefreshNeeded(false);
-                return;
-            }
-
-            const cancelledTimerId = data.Id;
-
-            if (cancelledTimerId) {
-                import('../../components/cardbuilder/cardBuilder')
-                    .then((cardBuilder) => {
-                        cardBuilder.onSeriesTimerCancelled(
-                            cancelledTimerId,
-                            itemsContainer
-                        );
-                    })
-                    .catch((err) => {
-                        console.error(
-                            '[onSeriesTimerCancelled] failed to load onSeriesTimer Cancelled',
-                            err
-                        );
-                    });
-            }
     },
-        [getEventsToMonitor, notifyRefreshNeeded]
+    [invalidateQueries]
     );
 
     const onLibraryChanged = useCallback(
-        (_e: Event, data: LibraryUpdateInfo) => {
+        (_e: Event, apiClient, data: LibraryUpdateInfo) => {
-            const eventsToMonitor = getEventsToMonitor();
+            if (eventsToMonitor.includes('seriestimers') || eventsToMonitor.includes('timers')) {
-            if (
-                eventsToMonitor.indexOf('seriestimers') !== -1
-                || eventsToMonitor.indexOf('timers') !== -1
-            ) {
                 // yes this is an assumption
                 return;
             }
@@ -348,32 +249,31 @@ const ItemsContainer: FC<ItemsContainerProps> = ({
 
             notifyRefreshNeeded(false);
         },
-        [getEventsToMonitor, notifyRefreshNeeded, parentId]
+        [eventsToMonitor, notifyRefreshNeeded, parentId]
     );
 
     const onPlaybackStopped = useCallback(
-        (_e: Event, stopInfo) => {
+        (_e: Event, apiClient, stopInfo) => {
             const state = stopInfo.state;
 
-            const eventsToMonitor = getEventsToMonitor();
             if (
                 state.NowPlayingItem
                 && state.NowPlayingItem.MediaType === 'Video'
             ) {
-                if (eventsToMonitor.indexOf('videoplayback') !== -1) {
+                if (eventsToMonitor.includes('videoplayback')) {
                     notifyRefreshNeeded(true);
                     return;
                 }
             } else if (
                 state.NowPlayingItem
                 && state.NowPlayingItem.MediaType === 'Audio'
-                && eventsToMonitor.indexOf('audioplayback') !== -1
+                && eventsToMonitor.includes('videoplayback')
             ) {
                 notifyRefreshNeeded(true);
                 return;
             }
         },
-        [getEventsToMonitor, notifyRefreshNeeded]
+        [eventsToMonitor, notifyRefreshNeeded]
     );
 
     const setFocus = useCallback(
@@ -418,9 +318,8 @@ const ItemsContainer: FC<ItemsContainerProps> = ({
 
         if (getItemsHtml) {
             itemsContainer.innerHTML = getItemsHtml();
-        }
-
             imageLoader.lazyChildren(itemsContainer);
+        }
 
         if (hasActiveElement) {
             setFocus(itemsContainer, focusId);

src/elements/emby-playstatebutton/PlayedButton.tsx

@@ -1,5 +1,6 @@
-import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client';
+import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
-import React, { FC, useCallback } from 'react';
+import { useQueryClient } from '@tanstack/react-query';
+import React, { type FC, useCallback } from 'react';
 import CheckIcon from '@mui/icons-material/Check';
 import { IconButton } from '@mui/material';
 import classNames from 'classnames';
@@ -10,28 +11,30 @@ interface PlayedButtonProps {
     className?: string;
     isPlayed : boolean | undefined;
     itemId: string | null | undefined;
-    itemType: string | null | undefined
+    itemType: string | null | undefined,
+    queryKey?: string[]
 }
 
 const PlayedButton: FC<PlayedButtonProps> = ({
     className,
     isPlayed = false,
     itemId,
-    itemType
+    itemType,
+    queryKey
 }) => {
+    const queryClient = useQueryClient();
     const { mutateAsync: togglePlayedMutation } = useTogglePlayedMutation();
-    const [playedState, setPlayedState] = React.useState<boolean>(isPlayed);
 
     const getTitle = useCallback(() => {
         let buttonTitle;
         if (itemType !== BaseItemKind.AudioBook) {
-            buttonTitle = playedState ? globalize.translate('Watched') : globalize.translate('MarkPlayed');
+            buttonTitle = isPlayed ? globalize.translate('Watched') : globalize.translate('MarkPlayed');
         } else {
-            buttonTitle = playedState ? globalize.translate('Played') : globalize.translate('MarkPlayed');
+            buttonTitle = isPlayed ? globalize.translate('Played') : globalize.translate('MarkPlayed');
         }
 
         return buttonTitle;
-    }, [playedState, itemType]);
+    }, [itemType, isPlayed]);
 
     const onClick = useCallback(async () => {
         try {
@@ -39,23 +42,29 @@ const PlayedButton: FC<PlayedButtonProps> = ({
                 throw new Error('Item has no Id');
             }
 
-            const _isPlayed = await togglePlayedMutation({
+            await togglePlayedMutation({
                 itemId,
-                playedState
+                isPlayed
+            },
+            { onSuccess: async() => {
+                await queryClient.invalidateQueries({
+                    queryKey,
+                    type: 'all',
+                    refetchType: 'active'
                 });
-            setPlayedState(!!_isPlayed);
+            } });
         } catch (e) {
             console.error(e);
         }
-    }, [playedState, itemId, togglePlayedMutation]);
+    }, [itemId, togglePlayedMutation, isPlayed, queryClient, queryKey]);
 
     const btnClass = classNames(
         className,
-        { 'playstatebutton-played': playedState }
+        { 'playstatebutton-played': isPlayed }
     );
 
     const iconClass = classNames(
-        { 'playstatebutton-icon-played': playedState }
+        { 'playstatebutton-icon-played': isPlayed }
     );
     return (
         <IconButton

src/elements/emby-progressbar/AutoTimeProgressBar.tsx

@@ -0,0 +1,79 @@
+import React, { type FC, useCallback, useEffect, useRef, useState } from 'react';
+import classNames from 'classnames';
+import LinearProgress, { linearProgressClasses } from '@mui/material/LinearProgress';
+import { useTheme } from '@mui/material/styles';
+import type { ProgressOptions } from 'types/progressOptions';
+
+interface AutoTimeProgressBarProps {
+    pct: number;
+    starTtime: number;
+    endTtime: number;
+    isRecording: boolean;
+    dataAutoMode?: string;
+    progressOptions?: ProgressOptions;
+}
+
+const AutoTimeProgressBar: FC<AutoTimeProgressBarProps> = ({
+    pct,
+    dataAutoMode,
+    isRecording,
+    starTtime,
+    endTtime,
+    progressOptions
+}) => {
+    const [progress, setProgress] = useState(pct);
+    const timerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+    const theme = useTheme();
+
+    const onAutoTimeProgress = useCallback(() => {
+        const start = parseInt(starTtime.toString(), 10);
+        const end = parseInt(endTtime.toString(), 10);
+
+        const now = new Date().getTime();
+        const total = end - start;
+        let percentage = 100 * ((now - start) / total);
+
+        percentage = Math.min(100, percentage);
+        percentage = Math.max(0, percentage);
+
+        setProgress(percentage);
+    }, [endTtime, starTtime]);
+
+    useEffect(() => {
+        if (timerRef.current) {
+            clearInterval(timerRef.current);
+        }
+
+        if (dataAutoMode === 'time') {
+            timerRef.current = setInterval(onAutoTimeProgress, 60000);
+        }
+
+        return () => {
+            if (timerRef.current) {
+                clearInterval(timerRef.current);
+                timerRef.current = null;
+            }
+        };
+    }, [dataAutoMode, onAutoTimeProgress]);
+
+    const progressBarClass = classNames(
+        'itemLinearProgress',
+        progressOptions?.containerClass
+    );
+
+    return (
+        <LinearProgress
+            className={progressBarClass}
+            variant='determinate'
+            value={progress}
+            sx={{
+                [`& .${linearProgressClasses.bar}`]: {
+                    borderRadius: 5,
+                    backgroundColor: isRecording ? theme.palette.error.main : theme.palette.primary.main
+                }
+            }}
+        />
+    );
+};
+
+export default AutoTimeProgressBar;

src/elements/emby-ratingbutton/FavoriteButton.tsx

@@ -1,4 +1,5 @@
-import React, { FC, useCallback } from 'react';
+import React, { type FC, useCallback } from 'react';
+import { useQueryClient } from '@tanstack/react-query';
 import FavoriteIcon from '@mui/icons-material/Favorite';
 import { IconButton } from '@mui/material';
 import classNames from 'classnames';
@@ -8,16 +9,18 @@ import globalize from 'scripts/globalize';
 interface FavoriteButtonProps {
     className?: string;
     isFavorite: boolean | undefined;
-    itemId: string | null | undefined
+    itemId: string | null | undefined;
+    queryKey?: string[]
 }
 
 const FavoriteButton: FC<FavoriteButtonProps> = ({
     className,
     isFavorite = false,
-    itemId
+    itemId,
+    queryKey
 }) => {
+    const queryClient = useQueryClient();
     const { mutateAsync: toggleFavoriteMutation } = useToggleFavoriteMutation();
-    const [favoriteState, setFavoriteState] = React.useState<boolean>(isFavorite);
 
     const onClick = useCallback(async () => {
         try {
@@ -25,28 +28,34 @@ const FavoriteButton: FC<FavoriteButtonProps> = ({
                 throw new Error('Item has no Id');
             }
 
-            const _isFavorite = await toggleFavoriteMutation({
+            await toggleFavoriteMutation({
                 itemId,
-                favoriteState
+                isFavorite
+            },
+            { onSuccess: async() => {
+                await queryClient.invalidateQueries({
+                    queryKey,
+                    type: 'all',
+                    refetchType: 'active'
                 });
-            setFavoriteState(!!_isFavorite);
+            } });
         } catch (e) {
             console.error(e);
         }
-    }, [favoriteState, itemId, toggleFavoriteMutation]);
+    }, [isFavorite, itemId, queryClient, queryKey, toggleFavoriteMutation]);
 
     const btnClass = classNames(
         className,
-        { 'ratingbutton-withrating': favoriteState }
+        { 'ratingbutton-withrating': isFavorite }
     );
 
     const iconClass = classNames(
-        { 'ratingbutton-icon-withrating': favoriteState }
+        { 'ratingbutton-icon-withrating': isFavorite }
     );
 
     return (
         <IconButton
-            title={favoriteState ? globalize.translate('Favorite') : globalize.translate('AddToFavorites')}
+            title={isFavorite ? globalize.translate('Favorite') : globalize.translate('AddToFavorites')}
             className={btnClass}
             size='small'
             onClick={onClick}

src/elements/emby-scrollbuttons/ScrollButtons.tsx

@@ -1,4 +1,4 @@
-import React, { FC, useCallback, useEffect, useRef, useState } from 'react';
+import React, { type FC, useCallback, useEffect, useRef, useState } from 'react';
 import scrollerFactory from '../../libraries/scroller';
 import globalize from '../../scripts/globalize';
 import IconButton from '../emby-button/IconButton';

src/elements/emby-scroller/Scroller.tsx

@@ -1,4 +1,4 @@
-import React, { FC, useCallback, useEffect, useRef, useState } from 'react';
+import React, { type FC, useCallback, useEffect, useRef, useState } from 'react';
 import classNames from 'classnames';
 import useElementSize from 'hooks/useElementSize';
 import layoutManager from '../../components/layoutManager';

src/hooks/useFetchItems.ts

@@ -376,10 +376,12 @@ export const useGetItemsViewByType = (
     return useQuery({
         queryKey: [
             'ItemsViewByType',
+            {
                 viewType,
                 parentId,
                 itemType,
                 libraryViewSettings
+            }
         ],
         queryFn: ({ signal }) =>
             fetchGetItemsViewByType(
@@ -526,17 +528,17 @@ export const useGetGroupsUpcomingEpisodes = (parentId: ParentId) => {
 
 interface ToggleFavoriteMutationProp {
     itemId: string;
-    favoriteState: boolean
+    isFavorite: boolean
 }
 
 const fetchUpdateFavoriteStatus = async (
     currentApi: JellyfinApiContext,
     itemId: string,
-    favoriteState: boolean
+    isFavorite: boolean
 ) => {
     const { api, user } = currentApi;
     if (api && user?.Id) {
-        if (favoriteState) {
+        if (isFavorite) {
             const response = await getUserLibraryApi(api).unmarkFavoriteItem({
                 userId: user.Id,
                 itemId: itemId
@@ -555,24 +557,24 @@ const fetchUpdateFavoriteStatus = async (
 export const useToggleFavoriteMutation = () => {
     const currentApi = useApi();
     return useMutation({
-        mutationFn: ({ itemId, favoriteState }: ToggleFavoriteMutationProp) =>
+        mutationFn: ({ itemId, isFavorite }: ToggleFavoriteMutationProp) =>
-            fetchUpdateFavoriteStatus(currentApi, itemId, favoriteState )
+            fetchUpdateFavoriteStatus(currentApi, itemId, isFavorite )
     });
 };
 
 interface TogglePlayedMutationProp {
     itemId: string;
-    playedState: boolean
+    isPlayed: boolean
 }
 
 const fetchUpdatePlayedState = async (
     currentApi: JellyfinApiContext,
     itemId: string,
-    playedState: boolean
+    isPlayed: boolean
 ) => {
     const { api, user } = currentApi;
     if (api && user?.Id) {
-        if (playedState) {
+        if (isPlayed) {
             const response = await getPlaystateApi(api).markUnplayedItem({
                 userId: user.Id,
                 itemId: itemId
@@ -591,8 +593,8 @@ const fetchUpdatePlayedState = async (
 export const useTogglePlayedMutation = () => {
     const currentApi = useApi();
     return useMutation({
-        mutationFn: ({ itemId, playedState }: TogglePlayedMutationProp) =>
+        mutationFn: ({ itemId, isPlayed }: TogglePlayedMutationProp) =>
-            fetchUpdatePlayedState(currentApi, itemId, playedState )
+            fetchUpdatePlayedState(currentApi, itemId, isPlayed )
     });
 };
 
@@ -676,7 +678,7 @@ const fetchGetTimers = async (
 export const useGetTimers = (isUpcomingRecordingsEnabled: boolean, indexByDate?: boolean) => {
     const currentApi = useApi();
     return useQuery({
-        queryKey: ['Timers', isUpcomingRecordingsEnabled, indexByDate],
+        queryKey: ['Timers', { isUpcomingRecordingsEnabled, indexByDate }],
         queryFn: ({ signal }) =>
             isUpcomingRecordingsEnabled ? fetchGetTimers(currentApi, indexByDate, { signal }) : []
     });
@@ -830,7 +832,7 @@ const fetchGetSectionItems = async (
                             ],
                             parentId: parentId ?? undefined,
                             imageTypeLimit: 1,
-                            enableImageTypes: [ImageType.Primary],
+                            enableImageTypes: [ImageType.Primary, ImageType.Thumb],
                             ...section.parametersOptions
                         },
                         {
@@ -882,7 +884,6 @@ const getSectionsWithItems = async (
     const updatedSectionWithItems: SectionWithItems[] = [];
 
     for (const section of sections) {
-        try {
         const items = await fetchGetSectionItems(
             currentApi, parentId, section, options
         );
@@ -893,9 +894,6 @@ const getSectionsWithItems = async (
                 items
             });
         }
-        } catch (error) {
-            console.error(`Error occurred for section ${section.type}: ${error}`);
-        }
     }
 
     return updatedSectionWithItems;
@@ -908,7 +906,7 @@ export const useGetSuggestionSectionsWithItems = (
     const currentApi = useApi();
     const sections = getSuggestionSections();
     return useQuery({
-        queryKey: ['SuggestionSectionWithItems', suggestionSectionType],
+        queryKey: ['SuggestionSectionWithItems', { suggestionSectionType }],
         queryFn: ({ signal }) =>
             getSectionsWithItems(currentApi, parentId, sections, suggestionSectionType, { signal }),
         enabled: !!parentId
@@ -922,9 +920,8 @@ export const useGetProgramsSectionsWithItems = (
     const currentApi = useApi();
     const sections = getProgramSections();
     return useQuery({
-        queryKey: ['ProgramSectionWithItems', programSectionType],
+        queryKey: ['ProgramSectionWithItems', { programSectionType }],
-        queryFn: ({ signal }) =>
+        queryFn: ({ signal }) => getSectionsWithItems(currentApi, parentId, sections, programSectionType, { signal })
-            getSectionsWithItems(currentApi, parentId, sections, programSectionType, { signal })
+
     });
 };
-

src/themes/theme.ts

@@ -1,5 +1,15 @@
 import { createTheme } from '@mui/material/styles';
 
+declare module '@mui/material/styles' {
+  interface Palette {
+    starIcon: Palette['primary'];
+  }
+
+  interface PaletteOptions {
+    starIcon?: PaletteOptions['primary'];
+  }
+}
+
 const LIST_ICON_WIDTH = 36;
 
 /** The default Jellyfin app theme for mui */
@@ -18,6 +28,12 @@ const theme = createTheme({
         },
         action: {
             selectedOpacity: 0.2
+        },
+        starIcon: {
+            main: '#f2b01e' // Yellow color
+        },
+        error: {
+            main: '#cb272a' // Red color
         }
     },
     typography: {

src/types/base/common/shared/types.ts

@@ -0,0 +1,3 @@
+export type NullableString = string | null | undefined;
+export type NullableNumber = number | null | undefined;
+export type NullableBoolean = boolean | null | undefined;

src/types/base/models/item-dto.ts

@@ -0,0 +1,22 @@
+import type { BaseItemDto, BaseItemKind, CollectionTypeOptions, RecordingStatus, SearchHint, SeriesTimerInfoDto, TimerInfoDto, UserItemDataDto, VirtualFolderInfo } from '@jellyfin/sdk/lib/generated-client';
+
+type BaseItem = Omit<BaseItemDto, 'ChannelId' | 'EndDate' | 'Id' | 'StartDate' | 'Status' | 'Type' | 'Artists' | 'MediaType' | 'Name' | 'CollectionType'>;
+type TimerInfo = Omit<TimerInfoDto, 'ChannelId' | 'EndDate' | 'Id' | 'StartDate' | 'Status' | 'Type' | 'Name'>;
+type SeriesTimerInfo = Omit<SeriesTimerInfoDto, 'ChannelId' | 'EndDate' | 'Id' | 'StartDate' | 'Type' | 'Name'>;
+type SearchHintItem = Omit<SearchHint, 'ItemId' |'Artists' | 'Id' | 'MediaType' | 'Name' | 'StartDate' | 'Type'>;
+type UserItem = Omit<UserItemDataDto, 'ItemId'>;
+type VirtualFolder = Omit<VirtualFolderInfo, 'CollectionType'>;
+
+export interface ItemDto extends BaseItem, TimerInfo, SeriesTimerInfo, SearchHintItem, UserItem, VirtualFolder {
+    'ChannelId'?: string | null;
+    'EndDate'?: string | null;
+    'Id'?: string | null;
+    'StartDate'?: string | null;
+    'Type'?: BaseItemKind | string | null;
+    'Status'?: RecordingStatus | string | null;
+    'CollectionType'?: CollectionTypeOptions | string | null;
+    'Artists'?: Array<string> | null;
+    'MediaType'?: string | null;
+    'Name'?: string | null;
+    'ItemId'?: string | null;
+}

src/types/base/models/item-kind.ts

@@ -0,0 +1,12 @@
+import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
+
+export const ItemKind = {
+    ...BaseItemKind,
+    Timer: 'Timer',
+    SeriesTimer: 'SeriesTimer'
+} as const;
+
+// eslint-disable-next-line @typescript-eslint/no-redeclare
+export type ItemKind = keyof typeof ItemKind;
+
+export type ItemType = ItemKind | null | undefined;

src/types/base/models/item-media-kind.ts

@@ -0,0 +1,15 @@
+export const ItemMediaKind = {
+    MusicArtist: 'MusicArtist',
+    Playlist: 'Playlist',
+    MusicGenre: 'MusicGenre',
+    Photo: 'Photo',
+    Audio: 'Audio',
+    Video: 'Video',
+    Book: 'Book',
+    Recording: 'Recording'
+} as const;
+
+// eslint-disable-next-line @typescript-eslint/no-redeclare
+export type ItemMediaKind = keyof typeof ItemMediaKind;
+
+export type ItemMediaType = ItemMediaKind | null | undefined;

src/types/cardOptions.ts

@@ -1,10 +1,17 @@
-import type { BaseItemDto } from '@jellyfin/sdk/lib/generated-client';
+import type { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
-import { CollectionType } from '@jellyfin/sdk/lib/generated-client/models/collection-type';
+import type { ImageType } from '@jellyfin/sdk/lib/generated-client/models/image-type';
+import type { UserItemDataDto } from '@jellyfin/sdk/lib/generated-client/models/user-item-data-dto';
+import type { BaseItemDtoImageBlurHashes } from '@jellyfin/sdk/lib/generated-client/models/base-item-dto-image-blur-hashes';
+import type { CollectionType } from '@jellyfin/sdk/lib/generated-client/models/collection-type';
+import { CardShape } from 'utils/card';
+import type { NullableString } from './base/common/shared/types';
+import type { ItemDto } from './base/models/item-dto';
+import type { ParentId } from './library';
 
 export interface CardOptions {
     itemsContainer?: HTMLElement | null;
     parentContainer?: HTMLElement | null;
-    items?: BaseItemDto[] | null;
+    items?: ItemDto[] | null;
     allowBottomPadding?: boolean;
     centerText?: boolean;
     coverImage?: boolean;
@@ -12,13 +19,16 @@ export interface CardOptions {
     overlayMoreButton?: boolean;
     overlayPlayButton?: boolean;
     overlayText?: boolean;
+    imageBlurhashes?: BaseItemDtoImageBlurHashes | null;
+    preferBanner?: boolean;
     preferThumb?: boolean | string | null;
     preferDisc?: boolean;
     preferLogo?: boolean;
     scalable?: boolean;
-    shape?: string | null;
+    shape?: CardShape;
+    defaultShape?: CardShape;
     lazy?: boolean;
-    cardLayout?: boolean | string;
+    cardLayout?: boolean | null;
     showParentTitle?: boolean;
     showParentTitleOrTitle?: boolean;
     showAirTime?: boolean;
@@ -35,9 +45,8 @@ export interface CardOptions {
     lines?: number;
     context?: CollectionType;
     action?: string | null;
-    defaultShape?: string;
     indexBy?: string;
-    parentId?: string | null;
+    parentId?: ParentId;
     showMenu?: boolean;
     cardCssClass?: string | null;
     cardClass?: string | null;
@@ -61,9 +70,10 @@ export interface CardOptions {
     showSeriesTimerChannel?: boolean;
     showSongCount?: boolean;
     width?: number;
+    widths?: any;
     showChannelLogo?: boolean;
     showLogo?: boolean;
-    serverId?: string;
+    serverId?: NullableString;
     collectionId?: string | null;
     playlistId?: string | null;
     defaultCardImageIcon?: string;
@@ -72,4 +82,46 @@ export interface CardOptions {
     showGroupCount?: boolean;
     containerClass?: string;
     noItemsMessage?: string;
+    showIndex?: boolean;
+    index?: string;
+    showIndexNumber?: boolean;
+    enableContentWrapper?: boolean;
+    enableOverview?: boolean;
+    enablePlayedButton?: boolean;
+    infoButton?: boolean;
+    imageSize?: string;
+    enableSideMediaInfo?: boolean;
+    imagePlayButton?: boolean;
+    border?: boolean;
+    highlight?: boolean;
+    smallIcon?: boolean;
+    artist?: boolean;
+    addToListButton?: boolean;
+    enableUserDataButtons?: boolean;
+    enableRatingButton?: boolean;
+    image?: boolean;
+    imageSource?: string;
+    showProgramDateTime?: boolean;
+    showChannel?: boolean;
+    mediaInfo?: boolean;
+    moreButton?: boolean;
+    recordButton?: boolean;
+    dragHandle?: boolean;
+    showProgramTime?: boolean;
+    parentTitleWithTitle?: boolean;
+    showIndexNumberLeft?: boolean;
+    sortBy?: string;
+    textLines?: (item: ItemDto) => (BaseItemKind | string | undefined)[];
+    userData?: UserItemDataDto;
+    rightButtons?: {
+        icon: string;
+        title: string;
+        id: string;
+    }[];
+    uiAspect?: number | null;
+    primaryImageAspectRatio?: number | null;
+    rows?: number | null;
+    imageType?: ImageType;
+    queryKey?: string[]
 }
+

src/types/dataAttributes.ts

@@ -0,0 +1,49 @@
+import type { CollectionType } from '@jellyfin/sdk/lib/generated-client/models/collection-type';
+import type { UserItemDataDto } from '@jellyfin/sdk/lib/generated-client/models/user-item-data-dto';
+import type { NullableBoolean, NullableNumber, NullableString } from './base/common/shared/types';
+
+export type AttributesOpts = {
+    context?: CollectionType,
+    parentId?: NullableString,
+    collectionId?: NullableString,
+    playlistId?: NullableString,
+    prefix?: NullableString,
+    action?: NullableString,
+    itemServerId?: NullableString,
+    itemId?: NullableString,
+    itemTimerId?: NullableString,
+    itemSeriesTimerId?: NullableString,
+    itemChannelId?: NullableString,
+    itemPlaylistItemId?: NullableString,
+    itemType?: NullableString,
+    itemMediaType?: NullableString,
+    itemCollectionType?: NullableString,
+    itemIsFolder?: NullableBoolean,
+    itemPath?: NullableString,
+    itemStartDate?: NullableString,
+    itemEndDate?: NullableString,
+    itemUserData?: UserItemDataDto
+};
+
+export type DataAttributes = {
+    'data-playlistitemid'?: NullableString;
+    'data-timerid'?: NullableString;
+    'data-seriestimerid'?: NullableString;
+    'data-serverid'?: NullableString;
+    'data-id'?: NullableString;
+    'data-type'?: NullableString;
+    'data-collectionid'?: NullableString;
+    'data-playlistid'?: NullableString;
+    'data-mediatype'?: NullableString;
+    'data-channelid'?: NullableString;
+    'data-path'?: NullableString;
+    'data-collectiontype'?: NullableString;
+    'data-context'?: NullableString;
+    'data-parentid'?: NullableString;
+    'data-startdate'?: NullableString;
+    'data-enddate'?: NullableString;
+    'data-prefix'?: NullableString;
+    'data-action'?: NullableString;
+    'data-positionticks'?: NullableNumber;
+    'data-isfolder'?: NullableBoolean;
+};

src/types/libraryTabContent.ts

@@ -1,7 +1,7 @@
-import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client';
+import type { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
-import { LibraryTab } from './libraryTab';
+import type { CollectionType } from '@jellyfin/sdk/lib/generated-client/models/collection-type';
-import { CollectionType } from '@jellyfin/sdk/lib/generated-client/models/collection-type';
+import type { LibraryTab } from './libraryTab';
-import { SectionType } from './sections';
+import type { SectionType } from './sections';
 
 export interface SectionsView {
     suggestionSections?: SectionType[];

src/types/listOptions.ts

@@ -1,9 +1,8 @@
-import { BaseItemDto, SeriesTimerInfoDto } from '@jellyfin/sdk/lib/generated-client';
 import { ItemSortBy } from '@jellyfin/sdk/lib/models/api/item-sort-by';
-import { CollectionType } from '@jellyfin/sdk/lib/generated-client/models/collection-type';
+import type { CollectionType } from '@jellyfin/sdk/lib/generated-client/models/collection-type';
-
+import type { ItemDto } from './base/models/item-dto';
 export interface ListOptions {
-    items?: BaseItemDto[] | SeriesTimerInfoDto[] | null;
+    items?: ItemDto[] | null;
     index?: string;
     showIndex?: boolean;
     action?: string | null;

src/types/mediaInfoItem.ts

@@ -0,0 +1,4 @@
+export interface MiscInfo {
+    text?: string | number;
+    cssClass?: string;
+}

src/types/progressOptions.ts

@@ -0,0 +1,8 @@
+import type { UserItemDataDto } from '@jellyfin/sdk/lib/generated-client/models/user-item-data-dto';
+
+export interface ProgressOptions {
+    containerClass: string,
+    type?: string | null,
+    userData?: UserItemDataDto,
+    mediaType?: string
+}

src/utils/card.ts

@@ -5,7 +5,15 @@ export enum CardShape {
     Portrait = 'portrait',
     PortraitOverflow = 'overflowPortrait',
     Square = 'square',
-    SquareOverflow = 'overflowSquare'
+    SquareOverflow = 'overflowSquare',
+    Auto = 'auto',
+    AutoHome = 'autohome',
+    AutoOverflow = 'autooverflow',
+    AutoVertical = 'autoVertical',
+    Mixed = 'mixed',
+    MixedSquare = 'mixedSquare',
+    MixedBackdrop = 'mixedBackdrop',
+    MixedPortrait = 'mixedPortrait',
 }
 
 export function getSquareShape(enableOverflow = true) {

src/utils/image.ts

@@ -1,3 +1,4 @@
+import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
 import type { DeviceInfo } from '@jellyfin/sdk/lib/generated-client/models/device-info';
 import type { SessionInfo } from '@jellyfin/sdk/lib/generated-client/models/session-info';
 
@@ -103,7 +104,41 @@ export function getLibraryIcon(library: string | null | undefined) {
     }
 }
 
+export function getItemTypeIcon(itemType: BaseItemKind | string) {
+    switch (itemType) {
+        case BaseItemKind.MusicAlbum:
+            return 'album';
+        case BaseItemKind.MusicArtist:
+        case BaseItemKind.Person:
+            return 'person';
+        case BaseItemKind.Audio:
+            return 'audiotrack';
+        case BaseItemKind.Movie:
+            return 'movie';
+        case BaseItemKind.Episode:
+        case BaseItemKind.Series:
+            return 'tv';
+        case BaseItemKind.Program:
+            return 'live_tv';
+        case BaseItemKind.Book:
+            return 'book';
+        case BaseItemKind.Folder:
+            return 'folder';
+        case BaseItemKind.BoxSet:
+            return 'collections';
+        case BaseItemKind.Playlist:
+            return 'view_list';
+        case BaseItemKind.Photo:
+            return 'photo';
+        case BaseItemKind.PhotoAlbum:
+            return 'photo_album';
+        default:
+            return 'folder';
+    }
+}
+
 export default {
     getDeviceIcon,
-    getLibraryIcon
+    getLibraryIcon,
+    getItemTypeIcon
 };

src/utils/items.ts

@@ -3,8 +3,10 @@ import { ImageType } from '@jellyfin/sdk/lib/generated-client/models/image-type'
 import { ItemSortBy } from '@jellyfin/sdk/lib/models/api/item-sort-by';
 import { SortOrder } from '@jellyfin/sdk/lib/generated-client/models/sort-order';
 import * as userSettings from 'scripts/settings/userSettings';
+import layoutManager from 'components/layoutManager';
 import { EpisodeFilter, FeatureFilters, LibraryViewSettings, ParentId, VideoBasicFilter, ViewMode } from '../types/library';
 import { LibraryTab } from 'types/libraryTab';
+import type { AttributesOpts, DataAttributes } from 'types/dataAttributes';
 
 export const getVideoBasicFilter = (libraryViewSettings: LibraryViewSettings) => {
     let isHd;
@@ -164,3 +166,31 @@ export const getDefaultLibraryViewSettings = (viewType: LibraryTab): LibraryView
         StartIndex: 0
     };
 };
+
+export function getDataAttributes(
+    opts: AttributesOpts
+): DataAttributes {
+    return {
+        'data-context': opts.context,
+        'data-collectionid': opts.collectionId,
+        'data-playlistid': opts.playlistId,
+        'data-parentid': opts.parentId,
+        'data-playlistitemid': opts.itemPlaylistItemId,
+        'data-action': layoutManager.tv ? opts.action : null,
+        'data-serverid': opts.itemServerId,
+        'data-id': opts.itemId,
+        'data-timerid': opts.itemTimerId,
+        'data-seriestimerid': opts.itemSeriesTimerId,
+        'data-channelid': opts.itemChannelId,
+        'data-type': opts.itemType,
+        'data-mediatype': opts.itemMediaType,
+        'data-collectiontype': opts.itemCollectionType,
+        'data-isfolder': opts.itemIsFolder,
+        'data-path': opts.itemPath,
+        'data-prefix': opts.prefix,
+        'data-positionticks': opts.itemUserData?.PlaybackPositionTicks,
+        'data-startdate': opts.itemStartDate?.toString(),
+        'data-enddate': opts.itemEndDate?.toString()
+    };
+}
+

src/utils/sections.ts

@@ -1,9 +1,12 @@
-import { ImageType, ItemFields, ItemFilter } from '@jellyfin/sdk/lib/generated-client';
 import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
+import { ItemFields } from '@jellyfin/sdk/lib/generated-client/models/item-fields';
+import { ItemFilter } from '@jellyfin/sdk/lib/generated-client/models/item-filter';
+import { ImageType } from '@jellyfin/sdk/lib/generated-client/models/image-type';
 import { ItemSortBy } from '@jellyfin/sdk/lib/models/api/item-sort-by';
 import { SortOrder } from '@jellyfin/sdk/lib/generated-client/models/sort-order';
 import * as userSettings from 'scripts/settings/userSettings';
-import { Section, SectionType, SectionApiMethod } from 'types/sections';
+import { CardShape } from 'utils/card';
+import { type Section, SectionType, SectionApiMethod } from 'types/sections';
 
 export const getSuggestionSections = (): Section[] => {
     const parametersOptions = {
@@ -29,7 +32,7 @@ export const getSuggestionSections = (): Section[] => {
             cardOptions: {
                 overlayPlayButton: true,
                 preferThumb: true,
-                shape: 'overflowBackdrop',
+                shape: CardShape.BackdropOverflow,
                 showYear: true
             }
         },
@@ -43,7 +46,7 @@ export const getSuggestionSections = (): Section[] => {
             },
             cardOptions: {
                 overlayPlayButton: true,
-                shape: 'overflowPortrait',
+                shape: CardShape.PortraitOverflow,
                 showYear: true
             }
         },
@@ -57,7 +60,7 @@ export const getSuggestionSections = (): Section[] => {
             },
             cardOptions: {
                 overlayPlayButton: true,
-                shape: 'overflowBackdrop',
+                shape: CardShape.BackdropOverflow,
                 preferThumb: true,
                 inheritThumb:
                     !userSettings.useEpisodeImagesInNextUpAndResume(undefined),
@@ -74,7 +77,7 @@ export const getSuggestionSections = (): Section[] => {
             },
             cardOptions: {
                 overlayPlayButton: true,
-                shape: 'overflowBackdrop',
+                shape: CardShape.BackdropOverflow,
                 preferThumb: true,
                 showSeriesYear: true,
                 showParentTitle: true,
@@ -90,7 +93,7 @@ export const getSuggestionSections = (): Section[] => {
             type: SectionType.NextUp,
             cardOptions: {
                 overlayPlayButton: true,
-                shape: 'overflowBackdrop',
+                shape: CardShape.BackdropOverflow,
                 preferThumb: true,
                 inheritThumb:
                     !userSettings.useEpisodeImagesInNextUpAndResume(undefined),
@@ -107,7 +110,7 @@ export const getSuggestionSections = (): Section[] => {
             },
             cardOptions: {
                 showUnplayedIndicator: false,
-                shape: 'overflowSquare',
+                shape: CardShape.SquareOverflow,
                 showParentTitle: true,
                 overlayPlayButton: true,
                 coverImage: true
@@ -125,7 +128,7 @@ export const getSuggestionSections = (): Section[] => {
             },
             cardOptions: {
                 showUnplayedIndicator: false,
-                shape: 'overflowSquare',
+                shape: CardShape.SquareOverflow,
                 showParentTitle: true,
                 action: 'instantmix',
                 overlayMoreButton: true,
@@ -144,7 +147,7 @@ export const getSuggestionSections = (): Section[] => {
             },
             cardOptions: {
                 showUnplayedIndicator: false,
-                shape: 'overflowSquare',
+                shape: CardShape.SquareOverflow,
                 showParentTitle: true,
                 action: 'instantmix',
                 overlayMoreButton: true,
@@ -157,8 +160,8 @@ export const getSuggestionSections = (): Section[] => {
 export const getProgramSections = (): Section[] => {
     const cardOptions = {
         inheritThumb: false,
-        shape: 'autooverflow',
+        shape: CardShape.AutoOverflow,
-        defaultShape: 'overflowBackdrop',
+        defaultShape: CardShape.BackdropOverflow,
         centerText: true,
         coverImage: true,
         overlayText: false,
@@ -309,8 +312,8 @@ export const getProgramSections = (): Section[] => {
             cardOptions: {
                 showYear: true,
                 lines: 2,
-                shape: 'autooverflow',
+                shape: CardShape.AutoOverflow,
-                defaultShape: 'overflowBackdrop',
+                defaultShape: CardShape.BackdropOverflow,
                 showTitle: true,
                 showParentTitle: true,
                 coverImage: true,
@@ -328,8 +331,8 @@ export const getProgramSections = (): Section[] => {
             cardOptions: {
                 showYear: false,
                 showParentTitle: false,
-                shape: 'autooverflow',
+                shape: CardShape.AutoOverflow,
-                defaultShape: 'overflowBackdrop',
+                defaultShape: CardShape.BackdropOverflow,
                 showTitle: true,
                 coverImage: true,
                 cardLayout: false,
@@ -347,8 +350,8 @@ export const getProgramSections = (): Section[] => {
                 isInProgress: true
             },
             cardOptions: {
-                shape: 'autooverflow',
+                shape: CardShape.AutoOverflow,
-                defaultShape: 'backdrop',
+                defaultShape: CardShape.Backdrop,
                 showParentTitle: false,
                 showParentTitleOrTitle: true,
                 showTitle: true,

webpack.common.js

@@ -204,6 +204,8 @@ const config = {
                     path.resolve(__dirname, 'node_modules/markdown-it'),
                     path.resolve(__dirname, 'node_modules/mdurl'),
                     path.resolve(__dirname, 'node_modules/punycode'),
+                    path.resolve(__dirname, 'node_modules/react-blurhash'),
+                    path.resolve(__dirname, 'node_modules/react-lazy-load-image-component'),
                     path.resolve(__dirname, 'node_modules/react-router'),
                     path.resolve(__dirname, 'node_modules/screenfull'),
                     path.resolve(__dirname, 'node_modules/ssr-window'),