mirror of
https://github.com/Psychotoxical/psysonic.git
synced 2026-07-22 07:15:47 +00:00
feat(themes): paginate theme store and keep scroll on refresh (#1011)
The community Theme Store grew large enough that browsing it meant scrolling through the whole catalogue. Paginate it (12 per page) with a Prev / "Page X of Y" / Next pager that resets to page 1 on filter changes and scrolls back to the top of the list when paging. Also fix the refresh button resetting the scroll position. It set the top-level loading state, which unmounted the list and collapsed the scroll viewport so it clamped back to the top. Refreshing now keeps the existing list mounted and only spins the refresh icon; the full-page loading and error placeholders are reserved for the initial load. Adds themeStorePagePrev / PageNext / PageStatus across all nine locales and a ThemeStoreSection test covering pagination, filtering, page reset, and the refresh-keeps-scroll behaviour.
This commit is contained in:
@@ -0,0 +1,146 @@
|
||||
import { describe, it, expect, vi, beforeEach } from 'vitest';
|
||||
import { screen, waitFor } from '@testing-library/react';
|
||||
import userEvent from '@testing-library/user-event';
|
||||
import { renderWithProviders } from '@/test/helpers/renderWithProviders';
|
||||
import { ThemeStoreSection } from './ThemeStoreSection';
|
||||
import type { FetchRegistryResult, Registry } from '@/utils/themes/themeRegistry';
|
||||
|
||||
// Control the registry the store browses so pagination/refresh are deterministic.
|
||||
vi.mock('@/utils/themes/themeRegistry', () => ({
|
||||
fetchRegistry: vi.fn(),
|
||||
fetchThemeCss: vi.fn(async () => 'css'),
|
||||
cdnUrl: (p: string) => `https://cdn.example/${p}`,
|
||||
}));
|
||||
|
||||
import { fetchRegistry } from '@/utils/themes/themeRegistry';
|
||||
|
||||
const fetchRegistryMock = vi.mocked(fetchRegistry);
|
||||
|
||||
/** A registry with `n` themes named `Theme 01`…`Theme NN` (zero-padded so the
|
||||
* component's alphabetical sort matches numeric order). */
|
||||
function makeRegistry(n: number): Registry {
|
||||
const themes = Array.from({ length: n }, (_, i) => {
|
||||
const num = String(i + 1).padStart(2, '0');
|
||||
return {
|
||||
id: `t${num}`,
|
||||
name: `Theme ${num}`,
|
||||
author: 'Tester',
|
||||
version: '1.0.0',
|
||||
description: `Description ${num}`,
|
||||
mode: (i % 2 === 0 ? 'dark' : 'light') as 'dark' | 'light',
|
||||
css: `themes/t${num}/theme.css`,
|
||||
thumbnail: `themes/t${num}/thumb.png`,
|
||||
tags: [],
|
||||
};
|
||||
});
|
||||
return { schemaVersion: 1, generatedAt: '2026-06-07T00:00:00Z', themes };
|
||||
}
|
||||
|
||||
const rows = (container: HTMLElement) => container.querySelectorAll('.theme-store-row');
|
||||
|
||||
describe('ThemeStoreSection — pagination & refresh', () => {
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks();
|
||||
// jsdom has no layout engine; goToPage() scrolls the list back up.
|
||||
Element.prototype.scrollIntoView = vi.fn();
|
||||
});
|
||||
|
||||
it('shows only one page of themes and a pager when the catalogue is large', async () => {
|
||||
fetchRegistryMock.mockResolvedValue({ registry: makeRegistry(30), stale: false });
|
||||
const { container } = renderWithProviders(<ThemeStoreSection />);
|
||||
|
||||
await screen.findByText('Theme 01');
|
||||
// PAGE_SIZE is 12 → 30 themes span 3 pages.
|
||||
expect(rows(container)).toHaveLength(12);
|
||||
expect(screen.getByText('Page 1 of 3')).toBeInTheDocument();
|
||||
// Page-2 themes are not rendered yet.
|
||||
expect(screen.queryByText('Theme 13')).not.toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('does not paginate when everything fits on one page', async () => {
|
||||
fetchRegistryMock.mockResolvedValue({ registry: makeRegistry(8), stale: false });
|
||||
const { container } = renderWithProviders(<ThemeStoreSection />);
|
||||
|
||||
await screen.findByText('Theme 01');
|
||||
expect(rows(container)).toHaveLength(8);
|
||||
expect(screen.queryByLabelText('Next page')).not.toBeInTheDocument();
|
||||
expect(screen.queryByText(/page 1 of/i)).not.toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('navigates between pages and disables prev/next at the bounds', async () => {
|
||||
fetchRegistryMock.mockResolvedValue({ registry: makeRegistry(30), stale: false });
|
||||
const { container } = renderWithProviders(<ThemeStoreSection />);
|
||||
const user = userEvent.setup();
|
||||
|
||||
await screen.findByText('Theme 01');
|
||||
expect(screen.getByLabelText('Previous page')).toBeDisabled();
|
||||
|
||||
await user.click(screen.getByLabelText('Next page'));
|
||||
expect(screen.getByText('Page 2 of 3')).toBeInTheDocument();
|
||||
expect(screen.getByText('Theme 13')).toBeInTheDocument();
|
||||
expect(screen.queryByText('Theme 01')).not.toBeInTheDocument();
|
||||
expect(screen.getByLabelText('Previous page')).toBeEnabled();
|
||||
|
||||
await user.click(screen.getByLabelText('Next page'));
|
||||
expect(screen.getByText('Page 3 of 3')).toBeInTheDocument();
|
||||
expect(rows(container)).toHaveLength(6); // 30 - 24
|
||||
expect(screen.getByLabelText('Next page')).toBeDisabled();
|
||||
});
|
||||
|
||||
it('filters the catalogue by the search query', async () => {
|
||||
fetchRegistryMock.mockResolvedValue({ registry: makeRegistry(30), stale: false });
|
||||
const { container } = renderWithProviders(<ThemeStoreSection />);
|
||||
const user = userEvent.setup();
|
||||
|
||||
await screen.findByText('Theme 01');
|
||||
await user.type(screen.getByRole('searchbox'), 'Theme 05');
|
||||
|
||||
await waitFor(() => expect(rows(container)).toHaveLength(1));
|
||||
expect(screen.getByText('Theme 05')).toBeInTheDocument();
|
||||
expect(screen.queryByText('Theme 04')).not.toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('resets to the first page when the search query changes', async () => {
|
||||
fetchRegistryMock.mockResolvedValue({ registry: makeRegistry(30), stale: false });
|
||||
renderWithProviders(<ThemeStoreSection />);
|
||||
const user = userEvent.setup();
|
||||
|
||||
await screen.findByText('Theme 01');
|
||||
await user.click(screen.getByLabelText('Next page'));
|
||||
expect(screen.getByText('Page 2 of 3')).toBeInTheDocument();
|
||||
|
||||
// 'theme' matches all 30 names, so the catalogue is unchanged in size — but
|
||||
// the page must snap back to 1 so the user isn't stranded past the end.
|
||||
await user.type(screen.getByRole('searchbox'), 'theme');
|
||||
await waitFor(() => expect(screen.getByText('Page 1 of 3')).toBeInTheDocument());
|
||||
expect(screen.getByText('Theme 01')).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('keeps the list mounted while refreshing (no scroll-resetting unmount)', async () => {
|
||||
const reg = makeRegistry(30);
|
||||
let resolveRefresh!: (v: FetchRegistryResult) => void;
|
||||
const pending = new Promise<FetchRegistryResult>(res => { resolveRefresh = res; });
|
||||
fetchRegistryMock
|
||||
.mockResolvedValueOnce({ registry: reg, stale: false }) // initial load
|
||||
.mockReturnValueOnce(pending); // manual refresh, held pending
|
||||
|
||||
const { container } = renderWithProviders(<ThemeStoreSection />);
|
||||
const user = userEvent.setup();
|
||||
|
||||
await screen.findByText('Theme 01');
|
||||
expect(container.querySelector('.animate-spin')).toBeNull();
|
||||
|
||||
await user.click(screen.getByLabelText('Refresh'));
|
||||
|
||||
// The whole point of the fix: refreshing must NOT swap the list for the
|
||||
// full-page loading placeholder (which collapses the scroll viewport and
|
||||
// jumps it to the top). The rows stay; only the icon spins.
|
||||
expect(rows(container)).toHaveLength(12);
|
||||
expect(screen.queryByText(/loading themes/i)).not.toBeInTheDocument();
|
||||
expect(container.querySelector('.animate-spin')).not.toBeNull();
|
||||
|
||||
resolveRefresh({ registry: reg, stale: false });
|
||||
await waitFor(() => expect(container.querySelector('.animate-spin')).toBeNull());
|
||||
expect(rows(container)).toHaveLength(12);
|
||||
});
|
||||
});
|
||||
Reference in New Issue
Block a user