Disables cooperative gestures when map is fullscreen in Safari (#11619)

* Fix fullscreen bug in Safari and add unit test
mapbox · Mar 18, 2022 · 0f558b3 · 0f558b3
1 parent 7e22ebf
commit 0f558b3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/ui/handler/scroll_zoom.js b/src/ui/handler/scroll_zoom.js
@@ -398,7 +398,7 @@ class ScrollZoomHandler {
     }
 
     _isFullscreen(): boolean {
-        return !!window.document.fullscreenElement;
+        return !!window.document.fullscreenElement || !!window.document.webkitFullscreenElement;
     }
 
     _showBlockerAlert() {

diff --git a/test/unit/ui/handler/scroll_zoom.test.js b/test/unit/ui/handler/scroll_zoom.test.js
@@ -455,6 +455,20 @@ test('When cooperativeGestures option is set to true, scroll zoom is activated w
     t.end();
 });
 
+test('When cooperativeGestures option is set to true, scroll zoom is not prevented when map is fullscreen', (t) => {
+    window.document.fullscreenElement = true;
+    const map = createMapWithCooperativeGestures(t);
+
+    const zoomSpy = t.spy();
+    map.on('zoom', zoomSpy);
+
+    simulate.wheel(map.getCanvas(), {type: 'wheel', deltaY: -simulate.magicWheelZoomDelta});
+    map._renderTaskQueue.run();
+
+    t.equal(zoomSpy.callCount, 1);
+    t.end();
+});
+
 test('Disabling scrollZoom removes scroll zoom blocker container', (t) => {
     const map = createMapWithCooperativeGestures(t);