fix(grid): fix VirtualTable with non-standard browser zooming (#1243)

DevExpress · Jul 16, 2018 · 412ba38 · 412ba38
1 parent adc2d19
commit 412ba38
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/packages/dx-react-grid/src/components/table-layout/virtual-table-layout.jsx b/packages/dx-react-grid/src/components/table-layout/virtual-table-layout.jsx
@@ -87,8 +87,8 @@ export class VirtualTableLayout extends React.PureComponent {
     // NOTE: prevent iOS to flicker in bounces
     if (node.scrollTop < 0 ||
       node.scrollLeft < 0 ||
-      node.scrollLeft + node.clientWidth > node.scrollWidth ||
-      node.scrollTop + node.clientHeight > node.scrollHeight) {
+      node.scrollLeft + node.clientWidth > Math.max(node.scrollWidth, node.clientWidth) ||
+      node.scrollTop + node.clientHeight > Math.max(node.scrollHeight, node.clientHeight)) {
       return;
     }
 

diff --git a/packages/dx-vue-grid/src/components/table-layout/virtual-table-layout.js b/packages/dx-vue-grid/src/components/table-layout/virtual-table-layout.js
@@ -141,8 +141,8 @@ export const VirtualTableLayout = {
       // NOTE: prevent iOS to flicker in bounces
       if (node.scrollTop < 0 ||
         node.scrollLeft < 0 ||
-        node.scrollLeft + node.clientWidth > node.scrollWidth ||
-        node.scrollTop + node.clientHeight > node.scrollHeight) {
+        node.scrollLeft + node.clientWidth > Math.max(node.scrollWidth, node.clientWidth) ||
+        node.scrollTop + node.clientHeight > Math.max(node.scrollHeight, node.clientHeight)) {
         return;
       }