IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Geomap: Ensure options work while in table view (#62632)

Browse Source
This commit is contained in:
Drew Slobodnjak 2023-01-31 12:24:13 -08:00 committed by GitHub
parent 55e7cf1aed
commit cf6952a963
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
public/app/plugins/panel/geomap/GeomapPanel.tsx
View File

@ -82,6 +82,8 @@ export class GeomapPanel extends Component<Props, State> {
for (const lyr of this.layers) { for (const lyr of this.layers) {
lyr.handler.dispose?.(); lyr.handler.dispose?.();
} }
// Ensure map is disposed
this.map?.dispose();
} }
shouldComponentUpdate(nextProps: Props) { shouldComponentUpdate(nextProps: Props) {
@ -183,15 +185,15 @@ export class GeomapPanel extends Component<Props, State> {
} }
initMapRef = async (div: HTMLDivElement) => { initMapRef = async (div: HTMLDivElement) => {
if (!div) {
// Do not initialize new map or dispose old map
return;
}
this.mapDiv = div; this.mapDiv = div;
if (this.map) { if (this.map) {
this.map.dispose(); this.map.dispose();
} }
if (!div) {
this.map = undefined;
return;
}
const { options } = this.props; const { options } = this.props;
const map = getNewOpenLayersMap(this, options, div); const map = getNewOpenLayersMap(this, options, div);