@refinitiv-ui/efx-grid 6.0.84 → 6.0.86

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

@@ -218,10 +218,14 @@ declare class DataView extends EventDispatcher {
 
     public getExpansionParents(from?: number|null, to?: number|null): (string)[]|null;
 
+    public getExpansionParentByRowId(rid: string): string;
+
     public isRowExpansion(rid: string): boolean;
 
     public hasRowExpansion(rid: string): boolean;
 
+    public getRowExpansionCount(rowId: string): number;
+
     public getRowExpansionId(rid: string, idx?: number|null): string;
 
     public getRowExpansionIndex(rid: string): number;

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

@@ -2094,6 +2094,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
@@ -2116,6 +2127,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

package/lib/core/es6/grid/Core.d.ts

@@ -227,10 +227,6 @@ declare class Core extends ElementWrapper {
 
     public getColumnData(colIndex: number): any;
 
-    public setColumnData(colIndex: number, userData: any): any;
-
-    public newColumnData(colIndex: number): any;
-
     public setAlwaysRenderColumn(colIndex: number, alwaysRender?: boolean|null): void;
 
     public getFitContentWidth(): boolean;

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

@@ -574,7 +574,7 @@ Core.prototype._hasPendingRowChange = false;
 * @return {string}
 */
 Core.getVersion = function () {
-	return "5.1.87";
+	return "5.1.90";
 };
 /** {@link ElementWrapper#dispose}
 * @override
@@ -2689,27 +2689,30 @@ Core.prototype.preserveGridSize = function (preserve) {
 };
 /** @public
 * @param {number} colIndex
-* @return {Object} userData
+* @return {!Object} Column data object
 */
 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.prototype.setColumnData = function (colIndex, userData) { // TODO: Deprecate this method
-	this._getColumnDef(colIndex)["columnData"] = userData;
+Core.prototype.setColumnData = function (colIndex, userData) {
+	this._getColumnDef(colIndex)["columnData"] = userData || {};
 	return userData;
 };
 /** @public
+* @function
+* @deprecated
+* @ignore
 * @param {number} colIndex
 * @return {!Object}
 */
-Core.prototype.newColumnData = function (colIndex) {
-	return this.getColumnData(colIndex) || {};
-};
+Core.prototype.newColumnData = Core.prototype.getColumnData;
 /** @public
 * @param {number} colIndex
 * @param {boolean=} alwaysRender
@@ -2723,10 +2726,7 @@ Core.prototype.setAlwaysRenderColumn = function(colIndex, alwaysRender) {
 */
 Core.prototype._isAlwaysRenderColumn = function (colIndex) {
 	var colData = this.getColumnData(colIndex);
-	if(colData) {
-		return colData["alwaysRender"] === true;
-	}
-	return false;
+	return colData["alwaysRender"] === true;
 };
 
 /** @public
@@ -4881,25 +4881,35 @@ 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;
@@ -5182,7 +5192,9 @@ Core.prototype._getColumnDef = function (colIndex) {
 		}
 		return def;
 	}
-	return {};
+	return {
+		"columnData": {}
+	};
 };
 /** Retrieve 1 or 2 level of nested object definition
 * @private

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

@@ -18,6 +18,14 @@ declare namespace SortableTitlePlugin {
         order?: SortableTitlePlugin.SortOrder|null
     };
 
+    type SortingDefinition = {
+        colIndex?: number|null,
+        colId?: string|null,
+        field?: string|null,
+        sortOrder?: SortableTitlePlugin.SortOrder|null,
+        order?: SortableTitlePlugin.SortOrder|null
+    };
+
     type ColumnOptions = {
         sortable?: boolean|null,
         sortBy?: string|null,
@@ -30,7 +38,7 @@ declare namespace SortableTitlePlugin {
     };
 
     type Options = {
-        initialSort?: (SortableTitlePlugin.InitialSort|(SortableTitlePlugin.InitialSort)[])|null,
+        initialSort?: (SortableTitlePlugin.InitialSort|(SortableTitlePlugin.SortingDefinition)[])|null,
         multicolumn?: (boolean|number)|null,
         multiColumn?: (boolean|number)|null,
         threeStatesSorting?: boolean|null,
@@ -79,7 +87,7 @@ declare class SortableTitlePlugin extends EventDispatcher {
 
     public getSortedColumnIndex(priority?: number|null): number;
 
-    public getSortPriority(colIndex: number): number;
+    public getSortPriority(colIndex: number, colRef?: string|null): number;
 
     public isColumnSorted(colIndex: number): boolean;
 
@@ -89,7 +97,7 @@ declare class SortableTitlePlugin extends EventDispatcher {
 
     public sortColumn(colRef: number|string|null, sortOrder?: string|null, opt_arg?: any): void;
 
-    public sortColumns(sortOptions: (SortableTitlePlugin.InitialSort)[]|null, opt_arg?: any): void;
+    public sortColumns(sortOptions: (SortableTitlePlugin.SortingDefinition)[]|null, opt_arg?: any): void;
 
     public clearSortState(opt_arg?: any): void;
 
@@ -113,6 +121,8 @@ declare class SortableTitlePlugin extends EventDispatcher {
 
     public getColumnSortingFields(): (string)[];
 
+    public setFirstSortOrder(colIdentifier: string|number|(string|number)[]|null, sortOrder?: string|null): void;
+
     public disableTwoStateSorting(disabled?: boolean|null): void;
 
     public freezeIndicator(bool?: boolean|null): void;