Merge pull request #19518 from backstage/camilal/search-page-limit-followup

[Search] Page limit configuration followup

.changeset/many-tips-attend.md

@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-search-react': patch
+---
+
+Optionally initializes the search context with default settings for search queries only when the config is defined, rather than always overriding it.

plugins/search-react/src/context/SearchContext.tsx

@@ -102,7 +102,7 @@ export const useSearchContextCheck = () => {
  * The initial state of `SearchContextProvider`.
  *
  */
-const searchInitialState: SearchContextState = {
+const defaultInitialSearchState: SearchContextState = {
   term: '',
   types: [],
   filters: {},
@@ -111,7 +111,7 @@ const searchInitialState: SearchContextState = {
 };
 
 const useSearchContextValue = (
-  initialValue: SearchContextState = searchInitialState,
+  initialValue: SearchContextState = defaultInitialSearchState,
 ) => {
   const searchApi = useApi(searchApiRef);
 
@@ -245,12 +245,16 @@ export const SearchContextProvider = (props: SearchContextProviderProps) => {
 
   const configApi = useApi(configApiRef);
 
+  const propsInitialSearchState = initialState ?? {};
+
+  const configInitialSearchState = configApi.has('search.query.pageLimit')
+    ? { pageLimit: configApi.getNumber('search.query.pageLimit') }
+    : {};
+
   const searchContextInitialState = {
-    ...searchInitialState,
-    ...(initialState || {}),
-    pageLimit:
-      configApi.getOptionalNumber('search.query.pageLimit') ||
-      initialState?.pageLimit,
+    ...defaultInitialSearchState,
+    ...propsInitialSearchState,
+    ...configInitialSearchState,
   };
 
   return hasParentContext && inheritParentContextIfAvailable ? (