@refinitiv-ui/efx-grid 6.0.90 → 6.0.92

package/lib/core/es6/grid/plugins/SortableTitlePlugin.js

@@ -44,8 +44,8 @@ import { isEmptyObject } from "../../../../tr-grid-util/es6/Util.js";
 * @extends {EventDispatcher}
 * @param {SortableTitlePlugin.Options=} options
 */
-var SortableTitlePlugin = function (options) { // TODO: Extract SortableTitlePlugin to grid extension.
-	var _t = this;
+let SortableTitlePlugin = function (options) { // TODO: Extract SortableTitlePlugin to grid extension.
+	let _t = this;
 	_t._onSectionAdded = _t._onSectionAdded.bind(_t);
 	_t._onMouseDown = _t._onMouseDown.bind(_t);
 
@@ -236,17 +236,17 @@ SortableTitlePlugin.prototype._sortingSequenceMap = null;
 * @private
 * @const
 */
-var CODE_UP = "\u25B2";
+let CODE_UP = "\u25B2";
 /** @type {string}
 * @private
 * @const
 */
-var CODE_DOWN = "\u25BC";
+let CODE_DOWN = "\u25BC";
 /** @type {string}
 * @private
 * @const
 */
-var CODE_DIAMOND = "\u25CA";
+let CODE_DIAMOND = "\u25CA";
 
 /** The name must be readonly and unique among all other plugins
 * @public
@@ -282,7 +282,7 @@ SortableTitlePlugin.prototype.initialize = function (host, options) {
 * @param {!Core} host
 */
 SortableTitlePlugin.prototype.unload = function (host) {
-	var at = this._hosts.indexOf(host);
+	let at = this._hosts.indexOf(host);
 	if (at < 0) { return; }
 
 	this._hosts.splice(at, 1);
@@ -304,12 +304,12 @@ SortableTitlePlugin.prototype.unload = function (host) {
 /** @public
 */
 SortableTitlePlugin.prototype.afterInit = function () {
-	var t = this;
+	let t = this;
 
 	// Set logic to the data source, since the data source not available during the initialization
 	t.setSortLogics(t._sortLogic);
 
-	var userInput = t._initialSort; // This will be passed from the user when they want to start with initialize sort
+	let userInput = t._initialSort; // This will be passed from the user when they want to start with initialize sort
 	if (userInput != null) {
 		if(Array.isArray(userInput)) {
 			if(t._maxCount === 1) { // TODO: max count could be part of sortColumns method
@@ -329,15 +329,15 @@ SortableTitlePlugin.prototype.afterInit = function () {
 SortableTitlePlugin.prototype.config = function (options) {
 	if (!options) { return; }
 
-	var t = this;
+	let t = this;
 
-	var icons = options["icons"];
+	let icons = options["icons"];
 	if (icons != null) {
 		if (icons["sorting"]) {
 			SortableTitlePlugin._icons = icons["sorting"];
 		}
 	}
-	var themeName = options["themeName"];
+	let themeName = options["themeName"];
 	if (!themeName || themeName.indexOf("solar") >= 0) {
 		t._solarTheme = true;
 	} else {
@@ -345,7 +345,7 @@ SortableTitlePlugin.prototype.config = function (options) {
 	}
 	t._initialSort = t._initialSortByColumnField(options);
 
-	var extOptions = options["sorting"];
+	let extOptions = options["sorting"];
 	if (!extOptions) {
 		return;
 	}
@@ -357,7 +357,7 @@ SortableTitlePlugin.prototype.config = function (options) {
 		t._userManagedLogic = true;
 	}
 
-	var val = extOptions["multiColumn"] || extOptions["multicolumn"];
+	let val = extOptions["multiColumn"] || extOptions["multicolumn"];
 	if (val != null) {
 		if (val === true) val = -1;
 		if (val === false) val = 1;
@@ -434,7 +434,7 @@ SortableTitlePlugin.prototype.config = function (options) {
 
 	val = extOptions["sortLogic"];
 	if (typeof val === "object") {
-		for (var field in val) {
+		for (let field in val) {
 			if (typeof val[field] === "function") {
 				t._sortLogic[field] = val[field];
 			}
@@ -447,26 +447,26 @@ SortableTitlePlugin.prototype.config = function (options) {
 * @return {!Object}
 */
 SortableTitlePlugin.prototype.getConfigObject = function (gridOptions) {
-	var obj = gridOptions || {};
+	let obj = gridOptions || {};
 
-	var columns = obj["columns"];
+	let columns = obj["columns"];
 	if (!columns) {
 		columns = obj["columns"] = [];
 	}
 
-	var host = this._hosts[0];
+	let host = this._hosts[0];
 
 	if (!host) return obj;
 
-	var sortedColumns = this.getSortedColumns();
-	var col, i, len;
+	let sortedColumns = this.getSortedColumns();
+	let col, i, len;
 	// Multiple column sorting cannot retain the sort order in the column option.
 	if(this._maxCount === 1 && sortedColumns != null) {
 		// assign sorting state to each columns
 		len = sortedColumns.length;
 		for (i = 0; i < len; i++) {
-			var sortedColumn = sortedColumns[i];
-			var colIndex = sortedColumn["colIndex"];
+			let sortedColumn = sortedColumns[i];
+			let colIndex = sortedColumn["colIndex"];
 			col = columns[colIndex];
 			if (!col) {
 				col = columns[colIndex] = {};
@@ -476,7 +476,7 @@ SortableTitlePlugin.prototype.getConfigObject = function (gridOptions) {
 	}
 
 	len = host.getColumnCount();
-	var opt, field;
+	let opt, field;
 	for(i = 0; i < len; ++i) {
 		col = columns[i];
 		if (!col) {
@@ -509,12 +509,12 @@ SortableTitlePlugin.prototype.getConfigObject = function (gridOptions) {
 
 	}
 
-	var extOptions = obj["sorting"];
+	let extOptions = obj["sorting"];
 	if(!extOptions) {
 		extOptions = obj["sorting"] = {};
 	}
 
-	var val = sortedColumns;
+	let val = sortedColumns;
 	if(val != null) {
 		extOptions["initialSort"] = val;
 	}
@@ -545,8 +545,8 @@ SortableTitlePlugin.prototype.getConfigObject = function (gridOptions) {
 		extOptions["disabled"] = true;
 	}
 
-	var sortingSeq = this._sortingSequence;
-	var notDefaultSeq = true;
+	let sortingSeq = this._sortingSequence;
+	let notDefaultSeq = true;
 	if (sortingSeq.length === 2) {
 		if (sortingSeq[0] === "a" && sortingSeq[1] === "d") { // Sorting Sequence is not the default one
 			notDefaultSeq = false;
@@ -574,22 +574,22 @@ SortableTitlePlugin.prototype.getColumnMenu = function (colIndex, config) {
 		config = {};
 	}
 
-	var menus = config["menus"];
+	let menus = config["menus"];
 	if (!menus) {
 		menus = config["menus"] = [];
 	}
 
-	var menu = menus[0];
+	let menu = menus[0];
 	if (!menu) {
 		menu = menus[0] = {
 			"menuItems": []
 		};
 	}
 
-	var order = this.getSortOrder(colIndex);
+	let order = this.getSortOrder(colIndex);
 
 	// Menu items for this extension
-	var extMenuItem = {
+	let extMenuItem = {
 		"indexScore": 100,
 		"label": "Sort Column",
 		"icon": "sort-a-to-z",
@@ -639,13 +639,13 @@ SortableTitlePlugin.prototype.getColumnMenu = function (colIndex, config) {
 * @param {Object} e
 */
 SortableTitlePlugin.prototype._onItemSortingClicked = function (e) {
-	var host = this._hosts[0];
-	var columnMenuExt = host["getPlugin"]("ColumnMenuPlugin");
+	let host = this._hosts[0];
+	let columnMenuExt = host["getPlugin"]("ColumnMenuPlugin");
 	columnMenuExt["hide"]();
 
-	var value = e["currentTarget"]["value"];
-	var colIndex = value["colIndex"];
-	var order = value["sortOrder"];
+	let value = e["currentTarget"]["value"];
+	let colIndex = value["colIndex"];
+	let order = value["sortOrder"];
 	this.sortColumn(colIndex, order);
 };
 
@@ -661,10 +661,10 @@ SortableTitlePlugin.prototype.getIcons = function () {
 */
 SortableTitlePlugin.prototype.setSortLogics = function (sortLogic) { // TODO: This should be deprecated
 	if (sortLogic != null) {
-		var host = this._hosts[0];
+		let host = this._hosts[0];
 		if (host) {
-			var ds = host.getDataSource();
-			for (var field in sortLogic) {
+			let ds = host.getDataSource();
+			for (let field in sortLogic) {
 				this._setSortLogic(ds, field, sortLogic[field]);
 			}
 		}
@@ -677,9 +677,9 @@ SortableTitlePlugin.prototype.setSortLogics = function (sortLogic) { // TODO: Th
 */
 SortableTitlePlugin.prototype.setSortLogic = function (field, func) { // TODO: This should be deprecated
 	if (typeof field === "string") {
-		var host = this._hosts[0];
+		let host = this._hosts[0];
 		if (host) {
-			var ds = host.getDataSource();
+			let ds = host.getDataSource();
 			this._setSortLogic(ds, field, func);
 		}
 	}
@@ -705,9 +705,9 @@ SortableTitlePlugin.prototype._setSortLogic = function (ds, field, func) { // TO
 * @return {string} "a" for ascending, "d" for descending, and "n" for no sorting
 */
 SortableTitlePlugin.prototype.getSortOrder = function (colIndex) {
-	var priority = (colIndex != null) ? this.getSortPriority(colIndex) : 0;
-	var state = this._sortStates[priority];
-	var sortOrder = state ? state["sortOrder"] : "";
+	let priority = (colIndex != null) ? this.getSortPriority(colIndex) : 0;
+	let state = this._sortStates[priority];
+	let sortOrder = state ? state["sortOrder"] : "";
 	return sortOrder || "n";
 };
 /** Return the first (highest priority) sorted column's index
@@ -725,12 +725,12 @@ SortableTitlePlugin.prototype.getSortedColumnIndex = function (priority) {
 * @return {number}
 */
 SortableTitlePlugin.prototype.getSortPriority = function (colIndex, colRef) {
-	var host = this._hosts[0];
+	let host = this._hosts[0];
 	if(host) {
-		var i;
-		var len = this._sortStates.length;
+		let i;
+		let len = this._sortStates.length;
 		if(colIndex >= 0) {
-			var colId = host.getColumnId(colIndex);
+			let colId = host.getColumnId(colIndex);
 			if(colId) {
 				for(i = 0; i < len; ++i) {
 					if(this._sortStates[i]["colId"] === colId) {
@@ -740,7 +740,7 @@ SortableTitlePlugin.prototype.getSortPriority = function (colIndex, colRef) {
 			}
 		} else if(colRef) {
 			for(i = 0; i < len; ++i) {
-				var sortState = this._sortStates[i];
+				let sortState = this._sortStates[i];
 				if(sortState["colId"] === colRef) {
 					return i;
 				}
@@ -763,15 +763,15 @@ SortableTitlePlugin.prototype.isColumnSorted = function (colIndex) {
 * @return {Array.<Object>} Array of objects with colIndex, colId, field, and sortOrder properties
 */
 SortableTitlePlugin.prototype.getSortedColumns = function () {
-	var len = this._sortStates.length;
+	let len = this._sortStates.length;
 	if (len <= 0) { return null; }
 
-	var arr = new Array(len);
-	for (var i = 0; i < len; ++i) {
-		var colIndex = this.getSortedColumnIndex(i);
-		var state = this._sortStates[i];
-		var retObj = {};
-		var colId = "";
+	let arr = new Array(len);
+	for (let i = 0; i < len; ++i) {
+		let colIndex = this.getSortedColumnIndex(i);
+		let state = this._sortStates[i];
+		let retObj = {};
+		let colId = "";
 		if(colIndex >= 0) {
 			retObj["colIndex"] = colIndex;
 			colId = this._getColumnId(colIndex);
@@ -779,7 +779,7 @@ SortableTitlePlugin.prototype.getSortedColumns = function () {
 		if(colId) {
 			retObj["colId"] = colId;
 		}
-		var field = state["field"] || "";
+		let field = state["field"] || "";
 		if(field) {
 			retObj["field"] = field;
 		}
@@ -815,9 +815,9 @@ SortableTitlePlugin.prototype.sortColumn = function (colRef, sortOrder, opt_arg)
 */
 SortableTitlePlugin.prototype.sortColumns = function (sortOptions, opt_arg) {
 	if (Array.isArray(sortOptions)) {
-		var len = sortOptions.length;
-		var states = new Array(len);
-		for (var i = 0; i < len; i++) {
+		let len = sortOptions.length;
+		let states = new Array(len);
+		for (let i = 0; i < len; i++) {
 			states[i] = this._prepareSorting(sortOptions[i]);
 		}
 		this._sortColumn(states, opt_arg);
@@ -870,7 +870,7 @@ SortableTitlePlugin.prototype.getSortingStates = function () {
 */
 SortableTitlePlugin.prototype.updateSortSymbols = function () {
 	if(!this._disabled) {
-		for (var i = this._hosts.length; --i >= 0;) {
+		for (let i = this._hosts.length; --i >= 0;) {
 			this._updateSortableIndicator(i);
 		}
 	}
@@ -881,11 +881,11 @@ SortableTitlePlugin.prototype.updateSortSymbols = function () {
 * @return {!Array.<string>}
 */
 SortableTitlePlugin.prototype.getDataColumnMap = function () {
-	var host = this._hosts[0];
-	var dataMap = [];
+	let host = this._hosts[0];
+	let dataMap = [];
 	if (host) {
-		var colCount = host.getColumnCount();
-		for (var i = 0; i < colCount; ++i) {
+		let colCount = host.getColumnCount();
+		for (let i = 0; i < colCount; ++i) {
 			dataMap[i] = this.getColumnSortingField(i);
 		}
 	}
@@ -900,7 +900,7 @@ SortableTitlePlugin.prototype.getDataColumnNames = SortableTitlePlugin.prototype
 SortableTitlePlugin.prototype.setDataColumnMap = function (dataMap) { // TODO: This should be deprecated
 	// This should work just like "sortBy"
 	if (Array.isArray(dataMap)) {
-		for (var i = dataMap.length; --i >= 0;) {
+		for (let i = dataMap.length; --i >= 0;) {
 			this.setColumnSortingField(i, dataMap[i]);
 		}
 	}
@@ -912,12 +912,12 @@ SortableTitlePlugin.prototype.setDataColumnNames = SortableTitlePlugin.prototype
 * @return {string} field A field used for sorting
 */
 SortableTitlePlugin.prototype.getColumnSortingField = function (colIndex) {
-	var sortOptions = this._getSortOptions(colIndex);
+	let sortOptions = this._getSortOptions(colIndex);
 	// options["field"] is already consolidated from field, sortBy, and sortable properties.
-	var field = (sortOptions) ? sortOptions["field"] : null;
+	let field = (sortOptions) ? sortOptions["field"] : null;
 
 	if (field == null && !this._rowDefMode) { // Old CompositeGrid may store sorting field in DataColumnName
-		var host = this._hosts[0];
+		let host = this._hosts[0];
 		if (host) {
 			field = host.getColumnField(colIndex);
 			if(!field) {
@@ -940,7 +940,7 @@ SortableTitlePlugin.prototype.getColumnSortingField = function (colIndex) {
 */
 SortableTitlePlugin.prototype.setColumnSortingField = function (colIndex, field, sortLogic, rowSorting) {
 	if (typeof colIndex == "number" && field != null) {
-		var options = this._newSortOptions(colIndex);
+		let options = this._newSortOptions(colIndex);
 		if (!field) {
 			field = "";
 		}
@@ -962,7 +962,7 @@ SortableTitlePlugin.prototype.setColumnSortingField = function (colIndex, field,
 * @param {Object} sortState
 * @returns {string}
 */
-var _toField = function(sortState) {
+let _toField = function(sortState) {
 	return sortState["field"] || "";
 };
 /** Return array of the fields from the currently sorted columns
@@ -989,18 +989,18 @@ SortableTitlePlugin.prototype.setFirstSortOrder = function (colIdentifier, sortO
 		sortOrder = "a"; // There is no "none" as the first sorting order
 	}
 
-	var fields = null;
+	let fields = null;
 	if (Array.isArray(colIdentifier)) {
 		fields = colIdentifier;
 	} else {
 		fields = [/** @type{string|number} */(colIdentifier)];
 	}
 
-	var len = fields.length;
-	for (var i = 0; i < len; ++i) {
-		var field = fields[i];
-		var sortingSeq = this.getSortingSequence(field).slice();
-		var index = sortingSeq.indexOf(sortOrder);
+	let len = fields.length;
+	for (let i = 0; i < len; ++i) {
+		let field = fields[i];
+		let sortingSeq = this.getSortingSequence(field).slice();
+		let index = sortingSeq.indexOf(sortOrder);
 		if (index >= 0) {
 			sortingSeq.splice(index, 1);
 		}
@@ -1016,7 +1016,7 @@ SortableTitlePlugin.prototype.setFirstSortOrder = function (colIdentifier, sortO
 * @see {@link SortableTitlePlugin#setSortingSequence}
 */
 SortableTitlePlugin.prototype.disableTwoStateSorting = function (disabled) {
-	var at = this._sortingSequence.indexOf("n");
+	let at = this._sortingSequence.indexOf("n");
 	if(disabled === false) { // two-state sorting
 		if(at >= 0) {
 			this._sortingSequence.splice(at, 1);
@@ -1032,10 +1032,10 @@ SortableTitlePlugin.prototype.disableTwoStateSorting = function (disabled) {
 * @param {boolean=} bool=true, if set to false it will be unfreeze indicator
 */
 SortableTitlePlugin.prototype.freezeIndicator = function (bool) {
-	var prevState = this._frozenIndicator;
+	let prevState = this._frozenIndicator;
 	this._frozenIndicator = bool !== false;
 	if(prevState && !this._frozenIndicator) { // from frozen to unfrozen, update the ui
-		for (var i = this._hosts.length; --i >= 0;) {
+		for (let i = this._hosts.length; --i >= 0;) {
 			this._updateSortableIndicator(i);
 		}
 	}
@@ -1080,8 +1080,8 @@ SortableTitlePlugin.prototype.disableColumnSorting = function (columns, disabled
 	if (typeof columns === "number") {
 		this._disableColumnSorting(columns, disabled);
 	} else if (Array.isArray(columns)) {
-		var len = columns.length;
-		for (var i = 0; i < len; ++i) {
+		let len = columns.length;
+		for (let i = 0; i < len; ++i) {
 			this._disableColumnSorting(columns[i] || 0, disabled);
 		}
 	}
@@ -1091,7 +1091,7 @@ SortableTitlePlugin.prototype.disableColumnSorting = function (columns, disabled
 * @param {boolean} disabled
 */
 SortableTitlePlugin.prototype._disableColumnSorting = function (colIndex, disabled) {
-	var sortOptions = this._newSortOptions(colIndex);
+	let sortOptions = this._newSortOptions(colIndex);
 	if (sortOptions["disabled"] !== disabled) {
 		sortOptions["disabled"] = disabled;
 		// TODO: Remove existing sort
@@ -1111,11 +1111,11 @@ SortableTitlePlugin.prototype.setClickDelayInterval = function (opt_ms) {
 * @returns {Object}
 */
 SortableTitlePlugin.prototype._initialSortByColumnField = function (options) {
-	var columns = options["columns"];
-	var colCount = columns ?  columns.length : 0;
-	for (var i = 0; i < colCount; i++) {
-		var column = columns[i];
-		var sortOrder = column["defaultSort"]; // composite and rt grid option for default sort order
+	let columns = options["columns"];
+	let colCount = columns ?  columns.length : 0;
+	for (let i = 0; i < colCount; i++) {
+		let column = columns[i];
+		let sortOrder = column["defaultSort"]; // composite and rt grid option for default sort order
 		if (sortOrder) {
 			// TODO: Support multi-column sorting
 			return {
@@ -1133,7 +1133,7 @@ SortableTitlePlugin.prototype._initialSortByColumnField = function (options) {
 SortableTitlePlugin.prototype._onSectionAdded = function (e) {
 	if (e["sectionType"] !== "title") { return; }
 
-	var section = /** @type{ILayoutGrid} */(e["section"]);
+	let section = /** @type{ILayoutGrid} */(e["section"]);
 	if (section.getIndex() !== 0) return; // only topmost header can click
 	section.listen("mousedown", this._onMouseDown);
 	section.listen("click", this._onClickTitle.bind(this, e["sender"]), 0); // Sorting has higher priority
@@ -1158,12 +1158,12 @@ SortableTitlePlugin.prototype._canClickToSort = function (hitObj) {
 		return false;
 	}
 
-	var grid = hitObj["grid"];
+	let grid = hitObj["grid"];
 	if (!grid || !grid.getElement()) { // The given grid has been disposed
 		return false;
 	}
 
-	var cep = this._getPlugin("CellEditingPlugin");
+	let cep = this._getPlugin("CellEditingPlugin");
 	if (cep && cep["isEditing"]()) { // Current cell is being edited, so skip the sort
 		return false;
 	}
@@ -1173,9 +1173,9 @@ SortableTitlePlugin.prototype._canClickToSort = function (hitObj) {
 		return false;
 	}
 
-	var colIndex = hitObj["colIndex"];
-	var section = hitObj["section"];
-	var rowIndex = hitObj["rowIndex"];
+	let colIndex = hitObj["colIndex"];
+	let section = hitObj["section"];
+	let rowIndex = hitObj["rowIndex"];
 
 	if (!this._isCellSortable(section, colIndex, rowIndex)) {
 		return false;
@@ -1194,17 +1194,17 @@ SortableTitlePlugin.prototype._proceedSorting = function (hitObj) {
 	this._clickTimer = 0;
 
 	if (this._canClickToSort(hitObj)) {
-		var colIndex = hitObj["colIndex"];
+		let colIndex = hitObj["colIndex"];
 		// _proceedSorting() method is always produced by user clicking at the header // Thus, this operation is guaranteed to be a user action
 		this.sortColumn(colIndex, null, { "isUserAction": true });
 
-		var grid = hitObj["grid"];
+		let grid = hitObj["grid"];
 		if(grid && grid["focus"]) {
 			grid["focus"]();
 		}
 
 		if (this._hasListener("clicked")) {
-			var ce = {};
+			let ce = {};
 			ce["colIndex"] = colIndex;
 			ce["sortOrder"] = this.getSortOrder(colIndex);
 			ce["dataColumnName"] = this.getColumnSortingField(colIndex); // This should be deprecated
@@ -1226,7 +1226,7 @@ SortableTitlePlugin.prototype._onMouseDown = function (e) {
 * @return {*|null}
  */
 SortableTitlePlugin.prototype._getPlugin = function(pluginName) {
-	var host = this._hosts[0];
+	let host = this._hosts[0];
 	return (host) ? host.getPlugin(pluginName) : null;
 };
 /** @private
@@ -1252,14 +1252,14 @@ SortableTitlePlugin.prototype._onClickTitle = function (grid, e) {
 		return;
 	}
 
-	var hitObj = grid.getRelativePosition(e);
+	let hitObj = grid.getRelativePosition(e);
 	if (!hitObj["hit"]) { // Click across multiple elements (dragging)
 		return;
 	}
 
-	var csp = this._getPlugin("ColumnSelectionPlugin");
+	let csp = this._getPlugin("ColumnSelectionPlugin");
 	if (csp && csp["isEnabled"]()) {
-		var colIndex = hitObj["colIndex"];
+		let colIndex = hitObj["colIndex"];
 		if (!csp["isSelectedColumn"](colIndex)) { // Sort only if the column is selected
 			return;
 		}
@@ -1287,8 +1287,8 @@ SortableTitlePlugin.prototype._onClickTitle = function (grid, e) {
 SortableTitlePlugin.prototype._popSortState = function (toIndex, opt_arg) {
 	if (toIndex < 0 || this._sortStates.length <= toIndex) { return false; }
 
-	var dirty = false;
-	for (var i = this._sortStates.length; --i >= toIndex;) {
+	let dirty = false;
+	for (let i = this._sortStates.length; --i >= toIndex;) {
 		this._clearSortSymbols(this._sortStates[i]);
 		dirty = true;
 	}
@@ -1345,7 +1345,7 @@ SortableTitlePlugin.prototype.setSortingSequence = function (sequence, colRef) {
 		return;
 	}
 
-	var field;
+	let field;
 	if (colRef != null) {
 		if (typeof colRef === "string") {
 			field = colRef;
@@ -1356,7 +1356,7 @@ SortableTitlePlugin.prototype.setSortingSequence = function (sequence, colRef) {
 
 	if (sequence) {
 		// Ensure that user sequence has only valid sort order
-		var sortingSequence = sequence.map(SortableTitlePlugin._toSortOrder);
+		let sortingSequence = sequence.map(SortableTitlePlugin._toSortOrder);
 		if (field) {
 			if (!this._sortingSequenceMap) {
 				this._sortingSequenceMap = {};
@@ -1386,19 +1386,19 @@ SortableTitlePlugin.prototype.clearAllColumnSortingSequences = function () {
 * @param {Function} comparer Compare function
 */
 SortableTitlePlugin.prototype.sortSeparators = function (comparer) {
-	var host = this._hosts[0];
-	var dv = host.getDataSource();
+	let host = this._hosts[0];
+	let dv = host.getDataSource();
 	if(comparer){
 		dv.sortSeparators(comparer);
 	} else {
-		var sortLogics = dv.getSortingLogics();
-		var sortOrders = [];
-		var sortFields = [];
-		var sortStateCount = this._sortStates.length;
-		var rowDefField = SortableTitlePlugin._toRowDefField();
-		for(var i = 0; i < sortStateCount; i++){
-			var sortState = this._sortStates[i];
-			var field = this._rowDefMode ? rowDefField : sortState["field"];
+		let sortLogics = dv.getSortingLogics();
+		let sortOrders = [];
+		let sortFields = [];
+		let sortStateCount = this._sortStates.length;
+		let rowDefField = SortableTitlePlugin._toRowDefField();
+		for(let i = 0; i < sortStateCount; i++){
+			let sortState = this._sortStates[i];
+			let field = this._rowDefMode ? rowDefField : sortState["field"];
 			sortOrders.push(sortState["sortOrder"]);
 			sortFields.push(field);
 		}
@@ -1416,13 +1416,13 @@ SortableTitlePlugin.prototype._prepareSorting = function (sortingDef, sortOrder)
 	if (!this._maxCount) {
 		return null;
 	}
-	var host = this._hosts[0];
+	let host = this._hosts[0];
 	if(!host) {
 		return null;
 	}
 
-	var colIndex = -1;
-	var colRef = "";
+	let colIndex = -1;
+	let colRef = "";
 	if(typeof sortingDef === "number") {
 		colIndex = sortingDef;
 	} else if(typeof sortingDef === "string") { // This would be either column id or field
@@ -1440,11 +1440,11 @@ SortableTitlePlugin.prototype._prepareSorting = function (sortingDef, sortOrder)
 		}
 	}
 
-	var field = "";
-	var sortLogic = null;
+	let field = "";
+	let sortLogic = null;
 	if(colIndex >= 0) {
 		field = this.getColumnSortingField(colIndex);
-		var sortOptions = this._getSortOptions(colIndex);
+		let sortOptions = this._getSortOptions(colIndex);
 		if(sortOptions) {
 			sortLogic = sortOptions["sortLogic"];
 		}
@@ -1452,16 +1452,16 @@ SortableTitlePlugin.prototype._prepareSorting = function (sortingDef, sortOrder)
 		field = colRef; // Assume that colRef is a field and not a column id
 	}
 
-	var priority = this.getSortPriority(colIndex, field);
-	var curState = (priority >= 0) ? this._sortStates[priority] : null;
-	var curOrder = curState ? curState["sortOrder"] : "n";
+	let priority = this.getSortPriority(colIndex, field);
+	let curState = (priority >= 0) ? this._sortStates[priority] : null;
+	let curOrder = curState ? curState["sortOrder"] : "n";
 
 	// Getting next sort order
-	var nextOrder = "n";
+	let nextOrder = "n";
 	if (sortOrder == null) { // Auto order switch
-		var sortingSequence = this.getSortingSequence(field);
+		let sortingSequence = this.getSortingSequence(field);
 
-		var sequenceIndex = sortingSequence.indexOf(curOrder);
+		let sequenceIndex = sortingSequence.indexOf(curOrder);
 		if (sequenceIndex < 0) {
 			sequenceIndex = 0;
 		} else {
@@ -1488,7 +1488,7 @@ SortableTitlePlugin.prototype._prepareSorting = function (sortingDef, sortOrder)
 		}
 		if (!curState) {
 			curState = {};
-			var colId = host.getColumnId(colIndex);
+			let colId = host.getColumnId(colIndex);
 			if(colId) {
 				curState["colId"] = colId;
 			}
@@ -1509,10 +1509,10 @@ SortableTitlePlugin.prototype._prepareSorting = function (sortingDef, sortOrder)
 		curState["sortOrder"] = nextOrder;
 	}
 
-	var clearedSortColIndexes = [];
+	let clearedSortColIndexes = [];
 	if (this._maxCount > 0) {
 		while (this._sortStates.length > this._maxCount) { // Shift excess
-			var index = this._clearSortSymbols(this._sortStates.shift());
+			let index = this._clearSortSymbols(this._sortStates.shift());
 			if (index !== null) {
 				clearedSortColIndexes.push(index);
 			}
@@ -1542,11 +1542,11 @@ SortableTitlePlugin.prototype._sortColumn = function (states, opt_arg) {
 	this._sortDataView(opt_arg); // Update Data
 	this.updateSortSymbols(); // Update Display
 
-	var evtArg = null;
+	let evtArg = null;
 	if(Array.isArray(states)) {
-		var len = states.length;
-		for(var i = 0; i < len; ++i) {
-			var state = states[i];
+		let len = states.length;
+		for(let i = 0; i < len; ++i) {
+			let state = states[i];
 			if(state) {
 				if(evtArg) {
 					if(!evtArg["colIndices"]) {
@@ -1576,13 +1576,13 @@ SortableTitlePlugin.prototype._sortColumn = function (states, opt_arg) {
 * @param {Object} e
 */
 SortableTitlePlugin.prototype._onColumnAdded = function (e) {
-	var t = this;
-	var colIndex = e["colIndex"];
-	var column = e["context"] || {};
+	let t = this;
+	let colIndex = e["colIndex"];
+	let column = e["context"] || {};
 
-	var sortable = !!t._sortableColumns;
-	var field = column["field"];
-	var sortBy = column["sortBy"];
+	let sortable = !!t._sortableColumns;
+	let field = column["field"];
+	let sortBy = column["sortBy"];
 
 	if (sortBy != null) { // composite grid option
 		sortable = !!sortBy;
@@ -1592,7 +1592,7 @@ SortableTitlePlugin.prototype._onColumnAdded = function (e) {
 		sortable = !!column["sortable"];
 	}
 
-	var sortLogic = column["sortLogic"] || column["sortingLogic"] || column["sorter"]; // Originally, rt grid support option for sortLogic by column
+	let sortLogic = column["sortLogic"] || column["sortingLogic"] || column["sorter"]; // Originally, rt grid support option for sortLogic by column
 	if(!sortLogic) {
 		sortLogic = t._sortLogic[field];
 	}
@@ -1600,7 +1600,7 @@ SortableTitlePlugin.prototype._onColumnAdded = function (e) {
 		sortLogic = null;
 	}
 
-	var sortingSequence = column["sortingSequence"];
+	let sortingSequence = column["sortingSequence"];
 	if (sortingSequence != null && field) { // Make sure that column config does not affect grid level config
 		t.setSortingSequence(sortingSequence, field);
 	}
@@ -1611,7 +1611,7 @@ SortableTitlePlugin.prototype._onColumnAdded = function (e) {
 		t.disableColumnSorting(colIndex, true);
 	}
 
-	var sortOrder = column["sortOrder"] || column["sort"];
+	let sortOrder = column["sortOrder"] || column["sort"];
 	if(sortOrder != null) {
 		sortOrder = SortableTitlePlugin._toSortOrder(sortOrder); // Invalid input will return "n"
 		if(sortOrder !== "n") {
@@ -1627,17 +1627,17 @@ SortableTitlePlugin.prototype._onColumnAdded = function (e) {
 * @fires SortableTitlePlugin#columnSorted
 */
 SortableTitlePlugin.prototype._onColumnRemoved = function (e) {
-	var sortCount = this._sortStates.length;
+	let sortCount = this._sortStates.length;
 	if (!sortCount) {
 		return;
 	}
-	var colId = e["colId"];
+	let colId = e["colId"];
 	if (!colId) {
 		return;
 	}
 	// WARNING: columnRemoved event could be fired repeatedly. Sorting could be triggered multiple times
-	for(var i = 0; i < sortCount; ++i) {
-		var sortState = this._sortStates[i];
+	for(let i = 0; i < sortCount; ++i) {
+		let sortState = this._sortStates[i];
 		if (sortState["colId"] === colId) {
 			this._sortStates.splice(i, 1);
 			this._clearSortSymbols(sortState);
@@ -1664,17 +1664,17 @@ SortableTitlePlugin.prototype._sortDataView = function (opt_action) {
 
 	if (!this._dataSorting) { return; }
 
-	var sortCount = this._sortStates.length;
+	let sortCount = this._sortStates.length;
 	if(this._userManagedLogic && sortCount > 1) { // The logic is managed by the user. There is no point in using multi-column sorting
 		sortCount = 1;
 	}
-	var orders = null;
-	var sortLogics = null;
-	var c_ref = null;
+	let orders = null;
+	let sortLogics = null;
+	let c_ref = null;
 	if (sortCount) {
 		orders = new Array(sortCount);
 		sortLogics = new Array(sortCount);
-		for (var i = 0; i < sortCount; ++i) {
+		for (let i = 0; i < sortCount; ++i) {
 			orders[i] = this._sortStates[i]["sortOrder"];
 			sortLogics[i] = this._sortStates[i]["sortLogic"]; // sortLogic can be null
 		}
@@ -1689,12 +1689,12 @@ SortableTitlePlugin.prototype._sortDataView = function (opt_action) {
 	}
 
 	// Perform sorting even if there is no sort state
-	for (var j = this._hosts.length; --j >= 0;) {
-		var host = this._hosts[j];
+	for (let j = this._hosts.length; --j >= 0;) {
+		let host = this._hosts[j];
 		// TODO: In wrap mode all hosts does not need to be sorted
-		var dataSource = host.getDataSource();
+		let dataSource = host.getDataSource();
 		if (dataSource) {
-			var noOptimization = opt_action["isUserAction"] == true;
+			let noOptimization = opt_action["isUserAction"] == true;
 			dataSource.sort(c_ref, orders, sortLogics, noOptimization); // If length === 0 data is not sorted
 		}
 	}
@@ -1706,18 +1706,18 @@ SortableTitlePlugin.prototype._sortDataView = function (opt_action) {
 * @return {number|null} The column index of cleared sort
 */
 SortableTitlePlugin.prototype._clearSortSymbols = function (state) {
-	var cells = state["targetCells"];
+	let cells = state["targetCells"];
 	if (!cells) {
 		return null;
 	}
-	var colIndex = null;
-	for (var j = cells.length; --j >= 0;) {	// One single cell per host
-		var cell = cells[j];
+	let colIndex = null;
+	for (let j = cells.length; --j >= 0;) {	// One single cell per host
+		let cell = cells[j];
 		cell["removeClass"]("sorting");
 		cell["removeClass"]("sortable");
 		cell["removeFloatingIcon"]("sort-symbol");
 		cell["removeFloatingIcon"]("priority-symbol");
-		var section;
+		let section;
 		if(colIndex == null && (section = cell["getSection"]())) {
 			colIndex = section["getColumnIndex"](cell["getParent"]());
 		}
@@ -1731,19 +1731,19 @@ SortableTitlePlugin.prototype._clearSortSymbols = function (state) {
 * @param {number} hostIndex
 */
 SortableTitlePlugin.prototype._updateSortableIndicator = function (hostIndex) {
-	var t = this;
-	var host = t._hosts[hostIndex];
+	let t = this;
+	let host = t._hosts[hostIndex];
 	if (!host || this._frozenIndicator) { return; }
 
-	var section = host.getSection("title");
+	let section = host.getSection("title");
 	if (section == null) { return; }
-	var colCount = section["getColumnCount"]();
-	for (var col = colCount; --col >= 0;) {
+	let colCount = section["getColumnCount"]();
+	for (let col = colCount; --col >= 0;) {
 
-		var rowCount = section["getRowCount"]();
-		for (var r = 0; r < rowCount; r++) {
+		let rowCount = section["getRowCount"]();
+		for (let r = 0; r < rowCount; r++) {
 
-			var cell = section["getCell"](col, r, true);
+			let cell = section["getCell"](col, r, true);
 			if (!cell) { continue; }
 
 			// Clear all sorting icons
@@ -1761,11 +1761,11 @@ SortableTitlePlugin.prototype._updateSortableIndicator = function (hostIndex) {
 
 			cell["addClass"]("sortable");
 
-			var priority = t.getSortPriority(col);
-			var state = t._sortStates[priority];
+			let priority = t.getSortPriority(col);
+			let state = t._sortStates[priority];
 
-			var isSorting = state && state["sortOrder"] !== "n";
-			var symbol, icon;
+			let isSorting = state && state["sortOrder"] !== "n";
+			let symbol, icon;
 			if (isSorting) {
 				if (!state["targetCells"]) {
 					state["targetCells"] = [];
@@ -1781,7 +1781,7 @@ SortableTitlePlugin.prototype._updateSortableIndicator = function (hostIndex) {
 				cell["addClass"]("sorting");
 
 				if(t._solarTheme) { // Insert icon when use solar theme
-					var textContent;
+					let textContent;
 
 					if (state["sortOrder"] === "a") {
 						textContent = CODE_UP;
@@ -1820,7 +1820,7 @@ SortableTitlePlugin.prototype._updateSortableIndicator = function (hostIndex) {
 * @return {Element}
 */
 SortableTitlePlugin.prototype._createIconElem = function (icon, fallback) {
-	var elem;
+	let elem;
 	if (!icon || typeof icon !== "string") {
 		elem = document.createElement("span");
 		elem.textContent = fallback;
@@ -1837,7 +1837,7 @@ SortableTitlePlugin.prototype._createIconElem = function (icon, fallback) {
 */
 SortableTitlePlugin.prototype._getColumnIndex = function (colRef) {
 	if(colRef != null) {
-		var host = this._hosts[0];
+		let host = this._hosts[0];
 		if(host) {
 			if(typeof colRef === "number") {
 				return colRef;
@@ -1856,7 +1856,7 @@ SortableTitlePlugin.prototype._getColumnIndex = function (colRef) {
 * @return {string} column id or empty string for not found
 */
 SortableTitlePlugin.prototype._getColumnId = function (colRef) {
-	var host = this._hosts[0];
+	let host = this._hosts[0];
 	if(host && colRef != null) {
 		return host.getColumnId(colRef);
 	}
@@ -1868,7 +1868,7 @@ SortableTitlePlugin.prototype._getColumnId = function (colRef) {
 * @return {Object}
 */
 SortableTitlePlugin.prototype._getSortOptions = function (colIndex) {
-	var host = this._hosts[0];
+	let host = this._hosts[0];
 	if (host) {
 		return host.getColumnData(colIndex)["sortableTitle"] || null;
 	}
@@ -1879,10 +1879,10 @@ SortableTitlePlugin.prototype._getSortOptions = function (colIndex) {
 * @return {!Object}
 */
 SortableTitlePlugin.prototype._newSortOptions = function (colIndex) {
-	var host = this._hosts[0];
-	var sortOptions = null;
+	let host = this._hosts[0];
+	let sortOptions = null;
 	if (host && colIndex >= 0) {
-		var colData = host.getColumnData(colIndex); // colData is guaranteed to exist
+		let colData = host.getColumnData(colIndex); // colData is guaranteed to exist
 		sortOptions = colData["sortableTitle"];
 		if (!sortOptions) {
 			sortOptions = colData["sortableTitle"] = {};
@@ -1897,13 +1897,13 @@ SortableTitlePlugin.prototype._newSortOptions = function (colIndex) {
 * @return {boolean}
 */
 SortableTitlePlugin.prototype._isCellSortable = function (section, colIndex, rowIndex) {
-	var options = this._getSortOptions(colIndex);
+	let options = this._getSortOptions(colIndex);
 	if (options) {
 		if (options["disabled"]) {
 			return false;
 		}
 
-		var field = options["field"];
+		let field = options["field"];
 		if (field != null) {
 			if (!field) {
 				return false;
@@ -1911,16 +1911,16 @@ SortableTitlePlugin.prototype._isCellSortable = function (section, colIndex, row
 		}
 	}
 
-	var targetCell = section["getCell"](colIndex, rowIndex, true);
+	let targetCell = section["getCell"](colIndex, rowIndex, true);
 	if (targetCell.hasClass("no-sort")) {
 		return false; // The cell is not allowed for sorting
 	}
-	var bottomCell = section["getCell"](colIndex, section["getRowCount"]() - 1, true);
+	let bottomCell = section["getCell"](colIndex, section["getRowCount"]() - 1, true);
 	if (targetCell !== bottomCell) {
 		return false;
 	}
-	var parentCell = targetCell.getParent();
-	var classList = parentCell["classList"];
+	let parentCell = targetCell.getParent();
+	let classList = parentCell["classList"];
 	// "collapsed" class in column element only enable by column stack in spreading mode
 	if (classList.contains("collapsed")) { // HACK: unsortable for collapsed stack in spreading mode
 		return false;