@vinctus/react-maplibre 1.3.1 → 1.3.3

package/dist/Layer.js

@@ -80,7 +80,9 @@ export const Layer = ({ layer, source }) => {
     }, [id, layerStructureString, sourceOptionsString, map, mapLoaded]);
     useEffect(() => {
         const current = applied.current;
-        if (!map || !mapLoaded || !current) {
+        // A replaced map is removed before the context hands out the new one, so this effect can run
+        // once more against the removed map.
+        if (!map || !mapLoaded || !current || map._removed) {
             return;
         }
         // The source disappears when the map's style is replaced, so the source and layer are rebuilt

package/dist/Popup.d.ts

@@ -6,5 +6,10 @@ export type PopupProps = {
     className?: string;
     closeOnClick?: boolean;
     closeButton?: boolean;
+    /**
+     * Called when MapLibre closes the popup through its close button or a map click. The popup is
+     * not reopened by a later render, so the parent should stop rendering it here.
+     */
+    onClose?: () => void;
 };
 export declare const Popup: FC<PopupProps>;

package/dist/Popup.js

@@ -2,8 +2,10 @@ import { useEffect, useContext, useRef } from 'react';
 import maplibre from 'maplibre-gl';
 import ReactDOMServer from 'react-dom/server';
 import { MapContext } from './Map';
-export const Popup = ({ children, longitude, latitude, className, closeOnClick, closeButton, }) => {
+export const Popup = ({ children, longitude, latitude, className, closeOnClick, closeButton, onClose, }) => {
     const { map, mapLoaded } = useContext(MapContext);
+    const onCloseRef = useRef(onClose);
+    onCloseRef.current = onClose;
     // The content is compared by its rendered markup because `children` has a new identity on every
     // parent render.
     const html = ReactDOMServer.renderToStaticMarkup(children);
@@ -21,8 +23,12 @@ export const Popup = ({ children, longitude, latitude, className, closeOnClick,
             .setLngLat(coordinates)
             .setHTML(initialHtml)
             .addTo(map);
+        const handleClose = () => { var _a; return (_a = onCloseRef.current) === null || _a === void 0 ? void 0 : _a.call(onCloseRef); };
+        popup.on('close', handleClose);
         popupInstance.current = popup;
         return () => {
+            // Removing the popup here also fires `close`, which is not a user closing it.
+            popup.off('close', handleClose);
             try {
                 popup.remove();
             }

package/package.json

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