@vaadin/grid 22.0.0-rc1 → 23.0.0-alpha2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/grid",
-  "version": "22.0.0-rc1",
+  "version": "23.0.0-alpha2",
   "publishConfig": {
     "access": "public"
   },
@@ -40,19 +40,19 @@
   "dependencies": {
     "@open-wc/dedupe-mixin": "^1.3.0",
     "@polymer/polymer": "^3.0.0",
-    "@vaadin/checkbox": "22.0.0-rc1",
-    "@vaadin/component-base": "22.0.0-rc1",
-    "@vaadin/text-field": "22.0.0-rc1",
-    "@vaadin/vaadin-lumo-styles": "22.0.0-rc1",
-    "@vaadin/vaadin-material-styles": "22.0.0-rc1",
-    "@vaadin/vaadin-themable-mixin": "22.0.0-rc1"
+    "@vaadin/checkbox": "23.0.0-alpha2",
+    "@vaadin/component-base": "23.0.0-alpha2",
+    "@vaadin/text-field": "23.0.0-alpha2",
+    "@vaadin/vaadin-lumo-styles": "23.0.0-alpha2",
+    "@vaadin/vaadin-material-styles": "23.0.0-alpha2",
+    "@vaadin/vaadin-themable-mixin": "23.0.0-alpha2"
   },
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4",
-    "@vaadin/polymer-legacy-adapter": "22.0.0-rc1",
+    "@vaadin/polymer-legacy-adapter": "23.0.0-alpha2",
     "@vaadin/testing-helpers": "^0.3.2",
     "lit": "^2.0.0",
     "sinon": "^9.2.0"
   },
-  "gitHead": "7b6f44bcd2c0fd415028ace666feeb0fedb1d540"
+  "gitHead": "070f586dead02ca41b66717820c647f48bf1665f"
 }

package/src/array-data-provider.js

