Commit 678ece00 authored by tom's avatar tom

fix initial loader issue

parent e6b8cacb
...@@ -23,6 +23,15 @@ const SearchResultsPageContent = () => { ...@@ -23,6 +23,15 @@ const SearchResultsPageContent = () => {
const [ showContent, setShowContent ] = React.useState(false); const [ showContent, setShowContent ] = React.useState(false);
React.useEffect(() => { React.useEffect(() => {
if (showContent) {
return;
}
if (!debouncedSearchTerm) {
setShowContent(true);
return;
}
if (redirectCheckQuery.data?.redirect && redirectCheckQuery.data.parameter) { if (redirectCheckQuery.data?.redirect && redirectCheckQuery.data.parameter) {
switch (redirectCheckQuery.data.type) { switch (redirectCheckQuery.data.type) {
case 'block': { case 'block': {
...@@ -41,7 +50,7 @@ const SearchResultsPageContent = () => { ...@@ -41,7 +50,7 @@ const SearchResultsPageContent = () => {
} }
!redirectCheckQuery.isLoading && setShowContent(true); !redirectCheckQuery.isLoading && setShowContent(true);
}, [ redirectCheckQuery, router ]); }, [ redirectCheckQuery, router, debouncedSearchTerm, showContent ]);
const handleSubmit = React.useCallback((event: FormEvent<HTMLFormElement>) => { const handleSubmit = React.useCallback((event: FormEvent<HTMLFormElement>) => {
event.preventDefault(); event.preventDefault();
...@@ -157,4 +166,4 @@ const SearchResultsPageContent = () => { ...@@ -157,4 +166,4 @@ const SearchResultsPageContent = () => {
); );
}; };
export default SearchResultsPageContent; export default React.memo(SearchResultsPageContent);
...@@ -44,12 +44,12 @@ export default function useSearchQuery(isSearchPage = false) { ...@@ -44,12 +44,12 @@ export default function useSearchQuery(isSearchPage = false) {
} }
}, debouncedSearchTerm); }, debouncedSearchTerm);
return { return React.useMemo(() => ({
searchTerm, searchTerm,
debouncedSearchTerm, debouncedSearchTerm,
handleSearchTermChange: setSearchTerm, handleSearchTermChange: setSearchTerm,
query, query,
redirectCheckQuery, redirectCheckQuery,
pathname, pathname,
}; }), [ debouncedSearchTerm, pathname, query, redirectCheckQuery, searchTerm ]);
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment