@refinitiv-ui/efx-grid 6.0.91 → 6.0.92

package/lib/core/es6/data/DataView.js

@@ -57,8 +57,8 @@ import { Conflator } from "../../../tr-grid-util/es6/Conflator.js";
 * @param {DataTable|DataView=} source
 * @see {@link DataTable}
 */
-var DataView = function(source) {
-	var t = this; // For file minification
+let DataView = function(source) {
+	let t = this; // For file minification
 	t._groupFilterLogic = t._groupFilterLogic.bind(t);
 	t._internalGroupSortingLogic = t._internalGroupSortingLogic.bind(t);
 
@@ -331,7 +331,7 @@ DataView.prototype.dispose = function() {
 	}
 
 	if(this._columnStats) {
-		for(var field in this._columnStats) {
+		for(let field in this._columnStats) {
 			this._columnStats[field].dispose();
 		}
 		this._columnStats = null;
@@ -361,12 +361,12 @@ DataView.prototype.getRowData = function(rid) {
 * @return {!Array}
 */
 DataView.prototype.getColumnData = function(cid, inclNonDataRow) {
-	var rids = this.getAllRowIds(true, inclNonDataRow);
+	let rids = this.getAllRowIds(true, inclNonDataRow);
 
-	var rows = [];
-	var len = rids.length;
-	for(var r = 0; r < len; ++r) {
-		var rowData = this._dt.getRowData(rids[r]);
+	let rows = [];
+	let len = rids.length;
+	for(let r = 0; r < len; ++r) {
+		let rowData = this._dt.getRowData(rids[r]);
 		if(rowData) {
 			rows.push(rowData[cid]);
 		} else if(inclNonDataRow) {
@@ -401,11 +401,11 @@ DataView.prototype._toRowId = function(rowRef) {
 * @return {!Array.<string>}
 */
 DataView.prototype._toRowIds = function(rowRefs) {
-	var rowCount = Array.isArray(rowRefs) ? rowRefs.length : 0;
-	var ary = new Array(rowCount);
-	var rids = this._getRids();
-	for(var r = 0; r < rowCount; ++r) {
-		var rowRef = rowRefs[r];
+	let rowCount = Array.isArray(rowRefs) ? rowRefs.length : 0;
+	let ary = new Array(rowCount);
+	let rids = this._getRids();
+	for(let r = 0; r < rowCount; ++r) {
+		let rowRef = rowRefs[r];
 		if(typeof rowRef === "number") {
 			this._rebuildRowIdsFromChildren();
 			ary[r] = rids[rowRef] || "";
@@ -429,7 +429,7 @@ DataView.prototype.getAllRowIds = function(shallowCopy, inclNonDataRow) {
 	this._rebuildRowIdsFromChildren();
 
 	// WARNING: this._pageView can contain non-data rows (group header rows), even if inclNonDataRow flag is false
-	var rids = (inclNonDataRow) ? this._getRids() : (this._pageView || this._rids);
+	let rids = (inclNonDataRow) ? this._getRids() : (this._pageView || this._rids);
 
 	return (shallowCopy) ? rids : rids.slice(0); // Fastest way to clone an array is Array.slice()
 };
@@ -441,7 +441,7 @@ DataView.prototype.getAllRowIds = function(shallowCopy, inclNonDataRow) {
 */
 DataView.prototype.getVisibleRowIds = function(shallowCopy) {
 	this._rebuildRowIdsFromChildren();
-	var rids = this._getRids();
+	let rids = this._getRids();
 	return shallowCopy ? rids : rids.slice(0); // Fastest way to clone an array
 };
 /** Return all data rows that is filtered and sorted, excluding header rows or paging. This method ignores pagination.
@@ -561,7 +561,7 @@ DataView.prototype.setColumnData = function(cid, valueList, opt_ridList) {
 * @fires DataView#dataChanged
 */
 DataView.prototype.setDataAt = function(rowIndex, cid, value) {
-	var rid = this.getRowId(rowIndex);
+	let rid = this.getRowId(rowIndex);
 	if(rid && this._dt) {
 		return this._dt.setData(rid, cid, value);
 	}
@@ -576,7 +576,7 @@ DataView.prototype.setDataAt = function(rowIndex, cid, value) {
 * @fires DataView#dataChanged
 */
 DataView.prototype.setRowDataAt = function(rowIndex, values, opt_eventArg) {
-	var rid = this.getRowId(rowIndex);
+	let rid = this.getRowId(rowIndex);
 	return this.setRowData(rid, values, opt_eventArg);
 };
 
@@ -588,7 +588,7 @@ DataView.prototype.setRowDataAt = function(rowIndex, values, opt_eventArg) {
 */
 DataView.prototype.insertRow = function(rowRef, opt_values, opt_rid) { // Data changed event may be dispatched
 	this._rebuildRowIdsFromChildren(); // TODO: Check if we need to rebuild row ids
-	var nextRid = this._toRowId(rowRef);
+	let nextRid = this._toRowId(rowRef);
 
 	if(this._dt) {
 		return this._dt.insertRow(nextRid, opt_values, opt_rid);
@@ -626,10 +626,10 @@ DataView.prototype.removeRows = function(rowRefs) {
 * move(ary, 1, 0); // [1, 0, 2] Move index 1 to the position before index 0
 */
 DataView.prototype.moveRow = function(fromRef, toRef) {
-	var toRid = this._toRowId(toRef);
+	let toRid = this._toRowId(toRef);
 
-	var fromIndices = /** @type{!Array.<number|string>} */(Array.isArray(fromRef) ? fromRef : [fromRef]);
-	var fromRids = this._toRowIds(fromIndices);
+	let fromIndices = /** @type{!Array.<number|string>} */(Array.isArray(fromRef) ? fromRef : [fromRef]);
+	let fromRids = this._toRowIds(fromIndices);
 
 	if(this._dt.hasSegmentation()) {
 		this.synchronizeRowOrder();
@@ -731,14 +731,14 @@ DataView.prototype.sort = function (cid, opt_sortOrder, sortLogics, noOptimizati
 		return;
 	}
 
-	var compMap = this.getSortingLogics();
-	var sortingDefs = this._sortingDefs;
-	var curSortLen = sortingDefs.length;
+	let compMap = this.getSortingLogics();
+	let sortingDefs = this._sortingDefs;
+	let curSortLen = sortingDefs.length;
 
 	if (Array.isArray(sortLogics)) {
-		for(var c = sortLogics.length; --c >= 0;) {
+		for(let c = sortLogics.length; --c >= 0;) {
 			if (typeof sortLogics[c] !== "function") {
-				var columnId = Array.isArray(cid) ? cid[c] : cid;
+				let columnId = Array.isArray(cid) ? cid[c] : cid;
 				sortLogics[c] = compMap[columnId] || compMap["_default"];
 			}
 		}
@@ -759,7 +759,7 @@ DataView.prototype.sort = function (cid, opt_sortOrder, sortLogics, noOptimizati
 		return;
 	}
 
-	var change = false;
+	let change = false;
 
 	if (this._groupMembers || sortingDefs.length <= 0 || noOptimization) {
 		change = true;
@@ -786,8 +786,8 @@ DataView.prototype.sortOnce = function(cid, opt_sortOrder) {
 * customLogic = function(a, b, sortOrder) {
 *   return (a - b) * sortOrder; // for numeric comparison
 * };
-* var dt = new DataTable();
-* var dv = new DataView(dt);
+* let dt = new DataTable();
+* let dv = new DataView(dt);
 * dv.setSortingLogic(customLogic);
 * dv.sort("Column id", "ascending");
 */
@@ -840,7 +840,7 @@ DataView.prototype.hideRow = function(rId, hidden) {
  */
 DataView.prototype.hideRows = function(rowRefs, hidden) {
 	hidden = hidden !== false;
-	var hiddenRids = this._hiddenRids;
+	let hiddenRids = this._hiddenRids;
 
 	if(hidden){
 		if(!hiddenRids) {
@@ -850,11 +850,11 @@ DataView.prototype.hideRows = function(rowRefs, hidden) {
 		return; // All rows are visible
 	}
 
-	var rids = this._toRowIds(rowRefs);
-	var dirty = false;
+	let rids = this._toRowIds(rowRefs);
+	let dirty = false;
 
-	for(var i = rids.length; --i >= 0;) {
-		var rid = rids[i];
+	for(let i = rids.length; --i >= 0;) {
+		let rid = rids[i];
 		if(rid) { // undefined, null, and an empty string value are not a valid row id
 			if(hidden) {
 				if(!hiddenRids[rid]) {
@@ -870,8 +870,8 @@ DataView.prototype.hideRows = function(rowRefs, hidden) {
 
 	if(dirty) {
 		if(!hidden) {
-			var hasHiddenRow = false;
-			for(var key in hiddenRids) { // eslint-disable-line
+			let hasHiddenRow = false;
+			for(let key in hiddenRids) { // eslint-disable-line
 				hasHiddenRow = true;
 				break;
 			}
@@ -924,8 +924,8 @@ DataView.prototype.hasHiddenRow = function(){
 * });
 */
 DataView.prototype.filterIn = function(cid, value, opt_filteringOut) {
-	var newLogic = this._getFilterLogic(cid, value);
-	var filteringOut = (opt_filteringOut === true);
+	let newLogic = this._getFilterLogic(cid, value);
+	let filteringOut = (opt_filteringOut === true);
 	if(this._userFilter === newLogic && typeof cid !== "function") {
 		if(!newLogic || filteringOut === this._filteringOut) {
 			return false; // Nothing to update
@@ -962,8 +962,8 @@ DataView.prototype.filterOut = function(cid, value) {
 * @fires DataView#dataChanged
 */
 DataView.prototype.filterInOnce = function(cid, value, opt_filteringOut) {
-	var checker = this._getFilterLogic(cid, value);
-	var removalMap = {};
+	let checker = this._getFilterLogic(cid, value);
+	let removalMap = {};
 	if(!this._getRemovalMap(
 		removalMap,
 		checker,
@@ -972,9 +972,9 @@ DataView.prototype.filterInOnce = function(cid, value, opt_filteringOut) {
 		return;
 	}
 
-	var firstChange = this._removeRowIds(removalMap);
+	let firstChange = this._removeRowIds(removalMap);
 
-	var pageIndexChanged = this._updatePageCount();
+	let pageIndexChanged = this._updatePageCount();
 	if(pageIndexChanged || this._transformView(firstChange)) {
 		this._dispatchGlobalChange();
 	} else {
@@ -997,15 +997,15 @@ DataView.prototype.filterOutOnce = function(cid, value) {
 * @return {number}
 */
 DataView.prototype._removeRowIds = function(removalMap) {
-	var firstChange = DataView._removeArrayItems(this._rids, removalMap);
+	let firstChange = DataView._removeArrayItems(this._rids, removalMap);
 	if(this._groupView) {
 		firstChange = DataView._removeArrayItems(this._groupView, removalMap);
 	}
 
 	if(this._groupMembers) {
-		var len = this._groupList.length;
-		for(var i = 0; i < len; ++i) {
-			var groupId = this._groupList[i];
+		let len = this._groupList.length;
+		for(let i = 0; i < len; ++i) {
+			let groupId = this._groupList[i];
 			this._groupMembers[groupId]._removeRowIds(removalMap);
 		}
 	}
@@ -1040,7 +1040,7 @@ DataView.prototype.disablePageCorrection = function(opt_disable) {
 * @fires DataView#dataChanged
 */
 DataView.prototype.setPage = function (pageIndex) {
-	var result = this._setPage(pageIndex);
+	let result = this._setPage(pageIndex);
 	if(result) {
 		this._dispatchGlobalChange();
 	}
@@ -1190,7 +1190,7 @@ DataView.prototype.groupBy = function (cid, opt_predefinedGroups) {
 
 	if(this._groupCriteria) {
 		if(this._groupList && this._groupList.length > 0) { // Dispose any existing member
-			for(var key in this._groupMembers) {
+			for(let key in this._groupMembers) {
 				this._groupMembers[key].dispose(); // Clear everything in the data view
 			}
 			this._groupMembers = {}; // Clear all members
@@ -1202,10 +1202,10 @@ DataView.prototype.groupBy = function (cid, opt_predefinedGroups) {
 		this._setPredefinedGroups(opt_predefinedGroups);
 	}
 
-	var i, len;
+	let i, len;
 	if(cid && this._groupLevel === 0) { // Sub group cannot be re-group without its parent noticing it
 		this._groupCriteria = [];
-		var ary;
+		let ary;
 		if(!Array.isArray(cid)) {
 			ary = [cid];
 		} else {
@@ -1213,7 +1213,7 @@ DataView.prototype.groupBy = function (cid, opt_predefinedGroups) {
 		}
 		len = ary.length;
 		for(i = 0; i < len; ++i) {
-			var criteria = ary[i];
+			let criteria = ary[i];
 			if(typeof criteria === "string") {
 				this._groupCriteria.push(this._defaultGroupCriteria.bind(this, criteria));
 			} else if(criteria) {
@@ -1276,9 +1276,9 @@ DataView.prototype.addGroup = function (value) {
 	if(!isArray(value)) {
 		this._addGroup(value);
 	} else {
-		var ary = /** @type{Array} */(value);
-		var len = ary.length;
-		for(var i = 0; i < len; ++i) {
+		let ary = /** @type{Array} */(value);
+		let len = ary.length;
+		for(let i = 0; i < len; ++i) {
 			this._addGroup(ary[i]);
 		}
 	}
@@ -1300,8 +1300,8 @@ DataView.prototype.sortGroups = function (compare) {
 	}
 
 	this._groupList.sort(this._internalGroupSortingLogic);
-	for(var i = this._groupList.length; --i >= 0;){
-		var groupId = this._groupList[i];
+	for(let i = this._groupList.length; --i >= 0;){
+		let groupId = this._groupList[i];
 		this._groupMembers[groupId].sortGroups(this._groupSortingLogic);
 	}
 	this._groupViewDirty = true;
@@ -1315,14 +1315,14 @@ DataView.prototype.sortGroups = function (compare) {
 * @param {number} destIndex
 */
 DataView.prototype.moveGroup = function (groupRef, destIndex) {
-	var movedGroup = this.getGroup(groupRef);
+	let movedGroup = this.getGroup(groupRef);
 	if(!movedGroup) {
 		return; // Cannot find the given group
 	}
 
-	var parentGroup = movedGroup.getDataSource();
-	var groupId = movedGroup.getGroupId();
-	var curGroupIndex = parentGroup._groupList.indexOf(groupId);
+	let parentGroup = movedGroup.getDataSource();
+	let groupId = movedGroup.getGroupId();
+	let curGroupIndex = parentGroup._groupList.indexOf(groupId);
 	if(curGroupIndex === destIndex || curGroupIndex + 1 === destIndex) {
 		return; // Nothing is needed to be moved
 	}
@@ -1360,11 +1360,11 @@ DataView.prototype._setPredefinedGroups = function (predefinedGroups) {
 	}
 
 	if(this._preDefGroups) {
-		this._preDefGroups.length = 0; // Remove all predefined groups in all members (this var is shared)
+		this._preDefGroups.length = 0; // Remove all predefined groups in all members (this let is shared)
 	}
-	var is2D = false;
+	let is2D = false;
 	if(predefinedGroups) {
-		for(var i = predefinedGroups.length; --i >= 0;) {
+		for(let i = predefinedGroups.length; --i >= 0;) {
 			if(Array.isArray(predefinedGroups[i])) {
 				is2D = true;
 				break;
@@ -1402,8 +1402,8 @@ DataView.prototype.addFooter = function (opt_num) {
 		this._footerRowIds = [];
 	}
 
-	for(var i = 0; i < opt_num; ++i) {
-		var footerRowId = this._groupRowId + "_footer" + (this._footerRowIds.length || "");
+	for(let i = 0; i < opt_num; ++i) {
+		let footerRowId = this._groupRowId + "_footer" + (this._footerRowIds.length || "");
 		this._footerRowIds.push(footerRowId);
 		this._groupRows[footerRowId] = this;
 	}
@@ -1417,8 +1417,8 @@ DataView.prototype.addFooter = function (opt_num) {
 */
 DataView.prototype.removeFooter = function () {
 	if(this._footerRowIds) {
-		var len = this._footerRowIds.length;
-		for(var i = 0; i < len; ++i) {
+		let len = this._footerRowIds.length;
+		for(let i = 0; i < len; ++i) {
 			delete this._groupRows[this._footerRowIds[i]];
 		}
 		this._footerRowIds = null;
@@ -1462,7 +1462,7 @@ DataView.prototype.getGroup = function (groupRef) {
 	if(!this._groupMembers) {
 		return null;
 	}
-	var groupId;
+	let groupId;
 	if(typeof groupRef === "number") {
 		groupId = this._groupList[groupRef];
 		if(!groupId) {
@@ -1473,13 +1473,13 @@ DataView.prototype.getGroup = function (groupRef) {
 	}
 
 	// Search immediate child groups by group Id
-	var dv = this._groupMembers[groupId];
+	let dv = this._groupMembers[groupId];
 	if(dv) {
 		return dv;
 	}
 
 	// A group cannot be found by group Id. It is now assumed to be row id
-	var rowId = groupId;
+	let rowId = groupId;
 	dv = this._groupRows[rowId]; // Groups of any level will be searched
 	if(dv) {
 		return dv;
@@ -1495,10 +1495,10 @@ DataView.prototype.getGroup = function (groupRef) {
 */
 DataView.prototype._getGroupByContentRowId = function (rowId) {
 	if(this._groupMembers) {
-		for (var i = 0; i < this._groupList.length; i++) {
-			var groupId = this._groupList[i];
-			var grp = this._groupMembers[groupId];
-			var childGroup = grp._getGroupByContentRowId(rowId);
+		for (let i = 0; i < this._groupList.length; i++) {
+			let groupId = this._groupList[i];
+			let grp = this._groupMembers[groupId];
+			let childGroup = grp._getGroupByContentRowId(rowId);
 			if(childGroup) {
 				return childGroup;
 			}
@@ -1518,10 +1518,10 @@ DataView.prototype._getGroupByContentRowId = function (rowId) {
 DataView.prototype.getAllGroups = function (out_ary) {
 	if(!out_ary) { out_ary = []; }
 	if(this._groupMembers) {
-		var len = this._groupList.length;
-		for(var i = 0; i < len; ++i) {
-			var groupId = this._groupList[i];
-			var grp = this._groupMembers[groupId];
+		let len = this._groupList.length;
+		for(let i = 0; i < len; ++i) {
+			let groupId = this._groupList[i];
+			let grp = this._groupMembers[groupId];
 			out_ary.push(grp);
 			grp.getAllGroups(out_ary);
 		}
@@ -1564,7 +1564,7 @@ DataView.prototype.getGroupRowId = function () {
 */
 DataView.prototype.getFooterRowIndex = function (rid) {
 	if(this._footerRowIds) {
-		for(var i = this._footerRowIds.length; --i >= 0;) {
+		for(let i = this._footerRowIds.length; --i >= 0;) {
 			if(this._footerRowIds[i] === rid) {
 				return i;
 			}
@@ -1604,17 +1604,17 @@ DataView.prototype.getGroupLevel = function (rowRef) {
 	if(rowRef != null && this._groupRows) {
 		if(typeof rowRef === 'number'){ // TODO: Change logic to acquire row id from row index instead
 			this._rebuildRowIdsFromChildren();
-			var rids = this._getRids(); // TODO : Should include hidden rows
-			var rid = rids[rowRef];
+			let rids = this._getRids(); // TODO : Should include hidden rows
+			let rid = rids[rowRef];
 			while(rid) {
-				var dv = this._groupRows[rid];
+				let dv = this._groupRows[rid];
 				if(dv) {
 					return dv._groupLevel;
 				}
 				rid = rids[--rowRef];
 			}
 		} else {
-			var currentGroup = this.getGroup(rowRef); // Slow becuase recursive
+			let currentGroup = this.getGroup(rowRef); // Slow becuase recursive
 			if(currentGroup) {
 				return currentGroup._groupLevel;
 			}
@@ -1633,8 +1633,8 @@ DataView.prototype.getGroupLevel = function (rowRef) {
 */
 DataView.prototype.enableColumnStats = function(cid, opt_enabled, opt_refId) {
 	if (!cid) { return null; }
-	var enabled = opt_enabled !== false;
-	var cs = this._columnStats[cid];
+	let enabled = opt_enabled !== false;
+	let cs = this._columnStats[cid];
 	if(enabled) {
 		if(!cs) {
 			cs = new ColumnStats(this, cid);
@@ -1650,8 +1650,8 @@ DataView.prototype.enableColumnStats = function(cid, opt_enabled, opt_refId) {
 		}
 	}
 	if(this._groupMembers) {
-		for(var i = this._groupList.length; --i >= 0;) {
-			var groupId = this._groupList[i];
+		for(let i = this._groupList.length; --i >= 0;) {
+			let groupId = this._groupList[i];
 			this._groupMembers[groupId].enableColumnStats(cid, opt_enabled, opt_refId);
 		}
 	}
@@ -1671,7 +1671,7 @@ DataView.prototype.getColumnStats = function(cid) {
 * @returns {boolean}
 */
 DataView.prototype.hide = function(opt_hidden) {
-	var val = opt_hidden !== false;
+	let val = opt_hidden !== false;
 	if(this._hidden === val) {
 		return false;
 	}
@@ -1743,7 +1743,7 @@ DataView.prototype._setCollapse = function(collapsed) {
 * @param {boolean=} opt_collapsed
 */
 DataView.prototype.collapse = function(opt_collapsed) {
-	var dirty = this._setCollapse(opt_collapsed !== false);
+	let dirty = this._setCollapse(opt_collapsed !== false);
 
 	if(dirty) {
 		if (this._shared.contentAsHeader) {
@@ -1762,12 +1762,12 @@ DataView.prototype.collapse = function(opt_collapsed) {
 * @param {boolean=} opt_collapsed
 */
 DataView.prototype.collapseAllGroups = function(opt_collapsed) {
-	var grpList = this.getAllGroups();
-	var len = grpList.length;
+	let grpList = this.getAllGroups();
+	let len = grpList.length;
 	if(len) {
-		var collapsed = (opt_collapsed !== false);
-		for(var i = 0; i < len; ++i) {
-			var grpItem = grpList[i];
+		let collapsed = (opt_collapsed !== false);
+		for(let i = 0; i < len; ++i) {
+			let grpItem = grpList[i];
 			grpItem._setCollapse(collapsed);
 		}
 		this._requestRebuildingRowIds(false);
@@ -1846,7 +1846,7 @@ DataView.prototype.getGroupColor = function() {
 DataView.prototype._getFirstHiddenRids = function() {
 	if(this._shared.contentAsHeader) {
 		if(this._showOnlyFirstMember) {
-			var rids = this._rids;
+			let rids = this._rids;
 			if (Array.isArray(rids) && rids.length) {
 				return [rids[0]]; // Get only the first member of rids
 			}
@@ -1874,8 +1874,8 @@ DataView.prototype.getVisibleRowCount = function() {
 * @return {boolean}
 */
 DataView.prototype.isRowDataInGroup = function (rowData, groupID) {
-	var criteria = this._groupCriteria;
-	var level = this._groupLevel;
+	let criteria = this._groupCriteria;
+	let level = this._groupLevel;
 
 	// Because self is a leaf group, only check against self.
 	if (!groupID || groupID === this.getGroupId()) {
@@ -1883,7 +1883,7 @@ DataView.prototype.isRowDataInGroup = function (rowData, groupID) {
 	}
 
 	// Check against self and all sub groups within self
-	for (var i = level; i < criteria.length; i++) {
+	for (let i = level; i < criteria.length; i++) {
 		if (criteria[i](rowData).indexOf(groupID) >= 0) {
 			return true;
 		}
@@ -1898,7 +1898,7 @@ DataView.prototype.isRowDataInGroup = function (rowData, groupID) {
 * @return {boolean}
 */
 DataView.prototype.isRowIdInGroup = function (rowId, groupID) {
-	var rowData = this.getRowData(rowId);
+	let rowData = this.getRowData(rowId);
 	if(rowData) {
 		return this.isRowDataInGroup(rowData, groupID);
 	}
@@ -1932,25 +1932,25 @@ DataView.prototype.addRowExpansion = function(rid, count) {
 		}
 	}
 
-	var rowIndex = this._rids.indexOf(rid);
+	let rowIndex = this._rids.indexOf(rid);
 	if(rowIndex < 0) {
 		// The given row id must be normal row. header and expansion row are not in the this._rids list
 		return;
 	}
 
-	var expCount = 0;
+	let expCount = 0;
 	if(this._expansionMap) {
 		expCount = this._expansionMap[rid] || 0;
 	} else {
 		this._expansionMap = {};
 		this._expansionChildren = {};
 	}
-	var totalChild = expCount + count;
+	let totalChild = expCount + count;
 	this._expansionMap[rid] = totalChild;
 
 	// create _expansionChildren mapping
 
-	for (var i = expCount; i < totalChild; i++) {
+	for (let i = expCount; i < totalChild; i++) {
 		this._expansionChildren[DataView._getDataViewExpansionId(rid, i)] = rid;
 	}
 
@@ -1964,7 +1964,7 @@ DataView.prototype.addRowExpansion = function(rid, count) {
 	}
 
 	if(this._updateExpansionView()) {
-		var e = {}; // Slow
+		let e = {}; // Slow
 		e["rid"] = rid;
 		e["type"] = "inserted";
 		e["nextRid"] = this._rids[rowIndex + 1];
@@ -1980,13 +1980,13 @@ DataView.prototype.removeRowExpansion = function(rid) {
 	if(!this._expansionMap) {
 		return;
 	}
-	var expCount = this._expansionMap[rid];
+	let expCount = this._expansionMap[rid];
 	if(!expCount) {
 		return;
 	}
 
-	var rids = new Array(expCount);
-	for (var i = 0; i < expCount; ++i) {
+	let rids = new Array(expCount);
+	for (let i = 0; i < expCount; ++i) {
 		rids[i] = DataView._getDataViewExpansionId(rid, i);
 		delete this._expansionChildren[rids[i]];
 	}
@@ -2011,7 +2011,7 @@ DataView.prototype.removeRowExpansion = function(rid) {
 * @param {number=} count=1
 */
 DataView.prototype.toggleRowExpansion = function(rowRef, force, count) {
-	var rid = this._toRowId(rowRef);
+	let rid = this._toRowId(rowRef);
 
 	if(force != null) {
 		force = force === true;
@@ -2047,17 +2047,17 @@ DataView.prototype.getRowsWithExpansion = function(from, to) {
 	if(!this._expansionMap) {
 		return [];
 	}
-	var rids = this._expansionView;
-	var len = rids.length;
+	let rids = this._expansionView;
+	let len = rids.length;
 	if(to == null) { to = len; }
 	else if(to > len) { to = len; }
 
 	if(!(from > 0)) { from = 0; } // Handle NaN, undefined, null, and other invalid value
 
-	var entryCount = this._expansionCount;
-	var out_ary = new Array(len);
-	for(var i = from; i < to; ++i) {
-		var rid = rids[i];
+	let entryCount = this._expansionCount;
+	let out_ary = new Array(len);
+	for(let i = from; i < to; ++i) {
+		let rid = rids[i];
 		if(this._expansionMap[rid]) {
 			out_ary[i] = rid;
 			if(--entryCount <= 0) {
@@ -2074,10 +2074,10 @@ DataView.prototype.getRowsWithExpansion = function(from, to) {
 * @return {Array.<string>} object mapping of rowIndex and parentRowId
 */
 DataView.prototype.getExpansionParents = function (from, to) {
-	var parentMapping = [];
+	let parentMapping = [];
 	if (this._expansionMap) {
-		var rids = this._expansionView;
-		var len = rids.length;
+		let rids = this._expansionView;
+		let len = rids.length;
 
 		// Handle NaN, undefined, null, and other invalid values
 		if (to == null || to > len) {
@@ -2087,7 +2087,7 @@ DataView.prototype.getExpansionParents = function (from, to) {
 			from = 0;
 		}
 
-		for (var i = from; i < to; ++i) {
+		for (let i = from; i < to; ++i) {
 			parentMapping[i] = this._expansionChildren[rids[i]] || "";
 		}
 	}
@@ -2147,7 +2147,7 @@ DataView.prototype.getRowExpansionCount = function(rowId) {
 */
 DataView.prototype.getRowExpansionId = function(rid, idx) {
 	if(this._expansionMap) {
-		var expCount = this._expansionMap[rid] || 0;
+		let expCount = this._expansionMap[rid] || 0;
 		if(!idx) {
 			idx = 0;
 		}
@@ -2165,7 +2165,7 @@ DataView.prototype.getRowExpansionId = function(rid, idx) {
 */
 DataView.prototype.getRowExpansionIndex = function(rid) {
 	if(rid) {
-		var matches = rid.match(/_ex(\d+)$/);
+		let matches = rid.match(/_ex(\d+)$/);
 		if(matches) {
 			return +matches[1]; // TODO: Check for NaN value
 		}
@@ -2176,7 +2176,7 @@ DataView.prototype.getRowExpansionIndex = function(rid) {
 * @return {boolean}
 */
 DataView.prototype._updateExpansionView = function() {
-	var expMap = this._expansionMap;
+	let expMap = this._expansionMap;
 	if(expMap) {
 		if(!this._expansionCount || this._expansionCount < 0) {
 			this._expansionCount = 0;
@@ -2186,22 +2186,22 @@ DataView.prototype._updateExpansionView = function() {
 			return true;
 		}
 
-		var rids = this._pageView || this._groupView || this._rids;
-		var rowLen = rids.length;
-		var origLen = this._expansionView ? this._expansionView.length : 0;
+		let rids = this._pageView || this._groupView || this._rids;
+		let rowLen = rids.length;
+		let origLen = this._expansionView ? this._expansionView.length : 0;
 		if(!this._expansionView) {
 			this._expansionView = new Array(rowLen);
 		} else {
 			this._expansionView.length = rowLen;
 		}
-		var entryCount = this._expansionCount;
-		for(var i = 0, j = 0; i < rowLen; ++i) {
-			var rid = rids[i];
+		let entryCount = this._expansionCount;
+		for(let i = 0, j = 0; i < rowLen; ++i) {
+			let rid = rids[i];
 			this._expansionView[j++] = rid;
 			if(entryCount) {
-				var expCount = expMap[rid] || 0;
+				let expCount = expMap[rid] || 0;
 				if(expCount) {
-					for(var k = 0; k < expCount; ++k) {
+					for(let k = 0; k < expCount; ++k) {
 						this._expansionView[j++] = DataView._getDataViewExpansionId(rid, k);
 					}
 					--entryCount;
@@ -2219,7 +2219,7 @@ DataView.prototype._updateExpansionView = function() {
 * @return {boolean}
 */
 DataView.prototype._transformView = function(firstChange) {
-	var dirty = this._updatePaginationView(firstChange);
+	let dirty = this._updatePaginationView(firstChange);
 	dirty |= this._updateExpansionView();
 	return dirty ? true : false;
 };
@@ -2234,12 +2234,12 @@ DataView.prototype.searchAll = function(searchLogic, opt_out) {
 	if(!opt_out) { opt_out = []; }
 
 	this._rebuildRowIdsFromChildren();
-	var rids = this._getRids();
-	var len = rids.length;
+	let rids = this._getRids();
+	let len = rids.length;
 
-	for(var i = 0; i < len; ++i) {
-		var rid = rids[i];
-		var row = this._dt.getRowData(rid);
+	for(let i = 0; i < len; ++i) {
+		let rid = rids[i];
+		let row = this._dt.getRowData(rid);
 		if(row) {
 			if(searchLogic(row)) {
 				opt_out.push(rid);
@@ -2256,8 +2256,8 @@ DataView.prototype.searchAll = function(searchLogic, opt_out) {
 */
 DataView.prototype.searchPrev = function(rowRef, searchLogic) {
 	this._rebuildRowIdsFromChildren();
-	var rids = this._getRids();
-	var rowIndex = -1;
+	let rids = this._getRids();
+	let rowIndex = -1;
 	if(typeof rowRef === "number") {
 		if(this._dt.getRowData(rids[rowRef])) {
 			rowIndex = rowRef;
@@ -2266,8 +2266,8 @@ DataView.prototype.searchPrev = function(rowRef, searchLogic) {
 		rowIndex = rids.indexOf(rowRef);
 	}
 
-	var foundAt = -1;
-	var len = rids.length;
+	let foundAt = -1;
+	let len = rids.length;
 	if(rowIndex > 0) {
 		foundAt = this._searchRow(rids, searchLogic, rowIndex - 1, -1, -1);
 		if(foundAt >= 0) {
@@ -2290,8 +2290,8 @@ DataView.prototype.searchPrev = function(rowRef, searchLogic) {
 */
 DataView.prototype.searchNext = function(rowRef, searchLogic) {
 	this._rebuildRowIdsFromChildren();
-	var rids = this._getRids();
-	var rowIndex = -1;
+	let rids = this._getRids();
+	let rowIndex = -1;
 	if(typeof rowRef === "number") {
 		if(this._dt.getRowData(rids[rowRef])) {
 			rowIndex = rowRef;
@@ -2303,8 +2303,8 @@ DataView.prototype.searchNext = function(rowRef, searchLogic) {
 		return -1;
 	}
 
-	var foundAt = -1;
-	var len = rids.length;
+	let foundAt = -1;
+	let len = rids.length;
 	if(rowIndex < len - 1) {
 		foundAt = this._searchRow(rids, searchLogic, rowIndex + 1, len, 1);
 		if(foundAt >= 0) {
@@ -2330,8 +2330,8 @@ DataView.prototype.searchNext = function(rowRef, searchLogic) {
 */
 DataView.prototype._searchRow = function(rids, searchLogic, start, end, inc) {
 	while(start !== end) {
-		var rid = rids[start];
-		var row = this._dt.getRowData(rid);
+		let rid = rids[start];
+		let row = this._dt.getRowData(rid);
 		if(row) {
 			if(searchLogic(row)) {
 				return start;
@@ -2348,15 +2348,15 @@ DataView.prototype._searchRow = function(rids, searchLogic, start, end, inc) {
 * @return {boolean} True if there is any change
 */
 DataView.prototype.stall = function(opt_bool) {
-	var newBool = opt_bool !== false;
-	var curBool = this._shared.stalledRids ? true : false;
+	let newBool = opt_bool !== false;
+	let curBool = this._shared.stalledRids ? true : false;
 	if(curBool === newBool) { return false; }
 	if(newBool) {
-		var srs = {};
+		let srs = {};
 		this._shared.stalledRids = srs;
-		var rids = this._getRids();
+		let rids = this._getRids();
 
-		for(var i = rids.length; --i >= 0;) {
+		for(let i = rids.length; --i >= 0;) {
 			srs[rids[i]] = 1;
 		}
 	} else {
@@ -2372,7 +2372,7 @@ DataView.prototype.stall = function(opt_bool) {
 */
 DataView.prototype.enableAutoGroupRemoval = function(opt_bool) {
 	opt_bool = opt_bool !== false;
-	var autoGroupRemoval = this._shared.autoGroupRemoval ? true : false;
+	let autoGroupRemoval = this._shared.autoGroupRemoval ? true : false;
 	if(autoGroupRemoval !== opt_bool) {
 		this._shared.autoGroupRemoval = opt_bool;
 		this._triggerGroupRefreshing();
@@ -2387,7 +2387,7 @@ DataView.prototype.enableAutoGroupRemoval = function(opt_bool) {
 */
 DataView.prototype.enableAutoGroupHiding = function(opt_bool) {
 	opt_bool = opt_bool !== false;
-	var autoGroupHiding = this._shared.autoGroupHiding ? true : false;
+	let autoGroupHiding = this._shared.autoGroupHiding ? true : false;
 	if(autoGroupHiding !== opt_bool) {
 		this._shared.autoGroupHiding = opt_bool;
 		this._triggerGroupRefreshing();
@@ -2411,7 +2411,7 @@ DataView.prototype.synchronizeRowOrder = function() {
 * @return {boolean} Return true if there is any change
 */
 DataView.prototype.setSegmentSeparator = function(rowRef, enabled) {
-	var rowId = "";
+	let rowId = "";
 	if(typeof rowRef === "number") {
 		rowId = this.getRowId(rowRef);
 	} else if(typeof rowRef === "string") {
@@ -2462,7 +2462,7 @@ DataView.prototype.getSegment = function(rid) {
 /**
 * @public
 * @param {string} rid Row id of a segment child
-* @return {string} Returns null if a segment cannot be found
+* @return {Segment} Returns null if a segment cannot be found
 */
 DataView.prototype.getSegmentParent = function(rid) {
 	return this._dt.getSegmentParent(rid);
@@ -2490,9 +2490,9 @@ DataView.prototype.getSegmentParentRowId = function(rid) {
 */
 DataView.prototype.collapseSegment = function(rowRef, collapsed) {
 	collapsed = collapsed !== false;
-	var segments = this._dt._getSegmentSeparators();
+	let segments = this._dt._getSegmentSeparators();
 	if(segments) {
-		var segmentRid = this._toRowId(rowRef);
+		let segmentRid = this._toRowId(rowRef);
 
 		if(segments.collapseSegment(segmentRid, collapsed)) {
 			this._refreshAndNotify(); // dispatch global change event
@@ -2515,7 +2515,7 @@ DataView.prototype.expandSegment = function(rowRef, expanded) {
 * @return {boolean} Return true if there is any change
 */
 DataView.prototype.expandAllSegments = function() {
-	var segments = this._dt._getSegmentSeparators();
+	let segments = this._dt._getSegmentSeparators();
 	if(segments) {
 		if(segments.expandAllSegments()) {
 			this._refreshAndNotify();
@@ -2534,7 +2534,7 @@ DataView.prototype.setSegmentCollapsingLogic = function() {};
 * @return {boolean} Return true if only the given row is a collapsed segment separator
 */
 DataView.prototype.isSegmentCollapsed = function(rowRef) {
-	var segments = this._dt._getSegmentSeparators();
+	let segments = this._dt._getSegmentSeparators();
 	if(segments) {
 		return segments.isCollapsedSegment(this._toRowId(rowRef));
 	}
@@ -2561,8 +2561,8 @@ DataView.prototype.fillSegments = function() {
 */
 DataView.prototype.addSegmentChild = function(segmentRef, rowRef, dataId) {
 	if(this._dt._getSegmentSeparators()) {
-		var segmentId = this._toRowId(segmentRef);
-		var rowId = this._toRowId(rowRef);
+		let segmentId = this._toRowId(segmentRef);
+		let rowId = this._toRowId(rowRef);
 		return this._dt.addSegmentChild(segmentId, rowId, dataId);
 	}
 	return false;
@@ -2575,8 +2575,8 @@ DataView.prototype.addSegmentChild = function(segmentRef, rowRef, dataId) {
 */
 DataView.prototype.addSegmentChildren = function(segmentRef, rowRefs, dataIds) {
 	if(this._dt._getSegmentSeparators()) {
-		var segmentId = this._toRowId(segmentRef);
-		var rowIds = this._toRowIds(rowRefs);
+		let segmentId = this._toRowId(segmentRef);
+		let rowIds = this._toRowIds(rowRefs);
 		return this._dt.addSegmentChildren(segmentId, rowIds, dataIds);
 	}
 	return false;
@@ -2588,8 +2588,8 @@ DataView.prototype.addSegmentChildren = function(segmentRef, rowRefs, dataIds) {
 */
 DataView.prototype.removeSegmentChild = function(segmentRef, rowRef) {
 	if(this._dt._getSegmentSeparators()) {
-		var segmentId = this._toRowId(segmentRef);
-		var rowId = this._toRowId(rowRef);
+		let segmentId = this._toRowId(segmentRef);
+		let rowId = this._toRowId(rowRef);
 		return this._dt.removeSegmentChild(segmentId, rowId); // TODO: Handle the case where a child is remove from its collapsed parent. Child should be made visible
 	}
 	return false;
@@ -2601,8 +2601,8 @@ DataView.prototype.removeSegmentChild = function(segmentRef, rowRef) {
 */
 DataView.prototype.removeSegmentChildren = function(segmentRef, rowRefs) {
 	if(this._dt._getSegmentSeparators()) {
-		var segmentId = this._toRowId(segmentRef);
-		var rowIds = this._toRowIds(rowRefs);
+		let segmentId = this._toRowId(segmentRef);
+		let rowIds = this._toRowIds(rowRefs);
 		return this._dt.removeSegmentChildren(segmentId, rowIds); // TODO: Handle the case where a child is remove from its collapsed parent. Child should be made visible
 	}
 	return false;
@@ -2727,15 +2727,15 @@ DataView.prototype.wrapView = function (wrapSize) {
 */
 DataView.prototype._updateWrapCount = function () {
 	this._wrapTimerId = 0;
-	var wrapSize = this._wrapSize;
+	let wrapSize = this._wrapSize;
 
-	var i;
-	var views = this._wrappedViews;
-	var viewCount = views ? views.length : 0;
-	var targetCount = 0;
+	let i;
+	let views = this._wrappedViews;
+	let viewCount = views ? views.length : 0;
+	let targetCount = 0;
 	if(wrapSize) {
-		var rids = this.getVisibleRowIds(true);
-		var rowCount = rids.length;
+		let rids = this.getVisibleRowIds(true);
+		let rowCount = rids.length;
 		targetCount = Math.ceil(rowCount / wrapSize);
 		if(viewCount < targetCount) {
 			if(!views) {
@@ -2777,7 +2777,7 @@ DataView.prototype._updateWrapCount = function () {
 */
 DataView.prototype.dump = function(opt_options) {
 	this._rebuildRowIdsFromChildren();
-	var rids = this._getRids();
+	let rids = this._getRids();
 
 	return DataCache.constructTable(this.getMultipleRowData(rids), opt_options, rids);
 };
@@ -2795,7 +2795,7 @@ DataView.prototype.dump = function(opt_options) {
 //}
 dv.log({"rowCount": 10}); // Showing 10 records
 dv.log({"getter": function(rowData, colName){
-	var complexData = rowData[colName];
+	let complexData = rowData[colName];
 	return complextData.someProperty;
 }});
 */
@@ -2832,13 +2832,13 @@ DataView.prototype._updateRowIds = function(opt_rowIds) {
 	this._dispatch("beforeFiltering", {});
 
 	this._excludedRids = {};
-	var exclusionCount = 0;
+	let exclusionCount = 0;
 	exclusionCount += DataView._copyObjectKeys(this._excludedRids, this._hiddenRids);
 
 	// Segment separators should not be filtered out (hidden)
-	var segments = this._dt._getSegmentSeparators();
-	var segmentIds = segments ? segments.getSegments() : null;
-	var userRemoval = this._getRemovalMap(
+	let segments = this._dt._getSegmentSeparators();
+	let segmentIds = segments ? segments.getSegments() : null;
+	let userRemoval = this._getRemovalMap(
 		this._excludedRids,
 		this._userFilter,
 		this._filteringOut,
@@ -2867,8 +2867,8 @@ DataView.prototype._updateRowIds = function(opt_rowIds) {
 	if(this._groupMembers) { // Has grouping
 		this._populateGroups(); // View will be properly re-populate inside _populateGroups()
 	} else { // No grouping
-		var pageIndexChanged = this._updatePageCount();
-		var sorted = this._sort();
+		let pageIndexChanged = this._updatePageCount();
+		let sorted = this._sort();
 		if(!sorted && !pageIndexChanged) {
 			this._transformView();
 		}
@@ -2880,19 +2880,19 @@ DataView.prototype._updateRowIds = function(opt_rowIds) {
 DataView.prototype._onDataChanged = function (e) {
 	if (this._conflator.conflate(e)) return;
 
-	var events = this._conflator.popAllData() || [e];
+	let events = this._conflator.popAllData() || [e];
 
 	// process all events
-	var eventsCount = events.length;
+	let eventsCount = events.length;
 	if (eventsCount === 1) {
-		var event = events[0];
+		let event = events[0];
 		if (event["globalChange"]) {
 			this._updateRowIds(); // Reset all row ids and perform sorting
 			this._dispatchDataChange(event);
 			return;
 		}
 
-		var type = event["type"];
+		let type = event["type"];
 		if (type === "inserted") {
 			this._onRowInserted(event);
 		} else if (type === "removed") {
@@ -2903,8 +2903,8 @@ DataView.prototype._onDataChanged = function (e) {
 	} else {
 		// multi event should occur globalchange
 		this._updateRowIds();  // Reset all row ids and perform sorting
-		var positionChangeOnly = true;
-		for (var i = 0; i < eventsCount; i++) {
+		let positionChangeOnly = true;
+		for (let i = 0; i < eventsCount; i++) {
 			if (!events[i].positionChangeOnly) {
 				positionChangeOnly = false;
 				break;
@@ -2930,21 +2930,21 @@ DataView.prototype._onRowInserted = function(e) { // onInsert
 		return 0;
 	}
 
-	var ret = 0;
+	let ret = 0;
 	if(this._groupMembers) {
-		var gids = this._resolveGroupId(e["rowData"]);
-		var groupLen = gids.length;
+		let gids = this._resolveGroupId(e["rowData"]);
+		let groupLen = gids.length;
 		if(groupLen > 1) {
 			// activate multi-group row mode
 			this._shared.multiGroupRow = true;
 		}
-		var gid;
-		for(var i = 0; i < groupLen; i++) {
+		let gid;
+		for(let i = 0; i < groupLen; i++) {
 			gid = gids[i];
 			if(this._groupMembers[gid]) { // Insert to existing member
 				ret = this._groupMembers[gid]._onRowInserted(e);
 			} else {
-				var member = this._addGroup(gid);
+				let member = this._addGroup(gid);
 				if(member) {
 					e["globalChange"] = true;
 					member._onRowInserted(e);
@@ -2961,23 +2961,23 @@ DataView.prototype._onRowInserted = function(e) { // onInsert
 		return ret; // the view is hidden and there is no need to be updated
 	}
 
-	var rid = e["rid"];
-	var rowData = e["rowData"];
+	let rid = e["rid"];
+	let rowData = e["rowData"];
 
 	if(!this._isAllowedInGroup(rid, rowData)) {
 		return ret;
 	}
 
-	var nextRid = /** @type{string} */(e["nextRid"]);
-	var rowIndex;
+	let nextRid = /** @type{string} */(e["nextRid"]);
+	let rowIndex;
 	if(this.isSorting() && !e["segmentChanged"]) {
 		rowIndex = this._addDataRow(rid);
 	} else {
 		rowIndex = this._addDataRow(rid, nextRid, e["fallback"]);
 	}
 
-	var pageIndexChanged = this._updatePageCount();
-	var sorted = this._sort();
+	let pageIndexChanged = this._updatePageCount();
+	let sorted = this._sort();
 	if(sorted) {
 		e["globalChange"] = true; // Notify parent
 	}
@@ -3017,12 +3017,12 @@ DataView.prototype._onRowRemoved = function(e) { // onRemove
 		return 1; // may not be a correct number
 	}
 
-	var removeCount = 0;
-	var rids = e["rids"];
-	var i;
+	let removeCount = 0;
+	let rids = e["rids"];
+	let i;
 	if(this._groupMembers) {
-		var rowData = e["rowData"];
-		var groupIds, groupId;
+		let rowData = e["rowData"];
+		let groupIds, groupId;
 		if(!rids && rowData) {
 			groupIds = this._resolveGroupId(rowData);
 			for(i = 0; i < groupIds.length; i++) {
@@ -3038,7 +3038,7 @@ DataView.prototype._onRowRemoved = function(e) { // onRemove
 				this._groupViewDirty = true;
 			}
 		} else {
-			var len = this._groupList.length;
+			let len = this._groupList.length;
 			for(i = 0; i < len; ++i) {
 				groupId = this._groupList[i];
 				removeCount += this._groupMembers[groupId]._onRowRemoved(e);
@@ -3046,9 +3046,9 @@ DataView.prototype._onRowRemoved = function(e) { // onRemove
 		}
 	}
 
-	var firstModifiedIndex = NaN;
-	var removedRids = null;
-	var rid, at;
+	let firstModifiedIndex = NaN;
+	let removedRids = null;
+	let rid, at;
 
 	// TODO: Change removal mechanism to object map based logic to speed up the process
 	removeCount = 0;
@@ -3076,7 +3076,7 @@ DataView.prototype._onRowRemoved = function(e) { // onRemove
 	}
 	if(removeCount > 0) {
 		// No sorting is required, since no order should be changed during the removal
-		var pageIndexChanged = this._updatePageCount();
+		let pageIndexChanged = this._updatePageCount();
 		if(pageIndexChanged || this._transformView(firstModifiedIndex)) {
 			this._dispatchGlobalChange();
 		} else {
@@ -3098,9 +3098,9 @@ DataView.prototype._onRowRemoved = function(e) { // onRemove
 * @return {number}
 */
 DataView.prototype._onRowUpdated = function(e) { // onUpdate
-	var rid = e["rid"];
-	var rowData = e["rowData"];
-	var i, gid;
+	let rid = e["rid"];
+	let rowData = e["rowData"];
+	let i, gid;
 	if(this.isRowFiltered(rid, rowData)) { // The row is qualified but it is filtered out
 		if(this._onRowRemoved(e)) {
 			return 1;
@@ -3109,8 +3109,8 @@ DataView.prototype._onRowUpdated = function(e) { // onUpdate
 	}
 
 	if(this._groupMembers) {
-		var flags = [];
-		var len = this._groupList.length;
+		let flags = [];
+		let len = this._groupList.length;
 		for(i = 0; i < len; ++i) {
 			gid = this._groupList[i];
 			flags[this._groupMembers[gid]._onRowUpdated(e)] = true;
@@ -3121,7 +3121,7 @@ DataView.prototype._onRowUpdated = function(e) { // onUpdate
 		}
 
 		// conclude flag
-		var processingFlag = 0;
+		let processingFlag = 0;
 		if(flags[2]) {
 			processingFlag = 2;
 		} else if(flags[1]) {
@@ -3150,7 +3150,7 @@ DataView.prototype._onRowUpdated = function(e) { // onUpdate
 
 					this._groupViewDirty = true; // Adding row to sub-group both single and multiple-group require parent group to rebuild rows
 
-					var groupLen = this._resolveGroupId(rowData).length;
+					let groupLen = this._resolveGroupId(rowData).length;
 					if(groupLen > 1) {
 						// activate multi-group row mode
 						this._shared.multiGroupRow = true;
@@ -3158,17 +3158,17 @@ DataView.prototype._onRowUpdated = function(e) { // onUpdate
 				}
 			}
 		} else { // This is the root node
-			var noNewGroup = (flags[1] && flags[2]) || flags[4];
+			let noNewGroup = (flags[1] && flags[2]) || flags[4];
 			if(this._shared.multiGroupRow || !noNewGroup) {
 				// 0 - updated data from non-existing group to new group
 				// 1 - updated data from existing group to new group
 				// 2 - updated data from a non-existing group to existing group
 				// 3 - updated data from a existing group to another existing group
 				// 4 - updated data with in a single group and no group member changed
-				var gids = this._resolveGroupId(rowData);
+				let gids = this._resolveGroupId(rowData);
 				for(i = 0; i < gids.length; i++) {
 					gid = gids[i];
-					var member = this._addGroup(gid); // Add header row
+					let member = this._addGroup(gid); // Add header row
 					if(member) {
 						member._onRowInserted(e);
 						processingFlag = 1;
@@ -3196,7 +3196,7 @@ DataView.prototype._onRowUpdated = function(e) { // onUpdate
 
 	// recursive task for leaf group
 	if(this._isAllowedInGroup(rid, rowData)) {
-		var newRowIndex = this._rids.indexOf(rid);
+		let newRowIndex = this._rids.indexOf(rid);
 		if(newRowIndex < 0) { // The row is qualified to be in the group, but not in the current view, so insert the row
 			this._onRowInserted(e);
 			return 2;
@@ -3223,8 +3223,8 @@ DataView.prototype._onRowUpdated = function(e) { // onUpdate
 */
 DataView.prototype._onGroupAdded = function(e) {
 	if(!this._hidden) {
-		var newGroup = /** @type{DataView} */(e["newGroup"]);
-		var rid = newGroup.getGroupRowId();
+		let newGroup = /** @type{DataView} */(e["newGroup"]);
+		let rid = newGroup.getGroupRowId();
 		this._groupView.push(rid); // Add header row
 		this._groupViewDirty = true;
 		this._dispatch("groupAdded", e);
@@ -3278,7 +3278,7 @@ DataView.prototype._onRefreshTimeout = function() {
 * @return {number}
 */
 DataView.prototype._addDataRow = function(rid, opt_nextRid, opt_fallback) {
-	var rowIndex = this._getRowIndex(this._rids, opt_nextRid, opt_fallback);
+	let rowIndex = this._getRowIndex(this._rids, opt_nextRid, opt_fallback);
 	this._insertItems(this._rids, rowIndex, rid);
 	if(this._groupView) {
 		if(this._groupMembers) {
@@ -3320,7 +3320,7 @@ DataView.prototype._getRowIndex = function(rids, opt_nextRid, opt_fallback) {
 		return -1;
 	}
 
-	var rowIndex = this._rids.indexOf(opt_nextRid);
+	let rowIndex = this._rids.indexOf(opt_nextRid);
 	if(rowIndex >= 0) {
 		return rowIndex;
 	}
@@ -3336,7 +3336,7 @@ DataView.prototype._getRowIndex = function(rids, opt_nextRid, opt_fallback) {
 * @returns {number}
 */
 DataView.prototype._removeDataRow = function(rid) {
-	var at = DataView._removeArrayItem(this._rids, rid);
+	let at = DataView._removeArrayItem(this._rids, rid);
 	if(this._groupView && at >= 0) {
 		at = DataView._removeArrayItem(this._groupView, rid);
 	}
@@ -3348,7 +3348,7 @@ DataView.prototype._removeDataRow = function(rid) {
 * @return {number} Index of the removed item
 */
 DataView._removeArrayItem = function(ary, item) {
-	var at = ary.indexOf(item);
+	let at = ary.indexOf(item);
 	if(at >= 0) {
 		ary.splice(at, 1);
 	}
@@ -3361,9 +3361,9 @@ DataView._removeArrayItem = function(ary, item) {
 * @return {number} First item index that is being removed. NaN if no item is removed
 */
 DataView._removeArrayItems = function(ary, items) {
-	var f = NaN;
-	var c = 0;
-	for(var i = ary.length; --i >= 0;) {
+	let f = NaN;
+	let c = 0;
+	for(let i = ary.length; --i >= 0;) {
 		if (items[ary[i]]) {
 			++c;
 		} else if(c) {
@@ -3385,9 +3385,9 @@ DataView._removeArrayItems = function(ary, items) {
 */
 DataView._copyObjectKeys = function(baseObj, masterObj) {
 	if(masterObj) {
-		var count = 0;
+		let count = 0;
 
-		for(var key in masterObj) {
+		for(let key in masterObj) {
 			baseObj[key] = 1;
 			++count; // WARNING: duplicated key can be counted more than once
 		}
@@ -3404,8 +3404,8 @@ DataView._copyObjectKeys = function(baseObj, masterObj) {
 DataView.prototype._isAllowedInGroup = function(rid, rowData) {
 	// Check if it the row is belong to this group branch
 	if(this._groupLevel > 0) {
-		var dv = this;
-		for(var i = this._groupLevel; --i >= 0;) {
+		let dv = this;
+		for(let i = this._groupLevel; --i >= 0;) {
 			if(!dv._groupFilterLogic(rid, rowData)) {
 				return false;
 			}
@@ -3455,10 +3455,10 @@ DataView.prototype._sort = function() {
 	}
 
 	if(this._dt._getSegmentSeparators() || this.isSorting()) {
-		var rids = this._rids;
-		var dataRows = this._dt.getMultipleRowData(rids);
-		var segmentValues = this._dt.getSegmentValues(rids, true); // WARNING: This does not work well for hidden/filtered rows
-		var change = DataTable._performMultiLevelSorting(dataRows, this._sortingDefs, segmentValues);
+		let rids = this._rids;
+		let dataRows = this._dt.getMultipleRowData(rids);
+		let segmentValues = this._dt.getSegmentValues(rids, true); // WARNING: This does not work well for hidden/filtered rows
+		let change = DataTable._performMultiLevelSorting(dataRows, this._sortingDefs, segmentValues);
 
 		if(change) {
 			this._rids = DataTable._reorderItems(rids, change); // Group view should be changed after this
@@ -3489,11 +3489,11 @@ DataView.prototype._getRemovalMap = function(removalMap, checker, filteringOut,
 		return 0;
 	}
 
-	var rids = this._rids; // Make local variable to speed up the process
-	var dt = this._dt;
-	var count = 0;
-	var rid, i, values;
-	var len = rids.length;
+	let rids = this._rids; // Make local variable to speed up the process
+	let dt = this._dt;
+	let count = 0;
+	let rid, i, values;
+	let len = rids.length;
 
 	if(exceptions) {
 		for(i = len; --i >= 0;) {
@@ -3534,14 +3534,14 @@ DataView.prototype._getRemovalMap = function(removalMap, checker, filteringOut,
 * @returns {number} Number of rids that would be filtered out
 */
 DataView.prototype._getEmptySegments = function(removalMap, segmentRids) {
-	var segments = this._dt._getSegmentSeparators();
-	var count = 0;
-	for(var segmentId in segmentRids) {
-		var segment = segments.getSegment(segmentId);
+	let segments = this._dt._getSegmentSeparators();
+	let count = 0;
+	for(let segmentId in segmentRids) {
+		let segment = segments.getSegment(segmentId);
 		if(segment) {
-			var chdr = segment.getChildren();
-			var emptySegment = true;
-			for(var childId in chdr) {
+			let chdr = segment.getChildren();
+			let emptySegment = true;
+			for(let childId in chdr) {
 				if(!removalMap[childId]) {
 					emptySegment = false;
 					break;
@@ -3603,23 +3603,23 @@ DataView.prototype._setPage = function (pageIndex) {
 * @return {boolean} Return true if there is any change, otherwise false
 */
 DataView.prototype._updatePaginationView = function(firstChange) {
-	var dirty = false;
+	let dirty = false;
 	if(this._pageView) {
 		if(!firstChange) { firstChange = 0; }
 
-		var pageStart = this._pageSize * (this._pageIndex - 1);
+		let pageStart = this._pageSize * (this._pageIndex - 1);
 
-		var pageEnd = this._pageSize + pageStart;
+		let pageEnd = this._pageSize + pageStart;
 		if(firstChange < pageEnd) { // The change happens before current page
-			var rids = this._groupView || this._rids;
+			let rids = this._groupView || this._rids;
 			if (pageEnd > rids.length) { // Shrink view if the last page is not a full page
 				pageEnd = rids.length;
 			}
 
 			// Populate the page
-			var ridsLen = pageEnd - pageStart;
+			let ridsLen = pageEnd - pageStart;
 			this._pageView.length = (ridsLen >= 0) ? ridsLen : 0;
-			for(var i = pageStart; i < pageEnd; ++i) {
+			for(let i = pageStart; i < pageEnd; ++i) {
 				this._pageView[i - pageStart] = rids[i];
 			}
 			dirty = true;
@@ -3635,10 +3635,10 @@ DataView.prototype._updatePaginationView = function(firstChange) {
 * @fires DataView#pageIndexChanged
 */
 DataView.prototype._updatePageCount = function () {
-	var lastPageIndex = 1;
+	let lastPageIndex = 1;
 	if (this._pageSize > 0) {
-		var rows = this._groupView || this._rids;
-		var rowCount = (rows.length > 0) ? rows.length : 0;
+		let rows = this._groupView || this._rids;
+		let rowCount = (rows.length > 0) ? rows.length : 0;
 		lastPageIndex = Math.ceil(rowCount / this._pageSize);
 	}
 	if(this._lastPageIndex !== lastPageIndex) {
@@ -3665,7 +3665,7 @@ DataView.prototype._dispatchRowRemoved = function(rid) {
 */
 DataView.prototype._dispatchMultiRowRemoved = function(rids) {
 	if(rids) {
-		var count = rids.length;
+		let count = rids.length;
 		if(count === 1) {
 			this._dispatchRowRemoved(rids[0]);
 		} else if(count > 1) {
@@ -3704,11 +3704,11 @@ DataView.prototype._setParent = function (source) {
 	if(this._parent && this._dt !== this._parent) { // Copy shared member from parent data view
 		this._shared = this._parent._shared;
 
-		var cids = this._parent._columnStats;
+		let cids = this._parent._columnStats;
 		if(cids) {
-			for(var cid in cids) {
-				var cs = this.enableColumnStats(cid);
-				var pcs = this._parent.getColumnStats(cid);
+			for(let cid in cids) {
+				let cs = this.enableColumnStats(cid);
+				let pcs = this._parent.getColumnStats(cid);
 				if(cs && pcs) {
 					cs.setColumnDataGetter(pcs.getColumnDataGetter());
 				}
@@ -3720,18 +3720,18 @@ DataView.prototype._setParent = function (source) {
 /** @private
 */
 DataView.prototype._populateGroups = function () {
-	var initialRids = this._rids;
-	var i, len, member;
+	let initialRids = this._rids;
+	let i, len, member;
 	this._rids = [];
 
 	// Collect members of each group from the available data
-	var groupId, groupIds, groupLen;
-	var ridMap = {};
-	var groupList = [];
+	let groupId, groupIds, groupLen;
+	let ridMap = {};
+	let groupList = [];
 	len = initialRids.length;
 	for(i = 0; i < len; ++i) {
-		var rid = initialRids[i];
-		var rowData = this._dt.getRowData(rid);
+		let rid = initialRids[i];
+		let rowData = this._dt.getRowData(rid);
 		if(rowData) {
 			groupIds = this._resolveGroupId(rowData);
 			groupLen = groupIds.length;
@@ -3739,9 +3739,9 @@ DataView.prototype._populateGroups = function () {
 				// activate multi-group row mode
 				this._shared.multiGroupRow = true;
 			}
-			for(var j = 0; j < groupLen; j++) {
+			for(let j = 0; j < groupLen; j++) {
 				groupId = groupIds[j];
-				var groupedRids = ridMap[groupId];
+				let groupedRids = ridMap[groupId];
 				if(groupedRids) {
 					groupedRids.push(rid);
 				} else {
@@ -3767,7 +3767,7 @@ DataView.prototype._populateGroups = function () {
 		}
 	}
 	// Remove any non existing predefined groups
-	var preDefGroups = null;
+	let preDefGroups = null;
 	if(this._preDefGroups && this._groupLevel < this._preDefGroups.length) {
 		preDefGroups = this._preDefGroups[this._groupLevel];
 	}
@@ -3796,7 +3796,7 @@ DataView.prototype._populateGroups = function () {
 	if(preDefGroups) {
 		len = preDefGroups.length;
 		for(i = 0; i < len; ++i) {
-			var pdg = this._addGroup(preDefGroups[i]);
+			let pdg = this._addGroup(preDefGroups[i]);
 			if(pdg) {
 				pdg._predefinedGroup = true;
 			}
@@ -3825,7 +3825,7 @@ DataView.prototype._populateGroups = function () {
 * @param {string} groupId
 */
 DataView.prototype._removeGroupMember = function (groupIndex, groupId) {
-	var member = this._groupMembers[groupId];
+	let member = this._groupMembers[groupId];
 	if(member) {
 		this._groupList.splice(groupIndex, 1);
 		delete this._groupMembers[groupId];
@@ -3839,7 +3839,7 @@ DataView.prototype._removeGroupMember = function (groupIndex, groupId) {
 * @return {Array.<string>}
 */
 DataView.prototype._defaultGroupCriteria = function(cid, values) {
-	var val = values[cid];
+	let val = values[cid];
 	if(Array.isArray(val)) {
 		return val.map(function(data) { // TODO: this is very slow
 			return data + "";
@@ -3854,7 +3854,7 @@ DataView.prototype._defaultGroupCriteria = function(cid, values) {
 * @return {boolean}
 */
 DataView.prototype._groupFilterLogic = function(rid, values) {
-	var gids = this._groupCriteria[this._groupLevel - 1](values); // TODO: this is very slow
+	let gids = this._groupCriteria[this._groupLevel - 1](values); // TODO: this is very slow
 	return gids.indexOf(this._groupId) >= 0;
 };
 
@@ -3864,8 +3864,8 @@ DataView.prototype._groupFilterLogic = function(rid, values) {
 * @return {number}
 */
 DataView.prototype._internalGroupSortingLogic = function(strA, strB) {
-	var dvA = this._groupMembers[strA];
-	var dvB = this._groupMembers[strB];
+	let dvA = this._groupMembers[strA];
+	let dvB = this._groupMembers[strB];
 
 	return this._groupSortingLogic(strA, strB, dvA, dvB);
 };
@@ -3875,18 +3875,18 @@ DataView.prototype._internalGroupSortingLogic = function(strA, strB) {
 * @return {DataView} Newly added group member. If it already exists, this method returns null.
 */
 DataView.prototype._addGroup = function (value) {
-	var groupId = value + "";
+	let groupId = value + "";
 	if(!groupId) {
 		// window.console.log("WARNING: Group Id cannot be an empty string");
 		return null;
 	}
-	var member = this._groupMembers[groupId];
+	let member = this._groupMembers[groupId];
 	if(member) {
 		return null;
 	}
-	var parentGrpRowId = this._groupRowId || "_grp";
-	var newGrpRowId = parentGrpRowId + "_" + groupId;
-	var arg;
+	let parentGrpRowId = this._groupRowId || "_grp";
+	let newGrpRowId = parentGrpRowId + "_" + groupId;
+	let arg;
 	if(this._hasListener("beforeGroupAdded")) {
 		arg = {
 			"dataView": this, // parent
@@ -3901,7 +3901,7 @@ DataView.prototype._addGroup = function (value) {
 		}
 	}
 	member = new DataView();
-	var collapsed = this._shared.defaultCollapse;
+	let collapsed = this._shared.defaultCollapse;
 	if(collapsed != null) {
 		member._collapsed = collapsed;
 	}
@@ -3980,10 +3980,10 @@ DataView.prototype._rebuildRowIdsFromChildren = function () {
 	this._rids.length = 0;
 	if(this._groupView) { this._groupView.length = 0; }
 	if(!this._hidden) {
-		var grpLen = this._groupList.length;
-		for(var i = 0; i < grpLen; ++i) { // Re-distribute this object content to all of its group members
-			var gid = this._groupList[i];
-			var member = this._groupMembers[gid];
+		let grpLen = this._groupList.length;
+		for(let i = 0; i < grpLen; ++i) { // Re-distribute this object content to all of its group members
+			let gid = this._groupList[i];
+			let member = this._groupMembers[gid];
 			member._rebuildRowIdsFromChildren();
 
 			Util.pushArrayItems(this._rids, member._rids);
@@ -3993,7 +3993,7 @@ DataView.prototype._rebuildRowIdsFromChildren = function () {
 					this._groupView.push(member._groupRowId); // Add header row
 				}
 				if(!member._collapsed) { // WARNING: This gives different value from isCollapsed() method
-					var rids = member._getFirstHiddenRids() || member._groupView || member._rids;
+					let rids = member._getFirstHiddenRids() || member._groupView || member._rids;
 					Util.pushArrayItems(this._groupView, rids);
 					Util.pushArrayItems(this._groupView, member._footerRowIds);
 				}
@@ -4018,7 +4018,7 @@ DataView.prototype._resolveGroupId = function (rowData) {
 /** @private
 */
 DataView.prototype._markColumnStatsDirty = function() {
-	for(var cid in this._columnStats) {
+	for(let cid in this._columnStats) {
 		this._columnStats[cid].markDirty();
 	}
 };