pogmommy/feishin
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix types for updated packages

Browse source
This commit is contained in:
jeffvli 2023-05-10 20:00:39 -07:00
parent 416476cc66
commit cf489d3934
3 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/renderer/components/virtual-grid/virtual-grid-wrapper.tsx
View file

@ -57,13 +57,16 @@ export const VirtualGridWrapper = ({
itemData, itemData,
route, route,
onScroll, onScroll,
height,
width,
...rest ...rest
}: Omit<FixedSizeListProps, 'ref' | 'itemSize' | 'children'> & { }: Omit<FixedSizeListProps, 'ref' | 'itemSize' | 'children' | 'height' | 'width'> & {
cardRows: CardRow<Album | AlbumArtist | Artist>[]; cardRows: CardRow<Album | AlbumArtist | Artist>[];
columnCount: number; columnCount: number;
display: ListDisplayType; display: ListDisplayType;
handleFavorite?: (options: { id: string[]; isFavorite: boolean; itemType: LibraryItem }) => void; handleFavorite?: (options: { id: string[]; isFavorite: boolean; itemType: LibraryItem }) => void;
handlePlayQueueAdd?: (options: PlayQueueAddOptions) => void; handlePlayQueueAdd?: (options: PlayQueueAddOptions) => void;
height?: number;
itemData: any[]; itemData: any[];
itemGap: number; itemGap: number;
itemHeight: number; itemHeight: number;
@ -72,6 +75,7 @@ export const VirtualGridWrapper = ({
refInstance: Ref<any>; refInstance: Ref<any>;
route?: CardRoute; route?: CardRoute;
rowCount: number; rowCount: number;
width?: number;
}) => { }) => {
const memoizedItemData = createItemData( const memoizedItemData = createItemData(
cardRows, cardRows,
@ -94,11 +98,13 @@ export const VirtualGridWrapper = ({
<FixedSizeList <FixedSizeList
ref={refInstance} ref={refInstance}
{...rest} {...rest}
height={(height && Number(height)) || 0}
initialScrollOffset={initialScrollOffset} initialScrollOffset={initialScrollOffset}
itemCount={rowCount} itemCount={rowCount}
itemData={memoizedItemData} itemData={memoizedItemData}
itemSize={itemHeight} itemSize={itemHeight}
overscanCount={5} overscanCount={5}
width={(width && Number(width)) || 0}
onScroll={memoizedOnScroll} onScroll={memoizedOnScroll}
> >
{GridCard} {GridCard}

5
src/renderer/components/virtual-grid/virtual-infinite-grid.tsx
View file

@ -21,18 +21,21 @@ export type VirtualInfiniteGridRef = {
setItemData: (data: any[]) => void; setItemData: (data: any[]) => void;
}; };
interface VirtualGridProps extends Omit<FixedSizeListProps, 'children' | 'itemSize'> { interface VirtualGridProps
extends Omit<FixedSizeListProps, 'children' | 'itemSize' | 'height' | 'width'> {
cardRows: CardRow<any>[]; cardRows: CardRow<any>[];
display?: ListDisplayType; display?: ListDisplayType;
fetchFn: (options: { columnCount: number; skip: number; take: number }) => Promise<any>; fetchFn: (options: { columnCount: number; skip: number; take: number }) => Promise<any>;
handleFavorite?: (options: { id: string[]; isFavorite: boolean; itemType: LibraryItem }) => void; handleFavorite?: (options: { id: string[]; isFavorite: boolean; itemType: LibraryItem }) => void;
handlePlayQueueAdd?: (options: PlayQueueAddOptions) => void; handlePlayQueueAdd?: (options: PlayQueueAddOptions) => void;
height?: number;
itemGap: number; itemGap: number;
itemSize: number; itemSize: number;
itemType: LibraryItem; itemType: LibraryItem;
loading?: boolean; loading?: boolean;
minimumBatchSize?: number; minimumBatchSize?: number;
route?: CardRoute; route?: CardRoute;
width?: number;
} }
export const VirtualInfiniteGrid = forwardRef( export const VirtualInfiniteGrid = forwardRef(

2
src/renderer/features/sidebar/components/sidebar-playlist-list.tsx
View file

@ -143,7 +143,7 @@ export const SidebarPlaylistList = ({ data }: SidebarPlaylistListProps) => {
h="100%" h="100%"
{...hideScrollbarElementProps} {...hideScrollbarElementProps}
> >
<AutoSizer onResize={(e) => setRect(e)}> <AutoSizer onResize={(e) => setRect(e as { height: number; width: number })}>
{() => ( {() => (
<FixedSizeList <FixedSizeList
className={isScrollbarHidden ? 'hide-scrollbar overlay-scrollbar' : 'overlay-scrollbar'} className={isScrollbarHidden ? 'hide-scrollbar overlay-scrollbar' : 'overlay-scrollbar'}