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

Jump to bottom

fix: allow mouse scroll in fullscreen (DHIS2-10252) #1420

Merged
merged 4 commits into from
Jan 19, 2021
Merged

fix: allow mouse scroll in fullscreen (DHIS2-10252) #1420

merged 4 commits into from
Jan 19, 2021

Conversation

turban
Copy link
Contributor

@turban turban commented Jan 19, 2021 •
edited
Loading

Fixes: https://jira.dhis2.org/browse/DHIS2-10252

This PR fixes:

  1. Switch to multitouch for map panning to avoid "scroll trap" on touch screens. This was fixed in maps-gl: fix: multitouch for map panning (DHIS2-10252) maps-gl#236
  2. Allow map to be resized outside the plugin component. The plugin resize method now has an additional argument: isFullscreen - mapPlugin.resize(el, isFullscreen) - if true mouse scroll zoom will be enabled. This is disabled by default to avoid "scroll trap" when scrolling a long dashboard. The old fullscreen handling code is kept to also support the built-in fullscreen control.
  3. Fixed a styling issue for the period labels in split view maps (occured in the MUI-UI transition):

Before:
Screenshot 2021-01-19 at 11 49 35

After:
Screenshot 2021-01-19 at 11 50 38

I've tested that this worked locally - can be tested fully when this fix is included in the maps plugin on the dashboard.

@turban turban merged commit 343690b into master Jan 19, 2021
@turban turban deleted the feat/DHIS2-10252 branch January 19, 2021 12:48
dhis2-bot added a commit that referenced this pull request Jan 19, 2021
@dhis2-bot
chore(release): cut 1.2.6 [skip ci]
4e910ca 
## [1.2.6](v1.2.5...v1.2.6) (2021-01-19)

### Bug Fixes

* allow mouse scroll in fullscreen (DHIS2-10252) ([#1420](#1420)) ([343690b](343690b))
@dhis2-bot
Copy link
Contributor

🎉 This PR is included in version 1.2.6 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@turban turban mentioned this pull request Jan 29, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@janhenrikoverland janhenrikoverland janhenrikoverland approved these changes

@jenniferarnesen jenniferarnesen Awaiting requested review from jenniferarnesen

Assignees
No one assigned
Labels
released
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@turban @dhis2-bot @janhenrikoverland