@refinitiv-ui/efx-grid 6.0.46 → 6.0.47

package/lib/core/es6/data/DataTable.d.ts

@@ -112,6 +112,8 @@ declare class DataTable extends DataCache {
 
     public getSegmentChildIds(segmentId: string): (string)[]|null;
 
+    public sortSeparators(sortLogics: ((...params: any[]) => any)|(((...params: any[]) => any))[]|null, sortOrders: (number)[]|null, cids: (string)[]|null): boolean;
+
     public sortSegments(compare: ((...params: any[]) => any)|null): boolean;
 
     public setClassificationSource(dc: DataCache|null): void;

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

@@ -76,6 +76,14 @@ DataTable.prototype._removedRows = null;
 */
 DataTable.prototype._userSegmentComparer = null;
 /** @private
+* @type {number}
+*/
+DataTable.prototype._segmentSortOrder = 0;
+/** @private
+* @type {*}
+*/
+DataTable.prototype._segmentSortContext = null;
+/** @private
 * @type {Object.<string, Object>}
 */
 DataTable.prototype._clsSource = null;
@@ -1248,6 +1256,51 @@ DataTable.prototype.getSegmentChildIds = function(segmentId) {
 	}
 	return null;
 };
+/** Sort all of existing segments by multiple sort logics
+* @public
+* @param {Function|Array.<Function>} sortLogics
+* @param {Array.<number>} sortOrders
+* @param {Array.<string>} cids
+* @return {boolean}
+*/
+DataTable.prototype.sortSeparators = function (sortLogics, sortOrders, cids) {
+	var dirty = false;
+	if(!this._segments){
+		return false;
+	}
+	if(typeof sortLogics === "function"){
+		return this.sortSegments(sortLogics);
+	}
+	var sortingDefs = DataTable._buildSortContext(
+		[],
+		cids,
+		sortOrders,
+		sortLogics
+	);
+	var defCount = sortingDefs ? sortingDefs.length : 0;
+	if(!defCount){
+		return dirty;
+	}
+
+	var sortOrder = 0;
+	var sortLogic, sortContext;
+	if(defCount > 1) {
+		sortLogic = DataTable._multiColumnSeparatorCompareLogic;
+		sortContext = sortingDefs;
+		sortOrder = 1; // sortOrder is not used by _multiColumnSeparatorCompareLogic
+	} else { // Single level sorting
+		sortLogic = DataTable._singleColumnSeparatorCompareLogic;
+		sortContext = sortingDefs[0];
+		sortOrder = /** @type{number} */(sortContext[3]);
+	}
+	this._segmentSortOrder = sortOrder;
+	this._segmentSortContext = sortContext;
+	dirty = this.sortSegments(sortLogic);
+	this._segmentSortOrder = 0;
+	this._segmentSortContext = null;
+
+	return dirty;
+};
 /** Sort all of existing segments by given compare function
 * @public
 * @param {Function} compare
@@ -1316,7 +1369,9 @@ DataTable.prototype.sortSegments = function (compare) {
 DataTable.prototype._bySegmentSeparator = function (segmentA, segmentB) {
 	return /** @type{number} */(this._userSegmentComparer(
 		this.getRowData(segmentA.getId()),
-		this.getRowData(segmentB.getId())
+		this.getRowData(segmentB.getId()),
+		this._segmentSortOrder,
+		this._segmentSortContext
 	));
 };
 
@@ -1657,6 +1712,47 @@ DataTable._singleColumnCompareLogic = function(a, b, order, sortingDef) {
 		sortingDef[4] // Context object
 	));
 };
