deblan-mirror/Choices
deblan-mirror/Choices
1
0
Fork 0
mirror of https://github.com/Choices-js/Choices.git synced 2024-06-01 13:32:23 +02:00
Code Issues Projects Releases Wiki Activity

Resolve janky scrolling

Browse source
This commit is contained in:
Josh Johnson 2017-12-18 12:17:35 +00:00
parent 9777287b92
commit f54a81f7f4
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/scripts/src/choices.js
View file

@ -1437,7 +1437,7 @@ class Choices {
if (nextEl) { if (nextEl) {
// We prevent default to stop the cursor moving // We prevent default to stop the cursor moving
// when pressing the arrow // when pressing the arrow
if (!isScrolledIntoView(nextEl, this.choiceList, directionInt)) { if (!isScrolledIntoView(nextEl, this.choiceList.element, directionInt)) {
this._scrollToChoice(nextEl, directionInt); this._scrollToChoice(nextEl, directionInt);
} }
this._highlightChoice(nextEl); this._highlightChoice(nextEl);
@ -1773,20 +1773,20 @@ class Choices {
return; return;
} }
const dropdownHeight = this.choiceList.height; const dropdownHeight = this.choiceList.element.offsetHeight;
const choiceHeight = choice.offsetHeight; const choiceHeight = choice.offsetHeight;
// Distance from bottom of element to top of parent // Distance from bottom of element to top of parent
const choicePos = choice.offsetTop + choiceHeight; const choicePos = choice.offsetTop + choiceHeight;
// Scroll position of dropdown // Scroll position of dropdown
const containerScrollPos = this.choiceList.scrollPos + dropdownHeight; const containerScrollPos = this.choiceList.element.scrollTop + dropdownHeight;
// Difference between the choice and scroll position // Difference between the choice and scroll position
const endPoint = direction > 0 ? ( const endPoint = direction > 0 ? (
(this.choiceList.scrollPos + choicePos) - containerScrollPos) : (this.choiceList.element.scrollTop + choicePos) - containerScrollPos
choice.offsetTop; ) : choice.offsetTop;
const animateScroll = () => { const animateScroll = () => {
const strength = SCROLLING_SPEED; const strength = SCROLLING_SPEED;
const choiceListScrollTop = this.choiceList.scrollPos; const choiceListScrollTop = this.choiceList.element.scrollTop;
let continueAnimation = false; let continueAnimation = false;
let easing; let easing;
let distance; let distance;