@@ -22,7 +22,7 @@ function checkPaths(arrayToCheck, action, items) {
 
   let result = true;
 
-  for (let i in arrayToCheck) {
+  for (const i in arrayToCheck) {
     const path = arrayToCheck[i].path;
 
     // skip simple paths
@@ -73,9 +73,8 @@ function normalizeEmptyValue(value) {
     return '';
   } else if (isNaN(value)) {
     return value.toString();
-  } else {
-    return value;
   }
+  return value;
 }
 
 /**

package/src/vaadin-grid-column-group.js

@@ -162,7 +162,7 @@ class GridColumnGroup extends ColumnBaseMixin(PolymerElement) {
       const childCountDigits = ~~(Math.log(rootColumns.length) / Math.LN10) + 1;
 
       // Final scope for the child columns needs to mind both factors.
-      const scope = Math.pow(10, trailingZeros - childCountDigits);
+      const scope = 10 ** (trailingZeros - childCountDigits);
 
       if (_rootColumns[0] && _rootColumns[0]._order) {
         _rootColumns.sort((a, b) => a._order - b._order);

package/src/vaadin-grid-column-reordering-mixin.js

@@ -3,15 +3,14 @@
  * Copyright (c) 2021 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
-import { GestureEventListeners } from '@polymer/polymer/lib/mixins/gesture-event-listeners.js';
-import { addListener } from '@polymer/polymer/lib/utils/gestures.js';
+import { addListener } from '@vaadin/component-base/src/gestures.js';
 import { updateColumnOrders } from './vaadin-grid-helpers.js';
 
 /**
  * @polymerMixin
  */
 export const ColumnReorderingMixin = (superClass) =>
-  class ColumnReorderingMixin extends GestureEventListeners(superClass) {
+  class ColumnReorderingMixin extends superClass {
     static get properties() {
       return {
         /**
@@ -339,9 +338,8 @@ export const ColumnReorderingMixin = (superClass) =>
       const targetRect = targetCell.getBoundingClientRect();
       if (targetRect.left > sourceCellRect.left) {
         return clientX > targetRect.right - sourceCellRect.width;
-      } else {
-        return clientX < targetRect.left + sourceCellRect.width;
       }
+      return clientX < targetRect.left + sourceCellRect.width;
     }
 
     /**
@@ -371,9 +369,8 @@ export const ColumnReorderingMixin = (superClass) =>
         }
         if (candidate.parentElement === draggedColumn.parentElement) {
           return candidate;
-        } else {
-          return targetCell._column;
         }
+        return targetCell._column;
       }
     }
 

package/src/vaadin-grid-column-resizing-mixin.js

@@ -3,14 +3,13 @@
  * Copyright (c) 2021 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
-import { GestureEventListeners } from '@polymer/polymer/lib/mixins/gesture-event-listeners.js';
-import { addListener } from '@polymer/polymer/lib/utils/gestures.js';
+import { addListener } from '@vaadin/component-base/src/gestures.js';
 
 /**
  * @polymerMixin
  */
 export const ColumnResizingMixin = (superClass) =>
-  class ColumnResizingMixin extends GestureEventListeners(superClass) {
+  class ColumnResizingMixin extends superClass {
     ready() {
       super.ready();
       const scroller = this.$.scroller;

package/src/vaadin-grid-column.js

@@ -30,9 +30,8 @@ export const ColumnBaseMixin = (superClass) =>
             const parent = this.parentNode;
             if (parent && parent.localName === 'vaadin-grid-column-group') {
               return parent.resizable || false;
-            } else {
-              return false;
             }
+            return false;
           }
         },
 
@@ -197,7 +196,9 @@ export const ColumnBaseMixin = (superClass) =>
       // Adds the column cells to the grid after the column is attached
       requestAnimationFrame(() => {
         // Skip if the column has been detached
-        if (!this._grid) return;
+        if (!this._grid) {
+          return;
+        }
 
         this._allCells.forEach((cell) => {
           if (!cell._content.parentNode) {
@@ -214,7 +215,9 @@ export const ColumnBaseMixin = (superClass) =>
       // Removes the column cells from the grid after the column is detached
       requestAnimationFrame(() => {
         // Skip if the column has been attached again
-        if (this._grid) return;
+        if (this._grid) {
+          return;
+        }
 
         this._allCells.forEach((cell) => {
           if (cell._content.parentNode) {
@@ -380,12 +383,10 @@ export const ColumnBaseMixin = (superClass) =>
         } else if (textAlign === 'end') {
           textAlignFallback = 'right';
         }
-      } else {
-        if (textAlign === 'start') {
-          textAlignFallback = 'right';
-        } else if (textAlign === 'end') {
-          textAlignFallback = 'left';
-        }
+      } else if (textAlign === 'start') {
+        textAlignFallback = 'right';
+      } else if (textAlign === 'end') {
+        textAlignFallback = 'left';
       }
 
       this._allCells.forEach((cell) => {
@@ -450,7 +451,9 @@ export const ColumnBaseMixin = (superClass) =>
       cells.forEach((cell) => {
         const model = this._grid.__getRowModel(cell.parentElement);
 
-        if (!renderer) return;
+        if (!renderer) {
+          return;
+        }
 
         if (cell._renderer !== renderer) {
           this._clearCellContent(cell);
@@ -558,7 +561,9 @@ export const ColumnBaseMixin = (superClass) =>
      * @protected
      */
     _defaultHeaderRenderer() {
-      if (!this.path) return;
+      if (!this.path) {
+        return;
+      }
 
       this.__setTextContent(this._headerCell._content, this._generateHeader(this.path));
     }
@@ -570,7 +575,9 @@ export const ColumnBaseMixin = (superClass) =>
      * @protected
      */
     _defaultRenderer(root, _owner, { item }) {
-      if (!this.path) return;
+      if (!this.path) {
+        return;
+      }
 
       this.__setTextContent(root, this.get(this.path, item));
     }

package/src/vaadin-grid-data-provider-mixin.js

@@ -350,10 +350,8 @@ export const DataProviderMixin = (superClass) =>
         this.dataProvider(params, (items, size) => {
           if (size !== undefined) {
             cache.size = size;
-          } else {
-            if (params.parentItem) {
-              cache.size = items.length;
-            }
+          } else if (params.parentItem) {
+            cache.size = items.length;
           }
 
           const currentItems = Array.from(this.$.items.children).map((row) => row._item);

package/src/vaadin-grid-dynamic-columns-mixin.js

@@ -54,9 +54,8 @@ export const DynamicColumnsMixin = (superClass) =>
         .map((col) => {
           if (col.localName === 'vaadin-grid-column-group') {
             return this._getChildColumns(col);
-          } else {
-            return [col];
           }
+          return [col];
         })
         .reduce((prev, curr) => {
           return prev.concat(curr);
@@ -66,14 +65,12 @@ export const DynamicColumnsMixin = (superClass) =>
     /** @private */
     _getColumnTree() {
       const rootColumns = FlattenedNodesObserver.getFlattenedNodes(this).filter(this._isColumnElement);
-      const columnTree = [];
+      const columnTree = [rootColumns];
 
-      for (let c = rootColumns; ; ) {
-        columnTree.push(c);
-        if (!this._hasColumnGroups(c)) {
-          break;
-        }
+      let c = rootColumns;
+      while (this._hasColumnGroups(c)) {
         c = this._flattenColumnGroups(c);
+        columnTree.push(c);
       }
 
       return columnTree;

package/src/vaadin-grid-keyboard-navigation-mixin.js

@@ -160,6 +160,8 @@ export const KeyboardNavigationMixin = (superClass) =>
         case ' ':
           keyGroup = 'Space';
           break;
+        default:
+          break;
       }
 
       this._detectInteracting(e);
@@ -240,28 +242,24 @@ export const KeyboardNavigationMixin = (superClass) =>
           if (this.__rowFocusMode) {
             // "If focus is on a row, moves focus to the first row. If focus is in the first row, focus does not move."
             dy = -Infinity;
+          } else if (e.ctrlKey) {
+            // "If focus is on a cell, moves focus to the first cell in the column. If focus is in the first row, focus does not move."
+            dy = -Infinity;
           } else {
-            if (e.ctrlKey) {
-              // "If focus is on a cell, moves focus to the first cell in the column. If focus is in the first row, focus does not move."
-              dy = -Infinity;
-            } else {
-              // "If focus is on a cell, moves focus to the first cell in the row. If focus is in the first cell of the row, focus does not move."
-              dx = -Infinity;
-            }
+            // "If focus is on a cell, moves focus to the first cell in the row. If focus is in the first cell of the row, focus does not move."
+            dx = -Infinity;
           }
           break;
         case 'End':
           if (this.__rowFocusMode) {
             // "If focus is on a row, moves focus to the last row. If focus is in the last row, focus does not move."
             dy = Infinity;
+          } else if (e.ctrlKey) {
+            // "If focus is on a cell, moves focus to the last cell in the column. If focus is in the last row, focus does not move."
+            dy = Infinity;
           } else {
-            if (e.ctrlKey) {
-              // "If focus is on a cell, moves focus to the last cell in the column. If focus is in the last row, focus does not move."
-              dy = Infinity;
-            } else {
-              // "If focus is on a cell, moves focus to the last cell in the row. If focus is in the last cell of the row, focus does not move."
-              dx = Infinity;
-            }
+            // "If focus is on a cell, moves focus to the last cell in the row. If focus is in the last cell of the row, focus does not move."
+            dx = Infinity;
           }
           break;
         case 'ArrowDown':
@@ -276,6 +274,8 @@ export const KeyboardNavigationMixin = (superClass) =>
         case 'PageUp':
           dy = -visibleItemsCount;
           break;
+        default:
+          break;
       }
 
       const activeRow = e.composedPath().find((el) => this.__isRow(el));
@@ -296,13 +296,12 @@ export const KeyboardNavigationMixin = (superClass) =>
             // "If focus is on a collapsed row, expands the row."
             this.expandItem(activeRow._item);
             return;
-          } else {
-            // "If focus is on an expanded row or is on a row that does not have child rows,
-            // moves focus to the first cell in the row."
-            this.__rowFocusMode = false;
-            this._onCellNavigation(activeRow.firstElementChild, 0, 0);
-            return;
           }
+          // "If focus is on an expanded row or is on a row that does not have child rows,
+          // moves focus to the first cell in the row."
+          this.__rowFocusMode = false;
+          this._onCellNavigation(activeRow.firstElementChild, 0, 0);
+          return;
         }
       } else if (key === backwardsKey) {
         // "Left Arrow:"
@@ -354,9 +353,8 @@ export const KeyboardNavigationMixin = (superClass) =>
       // Body rows have index property, otherwise DOM child index of the row is used.
       if (rowGroup === this.$.items) {
         return bodyFallbackIndex !== undefined ? bodyFallbackIndex : row.index;
-      } else {
-        return this.__getIndexOfChildElement(row);
       }
+      return this.__getIndexOfChildElement(row);
     }
 
     /**
@@ -392,51 +390,47 @@ export const KeyboardNavigationMixin = (superClass) =>
         this.toggleAttribute('navigating', true);
 
         return { dstRow: activeRowGroup.children[dstRowIndex] };
-      } else {
-        // Navigating body rows
-
-        let dstIsRowDetails = false;
-        if (activeCell) {
-          const isRowDetails = this.__isDetailsCell(activeCell);
-          // Row details navigation logic
-          if (activeRowGroup === this.$.items) {
-            const item = activeRow._item;
-            const dstItem = this._cache.getItemForIndex(dstRowIndex);
-            // Should we navigate to row details?
-            if (isRowDetails) {
-              dstIsRowDetails = dy === 0;
-            } else {
-              dstIsRowDetails =
-                (dy === 1 && this._isDetailsOpened(item)) ||
-                (dy === -1 && dstRowIndex !== currentRowIndex && this._isDetailsOpened(dstItem));
-            }
-            // Should we navigate between details and regular cells of the same row?
-            if (
-              dstIsRowDetails !== isRowDetails &&
-              ((dy === 1 && dstIsRowDetails) || (dy === -1 && !dstIsRowDetails))
-            ) {
-              dstRowIndex = currentRowIndex;
-            }
+      }
+      // Navigating body rows
+
+      let dstIsRowDetails = false;
+      if (activeCell) {
+        const isRowDetails = this.__isDetailsCell(activeCell);
+        // Row details navigation logic
+        if (activeRowGroup === this.$.items) {
+          const item = activeRow._item;
+          const dstItem = this._cache.getItemForIndex(dstRowIndex);
+          // Should we navigate to row details?
+          if (isRowDetails) {
+            dstIsRowDetails = dy === 0;
+          } else {
+            dstIsRowDetails =
+              (dy === 1 && this._isDetailsOpened(item)) ||
+              (dy === -1 && dstRowIndex !== currentRowIndex && this._isDetailsOpened(dstItem));
+          }
+          // Should we navigate between details and regular cells of the same row?
+          if (dstIsRowDetails !== isRowDetails && ((dy === 1 && dstIsRowDetails) || (dy === -1 && !dstIsRowDetails))) {
+            dstRowIndex = currentRowIndex;
           }
         }
+      }
 
-        // Ensure correct vertical scroll position, destination row is visible
-        this._ensureScrolledToIndex(dstRowIndex);
+      // Ensure correct vertical scroll position, destination row is visible
+      this._ensureScrolledToIndex(dstRowIndex);
 
-        // When scrolling with repeated keydown, sometimes FocusEvent listeners
-        // are too late to update _focusedItemIndex. Ensure next keydown
-        // listener invocation gets updated _focusedItemIndex value.
-        this._focusedItemIndex = dstRowIndex;
+      // When scrolling with repeated keydown, sometimes FocusEvent listeners
+      // are too late to update _focusedItemIndex. Ensure next keydown
+      // listener invocation gets updated _focusedItemIndex value.
+      this._focusedItemIndex = dstRowIndex;
 
-        // This has to be set after scrolling, otherwise it can be removed by
-        // `_preventScrollerRotatingCellFocus(row, index)` during scrolling.
-        this.toggleAttribute('navigating', true);
+      // This has to be set after scrolling, otherwise it can be removed by
+      // `_preventScrollerRotatingCellFocus(row, index)` during scrolling.
+      this.toggleAttribute('navigating', true);
 
-        return {
-          dstRow: [...activeRowGroup.children].find((el) => !el.hidden && el.index === dstRowIndex),
-          dstIsRowDetails
-        };
-      }
+      return {
+        dstRow: [...activeRowGroup.children].find((el) => !el.hidden && el.index === dstRowIndex),
+        dstIsRowDetails
+      };
     }
 
     /**
@@ -499,7 +493,10 @@ export const KeyboardNavigationMixin = (superClass) =>
           this._focusedColumnOrder = undefined;
         }
 
-        const columnIndexByOrder = dstColumns.reduce((acc, col, i) => ((acc[col._order] = i), acc), {});
+        const columnIndexByOrder = dstColumns.reduce((acc, col, i) => {
+          acc[col._order] = i;
+          return acc;
+        }, {});
         const dstColumnIndex = columnIndexByOrder[dstSortedColumnOrders[dstOrderedColumnIndex]];
         const dstCell = dstRow.children[dstColumnIndex];
 
@@ -526,6 +523,8 @@ export const KeyboardNavigationMixin = (superClass) =>
         case 'F2':
           wantInteracting = !this.interacting;
           break;
+        default:
+          break;
       }
 
       const { cell } = this._getGridEventLocation(e);
@@ -730,7 +729,9 @@ export const KeyboardNavigationMixin = (superClass) =>
      * @param {HTMLElement} focusTarget
      */
     _updateGridSectionFocusTarget(focusTarget) {
-      if (!focusTarget) return;
+      if (!focusTarget) {
+        return;
+      }
 
       const section = this._getGridSectionFromFocusTarget(focusTarget);
       const isInteractingWithinActiveSection = this.interacting && section === this._activeRowGroup;
@@ -888,9 +889,15 @@ export const KeyboardNavigationMixin = (superClass) =>
      * @private
      */
     _getGridSectionFromFocusTarget(focusTarget) {
-      if (focusTarget === this._headerFocusable) return this.$.header;
-      if (focusTarget === this._itemsFocusable) return this.$.items;
-      if (focusTarget === this._footerFocusable) return this.$.footer;
+      if (focusTarget === this._headerFocusable) {
+        return this.$.header;
+      }
+      if (focusTarget === this._itemsFocusable) {
+        return this.$.items;
+      }
+      if (focusTarget === this._footerFocusable) {
+        return this.$.footer;
+      }
       return null;
     }
 

package/src/vaadin-grid-row-details-mixin.js

@@ -106,7 +106,6 @@ export const RowDetailsMixin = (superClass) =>
         // Re-renders the row to open the details when a row details renderer is provided.
         if (rowDetailsRenderer && this._isDetailsOpened(row._item)) {
           this._updateItem(row, row._item);
-          return;
         }
       });
     }

package/src/vaadin-grid-scroll-mixin.js

@@ -31,6 +31,11 @@ export const ScrollMixin = (superClass) =>
       };
     }
 
+    /** @private */
+    get _scrollTop() {
+      return this.$.table.scrollTop;
+    }
+
     /**
      * Override (from iron-scroll-target-behavior) to avoid document scroll
      * @private
@@ -39,11 +44,6 @@ export const ScrollMixin = (superClass) =>
       this.$.table.scrollTop = top;
     }
 
-    /** @private */
-    get _scrollTop() {
-      return this.$.table.scrollTop;
-    }
-
     /** @private */
     get _scrollLeft() {
       return this.$.table.scrollLeft;

package/src/vaadin-grid-sort-mixin.js

@@ -88,15 +88,13 @@ export const SortMixin = (superClass) =>
           this._sorters.unshift(sorter);
         }
         this.__updateSortOrders();
-      } else {
-        if (sorter.direction) {
-          const otherSorters = this._sorters.filter((s) => s != sorter);
-          this._sorters = [sorter];
-          otherSorters.forEach((sorter) => {
-            sorter._order = null;
-            sorter.direction = null;
-          });
-        }
+      } else if (sorter.direction) {
+        const otherSorters = this._sorters.filter((s) => s != sorter);
+        this._sorters = [sorter];
+        otherSorters.forEach((sorter) => {
+          sorter._order = null;
+          sorter.direction = null;
+        });
       }
     }
 

package/src/vaadin-grid.d.ts

@@ -253,20 +253,16 @@ export interface GridEventMap<TItem> extends HTMLElementEventMap, GridCustomEven
  * in the second argument of the data provider callback:__
  *
  * ```javascript
- * grid.dataProvider = function(params, callback) {
- *   const url = 'https://api.example/data' +
- *       '?page=' + params.page +        // the requested page index
- *       '&per_page=' + params.pageSize; // number of items on the page
- *   const xhr = new XMLHttpRequest();
- *   xhr.onload = function() {
- *     const response = JSON.parse(xhr.responseText);
- *     callback(
- *       response.employees, // requested page of items
- *       response.totalSize  // total number of items
- *     );
- *   };
- *   xhr.open('GET', url, true);
- *   xhr.send();
+ * grid.dataProvider = ({page, pageSize}, callback) => {
+ *   // page: the requested page index
+ *   // pageSize: number of items on one page
+ *   const url = `https://api.example/data?page=${page}&per_page=${pageSize}`;
+ *
+ *   fetch(url)
+ *     .then((res) => res.json())
+ *     .then(({ employees, totalSize }) => {
+ *       callback(employees, totalSize);
+ *     });
  * };
  * ```
  *
@@ -274,17 +270,12 @@ export interface GridEventMap<TItem> extends HTMLElementEventMap, GridCustomEven
  *
  * ```javascript
  * grid.size = 200; // The total number of items
- * grid.dataProvider = function(params, callback) {
- *   const url = 'https://api.example/data' +
- *       '?page=' + params.page +        // the requested page index
- *       '&per_page=' + params.pageSize; // number of items on the page
- *   const xhr = new XMLHttpRequest();
- *   xhr.onload = function() {
- *     const response = JSON.parse(xhr.responseText);
- *     callback(response.employees);
- *   };
- *   xhr.open('GET', url, true);
- *   xhr.send();
+ * grid.dataProvider = ({page, pageSize}, callback) => {
+ *   const url = `https://api.example/data?page=${page}&per_page=${pageSize}`;
+ *
+ *   fetch(url)
+ *     .then((res) => res.json())
+ *     .then((resJson) => callback(resJson.employees));
  * };
  * ```
  *

package/src/vaadin-grid.js

@@ -139,20 +139,16 @@ import { StylingMixin } from './vaadin-grid-styling-mixin.js';
  * in the second argument of the data provider callback:__
  *
  * ```javascript
- * grid.dataProvider = function(params, callback) {
- *   const url = 'https://api.example/data' +
- *       '?page=' + params.page +        // the requested page index
- *       '&per_page=' + params.pageSize; // number of items on the page
- *   const xhr = new XMLHttpRequest();
- *   xhr.onload = function() {
- *     const response = JSON.parse(xhr.responseText);
- *     callback(
- *       response.employees, // requested page of items
- *       response.totalSize  // total number of items
- *     );
- *   };
- *   xhr.open('GET', url, true);
- *   xhr.send();
+ * grid.dataProvider = ({page, pageSize}, callback) => {
+ *   // page: the requested page index
+ *   // pageSize: number of items on one page
+ *   const url = `https://api.example/data?page=${page}&per_page=${pageSize}`;
+ *
+ *   fetch(url)
+ *     .then((res) => res.json())
+ *     .then(({ employees, totalSize }) => {
+ *       callback(employees, totalSize);
+ *     });
  * };
  * ```
  *
@@ -160,17 +156,12 @@ import { StylingMixin } from './vaadin-grid-styling-mixin.js';
  *
  * ```javascript
  * grid.size = 200; // The total number of items
- * grid.dataProvider = function(params, callback) {
- *   const url = 'https://api.example/data' +
- *       '?page=' + params.page +        // the requested page index
- *       '&per_page=' + params.pageSize; // number of items on the page
- *   const xhr = new XMLHttpRequest();
- *   xhr.onload = function() {
- *     const response = JSON.parse(xhr.responseText);
- *     callback(response.employees);
- *   };
- *   xhr.open('GET', url, true);
- *   xhr.send();
+ * grid.dataProvider = ({page, pageSize}, callback) => {
+ *   const url = `https://api.example/data?page=${page}&per_page=${pageSize}`;
+ *
+ *   fetch(url)
+ *     .then((res) => res.json())
+ *     .then((resJson) => callback(resJson.employees));
  * };
  * ```
  *
@@ -552,7 +543,9 @@ class Grid extends ElementMixin(
 
   /** @private */
   __getDistributedWidth(col, innerColumn) {
-    if (col == null || col === this) return 0;
+    if (col == null || col === this) {
+      return 0;
+    }
 
     const columnWidth = Math.max(this.__getIntrinsicWidth(col), this.__getDistributedWidth(col.parentElement, col));
 
@@ -694,6 +687,7 @@ class Grid extends ElementMixin(
    * @param {boolean} noNotify
    * @protected
    */
+  // eslint-disable-next-line max-params
   _updateRow(row, columns, section, isColumnRow, noNotify) {
     section = section || 'body';
 
@@ -802,13 +796,12 @@ class Grid extends ElementMixin(
           // -> row should be visible
           return true;
         }
-      } else {
-        if (column.footerRenderer) {
-          // The cell is the footer cell of a column that has a footer renderer
-          // -> row should be visible
-          return true;
-        }
+      } else if (column.footerRenderer) {
+        // The cell is the footer cell of a column that has a footer renderer
+        // -> row should be visible
+        return true;
       }
+      return false;
     });
 
     if (row.hidden !== !visibleRowCells.length) {