@vinctus/react-maplibre 0.2.14 → 0.2.16

package/dist/GeolocateControl.js

@@ -9,7 +9,12 @@ export const GeolocateControl = ({ position = 'bottom-right', options = { showUs
             map.addControl(control, position);
         }
         return () => {
-            map === null || map === void 0 ? void 0 : map.removeControl(control);
+            try {
+                map === null || map === void 0 ? void 0 : map.removeControl(control);
+            }
+            catch (_a) {
+                // Map might be destroyed already, ignore cleanup errors
+            }
         };
     }, [position, options, map]);
     return null;

package/dist/Layer.js

@@ -16,18 +16,17 @@ export const Layer = ({ layer, source }) => {
         return () => {
             if (added && map) {
                 try {
-                    // Check if layer exists before removing
-                    if (map.getLayer(parsedLayer.id)) {
-                        map.removeLayer(parsedLayer.id); // when removing, the layer must be removed first, and then the source
-                    }
-                    // Check if source exists before removing
-                    if (map.getSource(parsedLayer.id)) {
-                        map.removeSource(parsedLayer.id);
-                    }
+                    // Try to remove layer and source, ignoring errors if map is destroyed
+                    map.removeLayer(parsedLayer.id);
                 }
-                catch (error) {
-                    // Silently handle cleanup errors during navigation
-                    console.warn('Layer cleanup error:', error);
+                catch (_a) {
+                    // Layer might not exist or map might be destroyed
+                }
+                try {
+                    map.removeSource(parsedLayer.id);
+                }
+                catch (_b) {
+                    // Source might not exist or map might be destroyed
                 }
             }
         };

package/dist/Map.js

@@ -42,17 +42,15 @@ function addEventHandler(map, type, handler) {
 export const Map = React.forwardRef((_a, ref) => {
     var { children, style, id, longitude, latitude, maxPitch = DISABLE_PITCH, mapStyle = DEFAULT_STYLE, zoom, onDragEnd, onLoad, onMoveEnd, onZoomEnd, fallback } = _a, options = __rest(_a, ["children", "style", "id", "longitude", "latitude", "maxPitch", "mapStyle", "zoom", "onDragEnd", "onLoad", "onMoveEnd", "onZoomEnd", "fallback"]);
     const mapContainer = useRef(null);
-    const initializationRef = useRef(false);
+    const mapInstanceRef = useRef(null);
     const { map, setMap, setMapLoaded } = useMap();
     useImperativeHandle(ref, () => map, [map]);
     useEffect(() => {
-        if (initializationRef.current)
+        if (map)
             return; // initialize map only once
-        let createdMap = null;
         if (mapContainer.current) {
             const m = new maplibre.Map(Object.assign({ container: mapContainer.current, style: mapStyle, center: [longitude, latitude], zoom }, options));
-            createdMap = m;
-            initializationRef.current = true;
+            mapInstanceRef.current = m;
             if (onDragEnd)
                 addEventHandler(m, 'dragend', onDragEnd);
             if (onLoad)
@@ -65,26 +63,13 @@ export const Map = React.forwardRef((_a, ref) => {
             if (onZoomEnd)
                 addEventHandler(m, 'zoomend', onZoomEnd);
             setMap(m);
+            // Cleanup when component unmounts
+            return () => {
+                m.remove(); // This destroys the map and cleans up all layers/sources
+                mapInstanceRef.current = null;
+            };
         }
-        return () => {
-            if (createdMap) {
-                createdMap.remove(); // This destroys the map and cleans up all layers/sources
-                setMap(null);
-                setMapLoaded(false);
-                initializationRef.current = false;
-            }
-        };
-    }, [
-        onDragEnd,
-        onLoad,
-        onMoveEnd,
-        onZoomEnd,
-        mapStyle,
-        longitude,
-        latitude,
-        zoom,
-        options,
-    ]);
+    }, []); // Empty deps - only run once on mount
     const memoizedStyle = useMemo(() => (Object.assign({ position: 'relative', width: '100%', height: '100%' }, style)), [style]);
     return (_jsx(ErrorBoundary, { fallback: fallback, children: _jsx("div", { id: id, ref: mapContainer, style: memoizedStyle, children: children }) }));
 });

package/dist/NavigationControl.js

@@ -12,7 +12,12 @@ export const NavigationControl = ({ position = 'bottom-right', options = {
             map.addControl(control, position);
         }
         return () => {
-            map === null || map === void 0 ? void 0 : map.removeControl(control);
+            try {
+                map === null || map === void 0 ? void 0 : map.removeControl(control);
+            }
+            catch (_a) {
+                // Map might be destroyed already, ignore cleanup errors
+            }
         };
     }, [position, options, map]);
     return null;

package/dist/ScaleControl.js

@@ -9,7 +9,12 @@ export const ScaleControl = ({ position = 'bottom-right', options, }) => {
             map.addControl(control, position);
         }
         return () => {
-            map === null || map === void 0 ? void 0 : map.removeControl(control);
+            try {
+                map === null || map === void 0 ? void 0 : map.removeControl(control);
+            }
+            catch (_a) {
+                // Map might be destroyed already, ignore cleanup errors
+            }
         };
     }, [position, options, map]);
     return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vinctus/react-maplibre",
-  "version": "0.2.14",
+  "version": "0.2.16",
   "description": "Minimalist MapLibre GL JS React wrapper library",
   "type": "module",
   "types": "dist/index.d.ts",