Skip to content
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.

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

fix(rsc): wait for results in useSearchResults #5978

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions packages/react-instantsearch-core/src/lib/useSearchResults.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import { useEffect, useState } from 'react';

import { getIndexSearchResults } from './getIndexSearchResults';
import { use } from './use';
import { useIndexContext } from './useIndexContext';
import { useInstantSearchContext } from './useInstantSearchContext';
import { useRSCContext } from './useRSCContext';

import type { SearchResults } from 'algoliasearch-helper';
import type { ScopedResult } from 'instantsearch.js';
Expand All @@ -13,6 +15,7 @@ export type SearchResultsApi = {
};

export function useSearchResults(): SearchResultsApi {
const waitingForResultsRef = useRSCContext();
const search = useInstantSearchContext();
const searchIndex = useIndexContext();
const [searchResults, setSearchResults] = useState(() =>
Expand Down Expand Up @@ -41,5 +44,9 @@ export function useSearchResults(): SearchResultsApi {
};
}, [search, searchIndex]);

if (typeof window === 'undefined' && waitingForResultsRef?.current) {
use(waitingForResultsRef.current);
}

return searchResults;
}