@refinitiv-ui/efx-grid 6.0.84 → 6.0.86

package/lib/core/dist/core.js

@@ -20967,6 +20967,17 @@ DataView.prototype.getExpansionParents = function (from, to) {
 	return parentMapping;
 };
 
+/**
+* @public
+* @param {string} rid
+* @return {string} parent row id
+*/
+DataView.prototype.getExpansionParentByRowId = function(rid) {
+	if(this._expansionChildren) {
+		return this._expansionChildren[rid] || "";
+	}
+	return "";
+};
 /** Check if the specified row is itself a row expansion.
 * @public
 * @param {string} rid rowId
@@ -20989,6 +21000,18 @@ DataView.prototype.hasRowExpansion = function(rid) {
 	}
 	return false;
 };
+/**
+* @public
+* @param {string} rowId
+* @return {number}
+*/
+DataView.prototype.getRowExpansionCount = function(rowId) {
+	if(this._expansionMap) {
+		return this._expansionMap[rowId] || 0;
+	}
+	return 0;
+};
+
 /** Get row Id of the row expansion by providing the row Id of the row with row expansion (not row expansion itself). This is NOT recommended for normal usage, since the row expansion contains no data in the DataView
 * @public
 * @param {string} rid rowId
@@ -26155,7 +26178,7 @@ Core_Core.prototype._hasPendingRowChange = false;
 * @return {string}
 */
 Core_Core.getVersion = function () {
-	return "5.1.87";
+	return "5.1.90";
 };
 /** {@link ElementWrapper#dispose}
 * @override
@@ -28270,27 +28293,30 @@ Core_Core.prototype.preserveGridSize = function (preserve) {
 };
 /** @public
 * @param {number} colIndex
-* @return {Object} userData
+* @return {!Object} Column data object
 */
 Core_Core.prototype.getColumnData = function (colIndex) {
-	return this._getColumnDef(colIndex)["columnData"] || null;
+	return this._getColumnDef(colIndex)["columnData"];
 };
 /** @public
+* @deprecated
+* @ignore
 * @param {number} colIndex
 * @param {Object} userData
 * @return {Object}
 */
