@nextgis/leaflet-map-adapter 1.9.1 → 1.11.0

package/lib/index.d.ts

@@ -45,6 +45,7 @@ declare class LeafletMapAdapter implements MapAdapter<Map_2, any, Control> {
     };
     emitter: EventEmitter;
     map?: Map_2;
+    private _resizeObserver?;
     private _unselectCb;
     private _universalEvents;
     create(options: MapOptions): void;
@@ -75,6 +76,8 @@ declare class LeafletMapAdapter implements MapAdapter<Map_2, any, Control> {
     onMapClick(evt: LeafletMouseEvent): void;
     locate(opt: LocateOptions, events?: LocationEvents): Locate;
     private _addUnselectCb;
+    private _watchSizeChangeToUpdateMinZoom;
+    private _stopWatchSizeChangeToUpdateMinZoom;
     private _addMapListeners;
 }
 export default LeafletMapAdapter;

package/lib/leaflet-map-adapter.esm-browser.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/leaflet-map-adapter; version: 1.9.1; author: NextGIS */
+/** Bundle of @nextgis/leaflet-map-adapter; version: 1.11.0; author: NextGIS */
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
 var events = {exports: {}};
@@ -14562,6 +14562,9 @@ function createControl(control, options = {}, map) {
             if (options.bar) {
                 element.classList.add('leaflet-bar');
             }
+            if (options.addClass) {
+                element.classList.add(options.addClass);
+            }
             if (!options.margin && !options.bar) {
                 element.style.marginBottom = '0px';
                 element.style.marginTop = '0px';
@@ -15090,7 +15093,10 @@ class GeoJsonAdapter extends BaseAdapter {
     async _openPopup(def, options = {}, type, latLng) {
         var _a, _b;
         const { feature, layer } = def;
-        const { minWidth, autoPan, maxWidth, closeButton: closeButton_, } = { minWidth: 300, ...options };
+        const { minWidth, autoPan, maxWidth, closeButton: closeButton_, } = {
+            minWidth: 300,
+            ...options,
+        };
         const closeButton = closeButton_ !== null && closeButton_ !== void 0 ? closeButton_ : !this.options.selectOnHover;
         let popup;
         const _closeHandlers = [];
@@ -15318,14 +15324,14 @@ class GeoJsonAdapter extends BaseAdapter {
         }
     }
     _handleMouseEvents(layer) {
-        const isSelected = (l) => this._selectedLayers.indexOf(l) !== -1;
         const { onClick, onLayerClick, onMouseOut, onMouseOver } = this.options;
         // TODO: remove backward compatibility for onLayerClick
         const onClick_ = onClick || onLayerClick;
         if (onClick_) {
             layer.on('click', (e) => {
+                const selected = !!this._getSelected(layer);
                 onClick_({
-                    selected: isSelected(e.target),
+                    selected,
                     ...this._createMouseEvent(e),
                 });
             }, this);
@@ -15347,6 +15353,9 @@ class GeoJsonAdapter extends BaseAdapter {
             source: source,
         });
     }
+    _getSelected(layer) {
+        return this._selectedLayers.find((x) => x.layer === layer);
+    }
     _selectOnLayerClick(e) {
         leafletSrc.exports.DomEvent.stopPropagation(e);
         const layer = e.target;
@@ -15357,7 +15366,7 @@ class GeoJsonAdapter extends BaseAdapter {
             feature,
             ...createFeaturePositionOptions(feature),
         };
-        const isSelected = this._selectedLayers.find((x) => x.layer === layer);
+        const isSelected = this._getSelected(layer);
         if (isSelected) {
             if (this.options && this.options.unselectOnSecondClick) {
                 this._unSelectLayer(isSelected);
@@ -15942,6 +15951,7 @@ class LeafletMapAdapter$1 {
         if (this.map) {
             this.map.remove();
         }
+        this._stopWatchSizeChangeToUpdateMinZoom();
     }
     getContainer() {
         return this.map && this.map.getContainer();
@@ -15992,17 +16002,22 @@ class LeafletMapAdapter$1 {
             }
             if (maxBounds !== undefined) {
                 if (maxBounds) {
-                    map.setMaxBounds(arrayToBoundsExpression(maxBounds));
+                    const b = arrayToBoundsExpression(maxBounds);
+                    map.setMaxBounds(b);
+                    map.setMinZoom(map.getBoundsZoom(b));
+                    this._watchSizeChangeToUpdateMinZoom(b);
                 }
                 else {
                     // @ts-ignore `null` works for unset maxBounds, but not in typing
                     map.setMaxBounds(null);
+                    this._stopWatchSizeChangeToUpdateMinZoom();
                 }
             }
             if (maxZoom !== undefined) {
                 map.setMaxZoom(maxZoom);
             }
             if (minZoom !== undefined) {
+                this._stopWatchSizeChangeToUpdateMinZoom();
                 map.setMinZoom(minZoom);
             }
         }
@@ -16137,6 +16152,27 @@ class LeafletMapAdapter$1 {
         this._unselectCb.length = 0;
         this._unselectCb.push(cb);
     }
+    _watchSizeChangeToUpdateMinZoom(bounds) {
+        this._stopWatchSizeChangeToUpdateMinZoom();
+        const container = this.getContainer();
+        const map = this.map;
+        if (container && map && window.ResizeObserver) {
+            this._resizeObserver = new ResizeObserver(() => {
+                map.setMinZoom(map.getBoundsZoom(bounds));
+            });
+            this._resizeObserver.observe(container);
+        }
+    }
+    _stopWatchSizeChangeToUpdateMinZoom() {
+        const map = this.map;
+        if (map) {
+            map.setMinZoom(0);
+        }
+        if (this._resizeObserver) {
+            this._resizeObserver.disconnect();
+            this._resizeObserver = undefined;
+        }
+    }
     _addMapListeners() {
         const map = this.map;
         if (map) {