@treely/strapi-slices 8.2.5 → 8.2.7

package/dist/index.js

@@ -5066,7 +5066,6 @@ var ProjectsMap = ({
   const map = useRef4(null);
   const animationIntervalRef = useRef4(null);
   const [featureCollection, setFeatureCollection] = useState5(null);
-  const [isLoading, setIsLoading] = useState5(false);
   const initialBboxRef = useRef4(null);
   const [isMapReady, setIsMapReady] = useState5(false);
   const [strapiProjects, setStrapiProjects] = useState5(null);
@@ -5089,15 +5088,12 @@ var ProjectsMap = ({
   }, [locale, strapiProjects]);
   const fetchProjectsData = useCallback2(
     async (bbox) => {
-      setIsLoading(true);
       try {
         const fpmData = await getFpmProjectsByBbox_default(bbox);
         const mergedData = strapiProjects ? mergeProjectData_default(fpmData, strapiProjects) : fpmData;
         setFeatureCollection(mergedData);
       } catch (error) {
         console.error("Error fetching projects:", error);
-      } finally {
-        setIsLoading(false);
       }
     },
     [strapiProjects]
@@ -5115,7 +5111,11 @@ var ProjectsMap = ({
     [fetchProjectsData, isBboxContained]
   );
   const addProjectsLayer = useCallback2(() => {
-    if (!map.current || !featureCollection || !map.current.isStyleLoaded()) {
+    if (!map.current || !featureCollection) {
+      return;
+    }
+    if (!map.current.isStyleLoaded()) {
+      setTimeout(() => addProjectsLayer(), 100);
       return;
     }
     const filteredFeatureCollection = {
@@ -5354,7 +5354,7 @@ var ProjectsMap = ({
     } else {
       source.setData(filteredFeatureCollection);
     }
-  }, [featureCollection, locale, formatMessage]);
+  }, [featureCollection, formatMessage]);
   useEffect4(() => {
     if (map.current || !mapContainer.current) return;
     let initialCenter;
@@ -5379,19 +5379,17 @@ var ProjectsMap = ({
       center: initialCenter,
       zoom: initialZoom,
       maxZoom: MAPBOX_MAX_ZOOM,
-      minZoom: slice.minZoomLevel
+      minZoom: slice.minZoomLevel,
+      cooperativeGestures: true
     });
     map.current.addControl(new mapboxgl.NavigationControl(), "top-right");
     map.current.on("load", () => {
-      setIsMapReady(true);
-    });
-    map.current.on("moveend", () => {
-      if (initialBboxRef.current) {
-        debouncedUpdateBbox();
+      if (map.current?.getLayer("road-number-shield")) {
+        map.current?.setLayoutProperty("road-number-shield", "visibility", "none");
       }
+      setIsMapReady(true);
     });
     return () => {
-      debouncedUpdateBbox.cancel();
       if (animationIntervalRef.current) {
         clearInterval(animationIntervalRef.current);
       }
@@ -5401,9 +5399,17 @@ var ProjectsMap = ({
   }, [
     slice.defaultCenterCoordinates,
     slice.defaultZoomLevel,
-    slice.minZoomLevel,
-    debouncedUpdateBbox
+    slice.minZoomLevel
   ]);
+  useEffect4(() => {
+    if (!map.current || !isMapReady) return;
+    const currentMap = map.current;
+    currentMap.on("moveend", debouncedUpdateBbox);
+    return () => {
+      debouncedUpdateBbox.cancel();
+      currentMap.off("moveend", debouncedUpdateBbox);
+    };
+  }, [isMapReady, debouncedUpdateBbox]);
   useEffect4(() => {
     fetchStrapiData();
   }, [fetchStrapiData]);
@@ -5437,6 +5443,7 @@ var ProjectsMap = ({
             });
             const buffer = 1;
             const bbox = `${userLoc.lon - buffer},${userLoc.lat - buffer},${userLoc.lon + buffer},${userLoc.lat + buffer}`;
+            initialBboxRef.current = bbox;
             fetchProjectsData(bbox);
           }
         },
@@ -5454,7 +5461,7 @@ var ProjectsMap = ({
     fetchProjectsData
   ]);
   useEffect4(() => {
-    if (isMapReady && featureCollection && map.current?.isStyleLoaded()) {
+    if (isMapReady && featureCollection) {
       addProjectsLayer();
     }
   }, [isMapReady, featureCollection, addProjectsLayer]);
@@ -5506,8 +5513,7 @@ var ProjectsMap = ({
           overflow: "hidden",
           boxShadow: ["md", null, null, "none"]
         }
-      ),
-      isLoading && /* @__PURE__ */ jsx34(Box25, { children: "Loading projects..." })
+      )
     ] })
   ] });
 };
@@ -9263,7 +9269,7 @@ var Redirect = ({ slice }) => {
       router.asPath,
       router.query
     );
-    router.replace(redirectUrl);
+    window.location.replace(redirectUrl);
   }, [slice.url, router]);
   return /* @__PURE__ */ jsx61(Fragment32, {});
 };