remove unused refs from list/grid components

2026-05-16 21:50:35 +02:00 · 2025-12-08 22:00:34 -08:00
parent 628b0184de
commit a19a6815e9
24 changed files with 1563 additions and 1703 deletions
@@ -1,5 +1,4 @@
 import { UseSuspenseQueryOptions } from '@tanstack/react-query';
-import { forwardRef } from 'react';

 import { api } from '/@/renderer/api';
 import { useItemListInfiniteLoader } from '/@/renderer/components/item-list/helpers/item-list-infinite-loader';
@@ -13,55 +12,53 @@ import { ItemListKey } from '/@/shared/types/types';

 interface SongListInfiniteGridProps extends ItemListGridComponentProps<SongListQuery> {}

-export const SongListInfiniteGrid = forwardRef<any, SongListInfiniteGridProps>(
-    ({
-        gap = 'md',
-        itemsPerPage = 100,
-        itemsPerRow,
-        query = {
-            sortBy: SongListSort.NAME,
-            sortOrder: SortOrder.ASC,
-        },
-        saveScrollOffset = true,
-        serverId,
-    }) => {
-        const listCountQuery = songsQueries.listCount({
-            query: { ...query },
-            serverId: serverId,
-        }) as UseSuspenseQueryOptions<number, Error, number, readonly unknown[]>;
-
-        const listQueryFn = api.controller.getSongList;
-
-        const { data, onRangeChanged } = useItemListInfiniteLoader({
-            eventKey: ItemListKey.SONG,
-            itemsPerPage,
-            itemType: LibraryItem.SONG,
-            listCountQuery,
-            listQueryFn,
-            query,
-            serverId,
-        });
-
-        const { handleOnScrollEnd, scrollOffset } = useItemListScrollPersist({
-            enabled: saveScrollOffset,
-        });
-
-        const rows = useGridRows(LibraryItem.SONG, ItemListKey.SONG);
-
-        return (
-            <ItemGridList
-                data={data}
-                gap={gap}
-                initialTop={{
-                    to: scrollOffset ?? 0,
-                    type: 'offset',
-                }}
-                itemsPerRow={itemsPerRow}
-                itemType={LibraryItem.SONG}
-                onRangeChanged={onRangeChanged}
-                onScrollEnd={handleOnScrollEnd}
-                rows={rows}
-            />
-        );
+export const SongListInfiniteGrid = ({
+    gap = 'md',
+    itemsPerPage = 100,
+    itemsPerRow,
+    query = {
+        sortBy: SongListSort.NAME,
+        sortOrder: SortOrder.ASC,
    },
-);
+    saveScrollOffset = true,
+    serverId,
+}: SongListInfiniteGridProps) => {
+    const listCountQuery = songsQueries.listCount({
+        query: { ...query },
+        serverId: serverId,
+    }) as UseSuspenseQueryOptions<number, Error, number, readonly unknown[]>;
+
+    const listQueryFn = api.controller.getSongList;
+
+    const { data, onRangeChanged } = useItemListInfiniteLoader({
+        eventKey: ItemListKey.SONG,
+        itemsPerPage,
+        itemType: LibraryItem.SONG,
+        listCountQuery,
+        listQueryFn,
+        query,
+        serverId,
+    });
+
+    const { handleOnScrollEnd, scrollOffset } = useItemListScrollPersist({
+        enabled: saveScrollOffset,
+    });
+
+    const rows = useGridRows(LibraryItem.SONG, ItemListKey.SONG);
+
+    return (
+        <ItemGridList
+            data={data}
+            gap={gap}
+            initialTop={{
+                to: scrollOffset ?? 0,
+                type: 'offset',
+            }}
+            itemsPerRow={itemsPerRow}
+            itemType={LibraryItem.SONG}
+            onRangeChanged={onRangeChanged}
+            onScrollEnd={handleOnScrollEnd}
+            rows={rows}
+        />
+    );
+};
@@ -1,5 +1,4 @@
 import { UseSuspenseQueryOptions } from '@tanstack/react-query';
-import { forwardRef } from 'react';

 import { api } from '/@/renderer/api';
 import { useItemListInfiniteLoader } from '/@/renderer/components/item-list/helpers/item-list-infinite-loader';
@@ -15,80 +14,74 @@ import { ItemListKey } from '/@/shared/types/types';

 interface SongListInfiniteTableProps extends ItemListTableComponentProps<SongListQuery> {}

-export const SongListInfiniteTable = forwardRef<any, SongListInfiniteTableProps>(
-    (
-        {
-            autoFitColumns = false,
-            columns,
-            enableAlternateRowColors = false,
-            enableHorizontalBorders = false,
-            enableRowHoverHighlight = true,
-            enableSelection = true,
-            enableVerticalBorders = false,
-            itemsPerPage = 100,
-            query = {
-                sortBy: SongListSort.NAME,
-                sortOrder: SortOrder.ASC,
-            },
-            saveScrollOffset = true,
-            serverId,
-            size = 'default',
-        },
-        ref,
-    ) => {
-        const listCountQuery = songsQueries.listCount({
-            query: { ...query },
-            serverId: serverId,
-        }) as UseSuspenseQueryOptions<number, Error, number, readonly unknown[]>;
-
-        const listQueryFn = api.controller.getSongList;
-
-        const { data, onRangeChanged } = useItemListInfiniteLoader({
-            eventKey: ItemListKey.SONG,
-            itemsPerPage,
-            itemType: LibraryItem.SONG,
-            listCountQuery,
-            listQueryFn,
-            query,
-            serverId,
-        });
-
-        const { handleOnScrollEnd, scrollOffset } = useItemListScrollPersist({
-            enabled: saveScrollOffset,
-        });
-
-        const { handleColumnReordered } = useItemListColumnReorder({
-            itemListKey: ItemListKey.SONG,
-        });
-
-        const { handleColumnResized } = useItemListColumnResize({
-            itemListKey: ItemListKey.SONG,
-        });
-
-        return (
-            <ItemTableList
-                autoFitColumns={autoFitColumns}
-                CellComponent={ItemTableListColumn}
-                columns={columns}
-                data={data}
-                enableAlternateRowColors={enableAlternateRowColors}
-                enableExpansion={false}
-                enableHorizontalBorders={enableHorizontalBorders}
-                enableRowHoverHighlight={enableRowHoverHighlight}
-                enableSelection={enableSelection}
-                enableVerticalBorders={enableVerticalBorders}
-                initialTop={{
-                    to: scrollOffset ?? 0,
-                    type: 'offset',
-                }}
-                itemType={LibraryItem.SONG}
-                onColumnReordered={handleColumnReordered}
-                onColumnResized={handleColumnResized}
-                onRangeChanged={onRangeChanged}
-                onScrollEnd={handleOnScrollEnd}
-                ref={ref}
-                size={size}
-            />
-        );
+export const SongListInfiniteTable = ({
+    autoFitColumns = false,
+    columns,
+    enableAlternateRowColors = false,
+    enableHorizontalBorders = false,
+    enableRowHoverHighlight = true,
+    enableSelection = true,
+    enableVerticalBorders = false,
+    itemsPerPage = 100,
+    query = {
+        sortBy: SongListSort.NAME,
+        sortOrder: SortOrder.ASC,
    },
-);
+    saveScrollOffset = true,
+    serverId,
+    size = 'default',
+}: SongListInfiniteTableProps) => {
+    const listCountQuery = songsQueries.listCount({
+        query: { ...query },
+        serverId: serverId,
+    }) as UseSuspenseQueryOptions<number, Error, number, readonly unknown[]>;
+
+    const listQueryFn = api.controller.getSongList;
+
+    const { data, onRangeChanged } = useItemListInfiniteLoader({
+        eventKey: ItemListKey.SONG,
+        itemsPerPage,
+        itemType: LibraryItem.SONG,
+        listCountQuery,
+        listQueryFn,
+        query,
+        serverId,
+    });
+
+    const { handleOnScrollEnd, scrollOffset } = useItemListScrollPersist({
+        enabled: saveScrollOffset,
+    });
+
+    const { handleColumnReordered } = useItemListColumnReorder({
+        itemListKey: ItemListKey.SONG,
+    });
+
+    const { handleColumnResized } = useItemListColumnResize({
+        itemListKey: ItemListKey.SONG,
+    });
+
+    return (
+        <ItemTableList
+            autoFitColumns={autoFitColumns}
+            CellComponent={ItemTableListColumn}
+            columns={columns}
+            data={data}
+            enableAlternateRowColors={enableAlternateRowColors}
+            enableExpansion={false}
+            enableHorizontalBorders={enableHorizontalBorders}
+            enableRowHoverHighlight={enableRowHoverHighlight}
+            enableSelection={enableSelection}
+            enableVerticalBorders={enableVerticalBorders}
+            initialTop={{
+                to: scrollOffset ?? 0,
+                type: 'offset',
+            }}
+            itemType={LibraryItem.SONG}
+            onColumnReordered={handleColumnReordered}
+            onColumnResized={handleColumnResized}
+            onRangeChanged={onRangeChanged}
+            onScrollEnd={handleOnScrollEnd}
+            size={size}
+        />
+    );
+};
@@ -1,5 +1,4 @@
 import { UseSuspenseQueryOptions } from '@tanstack/react-query';
-import { forwardRef } from 'react';

 import { api } from '/@/renderer/api';
 import { useItemListPaginatedLoader } from '/@/renderer/components/item-list/helpers/item-list-paginated-loader';
@@ -14,60 +13,54 @@ import { ItemListKey } from '/@/shared/types/types';

 interface SongListPaginatedGridProps extends ItemListGridComponentProps<SongListQuery> {}

-export const SongListPaginatedGrid = forwardRef<any, SongListPaginatedGridProps>(
-    (
-        {
-            gap = 'md',
-            itemsPerPage = 100,
-            itemsPerRow,
-            query = {
-                sortBy: SongListSort.NAME,
-                sortOrder: SortOrder.ASC,
-            },
-            serverId,
-        },
-        ref,
-    ) => {
-        const listCountQuery = songsQueries.listCount({
-            query: { ...query },
-            serverId: serverId,
-        }) as UseSuspenseQueryOptions<number, Error, number, readonly unknown[]>;
-
-        const listQueryFn = api.controller.getSongList;
-
-        const { currentPage, onChange } = useItemListPagination();
-
-        const { data, pageCount, totalItemCount } = useItemListPaginatedLoader({
-            currentPage,
-            eventKey: ItemListKey.SONG,
-            itemsPerPage,
-            itemType: LibraryItem.SONG,
-            listCountQuery,
-            listQueryFn,
-            query,
-            serverId,
-        });
-
-        const rows = useGridRows(LibraryItem.SONG, ItemListKey.SONG);
-
-        return (
-            <ItemListWithPagination
-                currentPage={currentPage}
-                itemsPerPage={itemsPerPage}
-                onChange={onChange}
-                pageCount={pageCount}
-                totalItemCount={totalItemCount}
-            >
-                <ItemGridList
-                    currentPage={currentPage}
-                    data={data || []}
-                    gap={gap}
-                    itemsPerRow={itemsPerRow}
-                    itemType={LibraryItem.SONG}
-                    ref={ref}
-                    rows={rows}
-                />
-            </ItemListWithPagination>
-        );
+export const SongListPaginatedGrid = ({
+    gap = 'md',
+    itemsPerPage = 100,
+    itemsPerRow,
+    query = {
+        sortBy: SongListSort.NAME,
+        sortOrder: SortOrder.ASC,
    },
-);
+    serverId,
+}: SongListPaginatedGridProps) => {
+    const listCountQuery = songsQueries.listCount({
+        query: { ...query },
+        serverId: serverId,
+    }) as UseSuspenseQueryOptions<number, Error, number, readonly unknown[]>;
+
+    const listQueryFn = api.controller.getSongList;
+
+    const { currentPage, onChange } = useItemListPagination();
+
+    const { data, pageCount, totalItemCount } = useItemListPaginatedLoader({
+        currentPage,
+        eventKey: ItemListKey.SONG,
+        itemsPerPage,
+        itemType: LibraryItem.SONG,
+        listCountQuery,
+        listQueryFn,
+        query,
+        serverId,
+    });
+
+    const rows = useGridRows(LibraryItem.SONG, ItemListKey.SONG);
+
+    return (
+        <ItemListWithPagination
+            currentPage={currentPage}
+            itemsPerPage={itemsPerPage}
+            onChange={onChange}
+            pageCount={pageCount}
+            totalItemCount={totalItemCount}
+        >
+            <ItemGridList
+                currentPage={currentPage}
+                data={data || []}
+                gap={gap}
+                itemsPerRow={itemsPerRow}
+                itemType={LibraryItem.SONG}
+                rows={rows}
+            />
+        </ItemListWithPagination>
+    );
+};
@@ -1,5 +1,4 @@
 import { UseSuspenseQueryOptions } from '@tanstack/react-query';
-import { forwardRef } from 'react';

 import { api } from '/@/renderer/api';
 import { useItemListPaginatedLoader } from '/@/renderer/components/item-list/helpers/item-list-paginated-loader';
@@ -17,93 +16,87 @@ import { ItemListKey } from '/@/shared/types/types';

 interface SongListPaginatedTableProps extends ItemListTableComponentProps<SongListQuery> {}

-export const SongListPaginatedTable = forwardRef<any, SongListPaginatedTableProps>(
-    (
-        {
-            autoFitColumns = false,
-            columns,
-            enableAlternateRowColors = false,
-            enableHorizontalBorders = false,
-            enableRowHoverHighlight = true,
-            enableSelection = true,
-            enableVerticalBorders = false,
-            itemsPerPage = 100,
-            query = {
-                sortBy: SongListSort.NAME,
-                sortOrder: SortOrder.ASC,
-            },
-            saveScrollOffset = true,
-            serverId,
-            size = 'default',
-        },
-        ref,
-    ) => {
-        const listCountQuery = songsQueries.listCount({
-            query: { ...query },
-            serverId: serverId,
-        }) as UseSuspenseQueryOptions<number, Error, number, readonly unknown[]>;
-
-        const listQueryFn = api.controller.getSongList;
-
-        const { currentPage, onChange } = useItemListPagination();
-
-        const { data, pageCount, totalItemCount } = useItemListPaginatedLoader({
-            currentPage,
-            eventKey: ItemListKey.SONG,
-            itemsPerPage,
-            itemType: LibraryItem.SONG,
-            listCountQuery,
-            listQueryFn,
-            query,
-            serverId,
-        });
-
-        const { handleOnScrollEnd, scrollOffset } = useItemListScrollPersist({
-            enabled: saveScrollOffset,
-        });
-
-        const { handleColumnReordered } = useItemListColumnReorder({
-            itemListKey: ItemListKey.SONG,
-        });
-
-        const { handleColumnResized } = useItemListColumnResize({
-            itemListKey: ItemListKey.SONG,
-        });
-
-        const startRowIndex = currentPage * itemsPerPage;
-
-        return (
-            <ItemListWithPagination
-                currentPage={currentPage}
-                itemsPerPage={itemsPerPage}
-                onChange={onChange}
-                pageCount={pageCount}
-                totalItemCount={totalItemCount}
-            >
-                <ItemTableList
-                    autoFitColumns={autoFitColumns}
-                    CellComponent={ItemTableListColumn}
-                    columns={columns}
-                    data={data || []}
-                    enableAlternateRowColors={enableAlternateRowColors}
-                    enableExpansion={false}
-                    enableHorizontalBorders={enableHorizontalBorders}
-                    enableRowHoverHighlight={enableRowHoverHighlight}
-                    enableSelection={enableSelection}
-                    enableVerticalBorders={enableVerticalBorders}
-                    initialTop={{
-                        to: scrollOffset ?? 0,
-                        type: 'offset',
-                    }}
-                    itemType={LibraryItem.SONG}
-                    onColumnReordered={handleColumnReordered}
-                    onColumnResized={handleColumnResized}
-                    onScrollEnd={handleOnScrollEnd}
-                    ref={ref}
-                    size={size}
-                    startRowIndex={startRowIndex}
-                />
-            </ItemListWithPagination>
-        );
+export const SongListPaginatedTable = ({
+    autoFitColumns = false,
+    columns,
+    enableAlternateRowColors = false,
+    enableHorizontalBorders = false,
+    enableRowHoverHighlight = true,
+    enableSelection = true,
+    enableVerticalBorders = false,
+    itemsPerPage = 100,
+    query = {
+        sortBy: SongListSort.NAME,
+        sortOrder: SortOrder.ASC,
    },
-);
+    saveScrollOffset = true,
+    serverId,
+    size = 'default',
+}: SongListPaginatedTableProps) => {
+    const listCountQuery = songsQueries.listCount({
+        query: { ...query },
+        serverId: serverId,
+    }) as UseSuspenseQueryOptions<number, Error, number, readonly unknown[]>;
+
+    const listQueryFn = api.controller.getSongList;
+
+    const { currentPage, onChange } = useItemListPagination();
+
+    const { data, pageCount, totalItemCount } = useItemListPaginatedLoader({
+        currentPage,
+        eventKey: ItemListKey.SONG,
+        itemsPerPage,
+        itemType: LibraryItem.SONG,
+        listCountQuery,
+        listQueryFn,
+        query,
+        serverId,
+    });
+
+    const { handleOnScrollEnd, scrollOffset } = useItemListScrollPersist({
+        enabled: saveScrollOffset,
+    });
+
+    const { handleColumnReordered } = useItemListColumnReorder({
+        itemListKey: ItemListKey.SONG,
+    });
+
+    const { handleColumnResized } = useItemListColumnResize({
+        itemListKey: ItemListKey.SONG,
+    });
+
+    const startRowIndex = currentPage * itemsPerPage;
+
+    return (
+        <ItemListWithPagination
+            currentPage={currentPage}
+            itemsPerPage={itemsPerPage}
+            onChange={onChange}
+            pageCount={pageCount}
+            totalItemCount={totalItemCount}
+        >
+            <ItemTableList
+                autoFitColumns={autoFitColumns}
+                CellComponent={ItemTableListColumn}
+                columns={columns}
+                data={data || []}
+                enableAlternateRowColors={enableAlternateRowColors}
+                enableExpansion={false}
+                enableHorizontalBorders={enableHorizontalBorders}
+                enableRowHoverHighlight={enableRowHoverHighlight}
+                enableSelection={enableSelection}
+                enableVerticalBorders={enableVerticalBorders}
+                initialTop={{
+                    to: scrollOffset ?? 0,
+                    type: 'offset',
+                }}
+                itemType={LibraryItem.SONG}
+                onColumnReordered={handleColumnReordered}
+                onColumnResized={handleColumnResized}
+                onScrollEnd={handleOnScrollEnd}
+                size={size}
+                startRowIndex={startRowIndex}
+            />
+        </ItemListWithPagination>
+    );
+};