Skip to content

Media Inserter: Omit page arg from requests for the first set of results #80219

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

Merged
andrewserong merged 1 commit into from
Jul 14, 2026
Merged

Media Inserter: Omit page arg from requests for the first set of results #80219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion packages/block-editor/src/components/inserter/media-tab/hooks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,12 @@ export function useMediaResults( category, query = {}, refreshKey ) {
lastQueryKeyRef.current = key;
lastFetchRef.current = category.fetch;
lastSourceRef.current = category.name;
// Omit the default first page so sources that forward the query to a
// strict external API don't receive an unexpected `page` arg.
const { page, ...queryWithoutPage } = query;
const fetchQuery = page > 1 ? query : queryWithoutPage;
const { mediaItems, totalItems, totalPages } = normalizeFetchResult(
await category.fetch?.( query )
await category.fetch?.( fetchQuery )
);
if ( request === lastRequestRef.current ) {
// Set together so the grid and the pager never disagree.
Expand Down
35 changes: 35 additions & 0 deletions packages/block-editor/src/components/inserter/media-tab/test/hooks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,41 @@ describe( 'useMediaResults', () => {
expect( result.current.mediaList ).toEqual( [ { id: 1 } ] );
} );

it( 'omits the default first page from the fetch query', async () => {
const category = createCategory( 'images', [ { id: 1 } ] );
renderHook( () =>
useMediaResults(
category,
{ per_page: 20, page: 1, search: '' },
0
)
);
await waitFor( () =>
expect( category.fetch ).toHaveBeenCalledWith( {
per_page: 20,
search: '',
} )
);
} );

it( 'passes `page` to the fetch query when paging past the first page', async () => {
const category = createCategory( 'images', [ { id: 1 } ] );
renderHook( () =>
useMediaResults(
category,
{ per_page: 20, page: 2, search: '' },
0
)
);
await waitFor( () =>
expect( category.fetch ).toHaveBeenCalledWith( {
per_page: 20,
page: 2,
search: '',
} )
);
} );

it( 'leaves paging totals undefined for an array-returning source', async () => {
const category = createCategory( 'images', [ { id: 1 } ] );
const { result } = renderHook( () =>
Expand Down
Loading