Skip to content

Update experimental layout library controls #6777

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+346 −313
Open

Update experimental layout library controls #6777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
10a602b
Update experimental layout library controls
thornbill Apr 16, 2025
9b9948e
Enable shuffle in songs view
thornbill Apr 16, 2025
f749ae3
Hide library actions while loading
thornbill Apr 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 0 additions & 64 deletions src/apps/experimental/components/library/GridListViewButton.tsx
View file
Open in desktop

This file was deleted.

180 changes: 115 additions & 65 deletions src/apps/experimental/components/library/ItemsView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ import type { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/bas
import { CollectionType } from '@jellyfin/sdk/lib/generated-client/models/collection-type';
import { ImageType } from '@jellyfin/sdk/lib/generated-client/models/image-type';
import { ItemSortBy } from '@jellyfin/sdk/lib/generated-client/models/item-sort-by';
import React, { type FC, useCallback } from 'react';
import Box from '@mui/material/Box';
import ButtonGroup from '@mui/material/ButtonGroup';
import classNames from 'classnames';
import React, { type FC, useCallback } from 'react';

import { useApi } from 'hooks/useApi';
import { useLocalStorage } from 'hooks/useLocalStorage';
Expand All @@ -31,8 +32,8 @@ import PlayAllButton from './PlayAllButton';
import QueueButton from './QueueButton';
import ShuffleButton from './ShuffleButton';
import SortButton from './SortButton';
import GridListViewButton from './GridListViewButton';
import LibraryViewMenu from './LibraryViewMenu';
import ViewSettingsButton from './ViewSettingsButton';

interface ItemsViewProps {
viewType: LibraryTab;
Expand Down Expand Up @@ -75,7 +76,7 @@ const ItemsView: FC<ItemsViewProps> = ({

const { __legacyApiClient__ } = useApi();
const {
isLoading,
isPending,
data: itemsResult,
isPlaceholderData,
refetch
Expand Down Expand Up @@ -237,82 +238,131 @@ const ItemsView: FC<ItemsViewProps> = ({
)}
sx={{
display: 'flex',
flexWrap: 'wrap'
flexWrap: 'wrap',
alignItems: 'center'
}}
>
<Box
sx={{ marginRight: 0.5 }}
>
<LibraryViewMenu />
</Box>

<LibraryViewMenu />
<Box
sx={{
display: 'flex',
flexGrow: {
xs: 1,
md: 0
},
justifyContent: 'end'
}}
>
{!isPending && (
<>
<ButtonGroup
variant='contained'
sx={{
marginRight: 0.5
}}
>
{isBtnPlayAllEnabled && (
<PlayAllButton
item={item}
items={items}
viewType={viewType}
hasFilters={hasFilters}
libraryViewSettings={libraryViewSettings}
/>
)}

{isBtnPlayAllEnabled && (
<PlayAllButton
item={item}
items={items}
viewType={viewType}
hasFilters={hasFilters}
libraryViewSettings={libraryViewSettings}
/>
)}
{isBtnShuffleEnabled && totalRecordCount > 1 && (
<ShuffleButton
item={item}
items={items}
viewType={viewType}
hasFilters={hasFilters}
libraryViewSettings={libraryViewSettings}
/>
)}
{isBtnQueueEnabled
&& item
&& playbackManager.canQueue(item) && (
<QueueButton
item={item}
items={items}
hasFilters={hasFilters}
/>
)}
{isBtnSortEnabled && (
<SortButton
viewType={viewType}
libraryViewSettings={libraryViewSettings}
setLibraryViewSettings={setLibraryViewSettings}
/>
)}
{isBtnFilterEnabled && (
<FilterButton
parentId={parentId}
itemType={itemType}
viewType={viewType}
hasFilters={hasFilters}
libraryViewSettings={libraryViewSettings}
setLibraryViewSettings={setLibraryViewSettings}
/>
)}
{isBtnNewCollectionEnabled && <NewCollectionButton />}
{isBtnGridListEnabled && (
<GridListViewButton
viewType={viewType}
libraryViewSettings={libraryViewSettings}
setLibraryViewSettings={setLibraryViewSettings}
/>
)}
{isBtnShuffleEnabled && totalRecordCount > 1 && (
<ShuffleButton
item={item}
items={items}
viewType={viewType}
hasFilters={hasFilters}
isTextVisible={!isBtnPlayAllEnabled}
libraryViewSettings={libraryViewSettings}
/>
)}

{isPaginationEnabled && (
{isBtnQueueEnabled && item && playbackManager.canQueue(item) && (
<QueueButton
item={item}
items={items}
hasFilters={hasFilters}
isTextVisible={!isBtnPlayAllEnabled && !isBtnShuffleEnabled}
/>
)}
</ButtonGroup>

{isBtnNewCollectionEnabled && <NewCollectionButton />}
</>
)}
</Box>

<Box
sx={{
display: 'flex',
justifyContent: 'end',
flexBasis: {
xs: '100%',
md: 'auto'
},
flexGrow: 1
}}
>
<Box
sx={{
display: 'flex',
justifyContent: 'flex-end',
flexGrow: 1,
order: 10
flexGrow: {
xs: 1,
md: 0
}
}}
>
<ButtonGroup
color='inherit'
variant='text'
>
{isBtnFilterEnabled && (
<FilterButton
parentId={parentId}
itemType={itemType}
viewType={viewType}
hasFilters={hasFilters}
libraryViewSettings={libraryViewSettings}
setLibraryViewSettings={setLibraryViewSettings}
/>
)}

{isBtnSortEnabled && (
<SortButton
viewType={viewType}
libraryViewSettings={libraryViewSettings}
setLibraryViewSettings={setLibraryViewSettings}
/>
)}

{isBtnGridListEnabled && (
<ViewSettingsButton
viewType={viewType}
libraryViewSettings={libraryViewSettings}
setLibraryViewSettings={setLibraryViewSettings}
/>
)}
</ButtonGroup>
</Box>

{isPaginationEnabled && (
<Pagination
totalRecordCount={totalRecordCount}
libraryViewSettings={libraryViewSettings}
isPlaceholderData={isPlaceholderData}
setLibraryViewSettings={setLibraryViewSettings}
/>
</Box>
)}
)}
</Box>
</Box>

{isAlphabetPickerEnabled && hasSortName && (
Expand All @@ -322,7 +372,7 @@ const ItemsView: FC<ItemsViewProps> = ({
/>
)}

{isLoading ? (
{isPending ? (
<Loading />
) : (
<ItemsContainer
Expand Down
15 changes: 8 additions & 7 deletions src/apps/experimental/components/library/NewCollectionButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React, { FC, useCallback } from 'react';
import IconButton from '@mui/material/IconButton';
import AddIcon from '@mui/icons-material/Add';
import Add from '@mui/icons-material/Add';
import Button from '@mui/material/Button';

import globalize from 'lib/globalize';

const NewCollectionButton: FC = () => {
Expand All @@ -21,13 +22,13 @@ const NewCollectionButton: FC = () => {
}, []);

return (
<IconButton
title={globalize.translate('Add')}
className='paper-icon-button-light btnNewCollection autoSize'
<Button
variant='contained'
startIcon={<Add />}
onClick={showCollectionEditor}
>
<AddIcon />
</IconButton>
{globalize.translate('NewCollection')}
</Button>
);
};

Expand Down
Loading
Loading