@refinitiv-ui/efx-grid 6.0.127 → 6.0.128

package/lib/rt-grid/es6/Grid.js

@@ -2370,10 +2370,10 @@ Grid.prototype.insertRow = function(rowOption, rowRef) {
 		}
 	}
 	let rowDef = new RowDefinition(rowOption);
+	rowDef.registerToView(this._dv, this._getRowId(rowRef));
 	rowDef.setDataSource(this._dc, this._subs); // This could also subscribe chain index/ric to JET/RTK
 	this._initDuplicateRicData(rowDef);
 
-	rowDef.registerToView(this._dv, this._getRowId(rowRef));
 	if(rowOption && rowOption["hidden"]) {
 		this._dv.hideRow(rowDef.getRowId()); // Try to obtain rowId in rowDef since rowId is not assigned when new rows are created.
 	}
@@ -3945,12 +3945,9 @@ Grid.prototype._onDataComposed = function(e) {
 		return; // Row could already be removed or global change event is sent
 	}
 
-	let rowDef = rowData[ROW_DEF];
+	let rowDef = this._getRowDefinitionById(e["rid"]);
 	if(!rowDef) {
-		return;
-	}
-	if(!rowDef.getDataSource()) {
-		return; // Somehow, rowDef is invalid and doesn't have data source
+		return; // Somehow the given row id is invalid
 	}
 
 	if(this._autoDateConversion) { // auto data conversion
@@ -4011,8 +4008,8 @@ Grid.prototype._onSubSegmentChanged = function(e) {
 		rowDef = new RowDefinition({
 			"segmentId": segmentId // WARNING: This could cause row id duplication
 		});
-		rowDef.setDataSource(this._dc); // auto generated row does not require a subscription
 		rowDef.registerToView(this._dv);
+		rowDef.setDataSource(this._dc); // auto generated row does not require a subscription
 	}
 };
 

package/lib/rt-grid/es6/RowDefinition.js

@@ -610,7 +610,10 @@ RowDefinition.prototype.setDataSource = function(dataSource, subs) {
 	this._dc = dataSource || null;
 
 	if(this._dc) {
-		this.setRowData(_cloneObject(this._staticValues)); // Trigger data change
+		this.setRowData({}); // Trigger data change
+		if(this._staticValues) {
+			this.setRowData(this._staticValues); // Trigger dataComposed and add updates
+		}
 	}
 
 	this._subs = subs || null;
@@ -736,9 +739,14 @@ RowDefinition.prototype.setRowData = function(data) {
 /** @public
 */
 RowDefinition.prototype.resetRowData = function() {
-	if(this._dc) {
-		this._dc.setRowData(this._rowId, null);
-		this._dc.setRowData(this._rowId, _cloneObject(this._staticValues)); // Row data is guaranteed to be existed
+	let dc = this._dc;
+	if(dc) {
+		let rowId = this._rowId;
+		dc.setRowData(rowId, null);
+		dc.setRowData(rowId, {}); // Row data is guaranteed to be existed
+		if(this._staticValues) {
+			dc.setRowData(rowId, this._staticValues);  // Trigger dataComposed and add updates
+		}
 	}
 };
 /** @public

package/package.json

@@ -69,5 +69,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"version": "6.0.127"
+	"version": "6.0.128"
 }