Merge pull request #1107 from vinhyan/vinhyan/1025-Closing-tooltip-on-map-closes-property-details

Fix: Closing tooltip popup on map closes property details

Author: CodeWritingCow

src/components/PropertyMap.tsx

@@ -338,7 +338,7 @@ const PropertyMap: FC<PropertyMapProps> = ({
   useEffect(() => {
     if (!map) return;
     if (!selectedProperty) {
-      // setPopupInfo(null);
+      setPopupInfo(null);
       if (window.innerWidth < 640 && prevCoordinate) {
         map.setCenter(prevCoordinate as LngLatLike);
         setPrevCoordinate();
@@ -421,6 +421,12 @@ const PropertyMap: FC<PropertyMapProps> = ({
     e.target.getCanvas().style.cursor = cursorType;
   };
 
+  const handlePopupClose = () => {
+    setSelectedProperty(null);
+    setPopupInfo(null);
+    history.replaceState(null, '', `/find-properties`);
+  };
+
   // map load
   return (
     <div className="customized-map relative max-sm:min-h-[calc(100svh-100px)] max-sm:max-h-[calc(100svh-100px) h-full overflow-auto w-full">
@@ -514,7 +520,7 @@ const PropertyMap: FC<PropertyMapProps> = ({
             longitude={popupInfo.longitude}
             latitude={popupInfo.latitude}
             closeOnClick={false}
-            onClose={() => setPopupInfo(null)}
+            onClose={handlePopupClose}
           >
             <div className="flex flex-row items-center nowrap space-x-1">
               <span>{toTitleCase(popupInfo.feature.address)}</span>