Tweaks

bvaughn · Jun 18, 2019 · 7a8a1bf · 7a8a1bf
1 parent c035eee
commit 7a8a1bf
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/src/FixedSizeGrid.js b/src/FixedSizeGrid.js
@@ -66,6 +66,8 @@ const FixedSizeGrid = createGridComponent({
         if (scrollLeft >= minOffset && scrollLeft <= maxOffset) {
           return scrollLeft;
         } else if (minOffset > maxOffset) {
+          // Because we only take into account the scrollbar size when calculating minOffset
+          // this value can be larger than maxOffset when at the end of the list
           return minOffset;
         } else if (scrollLeft - minOffset < maxOffset - scrollLeft) {
           return minOffset;
@@ -117,9 +119,9 @@ const FixedSizeGrid = createGridComponent({
       default:
         if (scrollTop >= minOffset && scrollTop <= maxOffset) {
           return scrollTop;
+        } else if (minOffset > maxOffset) {
           // Because we only take into account the scrollbar size when calculating minOffset
           // this value can be larger than maxOffset when at the end of the list
-        } else if (minOffset > maxOffset) {
           return minOffset;
         } else if (scrollTop - minOffset < maxOffset - scrollTop) {
           return minOffset;

diff --git a/src/VariableSizeGrid.js b/src/VariableSizeGrid.js
@@ -274,9 +274,9 @@ const getOffsetForIndexAndAlignment = (
     default:
       if (scrollOffset >= minOffset && scrollOffset <= maxOffset) {
         return scrollOffset;
+      } else if (minOffset > maxOffset) {
         // Because we only take into account the scrollbar size when calculating minOffset
         // this value can be larger than maxOffset when at the end of the list
-      } else if (minOffset > maxOffset) {
         return minOffset;
       } else if (scrollOffset - minOffset < maxOffset - scrollOffset) {
         return minOffset;

diff --git a/src/__tests__/FixedSizeGrid.js b/src/__tests__/FixedSizeGrid.js
@@ -604,7 +604,7 @@ describe('FixedSizeGrid', () => {
       );
     });
 
-    it('should scroll to the correct item for align = "auto" at the end of the grid', () => {
+    it('should scroll to the correct item for align = "auto" at the right hand side of the grid', () => {
       getScrollbarSize.mockImplementation(() => 20);
 
       const rendered = ReactTestRenderer.create(

diff --git a/src/__tests__/VariableSizeGrid.js b/src/__tests__/VariableSizeGrid.js
@@ -224,7 +224,7 @@ describe('VariableSizeGrid', () => {
       );
     });
 
-    it('should scroll to the correct item for align = "auto" at the end of the grid', () => {
+    it('should scroll to the correct item for align = "auto" at the right hand side of the grid', () => {
       getScrollbarSize.mockImplementation(() => 20);
 
       const rendered = ReactTestRenderer.create(