+/** Performance is extremely vital in this method
+* @public
+* @ignore
+* @function
+* @param {*} a
+* @param {*} b
+* @param {number} order Not used by in this method
+* @param {Array.<Array>} sortingDefs
+* @return {number}
+*/
+DataTable._multiColumnSeparatorCompareLogic = function(a, b, order, sortingDefs) {
+	var count = sortingDefs.length;
+	var result = 0;
+	for(var c = 0; c < count; ++c) {
+		var sortingDef = sortingDefs[c];
+		result = DataTable._singleColumnSeparatorCompareLogic(a, b, sortingDef[3], sortingDef);
+		if(result) {
+			return result;
+		}
+	}
+	return result;
+};
+/** Performance is extremely vital in this method
+* @public
+* @ignore
+* @function
+* @param {*} a
+* @param {*} b
+* @param {number} order
+* @param {Array} sortingDef
+* @return {number}
+*/
+DataTable._singleColumnSeparatorCompareLogic = function(a, b, order, sortingDef) {
+	var key = /** @type{string} */(sortingDef[0]);
+	return /** @type{number} */(sortingDef[2](
+		a[key], // Value1
+		b[key], // Value2
+		order, // Sort order (3)
+		sortingDef[4] // Context object
+	));
+};
 /** @public
 * @function
 * @ignore

package/lib/core/es6/data/DataView.d.ts

@@ -272,6 +272,8 @@ declare class DataView extends EventDispatcher {
 
     public getSegmentChildIds(segmentRef: string|number|null): (string)[]|null;
 
+    public sortSeparators(sortLogics: (((...params: any[]) => any))[]|null, sortOrders: (number)[]|null, cids: (string)[]|null): void;
+
     public sortSegments(compare: ((...params: any[]) => any)|null): void;
 
     public enableEmptySegmentFiltering(enabled?: boolean|null): void;

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

@@ -2548,6 +2548,15 @@ DataView.prototype.getSegmentIds = function() {
 DataView.prototype.getSegmentChildIds = function(segmentRef) {
 	return this._dt.getSegmentChildIds(this._toRowId(segmentRef));
 };
+/** Sort all of existing segments by multiple sort logics
+* @public
+* @param {Array.<Function>} sortLogics
+* @param {Array.<number>} sortOrders
+* @param {Array.<string>} cids
+*/
+DataView.prototype.sortSeparators = function (sortLogics, sortOrders, cids) {
+	this._dt.sortSeparators(sortLogics, sortOrders, cids);
+};
 /** Sort all of existing segments by given compare function
 * @public
 * @param {Function} compare

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

@@ -554,7 +554,7 @@ Core.prototype._batches = null;
 * @return {string}
 */
 Core.getVersion = function () {
-	return "5.1.65";
+	return "5.1.66";
 };
 /** {@link ElementWrapper#dispose}
 * @override

package/lib/core/es6/grid/plugins/SortableTitlePlugin.d.ts

@@ -135,6 +135,8 @@ declare class SortableTitlePlugin extends EventDispatcher {
 
     public clearAllColumnSortingSequences(): void;
 
+    public sortSeparators(comparer: ((...params: any[]) => any)|null): void;
+
 }
 
 declare function len(disabled?: boolean|null): void;

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

@@ -1358,6 +1358,28 @@ SortableTitlePlugin.prototype.setSortingSequence = function (sequence, colRef) {
 SortableTitlePlugin.prototype.clearAllColumnSortingSequences = function () {
 	this._sortingSequenceMap = null;
 };
+/** @public
+* @description Sorting all separators according to compare function. If compare function is not specified, separators will will be sort by current sorting states.
+* @param {Function} comparer Compare function
+*/
+SortableTitlePlugin.prototype.sortSeparators = function (comparer) {
+	var host = this._hosts[0];
+	var dv = host.getDataSource();
+	if(comparer){
+		dv.sortSeparators(comparer);
+	} else {
+		var sortLogics = dv.getSortingLogics();
+		var sortOrders = [];
+		var sortFields = [];
+		var sortStateCount = this._sortStates.length;
+		for(var i = 0; i < sortStateCount; i++){
+			var sortState =  this._sortStates[i];
+			sortOrders.push(sortState["sortOrder"]);
+			sortFields.push(sortState["field"]);
+		}
+		dv.sortSeparators(sortLogics, sortOrders, sortFields);
+	}
+};
 
 
 /** @private

package/lib/grid/index.js

@@ -1,3 +1,3 @@
 import {Grid} from "./lib/efx-grid.js";
 export {Grid}
-window.EFX_GRID = { version: "6.0.46" };
+window.EFX_GRID = { version: "6.0.47" };

package/lib/types/es6/Core/data/DataTable.d.ts

@@ -112,6 +112,8 @@ declare class DataTable extends DataCache {
 
     public getSegmentChildIds(segmentId: string): (string)[]|null;
 
+    public sortSeparators(sortLogics: ((...params: any[]) => any)|(((...params: any[]) => any))[]|null, sortOrders: (number)[]|null, cids: (string)[]|null): boolean;
+
     public sortSegments(compare: ((...params: any[]) => any)|null): boolean;
 
     public setClassificationSource(dc: DataCache|null): void;

package/lib/types/es6/Core/data/DataView.d.ts

@@ -272,6 +272,8 @@ declare class DataView extends EventDispatcher {
 
     public getSegmentChildIds(segmentRef: string|number|null): (string)[]|null;
 
+    public sortSeparators(sortLogics: (((...params: any[]) => any))[]|null, sortOrders: (number)[]|null, cids: (string)[]|null): void;
+
     public sortSegments(compare: ((...params: any[]) => any)|null): void;
 
     public enableEmptySegmentFiltering(enabled?: boolean|null): void;

package/lib/types/es6/Core/grid/plugins/SortableTitlePlugin.d.ts

@@ -135,6 +135,8 @@ declare class SortableTitlePlugin extends EventDispatcher {
 
     public clearAllColumnSortingSequences(): void;
 
+    public sortSeparators(comparer: ((...params: any[]) => any)|null): void;
+
 }
 
 declare function len(disabled?: boolean|null): void;

package/package.json

@@ -66,5 +66,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"version": "6.0.46"
+	"version": "6.0.47"
 }