Merge pull request #453 from yext/dev/merge-v1.6.1-9b282d9-into-develop

Merge main (v1.6.1) into develop

THIRD-PARTY-NOTICES

@@ -1182,7 +1182,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 The following NPM package may be included in this product:
 
- - @yext/search-headless-react@2.5.0-beta.3
+ - @yext/search-headless-react@2.5.0-beta.4
 
 This package contains the following license and notice below:
 
@@ -1226,7 +1226,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 The following NPM package may be included in this product:
 
- - @yext/search-headless@2.6.0-beta.3
+ - @yext/search-headless@2.6.0-beta.4
 
 This package contains the following license and notice below:
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yext/search-ui-react",
-  "version": "1.7.0-beta.6",
+  "version": "1.7.0-beta.7",
   "description": "A library of React Components for powering Yext Search integrations",
   "author": "slapshot@yext.com",
   "license": "BSD-3-Clause",
@@ -85,7 +85,7 @@
     "@typescript-eslint/eslint-plugin": "^5.16.0",
     "@typescript-eslint/parser": "^5.16.0",
     "@yext/eslint-config-slapshot": "^0.5.0",
-    "@yext/search-headless-react": "^2.5.0-beta.3",
+    "@yext/search-headless-react": "^2.5.0-beta.4",
     "axe-core": "^4.8.2",
     "axe-playwright": "^1.2.3",
     "babel-jest": "^29.7.0",
@@ -108,7 +108,7 @@
     "util": "^0.12.5"
   },
   "peerDependencies": {
-    "@yext/search-headless-react": "^2.5.0-beta.3",
+    "@yext/search-headless-react": "^2.5.0-beta.4",
     "react": "^16.14 || ^17 || ^18",
     "react-dom": "^16.14 || ^17 || ^18"
   },

src/components/Pagination.tsx

@@ -76,6 +76,7 @@ export function Pagination(props: PaginationProps): JSX.Element | null {
   const navigateToPage = useCallback((newPageNumber: number) => {
     const newOffset = limit * (newPageNumber - 1);
     searchActions.setOffset(newOffset);
+    searchActions.setIsPagination(true);
     executeSearch(searchActions);
     reportAnalyticsEvent(newPageNumber, currentPageNumber, maxPageCount);
   }, [searchActions, limit, maxPageCount, currentPageNumber, reportAnalyticsEvent]);

src/hooks/useSearchWithNearMeHandling.ts

@@ -32,14 +32,19 @@ export function useSearchWithNearMeHandling(
   const searchActions = useSearchActions();
 
   async function executeQuery() {
-    let intents: SearchIntent[] = [];
-    if (!searchActions.state.location.userLocation) {
-      if (!autocompletePromiseRef.current) {
-        autocompletePromiseRef.current = executeAutocomplete(searchActions);
+    try {
+      let intents: SearchIntent[] = [];
+      if (!searchActions.state.location.userLocation) {
+        if (!autocompletePromiseRef.current) {
+          autocompletePromiseRef.current = executeAutocomplete(searchActions);
+        }
+        const autocompleteResponseBeforeSearch = await autocompletePromiseRef.current;
+        intents = autocompleteResponseBeforeSearch?.inputIntents || [];
+        await updateLocationIfNeeded(searchActions, intents, geolocationOptions);
       }
-      const autocompleteResponseBeforeSearch = await autocompletePromiseRef.current;
-      intents = autocompleteResponseBeforeSearch?.inputIntents || [];
-      await updateLocationIfNeeded(searchActions, intents, geolocationOptions);
+    } catch (e) {
+      console.error('Error executing autocomplete before search:', e);
+      await updateLocationIfNeeded(searchActions, [], geolocationOptions);
     }
     const verticalKey = searchActions.state.vertical.verticalKey ?? '';
     const query = searchActions.state.query.input ?? '';

tests/components/Pagination.test.tsx

@@ -18,6 +18,7 @@ const mockedState: Partial<State> = {
 
 const mockedActions = {
   state: mockedState,
+  setIsPagination: jest.fn(),
   setOffset: jest.fn(),
   executeVerticalQuery: jest.fn()
 };
@@ -157,6 +158,7 @@ describe('results are returned from search', () => {
     // navigate to the last results page
     await userEvent.click(screen.getByText(`${mockedResultsCount}`));
     expect(actions.setOffset).toHaveBeenCalledWith(mockedResultsCount - 1);
+    expect(actions.setIsPagination).toHaveBeenCalledWith(true);
     expect(actions.executeVerticalQuery).toHaveBeenCalledTimes(1);
   });
 });