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

Fix search results being capped to window height

Browse source
This commit is contained in:
jeffvli 2023-05-21 20:51:52 -07:00
parent 011f260e94
commit 611cbc6dd9
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/renderer/features/search/components/search-content.tsx
View file

@ -1,3 +1,4 @@
import { MutableRefObject, useMemo, useCallback } from 'react';
import { import {
ColDef, ColDef,
GridReadyEvent, GridReadyEvent,
@ -6,7 +7,7 @@ import {
} from '@ag-grid-community/core'; } from '@ag-grid-community/core';
import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact'; import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
import { Stack } from '@mantine/core'; import { Stack } from '@mantine/core';
import { MutableRefObject, useMemo, useCallback } from 'react'; import { generatePath, useNavigate } from 'react-router';
import { useParams, useSearchParams } from 'react-router-dom'; import { useParams, useSearchParams } from 'react-router-dom';
import { LibraryItem, QueueSong } from '/@/renderer/api/types'; import { LibraryItem, QueueSong } from '/@/renderer/api/types';
import { VirtualGridAutoSizerContainer } from '/@/renderer/components/virtual-grid'; import { VirtualGridAutoSizerContainer } from '/@/renderer/components/virtual-grid';
@ -18,7 +19,6 @@ import {
SONG_CONTEXT_MENU_ITEMS, SONG_CONTEXT_MENU_ITEMS,
} from '/@/renderer/features/context-menu/context-menu-items'; } from '/@/renderer/features/context-menu/context-menu-items';
import { usePlayQueueAdd } from '/@/renderer/features/player'; import { usePlayQueueAdd } from '/@/renderer/features/player';
import { generatePath, useNavigate } from 'react-router';
import { AppRoute } from '../../../router/routes'; import { AppRoute } from '../../../router/routes';
import { import {
useCurrentServer, useCurrentServer,
@ -44,8 +44,6 @@ export const SearchContent = ({ tableRef, getDatasource }: SearchContentProps) =
const handlePlayQueueAdd = usePlayQueueAdd(); const handlePlayQueueAdd = usePlayQueueAdd();
const playButtonBehavior = usePlayButtonBehavior(); const playButtonBehavior = usePlayButtonBehavior();
const isPaginationEnabled = true;
const getTable = useCallback( const getTable = useCallback(
(itemType: string) => { (itemType: string) => {
switch (itemType) { switch (itemType) {
@ -139,17 +137,11 @@ export const SearchContent = ({ tableRef, getDatasource }: SearchContentProps) =
}} }}
getRowId={(data) => data.data.id} getRowId={(data) => data.data.id}
infiniteInitialRowCount={25} infiniteInitialRowCount={25}
pagination={isPaginationEnabled}
paginationAutoPageSize={isPaginationEnabled}
paginationPageSize={table.pagination.itemsPerPage || 100}
rowBuffer={20} rowBuffer={20}
rowHeight={table.rowHeight || 40} rowHeight={table.rowHeight || 40}
rowModelType="infinite" rowModelType="infinite"
rowSelection="multiple" rowSelection="multiple"
// onBodyScrollEnd={handleScroll}
onCellContextMenu={handleContextMenu} onCellContextMenu={handleContextMenu}
// onColumnMoved={handleColumnChange}
// onColumnResized={debouncedColumnChange}
onGridReady={onGridReady} onGridReady={onGridReady}
onGridSizeChanged={handleGridSizeChange} onGridSizeChanged={handleGridSizeChange}
onRowDoubleClicked={handleRowDoubleClick} onRowDoubleClicked={handleRowDoubleClick}

7
src/renderer/features/search/routes/search-route.tsx
View file

@ -66,6 +66,8 @@ const SearchRoute = () => {
lastRow = startIndex + numOfItems; lastRow = startIndex + numOfItems;
} }
console.log('lastRow', lastRow);
params.successCallback(items, lastRow); params.successCallback(items, lastRow);
}, },
}; };
@ -111,6 +113,8 @@ const SearchRoute = () => {
lastRow = startIndex + numOfItems; lastRow = startIndex + numOfItems;
} }
console.log('lastRow', lastRow);
params.successCallback(items, lastRow); params.successCallback(items, lastRow);
}, },
}; };
@ -155,6 +159,9 @@ const SearchRoute = () => {
if (numOfItems < limit) { if (numOfItems < limit) {
lastRow = startIndex + numOfItems; lastRow = startIndex + numOfItems;
} }
console.log('items', items);
console.log('numOfItems :>> ', numOfItems);
console.log('lastRow', lastRow);
params.successCallback(items, lastRow); params.successCallback(items, lastRow);
}, },