@refinitiv-ui/efx-grid 6.0.85 → 6.0.87

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

@@ -1559,7 +1559,7 @@ DataView.prototype.getGroupRowId = function () {
 /**
 * @public
 * @ignore
-* @param {number} rid
+* @param {string} rid
 * @return {number}
 */
 DataView.prototype.getFooterRowIndex = function (rid) {
@@ -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

@@ -245,6 +245,8 @@ declare class Core extends ElementWrapper {
 
     public freezeSection(opt_frozenSection?: (string|number|null)|null): void;
 
+    public resetSectionFreezing(): void;
+
     public freezeFooter(frozenCount: number): void;
 
     public getFooterCount(): number;

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

@@ -574,7 +574,7 @@ Core.prototype._hasPendingRowChange = false;
 * @return {string}
 */
 Core.getVersion = function () {
-	return "5.1.89";
+	return "5.1.92";
 };
 /** {@link ElementWrapper#dispose}
 * @override
@@ -2872,6 +2872,12 @@ Core.prototype.freezeSection = function (opt_frozenSection) {
 	this._fixFrozenTopSections = true;
 	this._freezeTopSectionAt(opt_frozenSection);
 };
+/** @public
+*/
+Core.prototype.resetSectionFreezing = function () {
+	this._fixFrozenTopSections = false;
+	this._updateFrozenTopSections();
+};
 
 /** Vertical scrollbar will automatically appear for the rest of the sections, when container of Grid does NOT have enough space for Grid's content.
 * @private
@@ -4881,25 +4887,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;

package/lib/grid/index.js

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

package/lib/rt-grid/dist/rt-grid.js

@@ -125,7 +125,7 @@ Dom.div = function(className) {
 /** Shorthand for creating a span element with textContent
 * @public
 * @function
-* @param {string=} textContent
+* @param {(string|number)=} textContent
 * @param {string=} className
 * @return {!Element}
 */
@@ -866,7 +866,7 @@ EventDispatcher.preventDefault = preventDefault;
 * @param {number=} index
 */
 var VariableToken = function(str, index) {
-	str = str.replace(/^\s+|\s+$/gm, ""); // Trim white spaces -- equivalent to String.trim(), which is not support in IE8
+	str = str.trim();
 
 	if(this._inputConverter[str]) {
 		str = this._inputConverter[str];
@@ -1791,7 +1791,7 @@ Formula.prototype._parse = function(exp) {
 	if(exp.charAt(0) === "=") { // Remove the first equal sign
 		exp = exp.substr(1);
 	}
-	exp = exp.replace(/^\s+|\s+$/gm, ""); // Trim white spaces -- equivalent to String.trim(), which is not support in IE8
+	exp = exp.trim();
 	exp = exp.replace(/<>/g, "!=");
 	exp = exp.replace(/‛|‘|’/g, "'"); // Left and right single quote will be converted to simple single quote
 	exp = exp.replace(/‟|“|”/g, '"'); // Left and right double quote will be converted to simple double quote
@@ -13316,7 +13316,7 @@ RowDefinition.prototype._dataId = ""; // Data id can be different from rowId for
 * @private
 */
 RowDefinition.prototype._dc = null;
-/** @type {DataTable}
+/** @type {DataView}
 * @private
 */
 RowDefinition.prototype._view = null;
@@ -13594,8 +13594,8 @@ RowDefinition.prototype.getConfigObject = function(rowOptions) {
 	}
 
 	val = this._realTime;
-	if(val !== true) {
-		obj["realTime"] = val;
+	if(!val) {
+		obj["realTime"] = false;
 	}
 
 	val = this._permId;
@@ -15856,7 +15856,7 @@ ColumnDefinition.prototype.getConfigObject = function(colOptions) {
 	}
 
 	value = core.getMinimumColumnWidth(colIndex);
-	if(value !== 0) {
+	if(value > 0) {
 		obj["minWidth"] = value;
 	}
 
@@ -15958,7 +15958,7 @@ ColumnDefinition.prototype.getChildren = function() {
 };
 /**
 * @private
-* @param {string} colDef Child column definition
+* @param {ColumnDefinition} colDef Child column definition
 */
 ColumnDefinition.prototype._addChild = function(colDef) {
 	if(this === colDef || this._children.indexOf(colDef) > -1) {
@@ -49172,7 +49172,7 @@ var randString = function(min, max, seed) {
 /** Convert 2D Array to Array of records
 * @public
 * @param {Array.<Array>} data2D Array of values
-* @param {Array.<string>=} fields Keys to be mapped on the output records.
+* @param {Array.<string|number>=} fields Keys to be mapped on the output records.
 * @return {Array.<Object>} records
 */
 var toRecords = function(data2D, fields) {
@@ -51555,7 +51555,7 @@ var OperatorFunctions = {
 	"!": function(lhs, rhs){ return !lhs; },
 	"!!": function(lhs, rhs){ return !!lhs; }
 };
-/** @type {Object.<string, Function>}
+/** @type {Object.<string, number>}
 * @private
 * @const
 */