Check if getElement() is undefined before adding focus listener (Ca…

…nvas) (#8498)
Leaflet · Oct 3, 2022 · 579c90d · 579c90d
1 parent 00416a5
commit 579c90d
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 6 deletions.
diff --git a/spec/suites/layer/vector/RectangleSpec.js b/spec/suites/layer/vector/RectangleSpec.js
@@ -110,4 +110,16 @@ describe('Rectangle', function () {
 			expect(rectangle.getLatLngs()).to.eql(rectangle._latlngs);
 		});
 	});
+
+	describe("#Canvas", function () {
+		it("doesn't apply `focus` listener if element is undefined", function () {
+			map.remove();
+
+			map = L.map(container, {renderer: L.canvas()});
+			map.setView([0, 0], 6);
+			expect(function () {
+				L.polygon([[[2, 3], [4, 5]]]).addTo(map).bindTooltip('test');
+			}).to.not.throwException();
+		});
+	});
 });
diff --git a/src/layer/Tooltip.js b/src/layer/Tooltip.js
@@ -387,15 +387,21 @@ Layer.include({
 	},
 
 	_addFocusListenersOnLayer: function (layer) {
-		DomEvent.on(layer.getElement(), 'focus', function () {
-			this._tooltip._source = layer;
-			this.openTooltip();
-		}, this);
-		DomEvent.on(layer.getElement(), 'blur', this.closeTooltip, this);
+		var el = layer.getElement();
+		if (el) {
+			DomEvent.on(el, 'focus', function () {
+				this._tooltip._source = layer;
+				this.openTooltip();
+			}, this);
+			DomEvent.on(el, 'blur', this.closeTooltip, this);
+		}
 	},
 
 	_setAriaDescribedByOnLayer: function (layer) {
-		layer.getElement().setAttribute('aria-describedby', this._tooltip._container.id);
+		var el = layer.getElement();
+		if (el) {
+			el.setAttribute('aria-describedby', this._tooltip._container.id);
+		}
 	},