archive-gh-me/Leaflet
1
0
Fork 0
mirror of https://github.com/Leaflet/Leaflet.git synced 2025-12-08 21:26:14 +00:00
Code Issues Projects Releases Wiki Activity

Implemented trackResize for L.Popup (#9605)

Browse Source 
Signed-off-by: Iván Sánchez Ortega <ivan@sanchezortega.es>
This commit is contained in:
Iván Sánchez Ortega 2025-03-01 12:55:08 +01:00 committed by GitHub
parent 7d6bb49a43
commit 45c795a515
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 72 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
debug/tests/popup-resize.html Normal file
View File

@ -0,0 +1,46 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<title>Leaflet debug page - Popup Offset</title>
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=0" />
<link rel="stylesheet" href="../../dist/leaflet.css" />
<link rel="stylesheet" href="../css/screen.css" />
<script type="importmap">
{
"imports": {
"leaflet": "../../dist/leaflet-src.esm.js"
}
}
</script>
</head>
<body>
<div id="map"></div>
<script type="module">
import {TileLayer, Map, Marker} from 'leaflet';
const osm = new TileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {maxZoom: 18});
const map = new Map('map').setView([50.5, 30.51], 15).addLayer(osm);
let marker = new Marker(map.getCenter())
.addTo(map);
marker.bindPopup("foobar", {maxWidth: 600, trackResize: true}); // NOTE: change to true!!
setTimeout(()=>{
marker.getPopup().setContent(`Lorem ipsum sit amet.
<img id="image" src="https://cataas.com/cat?height=${480 + Math.random() * 80}&v=${Math.random()}" />`);
}, 2500);
marker.on('click',()=>{
marker.getPopup().setContent(`Lorem ipsum sit amet.
<img id="image" src="https://cataas.com/cat?height=${480 + Math.random() * 80}&v=${Math.random()}" />`);
})
marker.openPopup();
</script>
</body>
</html>

34
src/layer/Popup.js
View File

@ -117,7 +117,12 @@ export const Popup = DivOverlay.extend({
// @option className: String = ''
// A custom CSS class name to assign to the popup.
className: ''
className: '',
// @option trackResize: Boolean = true
// Whether the popup shall react to changes in the size of its contents
// (e.g. when an image inside the popup loads) and reposition itself.
trackResize: true,
},
// @namespace Popup
@ -220,6 +225,21 @@ export const Popup = DivOverlay.extend({
this.close();
}, this);
}
if (this.options.trackResize) {
this._resizeObserver = new ResizeObserver(((entries) => {
if (!this._map) { return; }
this._containerWidth = entries[0]?.contentRect?.width;
this._containerHeight = entries[0]?.contentRect?.height;
this._updateLayout();
this._updatePosition();
this._adjustPan();
}));
this._resizeObserver.observe(this._contentNode);
}
},
_updateLayout() {
@ -229,16 +249,13 @@ export const Popup = DivOverlay.extend({
style.width = '';
style.whiteSpace = 'nowrap';
let width = container.offsetWidth;
width = Math.min(width, this.options.maxWidth);
width = Math.max(width, this.options.minWidth);
style.width = `${width + 1}px`;
style.maxWidth = `${this.options.maxWidth}px`;
style.minWidth = `${this.options.minWidth}px`;
style.whiteSpace = '';
style.height = '';
const height = container.offsetHeight,
const height = this._containerHeight ?? container.offsetHeight,
maxHeight = this.options.maxHeight,
scrolledClass = 'leaflet-popup-scrolled';
@ -250,6 +267,7 @@ export const Popup = DivOverlay.extend({
}
this._containerWidth = this._container.offsetWidth;
this._containerHeight = this._container.offsetHeight;
},
_animateZoom(e) {
@ -271,7 +289,7 @@ export const Popup = DivOverlay.extend({
const map = this._map,
marginBottom = parseInt(getComputedStyle(this._container).marginBottom, 10) || 0,
containerHeight = this._container.offsetHeight + marginBottom,
containerHeight = this._containerHeight + marginBottom,
containerWidth = this._containerWidth,
layerPos = new Point(this._containerLeft, -containerHeight - this._containerBottom);