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

Dashboard: Fixes scrolling issues for Edge browser #17033

Merged
merged 3 commits into from
May 14, 2019
Merged

Dashboard: Fixes scrolling issues for Edge browser #17033

merged 3 commits into from
May 14, 2019

Conversation

jschill
Copy link
Contributor

@jschill jschill commented May 13, 2019

What this PR does / why we need it:
This will fix issue with scrolling the dashboards in MS Edge

Which issue(s) this PR fixes:
Fixes #16796
This can potentially address #16647 as well

@torkelo torkelo changed the title Fix: Scrolling the dashboards in the Edge browser Dashboard: Fixes scrolling issues for Edge browser May 13, 2019
@marefr marefr self-requested a review May 13, 2019 13:13
@torkelo torkelo self-requested a review May 13, 2019 13:31
marefr
marefr approved these changes May 13, 2019
View reviewed changes
Copy link
Contributor

@marefr marefr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works almost too good in Edge now 😄 This is a major improvement! In Firefox I see no difference.

@marefr marefr added this to the 6.2.0 milestone May 13, 2019
@torkelo torkelo merged commit 1001cd7 into master May 14, 2019
@torkelo torkelo deleted the 16796-edge-scrolling-dashboards branch May 14, 2019 05:36
ryantxu added a commit to ryantxu/grafana that referenced this pull request May 14, 2019
@ryantxu
Merge remote-tracking branch 'grafana/master' into direct-series-data
9b400a4 
* grafana/master:
  Gauge: Fix switching orientation issue when switching from BarGauge to Gauge (grafana#17064)
  serverlock: run tests async should be more linear time wise (grafana#17059)
  InfoPopover: Fixes transclude undefined error (grafana#17063)
  Dashboard: Fixes lazy loading & expanding collapsed rows on mobile (grafana#17055)
  fix: Azure Monitor adds missing closing div tag to query editor (grafana#17057)
  Chore: Use executable dir instead of pwd in CLI for isDev check (grafana#16974)
  Search: Set element height to 100% to avoid Chrome 74's overflow (grafana#17054)
  Docs: adds note about removing session storage (grafana#17003)
  Chore: remove use of `== false` (grafana#17036)
  Explore: use @grafana/ui legend (grafana#17027)
  tech: avoid alias for importing models in alerting (grafana#17041)
  DataSourcePlugin: support custom tabs (grafana#16859)
  Dashboard: Fixes scrolling issues for Edge browser (grafana#17033)
  SeriesData: remove color from Field (grafana#17044)
ryantxu added a commit to ryantxu/grafana that referenced this pull request May 14, 2019
@ryantxu
Merge remote-tracking branch 'grafana/master' into extensions
0fd3307 
* grafana/master:
  Gauge: Fix switching orientation issue when switching from BarGauge to Gauge (grafana#17064)
  serverlock: run tests async should be more linear time wise (grafana#17059)
  InfoPopover: Fixes transclude undefined error (grafana#17063)
  Dashboard: Fixes lazy loading & expanding collapsed rows on mobile (grafana#17055)
  fix: Azure Monitor adds missing closing div tag to query editor (grafana#17057)
  Chore: Use executable dir instead of pwd in CLI for isDev check (grafana#16974)
  Search: Set element height to 100% to avoid Chrome 74's overflow (grafana#17054)
  Docs: adds note about removing session storage (grafana#17003)
  Chore: remove use of `== false` (grafana#17036)
  Explore: use @grafana/ui legend (grafana#17027)
  tech: avoid alias for importing models in alerting (grafana#17041)
  DataSourcePlugin: support custom tabs (grafana#16859)
  Dashboard: Fixes scrolling issues for Edge browser (grafana#17033)
  SeriesData: remove color from Field (grafana#17044)
ryantxu added a commit to ryantxu/grafana that referenced this pull request May 14, 2019
@ryantxu
Merge remote-tracking branch 'grafana/master' into backend-service-in…
5ea7137 
…-grafanaui

* grafana/master:
  Gauge: Fix switching orientation issue when switching from BarGauge to Gauge (grafana#17064)
  serverlock: run tests async should be more linear time wise (grafana#17059)
  InfoPopover: Fixes transclude undefined error (grafana#17063)
  Dashboard: Fixes lazy loading & expanding collapsed rows on mobile (grafana#17055)
  fix: Azure Monitor adds missing closing div tag to query editor (grafana#17057)
  Chore: Use executable dir instead of pwd in CLI for isDev check (grafana#16974)
  Search: Set element height to 100% to avoid Chrome 74's overflow (grafana#17054)
  Docs: adds note about removing session storage (grafana#17003)
  Chore: remove use of `== false` (grafana#17036)
  Explore: use @grafana/ui legend (grafana#17027)
  tech: avoid alias for importing models in alerting (grafana#17041)
  DataSourcePlugin: support custom tabs (grafana#16859)
  Dashboard: Fixes scrolling issues for Edge browser (grafana#17033)
  SeriesData: remove color from Field (grafana#17044)
ryantxu added a commit to ryantxu/grafana that referenced this pull request May 14, 2019
@ryantxu
Merge remote-tracking branch 'grafana/master' into reuse-query2
45c6035 
* grafana/master: (33 commits)
  Panels: Fixed alert icon position in panel header (grafana#17070)
  GraphPanel: use SeriesData directly (skip legacy transformation) (grafana#17037)
  Streaming: support streaming in MetricsPanelCtrl (grafana#17034)
  Gauge: Fix switching orientation issue when switching from BarGauge to Gauge (grafana#17064)
  serverlock: run tests async should be more linear time wise (grafana#17059)
  InfoPopover: Fixes transclude undefined error (grafana#17063)
  Dashboard: Fixes lazy loading & expanding collapsed rows on mobile (grafana#17055)
  fix: Azure Monitor adds missing closing div tag to query editor (grafana#17057)
  Chore: Use executable dir instead of pwd in CLI for isDev check (grafana#16974)
  Search: Set element height to 100% to avoid Chrome 74's overflow (grafana#17054)
  Docs: adds note about removing session storage (grafana#17003)
  Chore: remove use of `== false` (grafana#17036)
  Explore: use @grafana/ui legend (grafana#17027)
  tech: avoid alias for importing models in alerting (grafana#17041)
  DataSourcePlugin: support custom tabs (grafana#16859)
  Dashboard: Fixes scrolling issues for Edge browser (grafana#17033)
  SeriesData: remove color from Field (grafana#17044)
  chore: remove x character in explore
  Dashboard: show refresh button in kiosk mode (grafana#17032)
  Devenv: Updated gauge test dashboard
  ...
torkelo pushed a commit that referenced this pull request May 15, 2019
@jschill @torkelo
Dashboard: Fixes scrolling issues for Edge browser (#17033)
98da29f 
* Fix: Only set scrollTop on CustomScroll element when it's needed and move arrow functions out of the props

* Fix: Update snapshots

* Minor refactoring to reuse same functions when rendering custom scrollbar

Fixes #16796

(cherry picked from commit 1001cd7)
@torkelo torkelo mentioned this pull request May 15, 2019
Merged
@ying-jeanne ying-jeanne added the pr/external This PR is from external contributor label Apr 29, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@marefr marefr marefr approved these changes

@torkelo torkelo Awaiting requested review from torkelo

Assignees
No one assigned
Labels
add to changelog pr/external This PR is from external contributor
Projects
None yet
Milestone
6.2.0-beta2
Development

Successfully merging this pull request may close these issues.

Unable to scroll in MS Edge
4 participants
@jschill @marefr @torkelo @ying-jeanne