Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Correct tooltips across map zoom levels (#65080)

Ryan Lauriea67ad3b258d5
diff --git a/e2e/test/scenarios/visualizations-charts/maps.cy.spec.js b/e2e/test/scenarios/visualizations-charts/maps.cy.spec.js
index cd65c580cca..26933313570 100644
--- a/e2e/test/scenarios/visualizations-charts/maps.cy.spec.js
+++ b/e2e/test/scenarios/visualizations-charts/maps.cy.spec.js
@@ -92,6 +92,8 @@ describe("scenarios > visualizations > maps", () => {
SELECT 'Kleavor' as name, 68 as lat, -159 as lng
UNION ALL
SELECT 'Spectrier' as name, 68 as lat, 159 as lng
+ UNION ALL
+ SELECT 'Blastoise' as name, 68 as lat, 22 as lng
`,
"template-tags": {},
},
@@ -103,20 +105,33 @@ describe("scenarios > visualizations > maps", () => {
"map.longitude_column": "LNG",
"map.center_latitude": 67,
"map.center_longitude": -175,
- "map.zoom": 4,
+ "map.zoom": 1,
},
},
{ visitQuestion: true },
);
- cy.get(".leaflet-marker-icon").then((markers) => {
- // should draw 4 markers
- expect(markers).to.have.length(4);
- cy.get(markers[0]).should("be.visible");
- cy.get(markers[1]).should("not.be.visible"); // outside the viewport
- cy.get(markers[2]).should("not.be.visible"); // outside the viewport
- cy.get(markers[3]).should("be.visible");
- });
+ cy.log("zooming should preserve tooltips (metabase#64939)");
+
+ cy.get(".leaflet-marker-icon")
+ .then((markers) => {
+ // should draw 6 markers
+ expect(markers).to.have.length(6);
+
+ return cy.wrap(markers[2]); // Blastoise in Sweden
+ })
+ .then((marker) => {
+ cy.get(marker)
+ .realHover()
+ .realMouseWheel({ deltaY: -100, scrollBehavior: "nearest" });
+ });
+
+ // this waits until we redraw from 6 to 3
+ cy.get(".leaflet-marker-icon").should("have.length", 3);
+
+ cy.get(".leaflet-marker-icon").eq(2).as("blastoiseMarker");
+ cy.get("@blastoiseMarker").trigger("mousemove");
+ H.popover().findByText("Blastoise").should("be.visible");
});
it("should not assign the full name of the state as the filter value on a drill-through (metabase#14650)", () => {
diff --git a/frontend/src/metabase/visualizations/components/LeafletMarkerPinMap.jsx b/frontend/src/metabase/visualizations/components/LeafletMarkerPinMap.jsx
index 60377b919bf..c4fb8590fa7 100644
--- a/frontend/src/metabase/visualizations/components/LeafletMarkerPinMap.jsx
+++ b/frontend/src/metabase/visualizations/components/LeafletMarkerPinMap.jsx
@@ -76,11 +76,13 @@ export default class LeafletMarkerPinMap extends LeafletMap {
for (let i = 0; i < max; i++) {
if (i >= wrappedPoints.length) {
pinMarkerLayer.removeLayer(markers[i]); // remove excess markers
+ continue;
}
+
+ const index =
+ wrappedPoints.length > points.length ? wrappedPoints[i][2] : i;
if (i >= markers.length) {
// create new markers for new points
- const index = shouldGetWrappedPoints ? wrappedPoints[i][2] : i;
-
const marker = this._createMarker(index);
pinMarkerLayer.addLayer(marker);
markers.push(marker);
@@ -91,6 +93,8 @@ export default class LeafletMarkerPinMap extends LeafletMap {
// if any marker doesn't match the point, update it
if (lng !== wrappedPoints[i][0] || lat !== wrappedPoints[i][1]) {
markers[i].setLatLng(wrappedPoints[i].slice(0, 2));
+ // we need to re-attach the pointer events because the indexes might have changed from zooming
+ this._setupMarkerEvents(markers[i], index);
}
}
}
@@ -98,6 +102,13 @@ export default class LeafletMarkerPinMap extends LeafletMap {
_createMarker = (rowIndex) => {
const marker = L.marker([0, 0], { icon: this.pinMarkerIcon });
+ return this._setupMarkerEvents(marker, rowIndex);
+ };
+
+ _setupMarkerEvents = (marker, rowIndex) => {
+ marker.off("mousemove");
+ marker.off("mouseout");
+ marker.off("click");
marker.on("mousemove", () => {
const { onHoverChange } = this.props;
if (!onHoverChange) {