Fix Bug: permanent & sticky tooltip (#7563)

* Fixes bug: if tooltip is sticky and permanent it was not following the mouse * Add tests * Use fastframe * fix whitespace Co-authored-by: Vladimir Agafonkin <agafonkin@gmail.com>
Leaflet · Dec 2, 2021 · 30d91b1 · 30d91b1
1 parent 4b2946c
commit 30d91b1
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 3 deletions.
diff --git a/spec/suites/layer/TooltipSpec.js b/spec/suites/layer/TooltipSpec.js
@@ -304,6 +304,35 @@ describe('Tooltip', function () {
 		layer.closeTooltip();
 	});
 
+	it("opens a tooltip and follow the mouse (sticky)", function () {
+		var layer = L.rectangle([[58, 39.7], [54, 35.3]]).addTo(map);
+		layer.bindTooltip('Sticky', {sticky: true}).openTooltip();
+		var tooltip = layer.getTooltip();
+		expect(tooltip.getLatLng().equals(layer.getCenter())).to.be(true);
+
+		happen.at('click', 120, 120);
+		var latlng = map.containerPointToLatLng([120, 120]);
+		expect(tooltip.getLatLng().equals(latlng)).to.be(true);
+	});
+
+	it("opens a permanent tooltip and follow the mouse (sticky)", function (done) {
+		var layer = L.rectangle([[58, 39.7], [54, 35.3]]).addTo(map);
+		layer.bindTooltip('Sticky', {sticky: true, permanent: true}).openTooltip();
+		var tooltip = layer.getTooltip();
+		expect(tooltip.getLatLng().equals(layer.getCenter())).to.be(true);
+
+		var hand = new Hand({
+			timing: 'fastframe',
+			onStop: function () {
+				var latlng = map.containerPointToLatLng([120, 120]);
+				expect(tooltip.getLatLng().equals(latlng)).to.be(true);
+				done();
+			}
+		});
+		var toucher = hand.growFinger('mouse');
+		toucher.wait(100).moveTo(120, 120, 1000).wait(100);
+	});
+
 	it("closes existent tooltip on new bindTooltip call", function () {
 		var layer = new L.Marker(center).addTo(map);
 		var eventSpy = sinon.spy(layer, "unbindTooltip");

diff --git a/src/layer/Tooltip.js b/src/layer/Tooltip.js
@@ -322,13 +322,13 @@ Layer.include({
 		if (!this._tooltip.options.permanent) {
 			events.mouseover = this._openTooltip;
 			events.mouseout = this.closeTooltip;
-			if (this._tooltip.options.sticky) {
-				events.mousemove = this._moveTooltip;
-			}
 			events.click = this._openTooltip;
 		} else {
 			events.add = this._openTooltip;
 		}
+		if (this._tooltip.options.sticky) {
+			events.mousemove = this._moveTooltip;
+		}
 		this[onOff](events);
 		this._tooltipHandlersAdded = !remove;
 	},