-Core_Core.prototype.setColumnData = function (colIndex, userData) { // TODO: Deprecate this method
-	this._getColumnDef(colIndex)["columnData"] = userData;
+Core_Core.prototype.setColumnData = function (colIndex, userData) {
+	this._getColumnDef(colIndex)["columnData"] = userData || {};
 	return userData;
 };
 /** @public
+* @function
+* @deprecated
+* @ignore
 * @param {number} colIndex
 * @return {!Object}
 */
-Core_Core.prototype.newColumnData = function (colIndex) {
-	return this.getColumnData(colIndex) || {};
-};
+Core_Core.prototype.newColumnData = Core_Core.prototype.getColumnData;
 /** @public
 * @param {number} colIndex
 * @param {boolean=} alwaysRender
@@ -28304,10 +28330,7 @@ Core_Core.prototype.setAlwaysRenderColumn = function(colIndex, alwaysRender) {
 */
 Core_Core.prototype._isAlwaysRenderColumn = function (colIndex) {
 	var colData = this.getColumnData(colIndex);
-	if(colData) {
-		return colData["alwaysRender"] === true;
-	}
-	return false;
+	return colData["alwaysRender"] === true;
 };
 
 /** @public
@@ -30462,25 +30485,35 @@ Core_Core.prototype._dispatchRowExpansionBinding = function (e) {
 
 	var fromR = /** @type{number} */(e["fromRowIndex"]);
 	var toR = /** @type{number} */(e["toRowIndex"]);
-	var parents = dataView.getExpansionParents(fromR, toR);
 	var rids = dataView.getVisibleRowIds(true);
 	var section = /** @type{ILayoutGrid} */(e["section"]);
 
 	e["rowData"] = null;
 	e["cell"] = null;
-	for (var r = fromR; r < toR; ++r) {
-		var parentRid = parents[r];
+	var lastRowIndexChanged = false;
+	for (var r = toR - 1; r >= fromR; --r) {
+		var rowId = dataView.getRowId(r);
+		if(!lastRowIndexChanged) {
+			var reCount = dataView.getRowExpansionCount(rowId);
+			if(reCount > 0){
+				r = r + reCount + 1; // include parent row
+				lastRowIndexChanged = true;
+				continue;
+			}
+		}
+
 		var ctxRow = section.getContextRow(r);
-		if(parentRid) { // Previous row is the row with expansion
-			e["originalRowData"] = dataView.getRowData(parentRid);
-			e["originalRowId"] = parentRid;
+		var parentId = dataView.getExpansionParentByRowId(rowId);
+		if(parentId) { // dispatch to render row expansion
+			e["originalRowData"] = dataView.getRowData(parentId);
+			e["originalRowId"] = parentId;
 			e["rowExpansion"] = ctxRow["rowExpansion"] = true;
-		} else if(ctxRow["rowExpansion"]) {
+		} else if(ctxRow["rowExpansion"] ){ // dispose cases
 			e["originalRowData"] = null;
 			e["originalRowId"] = null;
 			e["rowExpansion"] = ctxRow["rowExpansion"] = false;
-		} else {
-			continue; // There is no need to dispatch the event for normal row
+		} else { // normal row no need to dispatch
+			continue;
 		}
 		e["rowId"] = rids[r];
 		e["rowIndex"] = r;
@@ -30763,7 +30796,9 @@ Core_Core.prototype._getColumnDef = function (colIndex) {
 		}
 		return def;
 	}
-	return {};
+	return {
+		"columnData": {}
+	};
 };
 /** Retrieve 1 or 2 level of nested object definition
 * @private
@@ -31620,16 +31655,26 @@ es6_Ext.inherits(SortableTitlePlugin, event_EventDispatcher);
  * @typedef {"a" | "ascending" | "d" | "descending" | "n" | null} SortableTitlePlugin~SortOrder
  */
 
-/** The sorting object which will be used for initialSort config.
+/** An object that specifies how sorting should be performed
  * @typedef {Object} SortableTitlePlugin~InitialSort
- * @property {number=} colIndex Index of the column
- * @property {string=} colId column id of the column
- * @property {string=} field field of the column
+ * @property {number=} colIndex Column index of a column to be sorted
+ * @property {string=} colId Column id of a column to be sorted
+ * @property {string=} field Field of a column to be sorted
  * @property {SortableTitlePlugin~SortOrder=} sortOrder=null Set to "d" for descending order and "a" for ascending order
- * @property {SortableTitlePlugin~SortOrder=} order Alias of sortOrder
+ * @property {SortableTitlePlugin~SortOrder=} order Alias to sortOrder
  */
 SortableTitlePlugin.InitialSort;
 
+/** An object that specifies how sorting should be performed
+ * @typedef {Object} SortableTitlePlugin~SortingDefinition
+ * @property {number=} colIndex Column index of a column to be sorted
+ * @property {string=} colId Column id of a column to be sorted
+ * @property {string=} field Field of a column to be sorted
+ * @property {SortableTitlePlugin~SortOrder=} sortOrder=null Set to "d" for descending order and "a" for ascending order
+ * @property {SortableTitlePlugin~SortOrder=} order Alias to sortOrder
+ */
+SortableTitlePlugin.SortingDefinition;
+
 /** The sorting properties for column option.
  * @typedef {Object} SortableTitlePlugin~ColumnOptions
  * @property {boolean=} sortable=false If enable, the column can be sorted by user click
@@ -31645,7 +31690,7 @@ SortableTitlePlugin.ColumnOptions;
 
 /** The configuration object for sorting options. This can be defined by `sorting` property in CompositeGrid configuration object.
  * @typedef {Object} SortableTitlePlugin~Options
- * @property {(SortableTitlePlugin~InitialSort|Array.<SortableTitlePlugin.InitialSort>)=} initialSort=null Set this config to initiate sorting after grid is created.
+ * @property {(SortableTitlePlugin~InitialSort|Array.<SortableTitlePlugin.SortingDefinition>)=} initialSort=null Set this config to initiate sorting after grid is created.
  * @property {(boolean|number)=} multicolumn=false Allow multiple columns to be sorted at the same time. If number is defined, it is treated as maximum number of column to be sorted.
  * @property {(boolean|number)=} multiColumn=false Alias to `multicolumn`
  * @property {boolean=} threeStatesSorting=false If enabled, sorting will cycle through ascending, descending and original order states. This option is deprecated in favor of sortingSequence option
@@ -31705,7 +31750,7 @@ SortableTitlePlugin.prototype._delayInterval = 0;
 */
 SortableTitlePlugin.prototype._lastMouseDown = 0;
 /** @private
-* @type {SortableTitlePlugin.InitialSort}
+* @type {SortableTitlePlugin.SortingDefinition}
 */
 SortableTitlePlugin.prototype._initialSort = null;
 /** @private
@@ -32028,7 +32073,8 @@ SortableTitlePlugin.prototype.getConfigObject = function (gridOptions) {
 		}
 		field = opt["field"];
 		if (field) {
-			if(col["field"] != null && col["field"] !== field) { // Core does not have field properties, so when you try to call getConfigObject in Core, it will return sortBy too.
+			// WARNING: When Core's column has no field, sortBy property does not get returned
+			if(col["field"] != null && col["field"] !== field) {
 				col["sortBy"] = field;
 			} // else The default value is an empty sortBy, which refers to the same column field by default.
 
@@ -32246,18 +32292,38 @@ SortableTitlePlugin.prototype.getSortOrder = function (colIndex) {
 * @return {number} Return negative value if there is no sorted column
 */
 SortableTitlePlugin.prototype.getSortedColumnIndex = function (priority) {
-	return this._getColumnIndexByOptions(this._sortStates[priority || 0]);
+	return this._getColumnIndex(this._sortStates[priority || 0]);
 };
 /** Start with 0 (the first column that is being sorted). The highest number will be sorted last. Negative value means the specified column is not sorted
 * @public
 * @param {number} colIndex
+* @param {string=} colRef field or column id
 * @return {number}
 */
-SortableTitlePlugin.prototype.getSortPriority = function (colIndex) {
-	var len = this._sortStates.length;
-	for (var i = 0; i < len; ++i) {
-		if (this._sortStates[i] === this._getSortOptions(colIndex)) {
-			return i;
+SortableTitlePlugin.prototype.getSortPriority = function (colIndex, colRef) {
+	var host = this._hosts[0];
+	if(host) {
+		var i;
+		var len = this._sortStates.length;
+		if(colIndex >= 0) {
+			var colId = host.getColumnId(colIndex);
+			if(colId) {
+				for(i = 0; i < len; ++i) {
+					if(this._sortStates[i]["colId"] === colId) {
+						return i;
+					}
+				}
+			}
+		} else if(colRef) {
+			for(i = 0; i < len; ++i) {
+				var sortState = this._sortStates[i];
+				if(sortState["colId"] === colRef) {
+					return i;
+				}
+				if(sortState["field"] === colRef) {
+					return i;
+				}
+			}
 		}
 	}
 	return -1;
@@ -32270,7 +32336,7 @@ SortableTitlePlugin.prototype.isColumnSorted = function (colIndex) {
 	return this.getSortPriority(colIndex) >= 0;
 };
 /** @public
-* @return {Array.<Object>} Array of object with "colIndex" and "sortOrder"
+* @return {Array.<Object>} Array of objects with colIndex, colId, field, and sortOrder properties
 */
 SortableTitlePlugin.prototype.getSortedColumns = function () {
 	var len = this._sortStates.length;
@@ -32280,12 +32346,21 @@ SortableTitlePlugin.prototype.getSortedColumns = function () {
 	for (var i = 0; i < len; ++i) {
 		var colIndex = this.getSortedColumnIndex(i);
 		var state = this._sortStates[i];
-		arr[i] = {
-			"colIndex": colIndex,
-			"colId": this._getColumnId(colIndex),
-			"field": state["field"] || "",
-			"sortOrder": state["sortOrder"] || "n"
-		};
+		var retObj = {};
+		var colId = "";
+		if(colIndex >= 0) {
+			retObj["colIndex"] = colIndex;
+			colId = this._getColumnId(colIndex);
+		}
+		if(colId) {
+			retObj["colId"] = colId;
+		}
+		var field = state["field"] || "";
+		if(field) {
+			retObj["field"] = field;
+		}
+		retObj["sortOrder"] = state["sortOrder"] || "n";
+		arr[i] = retObj;
 	}
 	return arr;
 };
@@ -32304,35 +32379,22 @@ SortableTitlePlugin.prototype.isSorting = function () {
 * @fires SortableTitlePlugin#columnSorted
 */
 SortableTitlePlugin.prototype.sortColumn = function (colRef, sortOrder, opt_arg) {
-	var state = this._prepareSorting(colRef, sortOrder);
-	if (state) {
-		this._sortColumn([state], opt_arg);
-	}
+	this._sortColumn(this._prepareSorting(colRef, sortOrder), opt_arg);
 };
 
 /** Sort multiple columns at once
 * @public
-* @param {Array.<SortableTitlePlugin.InitialSort>} sortOptions Input an array to specify the multiple column sort order
+* @param {Array.<SortableTitlePlugin.SortingDefinition>} sortOptions Input an array to specify the multiple column sort order
 * @param {Object=} opt_arg Event argument to be sent with preDataSorting event
 * @fires SortableTitlePlugin#preDataSorting
 * @fires SortableTitlePlugin#columnSorted
 */
 SortableTitlePlugin.prototype.sortColumns = function (sortOptions, opt_arg) {
 	if (Array.isArray(sortOptions)) {
-		var states = [];
-		for (var i = 0; i < sortOptions.length; i++) {
-			var opt = sortOptions[i];
-			var colRef = opt["colId"] || opt["field"];
-			if(colRef == null) {
-				colRef = opt["colIndex"];
-			}
-			var state = this._prepareSorting(
-				colRef,
-				opt["sortOrder"] || opt["order"]
-			);
-			if (state) {
-				states.push(state);
-			}
+		var len = sortOptions.length;
+		var states = new Array(len);
+		for (var i = 0; i < len; i++) {
+			states[i] = this._prepareSorting(sortOptions[i]);
 		}
 		this._sortColumn(states, opt_arg);
 	}
@@ -32433,7 +32495,10 @@ SortableTitlePlugin.prototype.getColumnSortingField = function (colIndex) {
 	if (field == null && !this._rowDefMode) { // Old CompositeGrid may store sorting field in DataColumnName
 		var host = this._hosts[0];
 		if (host) {
-			field = host.getDataColumnName(colIndex);
+			field = host.getColumnField(colIndex);
+			if(!field) {
+				field = host.getDataColumnName(colIndex);
+			}
 			if(field && sortOptions) {
 				sortOptions["field"] = field; // Cache for later use
 			}
@@ -32468,28 +32533,20 @@ SortableTitlePlugin.prototype.setColumnSortingField = function (colIndex, field,
 		}
 	}
 };
+
+/** @private
+* @param {Object} sortState
+* @returns {string}
+*/
+var _toField = function(sortState) {
+	return sortState["field"] || "";
+};
 /** Return array of the fields from the currently sorted columns
 * @public
 * @return {!Array.<string>} fields of each sorting states
 */
 SortableTitlePlugin.prototype.getColumnSortingFields = function () {
-	var len = this._sortStates.length;
-	var ary = new Array(len);
-	var host = this._hosts[0];
-
-	for(var i = 0; i < len; ++i) {
-		var sortOptions = this._sortStates[i];
-		var field = sortOptions["field"];
-		if(!field && !this._rowDefMode) {
-			var colIndex = this._getColumnIndexByOptions(sortOptions); // Slow
-			field = host.getDataColumnName(colIndex);
-			if(field) {
-				sortOptions["field"] = field; // Cache for later use
-			}
-		}
-		ary[i] = field || "";
-	}
-	return ary;
+	return this._sortStates.map(_toField);
 };
 
 /** This is deprecated in favor of setSortingSequence method. Move existing sort order to the front of sorting sequence. New sort order will be added, if the specified sort order does not exist in current sorting sequence.
@@ -32498,7 +32555,6 @@ SortableTitlePlugin.prototype.getColumnSortingFields = function () {
 * @param {string=} sortOrder="a" "ascending", "descending", "none"
 * @see {@link SortableTitlePlugin#setSortingSequence}
 */
-
 SortableTitlePlugin.prototype.setFirstSortOrder = function (colIdentifier, sortOrder) {
 	if (sortOrder) {
 		sortOrder = SortableTitlePlugin._toSortOrder(sortOrder);
@@ -32716,10 +32772,8 @@ SortableTitlePlugin.prototype._proceedSorting = function (hitObj) {
 	if (this._canClickToSort(hitObj)) {
 		var colIndex = hitObj["colIndex"];
 		// _proceedSorting() method is always produced by user clicking at the header // Thus, this operation is guaranteed to be a user action
-		var state = this._prepareSorting(colIndex);
-		if (state) {
-			this._sortColumn([state], { "isUserAction": true });
-		}
+		this.sortColumn(colIndex, null, { "isUserAction": true });
+
 		var grid = hitObj["grid"];
 		if(grid && grid["focus"]) {
 			grid["focus"]();
@@ -32729,7 +32783,7 @@ SortableTitlePlugin.prototype._proceedSorting = function (hitObj) {
 			var ce = {};
 			ce["colIndex"] = colIndex;
 			ce["sortOrder"] = this.getSortOrder(colIndex);
-			ce["dataColumnName"] = this.getColumnSortingField(colIndex);
+			ce["dataColumnName"] = this.getColumnSortingField(colIndex); // This should be deprecated
 			this._dispatch("clicked", ce);
 		}
 	}
@@ -32919,7 +32973,7 @@ SortableTitlePlugin.prototype.sortSeparators = function (comparer) {
 		var sortStateCount = this._sortStates.length;
 		var rowDefField = SortableTitlePlugin._toRowDefField();
 		for(var i = 0; i < sortStateCount; i++){
-			var sortState =  this._sortStates[i];
+			var sortState = this._sortStates[i];
 			var field = this._rowDefMode ? rowDefField : sortState["field"];
 			sortOrders.push(sortState["sortOrder"]);
 			sortFields.push(field);
@@ -32930,19 +32984,51 @@ SortableTitlePlugin.prototype.sortSeparators = function (comparer) {
 
 
 /** @private
-* @param {number|string} colRef Column index or field
+* @param {(number|string|SortableTitlePlugin.SortingDefinition)} sortingDef This could be column index, field, or SortingDefinition
 * @param {string=} sortOrder "a" for ascending, "d" for descending, and "n" for no sorting
 * @returns {Object} state Returns null, if nothing is changed
 */
-SortableTitlePlugin.prototype._prepareSorting = function (colRef, sortOrder) {
+SortableTitlePlugin.prototype._prepareSorting = function (sortingDef, sortOrder) {
 	if (!this._maxCount) {
 		return null;
 	}
+	var host = this._hosts[0];
+	if(!host) {
+		return null;
+	}
 
-	var colIndex = this._getColumnIndex(colRef);
-	var priority = this.getSortPriority(colIndex);
-	var field = this.getColumnSortingField(colIndex);
+	var colIndex = -1;
+	var colRef = "";
+	if(typeof sortingDef === "number") {
+		colIndex = sortingDef;
+	} else if(typeof sortingDef === "string") { // This would be either column id or field
+		colRef = sortingDef;
+		colIndex = this._getColumnIndex(colRef);
+	} else if(sortingDef && typeof sortingDef === "object") {
+		colRef = sortingDef["colId"] || sortingDef["field"];
+		if(colRef) {
+			colIndex = this._getColumnIndex(colRef);
+		} else if(typeof sortingDef["colIndex"] === "number") {
+			colIndex = sortingDef["colIndex"];
+		}
+		if(!sortOrder) {
+			sortOrder = sortingDef["sortOrder"] || sortingDef["order"] || null;
+		}
+	}
+
+	var field = "";
+	var sortLogic = null;
+	if(colIndex >= 0) {
+		field = this.getColumnSortingField(colIndex);
+		var sortOptions = this._getSortOptions(colIndex);
+		if(sortOptions) {
+			sortLogic = sortOptions["sortLogic"];
+		}
+	} else if(colRef) {
+		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";
 
@@ -32970,7 +33056,6 @@ SortableTitlePlugin.prototype._prepareSorting = function (colRef, sortOrder) {
 
 		this._sortStates.splice(priority, 1); // Remove sort states
 		this._clearSortSymbols(curState); // Clear any previous symbols
-		// TODO: Other states in curState should be cleared as it is actually a sortOptions object
 	}
 
 	if (nextOrder === "a" || nextOrder === "d") { // Reorder sort states
@@ -32978,12 +33063,14 @@ SortableTitlePlugin.prototype._prepareSorting = function (colRef, sortOrder) {
 			return null;
 		}
 		if (!curState) {
-			// TODO: Sort state object should not be sortOptions
-			curState = this._newSortOptions(colIndex); // This may come with sortLogic
-		}
-		if(colIndex < 0) {
-			curState["field"] = field;
+			curState = {};
+			var colId = host.getColumnId(colIndex);
+			if(colId) {
+				curState["colId"] = colId;
+			}
 		}
+		curState["field"] = field;
+		curState["sortLogic"] = sortLogic || null;
 
 		this._sortStates.push(curState); // Latest sorting have lowest priority (multiColumn sorting)
 	}
@@ -33018,31 +33105,47 @@ SortableTitlePlugin.prototype._prepareSorting = function (colRef, sortOrder) {
 };
 
 /** @private
-* @param {Array.<Object>} states States from _prepareSorting for dispatching columnSorted event.
+* @param {Object|Array.<Object>} states States from _prepareSorting for dispatching columnSorted event.
 * @param {Object=} opt_arg Event argument to be sent with preDataSorting event
 * @fires SortableTitlePlugin#preDataSorting
 * @fires SortableTitlePlugin#columnSorted
 */
 SortableTitlePlugin.prototype._sortColumn = function (states, opt_arg) {
+	if(!states) {
+		return;
+	}
+
 	this._sortDataView(opt_arg); // Update Data
 	this.updateSortSymbols(); // Update Display
 
-	var res = states[0] || {};
-	var len = states.length;
-	if (len > 1) {
-		res["colIndices"] = new Array(len);
-		res["sortedFields"] = new Array(len);
-		res["sortOrders"] = new Array(len);
-		res["prevOrders"] = new Array(len);
-		for (var i = 0; i < len; i++) {
-			var obj = states[i];
-			res["colIndices"][i] = obj["colIndex"];
-			res["sortedFields"][i] = obj["sortedField"];
-			res["sortOrders"][i] = obj["sortOrder"];
-			res["prevOrders"][i] = obj["prevOrder"];
+	var evtArg = null;
+	if(Array.isArray(states)) {
+		var len = states.length;
+		for(var i = 0; i < len; ++i) {
+			var state = states[i];
+			if(state) {
+				if(evtArg) {
+					if(!evtArg["colIndices"]) {
+						evtArg["colIndices"] = [];
+						evtArg["sortedFields"] = [];
+						evtArg["sortOrders"] = [];
+						evtArg["prevOrders"] = [];
+					}
+
+					evtArg["colIndices"].push(state["colIndex"]);
+					evtArg["sortedFields"].push(state["sortedField"]);
+					evtArg["sortOrders"].push(state["sortOrder"]);
+					evtArg["prevOrders"].push(state["prevOrder"]);
+				} else {
+					evtArg = state;
+				}
+			}
 		}
+		evtArg = states[0];
+	} else {
+		evtArg = states;
 	}
-	this._dispatch("columnSorted", res);
+	this._dispatch("columnSorted", evtArg);
 };
 
 /** @private
@@ -33100,24 +33203,23 @@ SortableTitlePlugin.prototype._onColumnAdded = function (e) {
 * @fires SortableTitlePlugin#columnSorted
 */
 SortableTitlePlugin.prototype._onColumnRemoved = function (e) {
-	if (!e["atTheMiddle"]) { return; }
-
 	var sortCount = this._sortStates.length;
 	if (!sortCount) {
 		return;
 	}
-	var colData = e["columnData"];
-	var sortOptions = colData ? colData["sortableTitle"] : null;
-	var sortOrder = sortOptions ? sortOptions["sortOrder"] : "";
-
-	// TODO: columnRemoved event could be fired repeatedly and triggers multiple sorts
-	if (sortOrder) {
-		var priority = this._sortStates.indexOf(sortOptions);
-		if (priority >= 0) {
-			this._sortStates.splice(priority, 1);
+	var 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];
+		if (sortState["colId"] === colId) {
+			this._sortStates.splice(i, 1);
+			this._clearSortSymbols(sortState);
+			this._sortDataView();
+			break;
 		}
-		this._clearSortSymbols(sortOptions);
-		this._sortDataView();
 	}
 };
 
@@ -33211,8 +33313,8 @@ SortableTitlePlugin.prototype._updateSortableIndicator = function (hostIndex) {
 
 	var section = host.getSection("title");
 	if (section == null) { return; }
-	var sectionCount = section["getColumnCount"]();
-	for (var col = sectionCount; --col >= 0;) {
+	var colCount = section["getColumnCount"]();
+	for (var col = colCount; --col >= 0;) {
 
 		var rowCount = section["getRowCount"]();
 		for (var r = 0; r < rowCount; r++) {
@@ -33306,35 +33408,24 @@ SortableTitlePlugin.prototype._createIconElem = function (icon, fallback) {
 };
 
 /** @private
-* @param {Object} sortOptions
+* @param {string|number|Object} colRef This can be sortState, column id, column field, or column index
 * @return {number}
 */
-SortableTitlePlugin.prototype._getColumnIndexByOptions = function (sortOptions) {
-	if(sortOptions) {
+SortableTitlePlugin.prototype._getColumnIndex = function (colRef) {
+	if(colRef != null) {
 		var host = this._hosts[0];
-		var colCount = host ? host.getColumnCount() : 0;
-		for (var c = 0; c < colCount; ++c) {
-			var colData = host.getColumnData(c); // Equivalent to _getSortOptions() method
-			if (colData) {
-				if(sortOptions === colData["sortableTitle"]) {
-					return c;
-				}
+		if(host) {
+			if(typeof colRef === "number") {
+				return colRef;
+			} else if(typeof colRef === "string") {
+				return host.getColumnIndex(colRef);
+			} else {
+				return host.getColumnIndex(colRef["colId"]);
 			}
 		}
 	}
 	return -1;
 };
-/** @private
-* @param {string|number} colRef
-* @return {number}
-*/
-SortableTitlePlugin.prototype._getColumnIndex = function (colRef) {
-	var host = this._hosts[0];
-	if(host && colRef != null) {
-		return host.getColumnIndex(colRef);
-	}
-	return -1;
-};
 
 /** @private
 * @param {string|number} colRef
@@ -33355,10 +33446,7 @@ SortableTitlePlugin.prototype._getColumnId = function (colRef) {
 SortableTitlePlugin.prototype._getSortOptions = function (colIndex) {
 	var host = this._hosts[0];
 	if (host) {
-		var colData = host.getColumnData(colIndex);
-		if (colData) {
-			return colData["sortableTitle"];
-		}
+		return host.getColumnData(colIndex)["sortableTitle"] || null;
 	}
 	return null;
 };