@refinitiv-ui/efx-grid 6.0.127 → 6.0.129

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

@@ -31,7 +31,7 @@ DataConnector.prototype._fieldChangedConflator = null;
 * @private
 */
 DataConnector.prototype._ricChangedConflator = null;
-/** @type {Object.<string, RowDefinition>}
+/** @type {Object.<string, Array.<RowDefinition>>}
 * @private
 */
 DataConnector.prototype._rowDefMap = null;

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

@@ -524,6 +524,10 @@ Grid.prototype._formulaConflator = null;
 */
 Grid.prototype._chainConflator = null;
 /** @private
+* @type {Object}
+*/
+Grid.prototype._constituentMap = null;
+/** @private
 * @type {number}
 */
 Grid.prototype._clientWidth = NaN;
@@ -2370,10 +2374,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.
 	}
@@ -2694,6 +2698,7 @@ Grid.prototype.removeAllRows = function() {
 	this._dcConflator.reset();
 	this._formulaConflator.reset();
 	this._chainConflator.reset();
+	this._constituentMap = null;
 	this._connector.removeAllRics();
 
 	// TODO: This logic should also be in the core grid
@@ -3593,15 +3598,15 @@ Grid.prototype._onQuote2PostUpdate = function (e) {
 * @param {Object} e
  */
 Grid.prototype._onQ2DataChanged = function (e) {
-	let subId = e["subId"];
-	let rowDef = this._getRowDefinitionById(subId);
+	let rowDef = this._getRowDefinitionById(e["subId"]);
 	if(!rowDef) {
 		return; // WARNING: This should not be happened because row has been removed but the data is still received
 	}
 
+	let ric = e["ric"];
 	let values = e["values"];
 	if (values) {
-		let ric = e["ric"];
+		let duplicateRics = null;
 		if(rowDef.verifyConstituent(ric)) {
 			let parentDef = rowDef;
 			let childDef = parentDef.getConstituent(ric);
@@ -3612,15 +3617,28 @@ Grid.prototype._onQ2DataChanged = function (e) {
 				if(!childDef) {
 					return; // Parent chain is not alive
 				}
+				duplicateRics = this._connector.getRowDefByRic(ric);
 				this._connector.addRic(childDef); // TODO: JET/RTK should not re-subscribe this
+				if(!this._constituentMap) {
+					this._constituentMap = {};
+				}
+				this._constituentMap[childDef.getRowId()] = childDef;
 				this._registerConstituents(childDef);
 			}
 		}
 
+		if(duplicateRics && duplicateRics.length) {
+			let duplicateRic = duplicateRics[0];
+			duplicateRic.cloneRowData(values, values);
+		}
+
 		rowDef.setRowData(values); // Trigger data changes
-	} else if(rowDef.isConstituent()) { // Subscription and its parent has been removed by Real-time provider
-		rowDef.setParent(null); // Manually remove child reference from its parent
-		this._removeRow(rowDef);
+	} else { // The constituent is requested to be removed by the real-time data provider
+		let childDef = rowDef.getConstituent(ric); // WARNING: normal ric and its delayed version must match with the one first given
+		if(childDef) {
+			childDef.setParent(null); // Manually remove child reference from its parent
+			this._removeRow(childDef);
+		}
 	}
 };
 
@@ -3631,6 +3649,9 @@ Grid.prototype._registerConstituents = function(rowDef) {
 	if(this._chainConflator.conflate(rowDef)) {
 		return;
 	}
+
+	this._constituentMap = null;
+
 	let view = this._dv;
 	let dt = view ? view.getDataSource() : null;
 	if(!dt) {
@@ -3940,17 +3961,21 @@ Grid.prototype._onDataComposed = function(e) {
 		return; // Cannot do data composition if there is no change in data
 	}
 
-	let rowData = e["rowData"];
-	if(!rowData) {
+	if(!e["rowData"]) {
 		return; // Row could already be removed or global change event is sent
 	}
 
-	let rowDef = rowData[ROW_DEF];
+	let rowId = e["rid"];
+	let rowDef = this._getRowDefinitionById(rowId);
 	if(!rowDef) {
-		return;
-	}
-	if(!rowDef.getDataSource()) {
-		return; // Somehow, rowDef is invalid and doesn't have data source
+		rowDef = this._constituentMap ? this._constituentMap[rowId] : null; // Row def could be in pending for adding to view
+		if(!rowDef) {
+			return; // Somehow the given row id is invalid
+		}
+		if(rowDef.isDisposed()) {
+			this._constituentMap[rowId] = null;
+			return;
+		}
 	}
 
 	if(this._autoDateConversion) { // auto data conversion
@@ -4011,8 +4036,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
 	}
 };
 
@@ -4524,7 +4549,8 @@ Grid.prototype._onTabNavigation = function(e) {
 */
 Grid.prototype._getEventHandlers = function() {
 	return {
-		"tabNavigation": this._onTabNavigation
+		"tabNavigation": this._onTabNavigation,
+		"q2DataChanged": this._onQ2DataChanged
 	};
 };
 

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/lib/tr-grid-cell-selection/es6/CellSelection.d.ts

@@ -2,7 +2,7 @@ import { Ext } from "../../tr-grid-util/es6/Ext.js";
 import { GridPlugin } from "../../tr-grid-util/es6/GridPlugin.js";
 import { MouseDownTrait } from "../../tr-grid-util/es6/MouseDownTrait.js";
 import { EventDispatcher } from "../../tr-grid-util/es6/EventDispatcher.js";
-import { isIE, cloneObject, prepareTSVContent } from "../../tr-grid-util/es6/Util.js";
+import { cloneObject, prepareTSVContent } from "../../tr-grid-util/es6/Util.js";
 import { ElfUtil } from "../../tr-grid-util/es6/ElfUtil.js";
 import { injectCss, prettifyCss } from "../../tr-grid-util/es6/Util.js";
 
@@ -16,7 +16,8 @@ declare namespace CellSelectionPlugin {
         selectionChanged?: ((...params: any[]) => any)|null,
         copy?: ((...params: any[]) => any)|null,
         beforeMouseDown?: ((...params: any[]) => any)|null,
-        selectableSections?: any[]|null
+        selectableSections?: any[]|null,
+        copyDisabled?: boolean|null
     };
 
 }