@refinitiv-ui/efx-grid 6.0.85 → 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.89";
+	return "5.1.90";
 };
 /** {@link ElementWrapper#dispose}
 * @override
@@ -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;