PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #3140 from matrix-org/travis/make-breadcrumbs-less-of-a-jerk

Browse source 
Don't boost trackpad users in breadcrumbs
This commit is contained in:
Travis Ralston 2019-06-26 07:13:19 -06:00 committed by GitHub
commit 854cb8a57e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/components/structures/IndicatorScrollbar.js
View file

@ -38,6 +38,8 @@ export default class IndicatorScrollbar extends React.Component {
this.checkOverflow = this.checkOverflow.bind(this); this.checkOverflow = this.checkOverflow.bind(this);
this._scrollElement = null; this._scrollElement = null;
this._autoHideScrollbar = null; this._autoHideScrollbar = null;
this._likelyTrackpadUser = null;
this._checkAgainForTrackpad = 0; // ts in milliseconds to recheck this._likelyTrackpadUser
this.state = { this.state = {
leftIndicatorOffset: 0, leftIndicatorOffset: 0,
@ -129,6 +131,16 @@ export default class IndicatorScrollbar extends React.Component {
// the harshness of the scroll behaviour. Should be a value between 0 and 1. // the harshness of the scroll behaviour. Should be a value between 0 and 1.
const yRetention = 1.0; const yRetention = 1.0;
// Check for trackpad users every so often to avoid boosting their scroll.
// See https://github.com/vector-im/riot-web/issues/10005
const now = new Date().getTime();
if (now >= this._checkAgainForTrackpad) {
this._likelyTrackpadUser = Math.abs(e.deltaX) > 0;
this._checkAgainForTrackpad = now + (15 * 60 * 1000); // 15min
}
const safeToBoost = !this._likelyTrackpadUser;
if (Math.abs(e.deltaX) <= xyThreshold) { if (Math.abs(e.deltaX) <= xyThreshold) {
// HACK: We increase the amount of scroll to counteract smooth scrolling browsers. // HACK: We increase the amount of scroll to counteract smooth scrolling browsers.
// Smooth scrolling browsers (Firefox) use the relative area to determine the scroll // Smooth scrolling browsers (Firefox) use the relative area to determine the scroll
@ -140,7 +152,7 @@ export default class IndicatorScrollbar extends React.Component {
const additionalScroll = e.deltaY < 0 ? -50 : 50; const additionalScroll = e.deltaY < 0 ? -50 : 50;
// noinspection JSSuspiciousNameCombination // noinspection JSSuspiciousNameCombination
const val = Math.abs(e.deltaY) < 25 ? (e.deltaY + additionalScroll) : e.deltaY; const val = Math.abs(e.deltaY) < 25 && safeToBoost ? (e.deltaY + additionalScroll) : e.deltaY;
this._scrollElement.scrollLeft += val * yRetention; this._scrollElement.scrollLeft += val * yRetention;
} }
} }