@refinitiv-ui/efx-grid 6.0.91 → 6.0.92

package/lib/core/es6/grid/LayoutGrid.js

@@ -36,8 +36,8 @@ import HScrollbar from "./components/HScrollbar.js";
  * @param {Object=} options
  * @extends {ElementWrapper}
  */
-var LayoutGrid = function (options) {
-	var _t = this;
+let LayoutGrid = function (options) {
+	let _t = this;
 
 	_t._onMouseMove = _t._onMouseMove.bind(_t);
 	_t._onMouseOut = _t._onMouseOut.bind(_t);
@@ -290,7 +290,7 @@ LayoutGrid.prototype.dispose = function () {
 
 	this._ctxRows.dispose();
 	this._stretchedCells.dispose();
-	for (var i = this._columns.length; --i >= 0; ) {
+	for (let i = this._columns.length; --i >= 0; ) {
 		this._columns[i].dispose();
 	}
 
@@ -327,7 +327,7 @@ LayoutGrid.prototype.setWidth = function (px) {
 		return false;
 	}
 
-	var changes = this._trackX.setTrackSize(px - this._rightSpaceSize); // WARNING: Perform scalling instead of setting width directly
+	let changes = this._trackX.setTrackSize(px - this._rightSpaceSize); // WARNING: Perform scalling instead of setting width directly
 
 	if (changes == null) {
 		return false;
@@ -359,7 +359,7 @@ LayoutGrid.prototype.setHeight = function (px) {
 		return false;
 	}
 
-	var changes = this._trackY.setTrackSize(px); // WARNING: Perform scalling instead of setting height directly
+	let changes = this._trackY.setTrackSize(px); // WARNING: Perform scalling instead of setting height directly
 
 	if (changes == null) {
 		return true;
@@ -403,24 +403,24 @@ LayoutGrid.prototype.hitTest = function (x, y, opt_omitSpan) {
 		return null;
 	}
 
-	var hitX = this._trackX.hitTest(x);
+	let hitX = this._trackX.hitTest(x);
 
 	if (hitX < 0) {
 		return null;
 	}
 
-	var hitY = this._trackY.hitTest(y);
+	let hitY = this._trackY.hitTest(y);
 
 	if (hitY < 0) {
 		return null;
 	}
 
-	var result = {};
+	let result = {};
 	result["colIndex"] = hitX;
 	result["rowIndex"] = hitY;
 
 	if (opt_omitSpan !== true) {
-		var cellSpan = this._cellSpans.getOccupyingSpan(hitX, hitY);
+		let cellSpan = this._cellSpans.getOccupyingSpan(hitX, hitY);
 
 		if (cellSpan) {
 			result["colIndex"] = cellSpan.indexX;
@@ -495,12 +495,12 @@ LayoutGrid.prototype.getDefaultRowHeight = function () {
  * @inheritDoc
  */
 LayoutGrid.prototype.setDefaultRowHeight = function (val) {
-	var defaultH = this._trackY.getDefaultLaneSize();
+	let defaultH = this._trackY.getDefaultLaneSize();
 
 	if (defaultH !== val) {
 		this._trackY.setDefaultLaneSize(val);
 
-		for (var i = 0; i < this._colCount; ++i) {
+		for (let i = 0; i < this._colCount; ++i) {
 			this._columns[i].setHeight(val);
 		}
 
@@ -577,7 +577,7 @@ LayoutGrid.prototype.setRowHeight = function (rowIndex, val) {
 		return false;
 	}
 
-	var dirty = this._trackY.setLaneSize(rowIndex, val);
+	let dirty = this._trackY.setLaneSize(rowIndex, val);
 
 	this._syncLayoutToRows(rowIndex, rowIndex + 1); // Update UI. WARNING: Very slow
 
@@ -599,10 +599,10 @@ LayoutGrid.prototype.setRowHeight = function (rowIndex, val) {
  * @returns {boolean}
  */
 LayoutGrid.prototype._updateRowHeights = function (track, start) {
-	var dirty = 0;
+	let dirty = 0;
 
-	for (var i = 0; i < this._rowCount; ++i) {
-		var val = track.getLaneSize(start);
+	for (let i = 0; i < this._rowCount; ++i) {
+		let val = track.getLaneSize(start);
 
 		dirty |= this._trackY.setLaneSize(i, val);
 		++start;
@@ -726,11 +726,11 @@ LayoutGrid.prototype.getCellTop = function (indexY) {
  * @inheritDoc
  */
 LayoutGrid.prototype.getCellWidth = function (indexX, indexY) {
-	var cellSpan = this._cellSpans.getOccupyingSpan(indexX, indexY);
+	let cellSpan = this._cellSpans.getOccupyingSpan(indexX, indexY);
 
 	if (cellSpan) {
-		var spanStart = this._trackX.getLaneStart(cellSpan.indexX);
-		var spanEnd = this._trackX.getLaneEnd(cellSpan.indexX + cellSpan.colSpan - 1);
+		let spanStart = this._trackX.getLaneStart(cellSpan.indexX);
+		let spanEnd = this._trackX.getLaneEnd(cellSpan.indexX + cellSpan.colSpan - 1);
 
 		return spanEnd - spanStart;
 	}
@@ -743,11 +743,11 @@ LayoutGrid.prototype.getCellWidth = function (indexX, indexY) {
  * @inheritDoc
  */
 LayoutGrid.prototype.getCellHeight = function (indexX, indexY) {
-	var cellSpan = this._cellSpans.getOccupyingSpan(indexX, indexY);
+	let cellSpan = this._cellSpans.getOccupyingSpan(indexX, indexY);
 
 	if (cellSpan) {
-		var spanStart = this._trackY.getLaneStart(cellSpan.indexY);
-		var spanEnd = this._trackY.getLaneEnd(cellSpan.indexY + cellSpan.rowSpan - 1);
+		let spanStart = this._trackY.getLaneStart(cellSpan.indexY);
+		let spanEnd = this._trackY.getLaneEnd(cellSpan.indexY + cellSpan.rowSpan - 1);
 
 		return spanEnd - spanStart;
 	}
@@ -776,7 +776,7 @@ LayoutGrid.prototype.getCellRowSpan = function (indexX, indexY) {
  * @inheritDoc
  */
 LayoutGrid.prototype.setCellRowSpan = function (indexX, indexY, spanVal) {
-	var cellSpan = this._cellSpans.setRowSpan(indexX, indexY, spanVal);
+	let cellSpan = this._cellSpans.setRowSpan(indexX, indexY, spanVal);
 
 	this._updateCellSpanSize(indexX, indexY, cellSpan);
 
@@ -795,7 +795,7 @@ LayoutGrid.prototype.setCellRowSpan = function (indexX, indexY, spanVal) {
 		return cellSpan.retVal !== 0;
 	}
 
-	var cell = this._getCell(indexX, indexY);
+	let cell = this._getCell(indexX, indexY);
 
 	if (cell && cell._rowSpan > 1) {
 		this._updateCellSpanClass(indexX, indexY, cell._colSpan, cell._rowSpan, false);
@@ -817,7 +817,7 @@ LayoutGrid.prototype.getCellColSpan = function (indexX, indexY) {
  * @inheritDoc
  */
 LayoutGrid.prototype.setCellColSpan = function (indexX, indexY, spanVal) {
-	var cellSpan = this._cellSpans.setColSpan(indexX, indexY, spanVal);
+	let cellSpan = this._cellSpans.setColSpan(indexX, indexY, spanVal);
 
 	this._updateCellSpanSize(indexX, indexY, cellSpan);
 
@@ -836,7 +836,7 @@ LayoutGrid.prototype.setCellColSpan = function (indexX, indexY, spanVal) {
 		return cellSpan.retVal !== 0;
 	}
 
-	var cell = this._getCell(indexX, indexY);
+	let cell = this._getCell(indexX, indexY);
 
 	if (cell && cell._colSpan > 1) {
 		this._updateCellSpanClass(indexX, indexY, cell._colSpan, cell._rowSpan, false);
@@ -850,14 +850,14 @@ LayoutGrid.prototype.setCellColSpan = function (indexX, indexY, spanVal) {
  * @inheritDoc
  */
 LayoutGrid.prototype.clearCellSpans = function () {
-	var cellSpans = this._cellSpans.clearAllSpans();
+	let cellSpans = this._cellSpans.clearAllSpans();
 
 	if (cellSpans == null) {
 		return false;
 	}
 
-	for (var i = cellSpans.length; --i >= 0; ) {
-		var cellSpan = cellSpans[i];
+	for (let i = cellSpans.length; --i >= 0; ) {
+		let cellSpan = cellSpans[i];
 
 		this._updateCellSpan(cellSpan.indexX, cellSpan.indexY, cellSpan, false);
 	}
@@ -870,14 +870,14 @@ LayoutGrid.prototype.clearCellSpans = function () {
  * @inheritDoc
  */
 LayoutGrid.prototype.clearColumnSpans = function (indexX) {
-	var cellSpans = this._cellSpans.removeSpanByColIndex(indexX);
+	let cellSpans = this._cellSpans.removeSpanByColIndex(indexX);
 
 	if (cellSpans == null) {
 		return false;
 	}
 
-	for (var i = cellSpans.length; --i >= 0; ) {
-		var cellSpan = cellSpans[i];
+	for (let i = cellSpans.length; --i >= 0; ) {
+		let cellSpan = cellSpans[i];
 
 		this._updateCellSpan(cellSpan.indexX, cellSpan.indexY, cellSpan, false);
 	}
@@ -941,8 +941,8 @@ LayoutGrid.prototype.setRowScalability = function (indexY, val) {
  */
 LayoutGrid.prototype.getCell = function (indexX, indexY, opt_includeSpan) {
 	if (opt_includeSpan && this._cellSpans.hasSpan()) {
-		var colSpan = this._cellSpans.getColSpan(indexX, indexY);
-		var rowSpan = this._cellSpans.getRowSpan(indexX, indexY);
+		let colSpan = this._cellSpans.getColSpan(indexX, indexY);
+		let rowSpan = this._cellSpans.getRowSpan(indexX, indexY);
 
 		if (colSpan < 0) {
 			indexX += colSpan;
@@ -961,7 +961,7 @@ LayoutGrid.prototype.getCell = function (indexX, indexY, opt_includeSpan) {
  * @inheritDoc
  */
 LayoutGrid.prototype.getCellContent = function (indexX, indexY) {
-	var cell = this.getCell(indexX, indexY);
+	let cell = this.getCell(indexX, indexY);
 
 	if (cell !== null) {
 		return cell.getContent();
@@ -975,7 +975,7 @@ LayoutGrid.prototype.getCellContent = function (indexX, indexY) {
  * @inheritDoc
  */
 LayoutGrid.prototype.setCellContent = function (indexX, indexY, data) {
-	var cell = this.getCell(indexX, indexY);
+	let cell = this.getCell(indexX, indexY);
 
 	if (cell == null) {
 		window.console.log("Error: Accessing nonexistent cell in Grid's Table");
@@ -1007,13 +1007,13 @@ LayoutGrid.prototype.setColumnCount = function (val) {
 		return;
 	}
 
-	var oldColCount = this._colCount;
+	let oldColCount = this._colCount;
 
 	this._trackX.setLaneCount(val);  // Need to be set before syncing layout
 	this._colCount = this._trackX.getLaneCount();
 
-	var i = 0;
-	var column = null;
+	let i = 0;
+	let column = null;
 
 	if (oldColCount > val) {
 		for (i = oldColCount; --i >= val; ) {
@@ -1070,8 +1070,8 @@ LayoutGrid.prototype.setRowCount = function (val, noBinding) {
 		return;
 	}
 
-	var c;
-	var oldRowCount = this._rowCount;
+	let c;
+	let oldRowCount = this._rowCount;
 
 	this._trackY.setLaneCount(val); // Need to be set before syncing layout
 	this._rowCount = this._trackY.getLaneCount();
@@ -1100,7 +1100,7 @@ LayoutGrid.prototype.setRowCount = function (val, noBinding) {
 
 		// Clear selection of the removed rows
 		if (val > 0) {
-			for (var i = val; i < oldRowCount; ++i) {
+			for (let i = val; i < oldRowCount; ++i) {
 				this._selectionList.deselect(i); // No UI change
 			}
 		} else {
@@ -1110,7 +1110,7 @@ LayoutGrid.prototype.setRowCount = function (val, noBinding) {
 		this._syncLayoutToRows(oldRowCount, val);
 	}
 
-	var e = {};
+	let e = {};
 
 	e["prevCount"] = oldRowCount;
 	e["rowCount"] = this._rowCount;
@@ -1176,7 +1176,7 @@ LayoutGrid.prototype.setBorders = function (lft, top, rgt, btm) {
  * @inheritDoc
  */
 LayoutGrid.prototype.getColumnStyle = function (colIndex, styleName) {
-	var column = this._columns[colIndex];
+	let column = this._columns[colIndex];
 
 	if (column) {
 		return column.getStyle(styleName);
@@ -1190,7 +1190,7 @@ LayoutGrid.prototype.getColumnStyle = function (colIndex, styleName) {
  * @inheritDoc
  */
 LayoutGrid.prototype.setColumnStyle = function (colIndex, styleName, value) {
-	var column = this._columns[colIndex];
+	let column = this._columns[colIndex];
 	if (column) {
 		column.setStyle(styleName, value);
 	}
@@ -1201,7 +1201,7 @@ LayoutGrid.prototype.setColumnStyle = function (colIndex, styleName, value) {
  * @inheritDoc
  */
 LayoutGrid.prototype.enableColumnClass = function (colIndex, className, enabled) {
-	var column = this._columns[colIndex];
+	let column = this._columns[colIndex];
 
 	if (column) {
 		column.enableClass(className, enabled);
@@ -1213,7 +1213,7 @@ LayoutGrid.prototype.enableColumnClass = function (colIndex, className, enabled)
  * @inheritDoc
  */
 LayoutGrid.prototype.hasColumnClass = function (colIndex, className) {
-	var column = this._columns[colIndex];
+	let column = this._columns[colIndex];
 
 	return (column) ? column.hasClass(className) : false;
 };
@@ -1224,7 +1224,7 @@ LayoutGrid.prototype.hasColumnClass = function (colIndex, className) {
  */
 LayoutGrid.prototype.enableRowClass = function (rowIndex, className, enabled) {
 	if (rowIndex >= 0 && rowIndex < this._rowCount) {
-		for (var c = 0; c < this._colCount; ++c) {
+		for (let c = 0; c < this._colCount; ++c) {
 			this._columns[c].getCell(rowIndex).enableClass(className, enabled);
 		}
 	}
@@ -1240,7 +1240,7 @@ LayoutGrid.prototype.setRowStyle = function (rowIndex, styleName, value, enabled
 			value = "";
 		}
 
-		for (var c = 0; c < this._colCount; ++c) {
+		for (let c = 0; c < this._colCount; ++c) {
 			this._columns[c].getCell(rowIndex).setStyle(styleName, value);
 		}
 	}
@@ -1267,13 +1267,13 @@ LayoutGrid.prototype.getContentWidth = function () {
  * @inheritDoc
  */
 LayoutGrid.prototype.getContentHeight = function () {
-	var layoutSize = this._trackY.getTrackSize();
+	let layoutSize = this._trackY.getTrackSize();
 
 	if (layoutSize <= 0) { // All of the cell has default size of zero
 		if (this._colCount * this.getVisibleRowCount() > 0) {
-			var column = this._columns[0];
-			var bottomCell = column.getCell(this._rowCount - 1);
-			var bottom = bottomCell.getTop() + bottomCell.getHeight();
+			let column = this._columns[0];
+			let bottomCell = column.getCell(this._rowCount - 1);
+			let bottom = bottomCell.getTop() + bottomCell.getHeight();
 
 			return bottom - column.getCell(0).getTop();
 		}
@@ -1291,9 +1291,9 @@ LayoutGrid.prototype.getCellsByRowIndex = function (rowIndex) {
 		return null;
 	}
 
-	var ary = new Array(this._colCount);
+	let ary = new Array(this._colCount);
 
-	for (var c = 0; c < this._colCount; ++c) {
+	for (let c = 0; c < this._colCount; ++c) {
 		ary[c] = this._columns[c].getCell(rowIndex);
 	}
 
@@ -1383,24 +1383,24 @@ LayoutGrid.prototype.setRowHighlight = function (rowIndex) {
 		return;
 	}
 
-	var prevIndex = this._rowHighlightIndex;
+	let prevIndex = this._rowHighlightIndex;
 
 	this._rowHighlightIndex = rowIndex;
 
-	for (var i = this._highlightedCells.length; --i >= 0;) {
+	for (let i = this._highlightedCells.length; --i >= 0;) {
 		this._highlightedCells[i].removeClass("highlighted-row"); // This will guarantee that there is no left over highlighted cell
 	}
 
 	if (rowIndex >= 0 && rowIndex < this._rowCount) {
 		this._highlightedCells.length = this._colCount;
 
-		for (var c = this._colCount; --c >= 0;) {
-			var cell = this._columns[c].getCell(rowIndex);
+		for (let c = this._colCount; --c >= 0;) {
+			let cell = this._columns[c].getCell(rowIndex);
 
 			this._highlightedCells[c] = cell;
 			cell.addClass("highlighted-row");
 		}
-		var stretchEl = this.getStretchedCell(rowIndex); // check stretched cell
+		let stretchEl = this.getStretchedCell(rowIndex); // check stretched cell
 		if(stretchEl) {
 			this._highlightedCells.push(stretchEl);
 			stretchEl.addClass("highlighted-row");
@@ -1410,7 +1410,7 @@ LayoutGrid.prototype.setRowHighlight = function (rowIndex) {
 	}
 
 	if (this._hasListener("rowHighlighted")) {
-		var e = {};
+		let e = {};
 
 		e["prevRowIndex"] = prevIndex;
 		e["rowIndex"] = rowIndex;
@@ -1488,7 +1488,7 @@ LayoutGrid.prototype.selectRowRange = function (rowIndex, len) {
 
 	this._selectionList.selectRange(rowIndex, len);
 
-	for (var r = 0; r < len; ++r) {
+	for (let r = 0; r < len; ++r) {
 		this._addSelectionUI(r + rowIndex);
 	}
 };
@@ -1498,14 +1498,14 @@ LayoutGrid.prototype.selectRowRange = function (rowIndex, len) {
  * @inheritDoc
  */
 LayoutGrid.prototype.clearSelectedRows = function () {
-	var count = this._selectionList.getSelectionCount();
+	let count = this._selectionList.getSelectionCount();
 
 	if (count) {
-		var sels = this._selectionList.getAllSelections(); // Slow
+		let sels = this._selectionList.getAllSelections(); // Slow
 
 		this._selectionList.clearAllSelections();
 
-		for (var i = 0; i < count; ++i) {
+		for (let i = 0; i < count; ++i) {
 			this._removeSelectionUI(sels[i]);
 		}
 
@@ -1551,12 +1551,12 @@ LayoutGrid.prototype.setRowAnchor = function (at) {
  * @inheritDoc
  */
 LayoutGrid.prototype.activateColumn = function (colIndex, opt_bool) {
-	var column = this._columns[colIndex];
+	let column = this._columns[colIndex];
 
 	if (column) {
-		var dirty = column.activate(opt_bool);
+		let dirty = column.activate(opt_bool);
 		if (opt_bool && dirty && this._rightSpace) {
-			var pn = this._rightSpace.parentNode;
+			let pn = this._rightSpace.parentNode;
 			if (pn) {
 				pn.appendChild(this._rightSpace);
 			}
@@ -1578,7 +1578,7 @@ LayoutGrid.prototype.activateRows = function () {
 LayoutGrid.prototype.moveRowsToTop = function (numRows) {
 	this._ctxRows.moveItemsToTop(numRows);
 	this._stretchedCells.moveCellsToTop(numRows);
-	for (var c = 0; c < this._colCount; ++c) {
+	for (let c = 0; c < this._colCount; ++c) {
 		this._columns[c].moveCellsToTop(numRows);
 	}
 };
@@ -1658,14 +1658,14 @@ LayoutGrid.prototype.insertColumn = function (index, opt_json) {
 		index = this._colCount;
 	}
 
-	var atTheMiddle = index < this._colCount;
-	var cellSpans = this._cellSpans.getAllSpans();
+	let atTheMiddle = index < this._colCount;
+	let cellSpans = this._cellSpans.getAllSpans();
 
 	this._updateCellSpans(cellSpans, false); // Clear all styling
 	this._trackX.insertLane(index, opt_json);
 	this._colCount = this._trackX.getLaneCount();
 
-	var column = this._newColumn(index);
+	let column = this._newColumn(index);
 
 	this._updateColumnIndices();
 
@@ -1679,13 +1679,13 @@ LayoutGrid.prototype.insertColumn = function (index, opt_json) {
 	// this._syncLayoutToColumns(index); // Core grid will guarantee updating width to each section
 
 	// Select the newly added cell, if there is a row selection
-	var count = this._selectionList.getSelectionCount();
+	let count = this._selectionList.getSelectionCount();
 
 	if (count) {
-		var sels = this._selectionList.getAllSelections(); // Slow
+		let sels = this._selectionList.getAllSelections(); // Slow
 
-		for (var i = sels.length; --i >= 0;) {
-			var cell = column.getCell(sels[i]);
+		for (let i = sels.length; --i >= 0;) {
+			let cell = column.getCell(sels[i]);
 
 			if (cell) {
 				cell.addClass("selected-row");
@@ -1705,18 +1705,18 @@ LayoutGrid.prototype.insertColumn = function (index, opt_json) {
  * @inheritDoc
  */
 LayoutGrid.prototype.removeColumnAt = function (index) {
-	var definition = this._trackX.removeLaneAt(index);
+	let definition = this._trackX.removeLaneAt(index);
 
 	if (definition == null) {
 		return null;
 	}
 
-	var cellSpans = this._cellSpans.getAllSpans();
+	let cellSpans = this._cellSpans.getAllSpans();
 
 	this._updateCellSpans(cellSpans, false); // Clear all styling
 	this._colCount = this._trackX.getLaneCount();
 
-	var column = this._columns.splice(index, 1)[0];
+	let column = this._columns.splice(index, 1)[0];
 
 	column.dispose();
 	definition["control"] = column;
@@ -1758,18 +1758,18 @@ LayoutGrid.prototype.moveColumn = function (from, to) {
 		return;
 	}
 
-	var cellSpans = this._cellSpans.getAllSpans();
+	let cellSpans = this._cellSpans.getAllSpans();
 
 	this._updateCellSpans(cellSpans, false); // Clear all styling
 	this._trackX.moveLane(from, to);
 
-	var movedColumn = this._columns[from];
+	let movedColumn = this._columns[from];
 
 	Util.moveArrayItem(this._columns, from, to);
 
 	if(movedColumn.getElement().offsetParent) {
-		var siblingIndex = to + 1;
-		var nextSibling = this._columns[siblingIndex] || null;
+		let siblingIndex = to + 1;
+		let nextSibling = this._columns[siblingIndex] || null;
 		while (nextSibling && !nextSibling.getElement().offsetParent) {
 			nextSibling = this._columns[++siblingIndex];
 		}
@@ -1779,7 +1779,7 @@ LayoutGrid.prototype.moveColumn = function (from, to) {
 	this._updateColumnIndices();
 	this._updateCellSpans(cellSpans, true); // Restore all styling
 
-	var minIndex = (from < to) ? from : to;
+	let minIndex = (from < to) ? from : to;
 
 	this._syncLayoutToColumns(minIndex);
 };
@@ -1812,9 +1812,9 @@ LayoutGrid.prototype.getColumnIndex = function (colElem) {
 		if(colElem["stretched"]) {
 			return this._stretchedCells.getColumnIndex(colElem);
 		}
-		var len = this._columns.length;
+		let len = this._columns.length;
 
-		for (var i = 0; i < len; ++i) {
+		for (let i = 0; i < len; ++i) {
 			if (this._columns[i].getElement() === colElem) {
 				return i;
 			}
@@ -1835,7 +1835,7 @@ LayoutGrid.prototype.getCellIndex = function (colIndex, cellElem) {
 			return this._stretchedCells.getRowIndex(cellElem);
 		}
 
-		var column = this._columns[colIndex];
+		let column = this._columns[colIndex];
 		if(column) {
 			return column.getCellIndex(cellElem);
 		}
@@ -1893,7 +1893,7 @@ LayoutGrid.prototype.updateLayout = function () {
  * @inheritDoc
  */
 LayoutGrid.prototype.stretchCell = function (cellRef, rowIndex, opt_stretching, onlyToTheRight) {
-	var colIndex = -1;
+	let colIndex = -1;
 	if (typeof cellRef === "number") {
 		colIndex = cellRef;
 		if(rowIndex == null) {
@@ -1913,11 +1913,11 @@ LayoutGrid.prototype.stretchCell = function (cellRef, rowIndex, opt_stretching,
 		return null;
 	}
 
-	var stretching = (opt_stretching !== false);
-	var cell = null;
+	let stretching = (opt_stretching !== false);
+	let cell = null;
 
 	if (stretching) {
-		var coverLayer = this._coverLayer;
+		let coverLayer = this._coverLayer;
 		if(!coverLayer) {
 			coverLayer = this._coverLayer = document.createElement("div");
 			coverLayer.className = "cover-layer";
@@ -1931,7 +1931,7 @@ LayoutGrid.prototype.stretchCell = function (cellRef, rowIndex, opt_stretching,
 		cell = this._stretchedCells.unstretchCell(rowIndex);
 	}
 	if(cell) {
-		var selected = this._selectionList.getSelection(rowIndex);
+		let selected = this._selectionList.getSelection(rowIndex);
 		cell.enableClass("selected-row", selected); // It's can enable class without get stretch cell again.
 	}
 	return cell;
@@ -1979,7 +1979,7 @@ LayoutGrid.prototype.getStretchedCells = function () { // TODO: Deprecate this m
 * @inheritDoc */
 LayoutGrid.prototype.updateStretchedCells = function () {
 	this._updateLayers();
-	var childCount = this._coverLayer ? this._coverLayer.children.length : 0; // TODO: Currently assume only stretched cells exists
+	let childCount = this._coverLayer ? this._coverLayer.children.length : 0; // TODO: Currently assume only stretched cells exists
 	if (childCount <= 0) {
 		return false;
 	}
@@ -1998,11 +1998,11 @@ LayoutGrid.prototype._calculateViewSize = function (forceRecal) {
 		return this._stretchedCells.getStretchSize();
 	}
 
-	var ctx = this._ctx;
-	var stretchSize = forceRecal ? 0 : this._stretchedCells.getStretchSize();
+	let ctx = this._ctx;
+	let stretchSize = forceRecal ? 0 : this._stretchedCells.getStretchSize();
 	if(!stretchSize && ctx) {
 		if(ctx["getWidth"]) {
-			var contentWidth = this.getContentWidth();
+			let contentWidth = this.getContentWidth();
 			stretchSize = ctx["getWidth"]();
 			if(stretchSize) { // Grid may not be in the document
 				if(contentWidth < stretchSize) { // If view width is larger than actual content
@@ -2025,7 +2025,7 @@ LayoutGrid.prototype._calculateViewSize = function (forceRecal) {
 * @param {boolean} enabled
 */
 LayoutGrid.prototype._enableStretchCellClass = function (rowIndex, className, enabled ) {
-	var stretchEl = this.getStretchedCell(rowIndex); // check stretched cell
+	let stretchEl = this.getStretchedCell(rowIndex); // check stretched cell
 	if(stretchEl) {
 		stretchEl.enableClass(className, enabled);
 	}
@@ -2092,7 +2092,7 @@ LayoutGrid.prototype.getRowLayout = function () {
 LayoutGrid.prototype.reserveRightSpace = function (size) {
 	if (size && size > 0) {
 		if (!this._rightSpace) {
-			var rs = this._rightSpace = document.createElement("div");
+			let rs = this._rightSpace = document.createElement("div");
 			rs.className = "tr-reserved-space";
 			rs.style.height = this.getContentHeight() + "px";
 
@@ -2106,7 +2106,7 @@ LayoutGrid.prototype.reserveRightSpace = function (size) {
 
 		this._updateCssWidth();
 	} else if (this._rightSpace) {
-		var pn = this._rightSpace.parentNode;
+		let pn = this._rightSpace.parentNode;
 
 		if (pn) {
 			pn.removeChild(this._rightSpace);
@@ -2125,17 +2125,17 @@ LayoutGrid.prototype.reserveRightSpace = function (size) {
 * @ignore
 */
 LayoutGrid.prototype._updateRightSpaceStyle = function() {
-	var rs = this._rightSpace;
+	let rs = this._rightSpace;
 	if(!rs) {
 		return;
 	}
-	var isScrollbarActive = false;
-	var pinnedRgtCount = 0;
+	let isScrollbarActive = false;
+	let pinnedRgtCount = 0;
 	if(this._hscrollbar) {
 		isScrollbarActive = this._hscrollbar.isActive();
 		pinnedRgtCount = this._hscrollbar.getPinnedRightColumnCount();
 	}
-	var absolutePos = isScrollbarActive && !pinnedRgtCount; // if true, the right space element will be positioned absolutely
+	let absolutePos = isScrollbarActive && !pinnedRgtCount; // if true, the right space element will be positioned absolutely
 
 	if (absolutePos) {
 		rs.style.top = this._trackY.getLaneStart(this._activeRow) + "px";
@@ -2153,7 +2153,7 @@ LayoutGrid.prototype._updateRightSpaceStyle = function() {
 */
 LayoutGrid.prototype._updateLayers = function() {
 	if(this._rightSpace) {
-		var pn = this._rightSpace.parentNode; // rightSpace can be located in two places: layout grid and pane slider
+		let pn = this._rightSpace.parentNode; // rightSpace can be located in two places: layout grid and pane slider
 		if(pn) {
 			pn.appendChild(this._rightSpace);
 		} else {
@@ -2181,7 +2181,7 @@ LayoutGrid.prototype.getReservedSpace = function () {
  * @inheritDoc
  */
 LayoutGrid.prototype.getComputedStyle = function () {
-	var elem = this._element;
+	let elem = this._element;
 
 	return elem.offsetParent ? getComputedStyle(elem) : null;
 };
@@ -2191,7 +2191,7 @@ LayoutGrid.prototype.getComputedStyle = function () {
  * @inheritDoc
  */
 LayoutGrid.prototype.isColumnActive = function (colIndex) {
-	var column = this._columns[colIndex];
+	let column = this._columns[colIndex];
 
 	return column ? column.isActive() : false;
 };
@@ -2205,11 +2205,11 @@ LayoutGrid.prototype.setRowAttributes = function (rowIndex, func) {
 		return;
 	}
 
-	for (var c = 0; c < this._colCount; ++c) {
-		var result = func(c);
-		for (var i = result.length; --i >= 0;) {
-			var entry = result[i];
-			var cell = this._columns[c].getCell(rowIndex);
+	for (let c = 0; c < this._colCount; ++c) {
+		let result = func(c);
+		for (let i = result.length; --i >= 0;) {
+			let entry = result[i];
+			let cell = this._columns[c].getCell(rowIndex);
 
 			if (!cell) {
 				continue;
@@ -2241,7 +2241,7 @@ LayoutGrid.prototype.selectColumn = function (colIndex, selected) {
 	if(selected) {
 		this._colSelDirty = true;
 
-		var boundLayer = this._boundLayer;
+		let boundLayer = this._boundLayer;
 		if(!boundLayer) {
 			this._initBoundLayer();
 			this._updateLayers();
@@ -2261,7 +2261,7 @@ LayoutGrid.prototype.isSelectedColumn = function (colIndex) {
 * @param {boolean=} selected
 */
 LayoutGrid.prototype.selectCell = function (colIndex, rowIndex, selected) {
-	var cell = this._getCell(colIndex, rowIndex);
+	let cell = this._getCell(colIndex, rowIndex);
 	if(cell) {
 		cell.enableClass("selection", selected);
 	}
@@ -2288,21 +2288,21 @@ LayoutGrid.prototype.getHorizontalLayout = function () {
 * @param {!Array.<boolean>} outNoBorders
 */
 LayoutGrid.prototype.calculateColumnBounds = function (lftIdx, rgtIdx, outPositions, outNoBorders) {
-	var lftPx = 0;
-	var rgtPx = 0;
-	var noLftBorder = false;
-	var noRgtBorder = false;
-	var pinnedRgtIdx = this._trackX.getLaneCount();
+	let lftPx = 0;
+	let rgtPx = 0;
+	let noLftBorder = false;
+	let noRgtBorder = false;
+	let pinnedRgtIdx = this._trackX.getLaneCount();
 	if(lftIdx >= 0) {
 		lftPx = this._trackX.getLaneStart(lftIdx);
 		rgtPx = this._trackX.getLaneEnd(rgtIdx);
 	}
 	if(lftPx < rgtPx) {
-		var lftView = 0;
-		var rgtView, rgtLimit;
-		var scrollLeft = 0;
-		var pinnedLftCount = 0;
-		var pinnedRgtCount = 0;
+		let lftView = 0;
+		let rgtView, rgtLimit;
+		let scrollLeft = 0;
+		let pinnedLftCount = 0;
+		let pinnedRgtCount = 0;
 		if(this._hscrollbar) {
 			scrollLeft = this._hscrollbar.getScrollLeft();
 			pinnedLftCount = this._hscrollbar.getPinnedLeftColumnCount();
@@ -2357,8 +2357,8 @@ LayoutGrid.prototype.updateColumnBounds = function (posAry, noBorderAry, topPx)
 		return;
 	}
 
-	var cbs = this._colBounds;
-	var cbc = this._colBoundCache;
+	let cbs = this._colBounds;
+	let cbc = this._colBoundCache;
 	if(!cbs) {
 		cbs = this._colBounds = [];
 	}
@@ -2366,13 +2366,13 @@ LayoutGrid.prototype.updateColumnBounds = function (posAry, noBorderAry, topPx)
 		cbc = this._colBoundCache = [];
 	}
 
-	var rangeCount = posAry.length;
-	var i;
-	var pn = null; // parentNode
-	var columnBound = null;
+	let rangeCount = posAry.length;
+	let i;
+	let pn = null; // parentNode
+	let columnBound = null;
 
 	// Remove unused bounds from document
-	var activeCount = cbs.length;
+	let activeCount = cbs.length;
 	for(i = rangeCount; i < activeCount; ++i) {
 		columnBound = cbs[i];
 		pn = columnBound.parentNode;
@@ -2388,10 +2388,10 @@ LayoutGrid.prototype.updateColumnBounds = function (posAry, noBorderAry, topPx)
 	}
 
 	for(i = 0; i < rangeCount; ++i) {
-		var positions = posAry[i];
-		var noBorders = noBorderAry[i];
-		var lftPx = /** @type{number} */(positions[0]);
-		var rgtPx = /** @type{number} */(positions[1]);
+		let positions = posAry[i];
+		let noBorders = noBorderAry[i];
+		let lftPx = /** @type{number} */(positions[0]);
+		let rgtPx = /** @type{number} */(positions[1]);
 
 		columnBound = cbc[i];
 		if(!columnBound) {
@@ -2418,20 +2418,20 @@ LayoutGrid.prototype.updateColumnBounds = function (posAry, noBorderAry, topPx)
 /** @public
 */
 LayoutGrid.prototype.updateColumnSeparators = function () {
-	var pinnedLeftCount = this._hscrollbar.getPinnedLeftColumnCount();
-	var pinnedRightCount = this._hscrollbar.getPinnedRightColumnCount();
+	let pinnedLeftCount = this._hscrollbar.getPinnedLeftColumnCount();
+	let pinnedRightCount = this._hscrollbar.getPinnedRightColumnCount();
 	if ((pinnedLeftCount || pinnedRightCount) && !this._boundLayer) {
 		this._initBoundLayer();
 	}
 
-	var isScrollbarActive = false;
+	let isScrollbarActive = false;
 	if(this._hscrollbar) {
 		isScrollbarActive = this._hscrollbar.isActive();
 	}
 
-	var boundLayer = this._boundLayer;
+	let boundLayer = this._boundLayer;
 
-	var colSeparator = this._leftColumnSeparator;
+	let colSeparator = this._leftColumnSeparator;
 	if (isScrollbarActive && pinnedLeftCount) {
 		if (!colSeparator) {
 			colSeparator = this._leftColumnSeparator = this._createColumnSeparator();
@@ -2444,7 +2444,7 @@ LayoutGrid.prototype.updateColumnSeparators = function () {
 			}
 		}
 
-		var rightPos = this._trackX.getLaneStart(pinnedLeftCount);
+		let rightPos = this._trackX.getLaneStart(pinnedLeftCount);
 		colSeparator.style.left = (rightPos - 1) + "px";
 		colSeparator.style.height = this._trackY.getTrackSize() + "px";
 	} else {
@@ -2466,9 +2466,9 @@ LayoutGrid.prototype.updateColumnSeparators = function () {
 				boundLayer.appendChild(colSeparator);
 			}
 		}
-		var colCount = this.getColumnCount();
-		var colWidth = this._trackX.getLaneEnd(colCount - 1) - this._trackX.getLaneStart(colCount - pinnedRightCount);
-		var viewSize = this._getViewSize();
+		let colCount = this.getColumnCount();
+		let colWidth = this._trackX.getLaneEnd(colCount - 1) - this._trackX.getLaneStart(colCount - pinnedRightCount);
+		let viewSize = this._getViewSize();
 
 		colSeparator.style.left = (viewSize - colWidth - this._rightSpaceSize) + "px";
 		colSeparator.style.height = this._trackY.getTrackSize() + "px";
@@ -2482,7 +2482,7 @@ LayoutGrid.prototype.updateColumnSeparators = function () {
 * @return {Element}
 */
 LayoutGrid.prototype._createColumnSeparator = function() {
-	var colSeparator = document.createElement("div");
+	let colSeparator = document.createElement("div");
 	colSeparator.classList.add("column-separator");
 	return colSeparator;
 };
@@ -2491,7 +2491,7 @@ LayoutGrid.prototype._createColumnSeparator = function() {
 * @return {Element}
 */
 LayoutGrid.prototype._initBoundLayer = function () {
-	var boundLayer = this._boundLayer;
+	let boundLayer = this._boundLayer;
 	if(!boundLayer) {
 		boundLayer = this._boundLayer = document.createElement("div");
 		boundLayer.className = "cover-layer";
@@ -2507,7 +2507,7 @@ LayoutGrid.prototype._initBoundLayer = function () {
  * @return {Cell}
  */
 LayoutGrid.prototype._getCell = function (indexX, indexY) {
-	var column = this._columns[indexX];
+	let column = this._columns[indexX];
 
 	return (column) ? column.getCell(indexY) : null;
 };
@@ -2521,10 +2521,10 @@ LayoutGrid.prototype._insertCells = function (from, to) {
 	this._activeRow = from;
 	this._activeRowEnd = to;
 
-	var top = this._trackY.getLaneStart(from);
+	let top = this._trackY.getLaneStart(from);
 
-	for (var c = 0; c < this._colCount; ++c) {
-		var column = this._columns[c];
+	for (let c = 0; c < this._colCount; ++c) {
+		let column = this._columns[c];
 
 		if (!column.hasCollapsedCells()) {
 			column.setTop(top);
@@ -2538,7 +2538,7 @@ LayoutGrid.prototype._insertCells = function (from, to) {
 	}
 
 	if (to > this._availableRowCount) {
-		var e = {};
+		let e = {};
 
 		e["prevRowIndex"] = this._availableRowCount;
 		e["rowIndex"] = to;
@@ -2554,14 +2554,14 @@ LayoutGrid.prototype._insertCells = function (from, to) {
  * @return {!ElementWrapper}
  */
 LayoutGrid.prototype._newColumn = function (indexX) {
-	var column = new Column(this._virOwner || this);
+	let column = new Column(this._virOwner || this);
 
 	column.setHeight(this._trackY.getDefaultLaneSize());
 	column.setCellCount(this._rowCount);
 	column.setTop(this._trackY.getLaneStart(this._activeRow));
 	column.activateCells(this._activeRow, this._activeRowEnd);
 
-	for (var r = 0; r < this._rowCount; ++r) {
+	for (let r = 0; r < this._rowCount; ++r) {
 		if (!this._trackY.isAtDefaultSize(r)) {
 			column.getCell(r).setHeight(this._trackY.getLaneSize(r));
 		}
@@ -2574,7 +2574,7 @@ LayoutGrid.prototype._newColumn = function (indexX) {
 	} else {
 		this._columns.splice(indexX, 0, column);
 
-		var nextColumn = this._columns[indexX + 1];
+		let nextColumn = this._columns[indexX + 1];
 
 		column.insertBefore(nextColumn);
 	}
@@ -2602,7 +2602,7 @@ LayoutGrid.prototype._updateViewHeight = function () {
 		return;
 	}
 
-	var contentHeight = this.getContentHeight();
+	let contentHeight = this.getContentHeight();
 
 	this._element.style.height = contentHeight + "px"; // View is kept in sync with content size
 
@@ -2614,8 +2614,8 @@ LayoutGrid.prototype._updateViewHeight = function () {
 /** @private
 */
 LayoutGrid.prototype._updateColumnIndices = function () {
-	var columnCount = this._columns.length;
-	var first = this._columns[0];
+	let columnCount = this._columns.length;
+	let first = this._columns[0];
 
 	if (first !== this._firstColumn) {
 		if (this._firstColumn) {
@@ -2629,7 +2629,7 @@ LayoutGrid.prototype._updateColumnIndices = function () {
 		}
 	}
 
-	var last = this._columns[columnCount - 1];
+	let last = this._columns[columnCount - 1];
 
 	if (last !== this._lastColumn) {
 		if (this._lastColumn) {
@@ -2641,10 +2641,10 @@ LayoutGrid.prototype._updateColumnIndices = function () {
 		if (this._lastColumn) { this._lastColumn.addClass("last"); }
 	}
 
-	var sibling = null;
+	let sibling = null;
 
-	for (var i = this._columns.length; --i >= 0;) {
-		var column = this._columns[i];
+	for (let i = this._columns.length; --i >= 0;) {
+		let column = this._columns[i];
 
 		column.setNextSibling(sibling);
 		sibling = column;
@@ -2669,8 +2669,8 @@ LayoutGrid.prototype._syncLayoutToColumns = function (from) {
 		return false;
 	}
 
-	for (var c = from; c < this._colCount; ++c) {
-		var column = this._columns[c];
+	for (let c = from; c < this._colCount; ++c) {
+		let column = this._columns[c];
 
 		column.setLeft(this._trackX.getLaneStart(c));
 		column.setWidth(this._trackX.getLaneSize(c));
@@ -2691,10 +2691,10 @@ LayoutGrid.prototype._syncLayoutToRows = function (indexY, toY) {
 		return;
 	}
 
-	for (var r = indexY; r < toY; ++r) {
-		var height = (this._trackY.isAtDefaultSize(r)) ? -1 : this._trackY.getLaneSize(r);
+	for (let r = indexY; r < toY; ++r) {
+		let height = (this._trackY.isAtDefaultSize(r)) ? -1 : this._trackY.getLaneSize(r);
 
-		for (var c = 0; c < this._colCount; ++c) {
+		for (let c = 0; c < this._colCount; ++c) {
 			this._columns[c].getCell(r).setHeight(height);
 		}
 	}
@@ -2722,7 +2722,7 @@ LayoutGrid.prototype._dispatchRowHeightChangedEvent = function (from, to) {
 		return;
 	}
 
-	var e = {};
+	let e = {};
 
 	e["rowIndex"] = from;
 	e["changeLength"] = to - from;
@@ -2736,7 +2736,7 @@ LayoutGrid.prototype._dispatchRowHeightChangedEvent = function (from, to) {
  * @param {CellSpan} cellSpan
  */
 LayoutGrid.prototype._updateCellSpanSize = function (indexX, indexY, cellSpan) {
-	var cell = this._getCell(indexX, indexY);
+	let cell = this._getCell(indexX, indexY);
 
 	if (cell == null) {
 		return;
@@ -2752,7 +2752,7 @@ LayoutGrid.prototype._updateCellSpanSize = function (indexX, indexY, cellSpan) {
 	if (cellSpan && cellSpan.rowSpan > 1) {
 		cell.setHeight(this.getCellHeight(indexX, indexY)); /////
 	} else {
-		var height = this._trackY.isAtDefaultSize(indexY) ? -1 : this._trackY.getLaneSize(indexY);
+		let height = this._trackY.isAtDefaultSize(indexY) ? -1 : this._trackY.getLaneSize(indexY);
 
 		cell.setHeight(height);
 	}
@@ -2765,8 +2765,8 @@ LayoutGrid.prototype._updateCellSpanSize = function (indexX, indexY, cellSpan) {
 LayoutGrid.prototype._updateCellSpanLayout = function (cellSpans) {
 	if (cellSpans == null) { return; }
 
-	for (var i = cellSpans.length; --i >= 0; ) {
-		var cellSpan = cellSpans[i];
+	for (let i = cellSpans.length; --i >= 0; ) {
+		let cellSpan = cellSpans[i];
 
 		this._updateCellSpanSize(cellSpan.indexX, cellSpan.indexY, cellSpan);
 	}
@@ -2793,9 +2793,9 @@ LayoutGrid.prototype._updateCellSpan = function (indexX, indexY, cellSpan, addin
  * @param {boolean} adding
  */
 LayoutGrid.prototype._updateCellSpanClass = function (indexX, indexY, colSpan, rowSpan, adding) {
-	var column;
+	let column;
 
-	for (var c = 0; c < colSpan; ++c) {
+	for (let c = 0; c < colSpan; ++c) {
 		column = this._columns[indexX + c];
 
 		if (!column) {
@@ -2805,7 +2805,7 @@ LayoutGrid.prototype._updateCellSpanClass = function (indexX, indexY, colSpan, r
 		column.collapseCells(indexY, rowSpan, adding, (c === 0), (c > 0));
 	}
 
-	var cell = this._getCell(indexX, indexY);
+	let cell = this._getCell(indexX, indexY);
 
 	if (cell) {
 		cell._colSpan = (adding) ? colSpan : 1;
@@ -2821,8 +2821,8 @@ LayoutGrid.prototype._updateCellSpanClass = function (indexX, indexY, colSpan, r
 LayoutGrid.prototype._updateCellSpans = function (cellSpans, adding) {
 	if (cellSpans == null) { return; }
 
-	for (var i = cellSpans.length; --i >= 0; ) {
-		var cellSpan = cellSpans[i];
+	for (let i = cellSpans.length; --i >= 0; ) {
+		let cellSpan = cellSpans[i];
 
 		this._updateCellSpan(cellSpan.indexX, cellSpan.indexY, cellSpan, adding);
 	}
@@ -2833,15 +2833,15 @@ LayoutGrid.prototype._updateCellSpans = function (cellSpans, adding) {
  * @param {Object} e
  */
 LayoutGrid.prototype._onMouseMove = function (e) {
-	var target = e["target"];
+	let target = e["target"];
 
-	var cellElement = Util.closestElement(target, "cell");
-	var colIndex = this._stretchedCells.getColumnIndex(cellElement);
+	let cellElement = Util.closestElement(target, "cell");
+	let colIndex = this._stretchedCells.getColumnIndex(cellElement);
 	if(colIndex < 0) { // Not found colIndex in stretching cell, then get from normal row
-		var colElement = Util.closestElement(target, "column");
+		let colElement = Util.closestElement(target, "column");
 		colIndex =	this.getColumnIndex(colElement);
 	}
-	var rowIndex = this.getCellIndex(colIndex, cellElement);
+	let rowIndex = this.getCellIndex(colIndex, cellElement);
 
 	this.setRowHighlight(rowIndex);
 };
@@ -2851,10 +2851,10 @@ LayoutGrid.prototype._onMouseMove = function (e) {
  * @param {Object} e
  */
 LayoutGrid.prototype._onMouseOut = function (e) {
-	var rel = e.relatedTarget;
+	let rel = e.relatedTarget;
 
 	if (rel) {
-		var thisElem = this._element;
+		let thisElem = this._element;
 
 		while (rel.parentNode !== null) {
 			rel = rel.parentNode;
@@ -2873,7 +2873,7 @@ LayoutGrid.prototype._onMouseOut = function (e) {
  * @param {number} rowIndex
  */
 LayoutGrid.prototype._updateSelectionUI = function (rowIndex) { // Update UI of the specified row index
-	var selected = this._selectionList.getSelection(rowIndex);
+	let selected = this._selectionList.getSelection(rowIndex);
 	this._enableStretchCellClass(rowIndex, "selected-row", selected);
 	this.enableRowClass(rowIndex, "selected-row", selected);
 };
@@ -2901,7 +2901,7 @@ LayoutGrid.prototype._removeSelectionUI = function (rowIndex) {
  */
 LayoutGrid.prototype._onEnterDocument = function () {
 	if (!this._initialized && this.getParent()) {
-		for (var c = 0; c < this._colCount; ++c) {
+		for (let c = 0; c < this._colCount; ++c) {
 			this._columns[c].enableAutoStyleUpdating();
 		}