From 146d4f093a54484030aa41a62ef64af7140ae607 Mon Sep 17 00:00:00 2001
From: Yen Truong <ytruong@yext.com>
Date: Wed, 16 Nov 2022 13:41:36 -0500
Subject: [PATCH] onClick > handleClick

---
 src/components/Geolocation.tsx           | 16 ++++++++--------
 tests/components/Geolocation.stories.tsx |  8 +++++++-
 tests/components/Geolocation.test.tsx    | 12 ++++++++----
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/components/Geolocation.tsx b/src/components/Geolocation.tsx
index 18ff25cea..16f272a8d 100644
--- a/src/components/Geolocation.tsx
+++ b/src/components/Geolocation.tsx
@@ -43,11 +43,8 @@ export interface GeolocationProps {
   label?: string,
   /** Custom icon component to display along with the button. */
   GeolocationIcon?: React.FunctionComponent,
-  /**
-   * A function which is called when the geolocation button is clicked.
-   * This is called prior to executing the existing click behavior.
-   */
-  onClick?: () => void,
+  /** A function which is called when the geolocation button is clicked. */
+  handleClick?: (position: GeolocationPosition) => void,
   /** CSS classes for customizing the component styling. */
   customCssClasses?: GeolocationCssClasses
 }
@@ -70,7 +67,7 @@ export function Geolocation({
   label = 'Use my location',
   //TODO: replace default icon with SVG create from design team
   GeolocationIcon = YextIcon,
-  onClick,
+  handleClick,
   customCssClasses,
 }: GeolocationProps): JSX.Element | null {
   const searchActions = useSearchActions();
@@ -79,10 +76,13 @@ export function Geolocation({
   const cssClasses = useComposedCssClasses(builtInCssClasses, customCssClasses);
 
   const handleGeolocationClick = useCallback(async () => {
-    onClick?.();
     setIsFetchingLocation(true);
     try {
       const position = await getUserLocation(geolocationOptions);
+      if (handleClick) {
+        handleClick(position);
+        return;
+      }
       const { latitude, longitude, accuracy } = position.coords;
       const locationFilter: SelectableStaticFilter = {
         displayName: 'Current Location',
@@ -109,7 +109,7 @@ export function Geolocation({
     } finally {
       setIsFetchingLocation(false);
     }
-  }, [geolocationOptions, onClick, radius, searchActions, staticFilters]);
+  }, [geolocationOptions, handleClick, radius, searchActions, staticFilters]);
 
   return (
     <div className={cssClasses.geolocationContainer}>
diff --git a/tests/components/Geolocation.stories.tsx b/tests/components/Geolocation.stories.tsx
index e0fee93fb..e74cc8614 100644
--- a/tests/components/Geolocation.stories.tsx
+++ b/tests/components/Geolocation.stories.tsx
@@ -13,7 +13,13 @@ const meta: ComponentMeta<typeof Geolocation> = {
   argTypes: {
     geolocationOptions: {
       control: false
-    }
+    },
+    GeolocationIcon: {
+      control: false
+    },
+    handleClick: {
+      control: false
+    },
   }
 };
 export default meta;
diff --git a/tests/components/Geolocation.test.tsx b/tests/components/Geolocation.test.tsx
index b8848f0ef..9573eed97 100644
--- a/tests/components/Geolocation.test.tsx
+++ b/tests/components/Geolocation.test.tsx
@@ -113,11 +113,15 @@ it('renders custom icon when provided', () => {
   expect(LocationIcon).toBeDefined();
 });
 
-it('executes onClick when provided', () => {
-  const mockedOnClickFn = jest.fn();
-  render(<Geolocation onClick={mockedOnClickFn} />);
+it('executes handleClick when provided', async () => {
+  const mockedHandleClickFn = jest.fn();
+  const actions = spyOnActions();
+  render(<Geolocation handleClick={mockedHandleClickFn} />);
   clickUpdateLocation();
-  expect(mockedOnClickFn).toBeCalledTimes(1);
+  await waitFor(() => {
+    expect(mockedHandleClickFn).toBeCalledTimes(1);
+  });
+  expect(actions.executeVerticalQuery).not.toBeCalled();
 });
 
 it('sets a location filter with user\'s coordinates in static filters state when clicked', async () => {