Potentially addressing Firefox+Windows slow wheel scrolling

bvaughn · Feb 17, 2016 · 24d0002 · 24d0002
1 parent 51794c0
commit 24d0002
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 6 deletions.
diff --git a/dist/react-virtualized.js b/dist/react-virtualized.js
diff --git a/dist/react-virtualized.js.map b/dist/react-virtualized.js.map
diff --git a/es/Grid/Grid.js b/es/Grid/Grid.js
@@ -286,8 +286,10 @@ var Grid = (function (_Component) {
       var scrollTop = _state.scrollTop;
 
       // Make sure any changes to :scrollLeft or :scrollTop get applied
-      if (scrollLeft >= 0 && scrollLeft !== prevState.scrollLeft || scrollTop >= 0 && scrollTop !== prevState.scrollTop) {
+      if (scrollLeft >= 0 && scrollLeft !== prevState.scrollLeft && scrollLeft !== this.refs.scrollingContainer.scrollLeft) {
         this.refs.scrollingContainer.scrollLeft = scrollLeft;
+      }
+      if (scrollTop >= 0 && scrollTop !== prevState.scrollTop && scrollTop !== this.refs.scrollingContainer.scrollTop) {
         this.refs.scrollingContainer.scrollTop = scrollTop;
       }
 

diff --git a/source/Grid/Grid.js b/source/Grid/Grid.js
@@ -224,10 +224,17 @@ export default class Grid extends Component {
 
     // Make sure any changes to :scrollLeft or :scrollTop get applied
     if (
-      (scrollLeft >= 0 && scrollLeft !== prevState.scrollLeft) ||
-      (scrollTop >= 0 && scrollTop !== prevState.scrollTop)
+      scrollLeft >= 0 &&
+      scrollLeft !== prevState.scrollLeft &&
+      scrollLeft !== this.refs.scrollingContainer.scrollLeft
     ) {
       this.refs.scrollingContainer.scrollLeft = scrollLeft
+    }
+    if (
+      scrollTop >= 0 &&
+      scrollTop !== prevState.scrollTop &&
+      scrollTop !== this.refs.scrollingContainer.scrollTop
+    ) {
       this.refs.scrollingContainer.scrollTop = scrollTop
     }
 

diff --git a/source/styles.css b/source/styles.css
@@ -4,6 +4,7 @@
   position: relative;
   overflow: auto;
   outline: 0;
+  scroll-behavior: smooth; /* Improves mouse wheel scroll speed for Firefox on Windows */
   -webkit-overflow-scrolling: touch;
 }
 

diff --git a/styles.css b/styles.css
@@ -4,6 +4,7 @@
   position: relative;
   overflow: auto;
   outline: 0;
+  scroll-behavior: smooth; /* Improves mouse wheel scroll speed for Firefox on Windows */
   -webkit-overflow-scrolling: touch;
 }