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: improved mobile handling (DHIS2-10413) #1459

Merged
merged 16 commits into from
Feb 25, 2021
Merged

fix: improved mobile handling (DHIS2-10413) #1459

merged 16 commits into from
Feb 25, 2021

Conversation

turban
Copy link
Contributor

@turban turban commented Feb 5, 2021 •
edited
Loading

Partly fixes: https://jira.dhis2.org/browse/DHIS2-10413 and https://jira.dhis2.org/browse/DHIS2-10512

Dependant on: dhis2/maps-gl#276

This PR changes the fullscreen/resize handling for dashboard/plugin maps.

Logic:

  • When the user is entering fullscreen, we leave the map view as it is. When the user is leaving fullscreen, we set the map view to cover the combined layer bounds (DHIS2-10512)
  • By default scroll wheel zoom is disabled for plugin maps, if entering fullscreen, we enable it again. Back to disabled when leaving fullscreen.
  • By default multiTouch is enabled for plugin maps (i.e. the maps needs to be panned by two fingers to avoid a page scroll trap). When entering fullscreen, we disable multi touch to allow "normal" touch interaction. When leaving multi touch is enabled again.

The PR also includes a popup style fix:

Before this PR:
Screenshot 2021-02-05 at 10 49 25

After this PR:
Screenshot 2021-02-05 at 10 48 04

@turban turban marked this pull request as draft February 5, 2021 10:41
@turban turban changed the title fix: improved mobile handling fix: improved mobile handling (DHIS2-10413) Feb 5, 2021
@turban turban added the WIP label Feb 5, 2021
@turban turban removed the WIP label Feb 24, 2021
@turban turban marked this pull request as ready for review February 24, 2021 16:53
@turban turban marked this pull request as draft February 24, 2021 17:03
@turban turban marked this pull request as ready for review February 25, 2021 09:03
@turban
Copy link
Contributor Author

turban commented Feb 25, 2021

Upgraded maps-gl dependency after dhis2/maps-gl#276 was merged.

edoardo
edoardo approved these changes Feb 25, 2021
View reviewed changes
src/util/map.js Show resolved Hide resolved
@turban turban merged commit e9f5995 into master Feb 25, 2021
@turban turban deleted the fix/DHIS2-10413 branch February 25, 2021 09:55
dhis2-bot added a commit that referenced this pull request Feb 25, 2021
@dhis2-bot
chore(release): cut 1.6.2 [skip ci]
63ff013 
## [1.6.2](v1.6.1...v1.6.2) (2021-02-25)

### Bug Fixes

* improved mobile handling (DHIS2-10413) ([#1459](#1459)) ([e9f5995](e9f5995))
@dhis2-bot
Copy link
Contributor

🎉 This PR is included in version 1.6.2 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@edoardo edoardo edoardo approved these changes

@jenniferarnesen jenniferarnesen Awaiting requested review from jenniferarnesen

@martinkrulltott martinkrulltott Awaiting requested review from martinkrulltott

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 @edoardo