Skip to content

Improved browser compatibility for table scroll #5051

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

Merged
merged 4 commits into from
Aug 11, 2020
Merged

Improved browser compatibility for table scroll #5051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
202a997
Improved browser compatibility for table scroll
Aug 6, 2020
67c96d3
Changed syntax to follow ES5
Aug 6, 2020
7f983c5
Changed the table scroll tests to use 'wheel' instead of 'mousewheel'
Aug 7, 2020
32d4fed
Changed 'mousewheel' event to 'wheel' in mouse_event.js
Aug 7, 2020
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
3 changes: 2 additions & 1 deletion src/traces/table/plot.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,14 @@ module.exports = function plot(gd, wrappedTraceHolders) {
.classed(c.cn.tableControlView, true)
.style('box-sizing', 'content-box');
if(dynamic) {
var wheelEvent = 'onwheel' in document ? 'wheel' : 'mousewheel';
cvEnter
.on('mousemove', function(d) {
tableControlView
.filter(function(dd) {return d === dd;})
.call(renderScrollbarKit, gd);
})
.on('mousewheel', function(d) {
.on(wheelEvent, function(d) {
if(d.scrollbarState.wheeling) return;
d.scrollbarState.wheeling = true;
var newY = d.scrollY + d3.event.deltaY;
Expand Down
6 changes: 2 additions & 4 deletions test/jasmine/assets/mouse_event.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,8 @@ module.exports = function(type, x, y, opts) {
var el = (opts && opts.element) || document.elementFromPoint(x, y);
var ev;

if(type === 'scroll' || type === 'mousewheel') {
// somehow table needs this to be mouswheel but others need wheel.
// yet they all work the same in the browser?
type = (type === 'scroll') ? 'wheel' : 'mousewheel';
if(type === 'scroll' || type === 'wheel') {
type = 'wheel';
ev = new window.WheelEvent(type, Lib.extendFlat({}, fullOpts, opts));
} else {
ev = new window.MouseEvent(type, fullOpts);
Expand Down
4 changes: 2 additions & 2 deletions test/jasmine/tests/table_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ describe('table', function() {
gdWheelEventCount = 0;
Plotly.plot(gd, mockCopy.data, mockCopy.layout)
.then(function() {
gd.addEventListener('mousewheel', function(evt) {
gd.addEventListener('wheel', function(evt) {
gdWheelEventCount++;
// make sure we don't *really* scroll the page.
// that would be annoying!
Expand All @@ -440,7 +440,7 @@ describe('table', function() {

function scroll(pos, dy) {
mouseEvent('mousemove', pos.x, pos.y);
mouseEvent('mousewheel', pos.x, pos.y, {deltaX: 0, deltaY: dy});
mouseEvent('wheel', pos.x, pos.y, {deltaX: 0, deltaY: dy});
}

it('bubbles scroll events iff they did not scroll a table', function() {
Expand Down