Only cache styles if not scrolling AND offsets are not adjusted

bvaughn · Jul 7, 2017 · fe3a3cb · fe3a3cb
1 parent 8136a16
commit fe3a3cb
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 1 deletion.
diff --git a/source/Grid/Grid.jest.js b/source/Grid/Grid.jest.js
@@ -1355,6 +1355,43 @@ describe('Grid', () => {
       ])
     })
 
+    it('should not cache cells if the offsets are not adjusted', () => {
+      const cellRendererCalls = []
+      function cellRenderer ({ columnIndex, key, rowIndex, style }) {
+        cellRendererCalls.push({ columnIndex, rowIndex })
+        return defaultCellRenderer({ columnIndex, key, rowIndex, style })
+      }
+      const props = {
+        cellRenderer,
+        columnWidth: 100,
+        height: 40,
+        rowHeight: 20,
+        rowCount: 100000,
+        scrollToRow: 0,
+        width: 100
+      }
+
+      render(getMarkup({
+        ...props,
+        scrollToRow: 0
+      }))
+      expect(cellRendererCalls).toEqual([
+        { columnIndex: 0, rowIndex: 0 },
+        { columnIndex: 0, rowIndex: 1 }
+      ])
+
+      cellRendererCalls.splice(0)
+
+      render(getMarkup({
+        ...props,
+        scrollToRow: 1
+      }))
+      expect(cellRendererCalls).toEqual([
+        { columnIndex: 0, rowIndex: 0 },
+        { columnIndex: 0, rowIndex: 1 }
+      ])
+    })
+
     it('should cache a cell once it has been rendered while scrolling', () => {
       const cellRendererCalls = []
       function cellRenderer ({ columnIndex, key, rowIndex, style }) {

diff --git a/source/Grid/defaultCellRangeRenderer.js b/source/Grid/defaultCellRangeRenderer.js
@@ -37,7 +37,7 @@ export default function defaultCellRangeRenderer ({
     rowSizeAndPositionManager.areOffsetsAdjusted()
   )
 
-  const canCacheStyle = !isScrolling || !areOffsetsAdjusted
+  const canCacheStyle = !isScrolling && !areOffsetsAdjusted;
 
   for (let rowIndex = rowStartIndex; rowIndex <= rowStopIndex; rowIndex++) {
     let rowDatum = rowSizeAndPositionManager.getSizeAndPositionOfCell(rowIndex)