Disables cooperative gestures when map is fullscreen in Safari #11619
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ansis
reviewed
Mar 18, 2022
src/ui/handler/scroll_zoom.js
Outdated
| @@ -398,6 +398,7 @@ class ScrollZoomHandler { | |||
| } | |||
|
|
|||
| _isFullscreen(): boolean { | |||
| if (isSafari(window)) return !!window.document.webkitFullscreenElement; | |||
There was a problem hiding this comment.
nit: This looks like it should work fine, but it might be a tiny bit cleaner to remove isSafari(...) and just always check for webkitFullScreenElement:
return !!window.document.fullscreenElement || !!window.document.webkitFullscreenElement.
ryanhamley
suggested changes
Mar 18, 2022
src/ui/handler/scroll_zoom.js
Outdated
| @@ -3,7 +3,7 @@ | |||
| import assert from 'assert'; | |||
| import * as DOM from '../../util/dom.js'; | |||
|
|
|||
| import {ease as _ease, bindAll, bezier} from '../../util/util.js'; | |||
| import {ease as _ease, bindAll, bezier, isSafari} from '../../util/util.js'; | |||
There was a problem hiding this comment.
isSafari is unused now which is causing a lint error
ansis
approved these changes
Mar 18, 2022
ryanhamley
approved these changes
Mar 18, 2022
avpeery
added a commit
that referenced
this pull request
Mar 18, 2022
* Fix fullscreen bug in Safari and add unit test
avpeery
added a commit
that referenced
this pull request
Mar 18, 2022
ahocevar
pushed a commit
to ahocevar/mapbox-gl-js
that referenced
this pull request
Mar 23, 2022
…x#11619) * Fix fullscreen bug in Safari and add unit test
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #11607. When a map is full screen, cooperative gestures should be disabled - this is more user-friendly as the presumption is that the user will want to only interact with the fullscreen map (e.g. not scroll to other content on the screen). This is expected behavior and works in other browsers. Recently discovered while testing Safari 15.4 that cooperative gestures continued to be enabled when map is fullscreen. It was believed that this was working prior (see PR #11086), but is also not working in 15.3.
Added unit test that mocks fullscreenElement, doesn't necessarily address this problem with safari but was a previously missing unit test that checks scroll zoom happens when map is full screen.
Launch Checklist
mapbox-gl-jschangelog:<changelog>Fixes disabling cooperative gestures when map is fullscreen in Safari.</changelog>