fixed the browser back button not woking

calcom · Jan 20, 2024 · 8b475bc · 8b475bc
1 parent 95e037c
commit 8b475bc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/packages/features/bookings/Booker/utils/query-param.ts b/packages/features/bookings/Booker/utils/query-param.ts
@@ -7,8 +7,7 @@ export const updateQueryParam = (param: string, value: string | number) => {
   } else {
     url.searchParams.set(param, `${value}`);
   }
-
-  window.history.pushState({}, "", url.href);
+  window.history.replaceState(window.history.state, "", url.href);
 };
 
 export const getQueryParam = (param: string) => {
@@ -22,5 +21,5 @@ export const removeQueryParam = (param: string) => {
 
   const url = new URL(window.location.href);
   url.searchParams.delete(param);
-  window.history.pushState({}, "", url.href);
+  window.history.replaceState(window.history.state, "", url.href);
 };
diff --git a/packages/features/calendars/DatePicker.tsx b/packages/features/calendars/DatePicker.tsx
@@ -192,10 +192,15 @@ const Days = ({
       // If selected date not available in the month, select the first available date of the month
       props.onChange(firstAvailableDateOfTheMonth);
     }
-
+    if (isSelectedDateAvailable) {
+      props.onChange(dayjs(selected));
+    }
     if (!firstAvailableDateOfTheMonth) {
       props.onChange(null);
     }
+    return () => {
+      props.onChange(null);
+    };
   };
 
   useEffect(useHandleInitialDateSelection);