Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disables cooperative gestures when map is fullscreen in Safari #11619

Merged
merged 11 commits into from
Mar 18, 2022
Merged

Disables cooperative gestures when map is fullscreen in Safari #11619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ae3c26f
Fix fullscreen bug in Safari
Mar 18, 2022
4f87ce1
currentFullscreen not needed
Mar 18, 2022
eee411f
simplify
Mar 18, 2022
92b9c22
add fullscreen unit test for cooperative gestures
Mar 18, 2022
7009388
remove isSafari from being imported
Mar 18, 2022
f1df7d5
typo
Mar 18, 2022
fc5d7c6
spy not set up right
Mar 18, 2022
c0f2842
unit test still not working
Mar 18, 2022
39c7cc2
mock fullscreenelement to pass test
Mar 18, 2022
d369a89
removed import
Mar 18, 2022
6066c1b
fix lint issue
Mar 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/ui/handler/scroll_zoom.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ class ScrollZoomHandler {
}

_isFullscreen(): boolean {
return !!window.document.fullscreenElement;
return !!window.document.fullscreenElement || !!window.document.webkitFullscreenElement;
}

_showBlockerAlert() {
Expand Down
14 changes: 14 additions & 0 deletions test/unit/ui/handler/scroll_zoom.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down