@refinitiv-ui/efx-grid 6.0.126 → 6.0.127

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

@@ -8621,8 +8621,7 @@ EventDispatcher_EventDispatcher._proto = EventDispatcher_EventDispatcher.prototy
 
 
 
-/**
- * Trigger when data within the table has been changed
+/** @description Trigger when data within the table has been changed
  * @event DataCache#dataChanged
  * @property {boolean} globalChange Indicates a big change. User should expect all data has been change
  * @property {string} type Type of changes. Possible values are "inserted", "removed", "updated", and undefined
@@ -8630,32 +8629,34 @@ EventDispatcher_EventDispatcher._proto = EventDispatcher_EventDispatcher.prototy
  * @property {Object.<string, *>} rowData Column values of the changed row in JSON object format
  */
 
-/**
- * Trigger before DataCache#dataChanged. Perform any data update during the event will NOT cause more dataChanged events
+/** @description Trigger before DataCache#dataChanged. Perform any data update during the event will NOT cause more dataChanged events
  * @event DataCache#dataComposed
  */
 
-/**
+/** Class for caching data and firing event when data is changed
  * @constructor
  * @extends {EventDispatcher}
  */
 let DataCache = function () {
-	let _t = this;
-
-	_t._rows = {};
-	_t._subs = {};
-	_t._onInsert = _t._onInsert.bind(_t);
-	_t._onUpdate = _t._onUpdate.bind(_t);
-	_t._onDelete = _t._onDelete.bind(_t);
-	_t._onQ2DataChanged = _t._onQ2DataChanged.bind(_t);
-	_t._onQ2SubAdded = _t._onQ2SubAdded.bind(_t);
-	_t._onQ2SubRemoved = _t._onQ2SubRemoved.bind(_t);
+	this._rows = {};
 
-	_t._addEvent("dataComposed");
-	_t._addEvent("dataChanged");
+	this._addEvent("dataComposed");
+	this._addEvent("dataChanged");
 };
 es6_Ext.inherits(DataCache, event_EventDispatcher);
 
+/** @protected
+ * @ignore
+ * @type {!Object.<string, Object>}
+ */
+DataCache.prototype._rows;
+
+/** @protected
+ * @ignore
+ * @type {boolean}
+ */
+DataCache.prototype._composing = false;
+
 //#region Public
 /**
  * @public
@@ -8663,162 +8664,64 @@ es6_Ext.inherits(DataCache, event_EventDispatcher);
 DataCache.prototype.dispose = function () {
 	this.unlistenAll();
 	this.clearAllData(true);
-	this._quotes2 = null;
 };
 
-/**
- * Deprecated. Built-in Data Service is deprecated due to the lack of flexibility. This API supports only Quotes2's "Subscriptions" object.
+/** Deprecated. Built-in Data Service is deprecated due to the lack of flexibility.
  * @public
- * @param {Object} subs Subscriptions object from JET.Quotes2
+ * @ignore
  */
-DataCache.prototype.setSubscriptions = function (subs) {
-	if (this._quotes2) {
-		this._quotes2["removeEventListener"]("dataChanged", this._onQ2DataChanged);
-		this._quotes2["removeEventListener"]("subscriptionAdded", this._onQ2SubAdded);
-		this._quotes2["removeEventListener"]("subscriptionRemoved", this._onQ2SubRemoved);
-	}
-
-	this._quotes2 = subs;
-
-	if (this._quotes2) {
-		this._quotes2["addEventListener"]("dataChanged", this._onQ2DataChanged);
-		this._quotes2["addEventListener"]("subscriptionAdded", this._onQ2SubAdded);
-		this._quotes2["addEventListener"]("subscriptionRemoved", this._onQ2SubRemoved);
-	}
-};
+DataCache.prototype.setSubscriptions = function () {};
 
-/**
- * Deprecated. Built-in Data Service is deprecated due to the lack of flexibility.This API supports only Quotes2's
- * "Subscriptions" object.
+/** Deprecated. Built-in Data Service is deprecated due to the lack of flexibility.
  * @public
- * @return {Object} subs Subscriptions object from JET.Quotes2
+ * @ignore
+ * @return {Object} Always returns null
  */
-DataCache.prototype.getSubscriptions = function () {
-	return this._quotes2;
-};
+DataCache.prototype.getSubscriptions = function () { return null; };
 
-/**
- * Deprecated. Built-in Data Service is deprecated due to the lack of flexibility.
+/** Deprecated. Built-in Data Service is deprecated due to the lack of flexibility.
  * @public
- * @param {Object} sub Subscription object from JET.Quote
- * @param {string=} opt_primaryRic Main RIC for creating Id or recalling subscription. This is because subscription
- * object does not provide a way to access its data
- * @param {Object=} opt_values Initial values
+ * @ignore
  */
-DataCache.prototype.addSubscription = function (sub, opt_primaryRic, opt_values) {
-	if (this.getSubscription(sub["id"])) {
-		return;
-	}
-
-	let internalSub = {"s": sub, "rics": {}};
-
-	this._subs[sub["id"]] = internalSub;
+DataCache.prototype.addSubscription = function () {};
 
-	if (!this._quotes2) {
-		sub["onNewRow"](this._onInsert);
-		sub["onUpdate"](this._onUpdate);
-		sub["onRemoveRow"](this._onDelete);
-	}
-
-	if (opt_primaryRic) {
-		internalSub["primary"] = opt_primaryRic;
-
-		if (!opt_values) {
-			opt_values = {};
-		}
-
-		this._onInsert(sub, opt_primaryRic, opt_values);
-	}
-};
-
-/**
- * Deprecated. Built-in Data Service is deprecated due to the lack of flexibility.
+/** Deprecated. Built-in Data Service is deprecated due to the lack of flexibility.
  * @public
- * @param {Object} sub Subscription object from JET.Quote
+ * @ignore
  */
-DataCache.prototype.removeSubscription = function (sub) { // All RICs associated to the subscription are removed
-	let subId = sub["id"];
+DataCache.prototype.removeSubscription = function () {};
 
-	if (!sub || !this._subs[subId]) {
-		return;
-	}
-
-	if (!this._quotes2) {
-		sub["stop"]();
-	}
-
-	let rics = this._subs[subId]["rics"];
-
-	for (let ric in rics) {
-		this.setRowData(subId + ric, null); // No subscription attached
-	}
-
-	delete this._subs[subId];
-};
-
-/**
- * Deprecated. Built-in Data Service is deprecated due to the lack of flexibility.
+/** Deprecated. Built-in Data Service is deprecated due to the lack of flexibility.
  * @public
+ * @ignore
  */
-DataCache.prototype.startAllSubscriptions = function () {
-	if (this._quotes2) {
-		this._quotes2["start"]();
-	} else {
-		for (let key in this._subs) {
-			this._subs[key]["s"]["start"]();
-		}
-	}
-};
+DataCache.prototype.startAllSubscriptions = function () {};
 
-/**
- * Deprecated. Built-in Data Service is deprecated due to the lack of flexibility.
+/** Deprecated. Built-in Data Service is deprecated due to the lack of flexibility.
  * @public
+ * @ignore
  */
-DataCache.prototype.stopAllSubscriptions = function () {
-	if (this._quotes2) {
-		this._quotes2["stop"]();
-	} else {
-		for (let key in this._subs) {
-			this._subs[key]["s"]["stop"]();
-		}
-	}
-};
+DataCache.prototype.stopAllSubscriptions = function () {};
 
-/**
+/** Deprecated. Built-in Data Service is deprecated due to the lack of flexibility.
  * @public
- * @param {string} sub_id
- * @return {Object} Subscription object from JET.Quote
+ * @ignore
+ * @return {Object} Always returns null
  */
-DataCache.prototype.getSubscription = function (sub_id) {
-	return (this._subs[sub_id]) ? this._subs[sub_id]["s"] : null;
-};
+DataCache.prototype.getSubscription = function () { return null; };
 
-/**
+/** Deprecated. Built-in Data Service is deprecated due to the lack of flexibility.
  * @public
- * @param {string} sub_id
- * @return {string} ric that has been input when calling addSubscription
+ * @ignore
+ * @return {string} Always returns empty string
  */
-DataCache.prototype.getPrimaryRic = function (sub_id) {
-	let subDef = this._subs[sub_id];
-	if (subDef) {
-		return subDef["primary"];
-	}
-	return "";
-};
+DataCache.prototype.getPrimaryRic = function () { return ""; };
 
-/**
- * @public
+/** @public
  * @param {boolean=} opt_suppressEvent
  * @fires DataCache#dataChanged
  */
-DataCache.prototype.clearAllData = function (opt_suppressEvent) { // All subscriptions are also removed
-	if (this._quotes2) {
-		this._quotes2["removeAllSubscriptions"]();
-	} else {
-		this.stopAllSubscriptions();
-	}
-
-	this._subs = {};
+DataCache.prototype.clearAllData = function (opt_suppressEvent) {
 	this._rows = {};
 
 	if (!opt_suppressEvent) {
@@ -8862,28 +8765,12 @@ DataCache.prototype.getData = function (rid, cid) {
 	return (row) ? row[cid] : null;
 };
 
-/**
- * Deprecated. Built-in Data Service is deprecated due to the lack of flexibility.
+/** Deprecated. Built-in Data Service is deprecated due to the lack of flexibility.
  * @public
- * @return {Object.<string, Array.<string>>} Map of Array of subscription object
+ * @ignore
+ * @return {Object.<string, Array.<string>>} Always returns null
  */
-DataCache.prototype.getAllRics = function () { // Slow
-	let ricMap = {};
-
-	for (let subId in this._subs) {
-		let rics = this._subs[subId]["rics"];
-
-		for (let ric in rics) {
-			if (!ricMap[ric]) {
-				ricMap[ric] = [];
-			}
-
-			ricMap[ric].push(subId);
-		}
-	}
-
-	return ricMap; // No duplicate ric
-};
+DataCache.prototype.getAllRics = function () { return null; };
 
 /**
  * @public
@@ -9082,27 +8969,22 @@ DataCache.prototype.cloneRowData = function (rid) {
 /** Deprecated. Built-in Data Service is deprecated due to the lack of flexibility.
  * @public
  * @ignore
- * @suppress {checkTypes}
  */
 DataCache.prototype.addStaticFields = function () {};
 
-/**
- * Deprecated. Built-in Data Service is deprecated due to the lack of flexibility.
+/** Deprecated. Built-in Data Service is deprecated due to the lack of flexibility.
  * @public
  * @ignore
- * @suppress {checkTypes}
  */
 DataCache.prototype.removeStaticFields = function () {};
 
-/**
- * Deprecated. Built-in Data Service is deprecated due to the lack of flexibility.
+/** Deprecated. Built-in Data Service is deprecated due to the lack of flexibility.
  * @public
  * @ignore
  */
 DataCache.prototype.resetStaticFields = function () {};
 
-/**
- * Deprecated. Built-in Data Service is deprecated due to the lack of flexibility.
+/** Deprecated. Built-in Data Service is deprecated due to the lack of flexibility.
  * @public
  * @ignore
  */
@@ -9143,40 +9025,29 @@ DataCache.prototype.log = function (opt_options) {
 	console.table(this.dump(opt_options));
 };
 
-//#region ADC
 /** Deprecated. Built-in Data Service is deprecated due to the lack of flexibility.
  * @public
  * @ignore
- * @param {string} userId
- * @param {string} productId
- * @param {string} url
- * @param {string=} opt_lang
  */
-DataCache.prototype.setDataCloudSettings = function (userId, productId, url, opt_lang) {};
+DataCache.prototype.setDataCloudSettings = function () {};
 
-/**
- * Deprecated. Built-in Data Service is deprecated due to the lack of flexibility.
+/** Deprecated. Built-in Data Service is deprecated due to the lack of flexibility.
  * @public
  * @ignore
  */
 DataCache.prototype.getDataCloudFields = function () {};
 
-/**
- * Deprecated. Built-in Data Service is deprecated due to the lack of flexibility.
+/** Deprecated. Built-in Data Service is deprecated due to the lack of flexibility.
  * @public
  * @ignore
- * @param {Array.<string>|string} fields
  */
-DataCache.prototype.addDataCloudFields = function (fields) {};
+DataCache.prototype.addDataCloudFields = function () {};
 
-/**
- * Deprecated. Built-in Data Service is deprecated due to the lack of flexibility.
+/** Deprecated. Built-in Data Service is deprecated due to the lack of flexibility.
  * @public
  * @ignore
- * @param {string} field
  */
-DataCache.prototype.removeDataCloudField = function (field) {};
-//#endregion ADC
+DataCache.prototype.removeDataCloudField = function () {};
 //#endregion Public
 
 /**
@@ -9313,162 +9184,6 @@ DataCache.constructTable = function (dataset, opt_options, opt_rowIds) {
 };
 
 
-//#region Private
-/**
- * For Quotes2 only
- * @private
- * @param {string} subId
- * @param {string} ric
- * @param {Object.<string, *>} values
- */
-DataCache.prototype._insertRic = function (subId, ric, values) {
-	// HACK: Some chain may have 0# symbol in there chain index (e.g. 0#CL:)
-	ric = ric.replace("0#", "");
-
-	let rid = subId + ric;
-
-	let rowData = this.getRowData(rid);
-	if (!rowData) { // Ensure that we have subscription id and ric from Quotes2
-		let tmp = values;
-
-		values = {}; // Clone a new object for duplicated ric
-
-		for (let key in tmp) { // Slow
-			values[key] = tmp[key];
-		}
-
-		values["SUB_ID"] = subId;
-		values["RIC"] = ric;
-	} else {
-		let rowDef = rowData["ROW_DEF"];
-		if(rowDef && rowDef.isChain()){
-			values["SUB_ID"] = subId;
-		}
-	}
-
-	this.setRowData(rid, values);
-};
-
-/**
- * @private
- * @param {Object} e
- */
-DataCache.prototype._onQ2DataChanged = function (e) {
-	let subId = e["subId"];
-	let ric = e["ric"];
-	let values = /** @type{Object.<string, *>} */(e["values"]);
-
-	if (values) {
-		this._insertRic(subId, ric, values);
-	} else { // Remove ric
-		delete this._subs[subId]["rics"][ric];
-
-		this.setRowData(subId + ric, null);
-	}
-};
-
-/**
- * @private
- * @param {Object} e
- */
-DataCache.prototype._onQ2SubAdded = function (e) {
-	let subs = e["subs"];
-	let len = subs.length;
-
-	for (let i = 0; i < len; ++i) {
-		let sub = subs[i];
-
-		// chain subId fires twice, one with "_ci_" and one without "_ci_"
-		// the subId with "_ci_" should be ignore
-		if(sub["id"].indexOf("_ci_") < 0){
-			this.addSubscription(sub, sub["ric"]);
-		}
-	}
-};
-
-/**
- * @private
- * @param {Object} e
- */
-DataCache.prototype._onQ2SubRemoved = function (e) {
-	let subs = e["subs"];
-	let len = subs.length;
-
-	for (let i = 0; i < len; ++i) {
-		let sub = subs[i];
-
-		// chain subId fires twice, one with "_ci_" and one without "_ci_"
-		// the subId with "_ci_" should be ignore
-		if(sub["id"].indexOf("_ci_") < 0){
-			this.removeSubscription(sub);
-		}
-	}
-};
-
-/**
- * @private
- * @param {Object} sub Subscription object from JET.Quote
- * @param {string} ric
- * @param {Object.<string, *>} values
- */
-DataCache.prototype._onInsert = function (sub, ric, values/*, rowN*/) {
-	let subId = sub["id"];
-
-	if (this._quotes2) {
-		this._insertRic(subId, ric, values);
-	} else {
-		this.setRowData(subId + ric, values, {"subscription": sub, "ric": ric});
-	}
-};
-
-/**
- * @private
- * @function
- */
-DataCache.prototype._onUpdate = DataCache.prototype._onInsert;
-
-/**
- * This is a legacy code and should be deprecated
- * @private
- * @param {Object} sub Subscription object from JET.Quote
- * @param {string} ric
- * @param {Array.<string, *>} values
- */
-DataCache.prototype._onDelete = function (sub, ric, values/*, rowN*/) {
-	delete this._subs[sub["id"]]["rics"][ric];
-
-	// We cannot cache event arguments because user may want to collect all the updates
-	this.setRowData(sub["id"] + ric, null, {"subscription": sub, "ric": ric});
-};
-
-/** @protected
- * @ignore
- * @type {!Object.<string, Object>}
- */
-DataCache.prototype._rows;
-
-/**
- * @private
- * @type {!Object.<string, Object>}
- */
-DataCache.prototype._subs;
-
-/**
- * @private
- * @type {Object}
- */
-DataCache.prototype._quotes2 = null;
-
-/** @protected
- * @ignore
- * @type {boolean}
- */
-DataCache.prototype._composing = false;
-
-//#endregion Private
-
-DataCache._proto = DataCache.prototype;
-
 /* harmony default export */ var data_DataCache = (DataCache);
 
 
@@ -12978,20 +12693,32 @@ const ROW_TYPES = {
 */
 const ROW_ID_PATTERN = /^_[^_]+_$/;
 
+/** @private
+* @function
+* @param {Object} obj
+* @returns {!Object} Always returns a new object
+*/
+let _cloneObject = function(obj) {
+	let newObj = {};
+	for(let key in obj) {
+		newObj[key] = obj[key];
+	}
+	return newObj;
+};
+
 /** @constructor
 * @param {RowDefinition~Options=} rowOptions
 */
 let RowDefinition = function(rowOptions) {
 	this._changes = {};
-	if(rowOptions && rowOptions["segmentId"]) { // This row will be classification header row
-		this._dataId = this._rowId = rowOptions["segmentId"];
+	if(rowOptions && rowOptions["segmentId"]) { // This row will be classified header row (subsegment header row)
+		this._rowId = rowOptions["segmentId"];
 		this._autoGenerated = true;
 		this._subSegment = true;
 		return;
 	}
 
 	this._rowId = "_" + RowDefinition._runningId++ + "_";
-	this._dataId = this._rowId;
 
 	if(rowOptions) {
 		if(rowOptions["asConstituent"]) { // Create row definition as a constituent of a chain
@@ -13044,10 +12771,6 @@ RowDefinition.prototype._realTime = true;
 * @private
 */
 RowDefinition.prototype._rowId = ""; // Row Id must be unique
-/** @type {string}
-* @private
-*/
-RowDefinition.prototype._dataId = ""; // Data id can be different from rowId for constituents of a chain
 /** @type {boolean}
 * @private
 */
@@ -13056,6 +12779,11 @@ RowDefinition.prototype._userId = false;
 * @private
 */
 RowDefinition.prototype._dc = null;
+/** Quotes2 subscription object
+* @type {Object}
+* @private
+*/
+RowDefinition.prototype._subs = null;
 /** @type {DataView}
 * @private
 */
@@ -13131,22 +12859,20 @@ RowDefinition.prototype.dispose = function() {
 		this._children = null;
 	}
 
+	if(this._dc) {
+		this._dc.setRowData(this._rowId, null); // Clear all data held by this row def
+		this._dc = null;
+	}
 	this._staticValues = null; // Static values contain user data
 	this._parent = null; // WARNING: This does not impact children count of the parent. A child must be destroyed by its parent only
 	this._depthLevel = 0;
 	this.unsubscribeForUpdates();
-	if(this._dc) {
-		let rowData = this.getRowData();
-		if(rowData) {
-			rowData[ROW_DEF] = null;
-		}
-		this._dc = null;
-	}
-	if(this._view) {
-		this._view = null;
-	}
-	this._rowId = this._dataId = "";
+	this._subs = null;
+	this._view = null; // WARNING: This does not remove this row from the UI view
+
+	this._subId = this._rowId = "";
 	this._userId = false;
+	this._autoGenerated = false;
 	this._userModel = null;
 };
 /** @public
@@ -13169,7 +12895,7 @@ RowDefinition.prototype.initialize = function(rowOptions) {
 			if(userRowId.match(ROW_ID_PATTERN)) {
 				console.warn("Please change the rowId format to avoid duplicated rows' id causing unexpected behavior.");
 			} else {
-				this._rowId = this._dataId = userRowId;
+				this._rowId = userRowId;
 				this._userId = true;
 			}
 		}
@@ -13225,7 +12951,7 @@ RowDefinition.prototype.initialize = function(rowOptions) {
 
 	let symbol = this._ric || this._chainRic;
 	if(symbol || this._permId){
-		this.setContent(symbol, extractedOptions); // this._dataId is modified
+		this.setContent(symbol, extractedOptions);
 	}
 
 	val = rowOptions["values"];
@@ -13234,28 +12960,20 @@ RowDefinition.prototype.initialize = function(rowOptions) {
 		this.setStaticRowData(val, rowOptions["fields"]);
 	}
 };
-/** @private
+/** @description Constituents will have subscription id, but have no subscription. It's row id will be different from subscription id. It will have a reference to its parent. It cannot be generated by themselve -- always be autogenerated.
+* @private
 * @param {!Object} rowOptions
 */
 RowDefinition.prototype._initializeAsConstituent = function(rowOptions) {
 	this._autoGenerated = true;
 	let parentDef = /** @type{RowDefinition} */(rowOptions["parent"]);
 	if(this.setParent(parentDef)) {
-		this._dataId = /** @type{string} */(rowOptions["dataId"]); // Constituent will have the same subId as its parent but with different ric
 		this._ric = /** @type{string} */(rowOptions["ric"]);
 		this._dc = parentDef._dc; // Parent chain must have data cache
-		if(this._dc) {
-			let rowData = this.getRowData(); // Do not trigger any data update
-			if(rowData) { // Row data from data cache must exist beforehand
-				rowData[ROW_DEF] = this;  // This is for easy referencing from data streaming, also for preventing duplication
-			}
-		}
-	}
-	let val = rowOptions["values"];
-	// eslint-disable-next-line no-undefined
-	if(val !== undefined) {
-		this.setStaticRowData(val, rowOptions["fields"]);
+		this._subId = parentDef._subId; // Child constituent uses the same subscription as its parent
 	}
+	this._staticValues = rowOptions["values"] || null;
+	this.resetRowData();
 };
 /** @private
 * @param {DataView} view
@@ -13310,9 +13028,9 @@ RowDefinition.prototype.setContent = function(userInput, extractedOptions) {
 	}
 
 	let dirty = (this._userInput !== userInput);
-	let permId = extractedOptions["permId"];
+	let permId = extractedOptions["permId"] || "";
 	if(this._permId !== permId){
-		this._permId = permId || "";
+		this._permId = permId;
 		dirty = true;
 	}
 	if(!dirty) {
@@ -13329,10 +13047,7 @@ RowDefinition.prototype.setContent = function(userInput, extractedOptions) {
 	let dv = this._view;
 	let stalledSorting = _stallSorting(dv, realtimeRow && asChain, false); // To preserve current position of the segment/chain
 
-	if(!this.unsubscribeForUpdates()){
-		this._clearStaticData();
-	}
-	this.resetUpdates(); // Remove all previous data updates because a new content is just entered
+	this.unsubscribeForUpdates(); // Static data remains intact
 
 	this._userInput = userInput;
 	let collapsed = extractedOptions["collapsed"];
@@ -13346,9 +13061,6 @@ RowDefinition.prototype.setContent = function(userInput, extractedOptions) {
 		this._isChain = asChain != null ? asChain : null; // this could be null or undefined
 		this._chainRic = chainRic || "";
 	}
-	// A symbol can be either RIC or permId
-	// JET/RTK will generate data id to be rowId (given from this rowDef) + ric
-	this._dataId = this._rowId + this.getSymbol();
 
 	if(dv) {
 		let segmentId = dv.getSegmentParentRowId(this._rowId);
@@ -13367,27 +13079,18 @@ RowDefinition.prototype.setContent = function(userInput, extractedOptions) {
 			dv.setSegmentSeparator(this._rowId, true);
 		}
 
-		if(collapsed !== this.isChainCollapsed()) {
+		if(collapsed !== this.isChainCollapsed()) { // WARNING: This is not optimizsed
 			dv.collapseSegment(this._rowId, collapsed);
 		}
 		this._collapsed = null;
 
 		_stallSorting(dv, false, stalledSorting);
 		if(segmentId) { // If data id is changed and the row is a child of a segment, then segment child data id must be updated
-			dv.addSegmentChild(segmentId, this._rowId, this._dataId);
+			dv.addSegmentChild(segmentId, this._rowId);
 		}
 	}
 
-	if(!this.subscribeForUpdates()) {
-		if(this._dc) {
-			// This will work for runtime ric modification, but not for first initilization.
-			// Avoid losing the ROW_DEF pointer.
-			let rowData = {};
-			rowData[ROW_DEF] = this; // Enable tracking back and updating data
-			rowData["X_RIC_NAME"] = this.getDisplayText();
-			this.setRowData(rowData);
-		}
-	}
+	this.subscribeForUpdates();
 	return true;
 };
 /** @public
@@ -13499,12 +13202,12 @@ RowDefinition.prototype.getConfigObject = function(rowOptions) {
 
 	return obj;
 };
-/** Since an index chain (e.g. .FTSE) can automatically produce rows for its constituent, we need to separate rowId and dataId, so that the constituents still use the same data Id as that of its parent.
+/** Data id is deprecated
 * @public
-* @return {string} Data Id will never be empty string unless the row has been removed
+* @return {string} Always return empty string
 */
 RowDefinition.prototype.getDataId = function() {
-	return this._dataId;
+	return "";
 };
 /** @public
 * @return {string}
@@ -13540,26 +13243,16 @@ RowDefinition.prototype.getType = function() {
 /** This method should always be called right after the initialization
 * @public
 * @param {DataCache} dataSource
+* @param {Object=} subs Quotes2 subscription object
 */
-RowDefinition.prototype.setDataSource = function(dataSource) {
+RowDefinition.prototype.setDataSource = function(dataSource, subs) {
 	this._dc = dataSource || null;
-	if(!this._dc) {
-		return;
-	}
-
-	let rowData = this.getRowData();
-	if(!rowData) {
-		rowData = {};
-		rowData[ROW_DEF] = this; // Enable tracking back and updating data
-		rowData["X_RIC_NAME"] = this.getDisplayText();
-		this.setRowData(rowData); // TODO: This will dispatch dataChanged event and caused update to be added, which should not happen
-	}
 
-	// Add static value to the new source
-	if(this._staticValues) {
-		this.setRowData(this._staticValues);
+	if(this._dc) {
+		this.setRowData(_cloneObject(this._staticValues)); // Trigger data change
 	}
 
+	this._subs = subs || null;
 	// This will work for runtime row insertion, but not for first initilization.
 	this.subscribeForUpdates();
 };
@@ -13574,14 +13267,14 @@ RowDefinition.prototype.getDataSource = function() {
 * @return {Object} rowData
 */
 RowDefinition.prototype.getRowData = function() {
-	return this._dc ? this._dc.getRowData(this._dataId) : {};
+	return this._dc ? this._dc.getRowData(this._rowId) : {};
 };
 /** @public
 * @param {string} field
 * @return {*} data
 */
 RowDefinition.prototype.getData = function(field) {
-	return this._dc ? this._dc.getData(this._dataId, field) : null;
+	return this._dc ? this._dc.getData(this._rowId, field) : null;
 };
 
 /** This method replaces all existing static data by the given data -- all existing static data are removed.
@@ -13606,7 +13299,7 @@ RowDefinition.prototype.setStaticRowData = function(data, indexToFieldMap) {
 * @return {Object.<string, *>}
 */
 RowDefinition.prototype._cloneStaticRowData = function() {
-	return this._staticValues ? cloneObject(this._staticValues) : null;
+	return this._staticValues ? _cloneObject(this._staticValues) : null;
 };
 /** @public
 * @param {string} field
@@ -13676,7 +13369,15 @@ RowDefinition.prototype.cloneRowData = function(obj, exceptionObj) {
 */
 RowDefinition.prototype.setRowData = function(data) {
 	if(this._dc) {
-		this._dc.setRowData(this._dataId, data);
+		this._dc.setRowData(this._rowId, 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
 	}
 };
 /** @public
@@ -13685,18 +13386,20 @@ RowDefinition.prototype.setRowData = function(data) {
 */
 RowDefinition.prototype.setData = function(field, value) {
 	if(this._dc) {
-		this._dc.setData(this._dataId, field, value);
+		this._dc.setData(this._rowId, field, value);
 	}
 };
 /** @private
 */
 RowDefinition.prototype._clearStaticData = function() {
-	if(this._staticValues) {
-		for(let key in this._staticValues) {
-			this._staticValues[key] = null;
-		}
+	let staticValues = this._staticValues;
+	if(staticValues) {
 		if(this._dc) {
-			this._dc.setRowData(this._dataId, this._staticValues);
+			let obj = {};
+			for(let key in staticValues) {
+				obj[key] = null;
+			}
+			this._dc.setRowData(this._rowId, obj);
 		}
 		this._staticValues = null;
 	}
@@ -13734,7 +13437,7 @@ RowDefinition.prototype.getDisplayText = function() {
 		return this._label;
 	}
 
-	if(this._ric) {
+	if(this._ric) { // Use chainRic instead if this is a chain
 		return this._ric;
 	}
 
@@ -13764,6 +13467,12 @@ RowDefinition.prototype.isChain = function() {
 	return this._isChain;
 };
 /** @public
+* @return {boolean}
+*/
+RowDefinition.prototype.isConstituent = function() {
+	return (this._autoGenerated && this._subId && this._rowId !== this._subId) ? true : false;
+};
+/** @public
 * @function
 * @param {RowDefinition} rowDef
 * @return {boolean}
@@ -13822,19 +13531,23 @@ RowDefinition.prototype.isRealTimeRow = function() {
 };
 
 /** @public
+* @param {Object=} subs
 * @return {boolean} If a subscription is made, return true.
 */
-RowDefinition.prototype.subscribeForUpdates = function() {
-	if(!this.isRealTimeRow() && !this.getPermId()) {
-		return false;
+RowDefinition.prototype.subscribeForUpdates = function(subs) {
+	if(subs) {
+		this._subs = subs;
+	} else {
+		subs = this._subs;
 	}
-
-	let subs = this._dc ? this._dc.getSubscriptions() : null;
 	if(!subs) {
 		return false;
 	}
+	if(!this.isRealTimeRow() && !this.getPermId()) {
+		return false;
+	}
 	// TODO: Check if the same subscription is being made.
-	let prevRowData = this.unsubscribeForUpdates();
+	this.unsubscribeForUpdates();
 
 	if(this.isChain()) {
 		let symbol = this._chainRic;
@@ -13852,57 +13565,51 @@ RowDefinition.prototype.subscribeForUpdates = function() {
 		this._subId = subs["addRic"](this._ric, this._rowId);
 	}
 
-	if(prevRowData) {
-		this._dc.setRowData(this._dataId, prevRowData); // TODO: We may need to create a new object instead of prevRowData for data correctness
-	} else {
-		this._dc.setRowData(this._dataId, {"X_RIC_NAME": this.getDisplayText(), "ROW_DEF": this}); // Trigger data update immediately
-	}
+	let xRicName = this.getDisplayText(); // WARNING: This does not cover real-time X_RIC_NAME updates
+	this.setRowData({"X_RIC_NAME": xRicName}); // Trigger data update immediately
+
 	return true;
 };
-/** @public
- * @returns {*}
+/** Unsubscribe existing real-time data service. Static data is maintained
+* @public
+* @returns {null} Always return null
 */
 RowDefinition.prototype.unsubscribeForUpdates = function() {
-	if(!this._subId) {
-		return;
+	if(this.isSubscribing()) { // Only normal real-time rows and chains have both subId and subscription object
+		this._subs["removeSubscription"](this._subId);
+		this._subId = "";
+		this.resetUpdates();
+		this.resetRowData(); // Real-time data is removed while static data is maintained
 	}
-
-	let subs = this._dc.getSubscriptions();
-	let prevRowData = this.getRowData();
-
-	subs["removeSubscription"](this._subId);
-	this._subId = "";
-	this.resetUpdates();
-	// TODO: Reset only if this is the last ric
-	this._dc.setRowData(this._dataId, null); // Trigger data update immediately
-	this._clearStaticData();
-	// eslint-disable-next-line consistent-return
-	return prevRowData;
+	return null;
 };
 /** @public
 * @return {boolean}
 */
 RowDefinition.prototype.isSubscribing = function() {
-	return this._subId ? true : false;
+	return (this._subId && this._subs) ? true : false;
+};
+/** @public
+* @return {string}
+*/
+RowDefinition.prototype.getSubId = function() {
+	return this._subId;
 };
 
 /** Take event argument from streaming update with "changes" array property
 * @public
-* @param {Object} e Object with changes property
+* @param {Object} changes
 * @return {boolean} Returns true if there is any change
 */
-RowDefinition.prototype.addUpdate = function(e) {
-	if(e) {
-		let changes = e["changes"];
-		if(changes) {
-			let dirty = 0;
-			for(let field in changes) {
-				this._changes[field] = dirty = 1;
-			}
-			if(dirty) {
-				++this._updateCount;
-				return true;
-			}
+RowDefinition.prototype.addUpdate = function(changes) {
+	if(changes) {
+		let dirty = 0;
+		for(let field in changes) {
+			this._changes[field] = dirty = 1;
+		}
+		if(dirty) {
+			++this._updateCount;
+			return true;
 		}
 	}
 	return false;
@@ -13925,27 +13632,27 @@ RowDefinition.prototype.resetUpdates = function() {
 
 /** @public
 * @param {DataView} view
-* @param {string=} destRowId Destination position where the row will be placed BEFORE the specified position.
+* @param {string=} destRowId Destination position where the row will be placed BEFORE the specified position
+* @returns {boolean} Returns true for successful registration
 */
 RowDefinition.prototype.registerToView = function(view, destRowId) {
 	if(!view || this._view === view) {
-		return; // Already in the view
+		return false; // Already in the view
 	}
-	this._view = view;
 
-	let rowId = this.getRowId();
-	if(view.getRowData(rowId)) {
-		console.warn("Duplicated rows' id.");
-		return;
+	this._view = view;
+	let rowId = this._rowId;
+	let rowData = view.getRowData(rowId);
+	if(rowData && rowData[ROW_DEF]) {
+		console.warn("Duplicate row id detected");
+		return false;
 	}
 
-	let rowData = null;
 	if(this._subSegment) {
-		rowData = this._view.getRowData(this.getRowId());
-		if(rowData) {
-			rowData[ROW_DEF] = this; // no event trigger
+		if(rowData) { // Row data for sub segment has been created by data view
+			rowData[ROW_DEF] = this; // It only needs to register row def to the row data
 		}
-		return;
+		return true;
 	}
 
 	rowData = {};
@@ -13958,7 +13665,13 @@ RowDefinition.prototype.registerToView = function(view, destRowId) {
 		if(parentRowId) {
 			if(isSegment) { // A chain or a segment cannot be put inside another segment
 				destRowId = _getEndOfSegmentRowId(view, destRowId);
-			} // else { // Normal row is inserted into a segment
+			} else if(!this.isConstituent()) { // Normal row cannot be put inside another chain
+				let parentRowDef = view.getData(parentRowId, ROW_DEF);
+				if(parentRowDef.isChain()) {
+					parentRowId = null;
+					destRowId = _getEndOfSegmentRowId(view, destRowId);
+				} // else { // Normal row is inserted into a segment
+			} // Constituent can be inserted inside a chain
 		}
 	}
 
@@ -13973,8 +13686,10 @@ RowDefinition.prototype.registerToView = function(view, destRowId) {
 			this._collapsed = null;
 		}
 	} else if(!this._parent && parentRowId) { // Constituent cannot be added to another segment
-		view.addSegmentChild(parentRowId, rowId, this._dataId);
+		view.addSegmentChild(parentRowId, rowId);
 	}
+
+	return true;
 };
 /** @private
 * @param {Array.<string>=} rowIds
@@ -13991,7 +13706,9 @@ RowDefinition.prototype._deregisterFromView = function(rowIds) {
 	}
 	return "";
 };
-/** @public
+/** Deprecated.
+* @public
+* @ignore
 * @function
 * @param {Array.<string>} rowIds
 * @param {RowDefinition} rowDef
@@ -14008,77 +13725,74 @@ RowDefinition.deregisterFromView = function(rowIds, rowDef) {
 * @return {Object}
 */
 RowDefinition.prototype._getChildStaticRowData = function(ric) {
-	if(!this._staticValues) {
-		return null;
+	if(this._staticValues) {
+		let childValues = this._staticValues[RowDefinition._childDataField];
+		if(childValues) {
+			return childValues[ric] || null;
+		}
 	}
+	return null;
+};
 
-	let childValues = this._staticValues[RowDefinition._childDataField];
-	if(!childValues) {
-		return null;
+/** @public
+* @ignore
+* @param {string} ric
+* @return {RowDefinition}
+*/
+RowDefinition.prototype.getConstituent = function(ric) {
+	if(this._children && ric) {
+		for(let i = this._children.length; --i >= 0;) {
+			if(this._children[i]._ric === ric) {
+				return this._children[i];
+			}
+		}
 	}
+	return null;
+};
 
-	return childValues[ric] || null;
+/** Check whether the given ric can be a constituent of this row definition. WARNING: permId is not handled by this method
+* @public
+* @ignore
+* @param {string} ric
+* @return {boolean} Returns true if the given ric can be its constituent
+*/
+RowDefinition.prototype.verifyConstituent = function(ric) {
+	if(this._isChain && ric) { // A constituent must have a valid ric
+		if(this._ric !== ric) { // A constituent cannot have the same ric as its parent
+			if(this._ric !== ("0#" + ric)) { // Real-time service may return ric without 0#
+				return this._ric !== ("/" + ric); // Real-time service may return ric with slash (delayed ric)
+			}
+		}
+	}
+	return false;
 };
-/** @public
+/** verifyConstituent should be called before calling this method
+* @public
 * @ignore
 * @param {string} ric
 * @return {RowDefinition} Return newly created child definition, if success
 */
 RowDefinition.prototype.addConstituent = function(ric) {
-	if(!ric || this._ric === ric) { // Parent cannot have a child with no name or the same name as itself
-		return null;
-	}
 	if(!(this._rowId && this._subId && this._isChain)) { // Chain must be alive (has not been disposed). Chain must be subscribed as chain
 		return null;
 	}
 
-	let childDef = null;
-	if(this._children) {
-		for(let i = this._children.length; --i >= 0;) {
-			if(this._children[i]._ric === ric) {
-				childDef = this._children[i]; // Constituent has already been added
-				break;
-			}
-		}
-	} else {
+	if(!this._children) {
 		this._children = [];
 	}
 
-	let newChild = !childDef;
-	if(newChild) {
-		let rowOptions = {
-			"asConstituent": true,
-			"dataId": this._subId + ric,
-			"ric": ric,
-			"parent": this
-		};
-
-		let staticData = this._getChildStaticRowData(ric);
-		if(staticData) {
-			rowOptions["values"] = staticData;
-		}
-
-		childDef = new RowDefinition(rowOptions);
-	}
+	let rowOptions = {
+		"asConstituent": true,
+		"ric": ric,
+		"parent": this
+	};
 
-	if(this._view) {
-		let rowId = this.getRowId();
-		// WARNING: insert position, we prioritize using CHILD_ORDER (From server) in dc first. If it does not exist, the last row of the segment will be pushed
-		let childOrder = childDef.getData("CHILD_ORDER");
-		let dt = this._view.getDataSource();
-
-		let parentIndex = dt.getRowIndex(rowId);
-		let position =  parentIndex + this.getChildCount(); // push the last position
-		if(childOrder != null) {
-			// Warning: We need to carry a value of 1 because the CHILD_ORDER starts with 0, and it will be added to the parentIndex. In case the parent rowIndex is not included.
-			position = parentIndex + childOrder + 1; // insert between segment
-		} // else {} it will be push in the last row of segment
-		childDef.registerToView(this._view, dt.getRowId(position));
-		// TODO: Handle nested children
-		this._view.addSegmentChild(rowId, childDef.getRowId(), childDef.getDataId());
+	let staticData = this._getChildStaticRowData(ric); // TODO: Remove the child's static data from parent
+	if(staticData) {
+		rowOptions["values"] = staticData;
 	}
 
-	return newChild ? childDef : null;
+	return new RowDefinition(rowOptions); // childDef is added to this._children in the constructor
 };
 
 /** Used to convert autogenerated row to regular real-time row
@@ -14086,25 +13800,18 @@ RowDefinition.prototype.addConstituent = function(ric) {
 * @ignore
 */
 RowDefinition.prototype.toRealTimeRow = function() {
-	if(!this._ric) { // Empty row
-		return;
-	}
-	if(this.isRowHeader() || !this._parent) {
-		return; // If the row is already a normal row or row header, it cannot be converted
+	if(!this.isConstituent()) {
+		return; // Only a constituent can be converted to a real-time row
 	}
 
+	let subs = this._parent._subs;
 	this._realTime = true;
-	this._dc.setRowData(this._dataId, null); // Remove existing data. WARNING: Trigger data update immediately
-	this._dataId = this._rowId + this._ric; // JET/RTK will generate data id to be rowId (given from this rowDef) + ric;
-
 	this._autoGenerated = false;
 	this._parent = null;
 	this._depthLevel = 0;
 
-	this.subscribeForUpdates();
-	if(this._staticValues) { // Add static value to the new allocated row
-		this.setRowData(this._staticValues);
-	}
+	this.resetRowData(); // WARNING: existing real-time data is lost after this line
+	this.subscribeForUpdates(subs); // Static data remains intact
 };
 
 /** @public
@@ -14114,11 +13821,7 @@ RowDefinition.prototype.unlinkChain = function() {
 		return;
 	}
 
-	let staticData = this._cloneStaticRowData();
-	this.unsubscribeForUpdates();
-
-	// Restore static data
-	this.setStaticRowData(staticData);
+	this.unsubscribeForUpdates(); // Static data remains intact
 
 	let view = this._view;
 	if(view) {
@@ -14233,6 +13936,22 @@ RowDefinition.prototype.getChildCount = function() {
 	return (this._children) ? this._children.length : 0;
 };
 /** @public
+* @return {number}
+*/
+RowDefinition.prototype.countChildInView = function() {
+	if(this._children) {
+		let viewCount = 0;
+		let childCount = this._children.length;
+		for(let i = 0; i < childCount; ++i) {
+			if(this._children[i]._view) {
+				++viewCount;
+			}
+		}
+		return viewCount;
+	}
+	return 0;
+};
+/** @public
 * @return {RowDefinition}
 */
 RowDefinition.prototype.getParent = function() {
@@ -24196,7 +23915,8 @@ HScrollbar.prototype.setScrollContent = function (grid, sections, startColIndex,
 			column = /** @type{Column} */(section.getColumn(c));
 			column.setScrollState(paneElem, null, false);
 		}
-		pane.setParent(section.getColumnHost());
+		let scrollHost = section.getColumnHost();
+		pane.setParent(scrollHost);
 		let columns = [];
 		let content = [];
 		for (c = startColIndex; c < endColIndex; ++c) {
@@ -24213,9 +23933,11 @@ HScrollbar.prototype.setScrollContent = function (grid, sections, startColIndex,
 
 		let rs = section.getReservedSpace();
 		if(rs) {
-			if(!this._pinnedRightColumnCount) {
+			if(this.isActive() && !this._pinnedRightColumnCount) {
 				paneSlider.addContent(rs);
 				content.push(rs);
+			} else {
+				scrollHost.appendChild(rs);
 			}
 			section._updateRightSpaceStyle();
 		}
@@ -36572,7 +36294,7 @@ Core.prototype._hasPendingRowChange = false;
 * @return {string}
 */
 Core.getVersion = function () {
-	return "5.1.121";
+	return "5.1.125";
 };
 /** {@link ElementWrapper#dispose}
 * @override
@@ -39638,37 +39360,37 @@ Core.prototype.getYScrollVal = function (sectionRef, rowIndex, topOfView) {
 		section = this.getSection(sectionRef);
 	}
 
+	let rowIndexOffset = (section) ? section.getRowOffset() : this._sectionStarts[this._startVScrollbarIndex];
+	let heightOffset = this._layoutY.getLaneStart(this._startVScrollbarIndex);
+
 	let rowCount = this._layoutY.getLaneCount();
 	if (rowIndex <= 0) { rowIndex = 0; }
 	else if (rowIndex >= rowCount) { rowIndex = rowCount - 1; }
 
+	if (topOfView) {
+		return this._layoutY.getLaneStart(rowIndex + rowIndexOffset) - heightOffset;
+	}
+
+	let bufferSize = 2; // for more appealing space
 	let viewInfo = this.getVerticalViewInfo();
 	let firstFullRow = viewInfo.firstFullRow; // TODO: Make it work in zooming mode
-
-	let scrollIndex = -1;
-	if (topOfView) {
-		scrollIndex = rowIndex;
-	} else {
-		if(rowIndex < firstFullRow) { // Scroll up
-			scrollIndex = rowIndex - 3; // Have some spaces at the top for more appealing visual
-			if(scrollIndex < 0) {
-				scrollIndex = 0;
-			}
-		} else { // Scroll down
-			let lastFullRow = viewInfo.lastFullRow;
-			if (rowIndex > lastFullRow) {
-				let viewIndexSize = lastFullRow - firstFullRow;
-				scrollIndex = rowIndex - viewIndexSize + 3;
-				if(scrollIndex < 0) {
-					scrollIndex = 0;
-				}
-			}
+	if(rowIndex < firstFullRow) { // Scroll up, as the target row is outside of view
+		let targetIndex = rowIndex - bufferSize; // Have some spaces at the top for more appealing visual
+		if(targetIndex < 0) {
+			targetIndex = 0;
 		}
+
+		return this._layoutY.getLaneStart(targetIndex + rowIndexOffset) - heightOffset;
 	}
 
-	let rowIndexOffset = (section) ? section.getRowOffset() : this._sectionStarts[this._startVScrollbarIndex];
-	let heightOffset = this._layoutY.getLaneStart(this._startVScrollbarIndex);
-	return (scrollIndex >= 0) ? (this._layoutY.getLaneStart(scrollIndex + rowIndexOffset) - heightOffset) : null;
+	let lastFullRow = viewInfo.lastFullRow;
+	if (rowIndex > lastFullRow) { // Scroll down, as the target row is outside of view
+		let targetScroll = this._layoutY.getLaneStart(rowIndex + rowIndexOffset + bufferSize + 1);
+
+		return targetScroll - viewInfo.viewHeight - heightOffset;
+	}
+
+	return null;
 };
 /** Scroll up or down to make specified row visible in the view
 * @public
@@ -39693,7 +39415,12 @@ Core.prototype.getVerticalViewInfo = function() {
 	let viewBottom = viewTop + viewHeight;
 
 	let topRowIndex = this._layoutY.hitTest(viewTop) - rowIndexOffset;
-	let bottomRowIndex = this._layoutY.hitTest(viewBottom - 0.1) - rowIndexOffset;
+	let bottomRowIndex = this._layoutY.hitTest(viewBottom - 0.1);
+	if(bottomRowIndex < 0) { // view is larger than existing row count
+		bottomRowIndex = this._layoutY.getLaneCount() - 1;
+	}
+	bottomRowIndex -= rowIndexOffset;
+
 	let laneTop = this._layoutY.getLaneStart(topRowIndex + rowIndexOffset);
 	let laneBottom = this._layoutY.getLaneEnd(bottomRowIndex + rowIndexOffset);
 
@@ -39701,7 +39428,10 @@ Core.prototype.getVerticalViewInfo = function() {
 		topRowIndex: topRowIndex,
 		firstFullRow: (laneTop < viewTop) ? topRowIndex + 1 : topRowIndex,
 		lastFullRow: (laneBottom > viewBottom) ? bottomRowIndex - 1 : bottomRowIndex,
-		bottomRowIndex: bottomRowIndex
+		bottomRowIndex: bottomRowIndex,
+		viewHeight: viewHeight,
+		viewTop: viewTop,
+		viewBottom: viewBottom
 	};
 };
 /** @public
@@ -45049,12 +44779,6 @@ SortableTitlePlugin._proto = SortableTitlePlugin.prototype;
 * @description Fired only when a row will be removed through Grid's API and before occurring of the actual removal
 */
 
-/** @type {string}
-* @private
-* @const
-*/
-const SUB_ID = "SUB_ID";
-
 /** @private
 * @param {RowDefinition} rowDef
 * @return {Object}
@@ -45189,10 +44913,10 @@ let Grid = function(placeholder, config) {
 
 	t._onDataChanged = t._onDataChanged.bind(t);
 	t._onQuote2PostUpdate = t._onQuote2PostUpdate.bind(t);
+	t._onQ2DataChanged = t._onQ2DataChanged.bind(t);
 	t._onDataComposed = t._onDataComposed.bind(t);
 	t._onSubSegmentChanged = t._onSubSegmentChanged.bind(t);
 	t._recalculateFormulas = t._recalculateFormulas.bind(t);
-	t._updateStreamingData = t._updateStreamingData.bind(t);
 	t.updateColumnTitle = t.updateColumnTitle.bind(t);
 	t._populateTimeSeriesChildren = t._populateTimeSeriesChildren.bind(t);
 
@@ -45204,7 +44928,7 @@ let Grid = function(placeholder, config) {
 	t._updateRowData = t._updateRowData.bind(t);
 	t._onFormulaDataChanged = t._onFormulaDataChanged.bind(t);
 	t._onFormulaDataRequired = t._onFormulaDataRequired.bind(t);
-	t._addMemberOfChain = t._addMemberOfChain.bind(t);
+	t._registerConstituents = t._registerConstituents.bind(t);
 	t._onColumnAdded = t._onColumnAdded.bind(t);
 	t._onRowExpansionBinding = t._onRowExpansionBinding.bind(t);
 	t._onColumnHeaderBinding = t._onColumnHeaderBinding.bind(t);
@@ -45219,9 +44943,9 @@ let Grid = function(placeholder, config) {
 	t._onVScroll = t._onVScroll.bind(t);
 	t._selfScrollToRow = t._selfScrollToRow.bind(t);
 
-	t._streamingConflator = new Conflator(50, t._updateStreamingData);
+	t._dcConflator = new Conflator(50, t._onDataChanged);
 	t._formulaConflator = new Conflator(300, t._onFormulaDataChanged);
-	t._chainConflator = new Conflator(100, t._addMemberOfChain);
+	t._chainConflator = new Conflator(100, t._registerConstituents);
 	t._columnTitleConflator = new Conflator(0, t.updateColumnTitle);
 	t._timeSeriesChildConflator = new Conflator(0, t._populateTimeSeriesChildren);
 
@@ -45358,7 +45082,7 @@ Grid.prototype._sharedDataSource = false;
  */
 Grid.prototype._sharedSorter = false;
 
-/** JET.Quotes2 Subscription
+/** JET/RTK's Quotes2 subscription object
  * @type {Object}
  * @private
  */
@@ -45376,7 +45100,7 @@ Grid.prototype._columnSorter = null;
 /** @private
 * @type {Conflator}
 */
-Grid.prototype._streamingConflator = null;
+Grid.prototype._dcConflator = null;
 /** @private
 * @type {SnapshotFiller}
 */
@@ -45399,10 +45123,6 @@ Grid.prototype._fnEngine = null;
 */
 Grid.prototype._formulaConflator = null;
 
-/** @private
-* @type {Object.<string, Object>}
-*/
-Grid.prototype._chainMembers = null;
 /** @private
 * @type {Conflator}
 */
@@ -45511,7 +45231,15 @@ Grid.prototype.dispose = function() {
 	this._grid.dispose();
 	this._connector.reset();
 
-	if(!this._sharedDataSource) { // make sure that it is the final grid, and that it will be dispose data
+	if(!this._sharedDataSource) { // Make sure that this is the final grid, and its data is disposed
+		if(this._subs) {
+			this._subs.removeEventListener("postUpdate", this._onQuote2PostUpdate);
+			this._subs.removeEventListener("dataChanged", this._onQ2DataChanged);
+			this._subs["dispose"]();
+		}
+		if(this._dc) {
+			this._dc.dispose();
+		}
 		if(this._dt) {
 			this._dt.dispose();
 		}
@@ -45519,12 +45247,7 @@ Grid.prototype.dispose = function() {
 			this._dv.dispose();
 		}
 	}
-	this._mainGrid = this._dt = this._dv = null;
-
-	if(this._subs) {
-		this._subs["dispose"]();
-		this._subs = null;
-	}
+	this._mainGrid = this._dc = this._dt = this._dv = this._subs = null;
 
 	if(this._focusingArgs) {
 		_clearTimeout(this._focusingArgs.id);
@@ -45553,7 +45276,11 @@ Grid.prototype.listen = Grid.prototype.addEventListener;
 /** @public
 */
 Grid.prototype.initSubscription = function() {
-	if(!this._dc || this._dc.getSubscriptions()) { // Subscription is already initialized
+	if(this._subs) { // Subscription is already initialized
+		return;
+	}
+	if(this._sharedDataSource) {
+		this._subs = this._mainGrid._subs;
 		return;
 	}
 
@@ -45566,6 +45293,9 @@ Grid.prototype.initSubscription = function() {
 	}
 	if(q) {
 		s = q["create"]();
+		if(this._RTK && this._RTK.prefetchWorkaround) { // The workaround for RTK Quotes has a bug concerning the removal of the last row; it isn't removed.
+			s.addRic("DUMMY.WORKAROUND", "DUMMY.WORKAROUND");
+		}
 	}
 	if(!s) {
 		return;
@@ -45576,8 +45306,8 @@ Grid.prototype.initSubscription = function() {
 
 	this._subs = s;
 	this._subs["start"]();
-	this._dc.setSubscriptions(s);
 	this._subs.addEventListener("postUpdate", this._onQuote2PostUpdate);
+	this._subs.addEventListener("dataChanged", this._onQ2DataChanged);
 
 	// TODO: Subscriptions should be registered per row.
 	// However, chain subscription cannot be integrated with DataConnector in this current implementation.
@@ -45586,7 +45316,7 @@ Grid.prototype.initSubscription = function() {
 	for(let i = 0; i < len; ++i) {
 		let rowDef = rowDefs[i];
 		if(rowDef) {
-			rowDef.subscribeForUpdates();
+			rowDef.subscribeForUpdates(s);
 		}
 	}
 };
@@ -47194,29 +46924,31 @@ Grid.prototype._initDuplicateRicData = function(rowDef) {
 };
 
 /** @private
-* @param {Object} rowDef
-* @param {Array<Object>} children
+* @param {Object} newRowDef
 */
-Grid.prototype._cloneChain = function(rowDef) {
-	let rowDefs = this._connector.getRowDefByRic(rowDef.getSymbol());
+Grid.prototype._cloneChain = function(newRowDef) {
+	let rowDefs = this._connector.getRowDefByRic(newRowDef.getSymbol());
 	let firstRowDef = rowDefs ? rowDefs[0] : null;
 	let constituents = firstRowDef ? firstRowDef.getChildren() : null;
-
-	if(!constituents) {
-		return;
-	}
-	let count = constituents.length;
-	if(count < 0 ) {
+	let count = constituents ? constituents.length : 0;
+	if(count < 0) {
 		return;
 	}
 
-	let subId = rowDef.getData(SUB_ID);
+	let subId = newRowDef.getSubId();
+	if(!subId) {
+		return; // A chain without subscription cannot have constituents
+	}
+	let evtArg = {
+		"subId": subId
+	};
 	for (let i = 0; i < count; i++) {
-		let childRowDef = constituents[i];
-		let rowData = childRowDef.cloneRowData();
-		rowData["SUB_ID"] = subId;
-		let rid = subId + rowData["RIC"];
-		this._dc.setRowData(rid, rowData);
+		let childRowDef = constituents[i]; // TODO: the constituents should be sorted by CHILD_ORDER first
+		evtArg["ric"] = childRowDef.getRic();
+		evtArg["values"] = childRowDef.cloneRowData();
+		evtArg["values"]["SUB_ID"] = subId; // Imitate real-time service responses
+
+		this._onQ2DataChanged(evtArg); // WARNING: evtArg is shared across multiple calls
 	}
 };
 /** @public
@@ -47242,7 +46974,7 @@ Grid.prototype.insertRow = function(rowOption, rowRef) {
 		}
 	}
 	let rowDef = new RowDefinition(rowOption);
-	rowDef.setDataSource(this._dc); // This could also subscribe chain index/ric to JET/RTK
+	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));
@@ -47554,17 +47286,16 @@ Grid.prototype.removeAllRows = function() {
 	if(!this._dt.getRowCount()) {
 		return;
 	}
+	// Data source is not shared at this point
 	let rowDefs = this._getAllRowDefinitions();
 
-	if(!this._sharedDataSource) {
-		this._dc.clearAllData();
-		this._dt.clearAllData();
-		this._clearDataUpdates();
-	}
+	this._dc.clearAllData();
+	this._dt.clearAllData();
+	this._clearDataUpdates();
 
-	rowDefs.forEach(RowDefinition.dispose);
+	rowDefs.forEach(RowDefinition.dispose); // Each individual subscription is unsubscribed along with disposed rowDef
 
-	this._streamingConflator.reset();
+	this._dcConflator.reset();
 	this._formulaConflator.reset();
 	this._chainConflator.reset();
 	this._connector.removeAllRics();
@@ -48461,94 +48192,127 @@ Grid.prototype._onQuote2PostUpdate = function (e) {
 	}
 };
 
-/** @private
-* @param {!Object} e
-*/
-Grid.prototype._onDataChanged = function(e) {
-	let rowData = e["rowData"]; // Use rowData to retrieve corresponding subscription object
-	if (!rowData || this._unlinking) {
-		return; // This must be a global change
+/**
+* @private
+* @param {Object} e
+ */
+Grid.prototype._onQ2DataChanged = function (e) {
+	let subId = e["subId"];
+	let rowDef = this._getRowDefinitionById(subId);
+	if(!rowDef) {
+		return; // WARNING: This should not be happened because row has been removed but the data is still received
 	}
-	let rowDef = rowData[ROW_DEF];
 
-	if(rowDef) {
-		let rowId = rowDef.getRowId();
-		if(rowId) {
-			// e["rid"] could be from JET/RTK (rowId + ric) or static data update (rowId)
-			let curRowData = this._dc.getRowData(e["rid"]);
-			if (curRowData) {
-				if(rowDef.addUpdate(e)) { // This is the only place that update array can grow. It is used for blinking data.
-					this._dt._hasNewUpdates = true; // Mark data table for cleaning it up later
+	let values = e["values"];
+	if (values) {
+		let ric = e["ric"];
+		if(rowDef.verifyConstituent(ric)) {
+			let parentDef = rowDef;
+			let childDef = parentDef.getConstituent(ric);
+			if(childDef) { // The constituent will share the same sub id as its parent
+				rowDef = childDef;
+			} else {
+				rowDef = childDef = parentDef.addConstituent(ric);
+				if(!childDef) {
+					return; // Parent chain is not alive
 				}
-				this._updateStreamingData();
-			} else if(rowDef.isAutoGenerated()) { // Subscription and its parent has been removed by Real-time provider
-				rowDef.setParent(null); // Manually remove child reference from its parent
-				this._removeRow(rowDef);
+				this._connector.addRic(childDef); // TODO: JET/RTK should not re-subscribe this
+				this._registerConstituents(childDef);
 			}
 		}
-		return;
-	}
 
-	// The new data update has no row definition, meaning that we have found a new constituent from a chain.
-	let subId = rowData[SUB_ID]; // The constituent will share the same sub id as its parent
-	if(subId) {
-		let parentDef = this._getRowDefinitionById(subId);
-		if(parentDef && parentDef.isChain() && parentDef.getRic() !== rowData["RIC"]) { // TODO: Check for delayed ric
-			if(!this._chainMembers) {
-				this._chainMembers = {};
-			}
-			if(!this._chainMembers[e["rid"]]) { // Prevent duplication
-				this._chainMembers[e["rid"]] = rowData;
-				this._addMemberOfChain(rowData);
-			}
-		}
+		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);
 	}
 };
+
 /** @private
-* @param {!Object} rowData
+* @param {RowDefinition} rowDef
 */
-Grid.prototype._addMemberOfChain = function(rowData) {
-	if(this._chainConflator.conflate(rowData)) {
+Grid.prototype._registerConstituents = function(rowDef) {
+	if(this._chainConflator.conflate(rowDef)) {
+		return;
+	}
+	let view = this._dv;
+	let dt = view ? view.getDataSource() : null;
+	if(!dt) {
 		return;
 	}
 
-	let rows = this._chainConflator.popAllData(); // This must have no duplication
-	let len = rows ? rows.length : 0;
+	let childDefs = this._chainConflator.popAllData(); // This must have no duplication
+	let childCount = childDefs ? childDefs.length : 0;
+
+	// Validate row definition and collect its info
 	let i;
+	let validDefs = [];
+	let maxCountMap = {};
+	for(i = 0; i < childCount; ++i) {
+		let childDef = childDefs[i];
+		let parentDef = childDef.getParent();
+		if(!parentDef) {
+			break; // A constituent without parent cannot be added to the view
+		}
+		let parentRowId = parentDef.getRowId();
+		let maxCount = maxCountMap[parentRowId];
+		if(maxCount == null) {
+			maxCount = maxCountMap[parentRowId] = parentDef.countChildInView();
+		}
+		validDefs.push(childDef);
+	}
+
+	childCount = validDefs.length;
+	if(!childCount) {
+		return;
+	}
 
 	let prevState = false;
-	if(len > 1) {
+	if(childCount > 1) {
 		prevState = this._dt.freeze(); // Avoid sorting for each insertion
 	}
-	let childDefs = [];
-	for(i = 0; i < len; ++i) {
-		rowData = /** @type{!Object} */(rows[i]);
-		let subId = rowData[SUB_ID];
-		let parentDef = this._getRowDefinitionById(subId);
-		if(parentDef) {
-			let childDef = parentDef.addConstituent(/** @type{string} */(rowData["RIC"]), this._dt);
-			if(childDef) {
-				childDefs.push(childDef);
-			} // else { // childDef has already been added
-		}
-	}
-	this._chainMembers = null; // Clear all waiting chain members
 
-	let childCount = childDefs.length;
-	if(childCount) {
-		for(i = childCount; --i >= 0;) {
-			this._connector.addRic(childDefs[i]); // TODO: JET/RTK should not re-subscribe this
+	for(i = 0; i < childCount; ++i) {
+		let childDef = validDefs[i];
+		let parentDef = childDef.getParent();
+		let parentRowId = parentDef.getRowId();
+		let maxCount = maxCountMap[parentRowId];
+
+		// TODO: Handle nested children
+		view.addSegmentChild(parentRowId, childDef.getRowId());
+
+		// Added order and child order can be different
+		// CHILD_ORDER value from real-time service indicates the order of constituents.
+		let destIndex = dt.getRowIndex(parentRowId) + 1; // WARNING: Not checking for negative index
+		let childOrder = childDef.getData("CHILD_ORDER"); // CHILD_ORDER starts from 0
+		if(childOrder != null && childOrder < maxCount) {
+			destIndex += childOrder;
+		} else {
+			destIndex += maxCount;
 		}
+		let destRowId = dt.getRowId(destIndex);
+		childDef.registerToView(view, destRowId);
+		maxCountMap[parentRowId] = maxCount + 1; // Since new child has been added to the view, maxCount has to be updated
 	}
-	if(len > 1) {
+	if(childCount > 1) {
 		this._dt.freeze(prevState);
 	}
 };
 
 /** @private
+* @param {Object} e
 */
-Grid.prototype._updateStreamingData = function() {
-	if(this._streamingConflator.conflate()) {
+Grid.prototype._onDataChanged = function(e) {
+	if(this._dt && e && e["rid"] && e["changes"]) {
+		let rowDef = this._getRowDefinitionById(e["rid"]);
+		if(rowDef) {
+			if(rowDef.addUpdate(e["changes"])) { // This is the only place that update array can grow. It is used for blinking data.
+				this._dt._hasNewUpdates = true; // Mark data table for cleaning it up later
+			}
+		}
+	}
+
+	if(this._dcConflator.conflate()) {
 		return;
 	}
 
@@ -48849,9 +48613,9 @@ Grid.prototype._onSubSegmentChanged = function(e) {
 		// let parentId = segment.getParentId();
 		let segmentId = segment.getId();
 		rowDef = new RowDefinition({
-			"segmentId": segmentId
+			"segmentId": segmentId // WARNING: This could cause row id duplication
 		});
-		rowDef.setDataSource(this._dc);
+		rowDef.setDataSource(this._dc); // auto generated row does not require a subscription
 		rowDef.registerToView(this._dv);
 	}
 };
@@ -52886,10 +52650,6 @@ CellPainter.prototype._scopes;
 * @private
 */
 CellPainter.prototype._columnStats = null;
-/** @type {boolean}
-* @private
-*/
-CellPainter.prototype._levelColorDisabled = false;
 /** @type {number}
 * @private
 */
@@ -52945,6 +52705,10 @@ CellPainter.supportedStyles = CellPainter.bgStyles.concat(CellPainter.nonBgStyle
 * @public
 */
 CellPainter.themeReady = null;
+/** @type {Object}
+* @private
+*/
+CellPainter._contrastColors = {};
 
 /** Deprecated in favor of ExpressionParser
 * @public
@@ -53538,7 +53302,7 @@ CellPainter.prototype._getStyles = function(rowData, min, max) {
 				} else if(ret < 0) {
 					curCond["cssClass"] = curCond["downClass"];
 				} else {
-					curCond["cssClass"] = this._levelColorDisabled ? "" : curCond["levelClass"];
+					curCond["cssClass"] = curCond["levelClass"];
 				}
 				curCond["cssClass"] = curCond["cssClass"] || "";
 				return curCond;
@@ -53739,8 +53503,12 @@ CellPainter._clearBlinkTimer = function(scp, opt_restoreColor) {
 CellPainter.getOppositeColor = function (hexCode) {
 	if(typeof hexCode === "string") {
 		if(hexCode.charAt(0) === "#") {
-			let triplet = hex2Num(hexCode);
-			return getContrastColor(triplet);
+			let contrastColor = CellPainter._contrastColors[hexCode];
+			if (!contrastColor) {
+				let triplet = hex2Num(hexCode);
+				contrastColor = CellPainter._contrastColors[hexCode] = getContrastColor(triplet);
+			}
+			return contrastColor;
 		}
 	} else if(Array.isArray(hexCode)) {
 		return getContrastColor(hexCode);
@@ -53834,67 +53602,48 @@ CellPainter.prototype._paintCell = function(cell, rowData, min, max) {
 };
 
 /**
-* @public
+* @private
 * @param {tr.grid.Cell} cell
-* @param {number} blinkSignal
-* @param {Object} rowData to calculate original style e.g. { PCTCHNG: 0.53, CF_NETCHNG: 0.75 }
+* @return {Object}
 */
-CellPainter.prototype.blink = function (cell, blinkSignal, rowData) {
-	this._blinkCell(cell, rowData, blinkSignal);
-};
+CellPainter.prototype._prepareScope = function(cell) {
+	let scope = cell["blinking"];
+	if (!scope) {
+		scope = {};
+		scope["cell"] = cell;
+		cell["blinking"] = scope;
+
+		this._scopes.push(scope);
+	}
 
-/**
-* @public
-* @param {tr.grid.Cell} cell
-* @param {number} newValue
-* @param {number} oldValue
-* @param {Object} rowData e.g. { PCTCHNG: 0.53, CF_NETCHNG: 0.75 }
-* @return {boolean}
-*/
-CellPainter.prototype.blinkCell = function(cell, newValue, oldValue, rowData) {
 	let bc = this._blinkCondition;
-	if (!bc) return false;
+	if (scope["blinkId"] !== bc["blinkId"]) {
+		scope["blinkId"] = bc["blinkId"];
+		scope["field"] = bc["field"];
+		let restorer = bc["border"] ? CellPainter._borderRestorer : CellPainter._cellRestorer;
+		scope._restorer = restorer.bind(this, scope);
+	}
 
-	let blinkSignal = this._blinkCondition._fn(newValue, oldValue);
-	return this._blinkCell(cell, rowData, blinkSignal);
+	return scope;
 };
 
-/** @private
+/**
+* @public
 * @param {tr.grid.Cell} cell
-* @param {Object} rowData e.g. { PCTCHNG: 0.53, CF_NETCHNG: 0.75 }
 * @param {number} blinkSignal
+* @param {Object} rowData to calculate original style e.g. { PCTCHNG: 0.53, CF_NETCHNG: 0.75 }
 * @return {boolean}
 */
-CellPainter.prototype._blinkCell = function(cell, rowData, blinkSignal) {
+CellPainter.prototype.blink = function (cell, blinkSignal, rowData) {
 	if (!cell) return false;
 
-	if (this._levelColorDisabled) {
-		if(!blinkSignal) { // Disabled level color equivalent to no blinking for blink signal 0
-			return false;
-		}
-	}
-
 	let elem = cell.getElement();
 	if (!elem) return false; // Cell has been disposed
 
 	let bc = this._blinkCondition;
 	if (!bc) return false;
 
-	let scope = cell["blinking"];
-	if (!scope) {
-		scope = {};
-		scope["cell"] = cell;
-		cell["blinking"] = scope;
-
-		this._scopes.push(scope);
-	}
-
-	if (scope["blinkId"] !== bc["blinkId"]) {
-		scope["blinkId"] = bc["blinkId"];
-		scope["field"] = bc["field"];
-		let restorer = bc["border"] ? CellPainter._borderRestorer : CellPainter._cellRestorer;
-		scope._restorer = restorer.bind(this, scope);
-	}
+	let scope = this._prepareScope(cell);
 
 	scope["rowData"] = rowData;
 
@@ -53910,9 +53659,47 @@ CellPainter.prototype._blinkCell = function(cell, rowData, blinkSignal) {
 		contrastColor = bc["contrastLevelColor"];
 	}
 
+	return this._blink(scope, elem, blinkColor, contrastColor);
+};
+
+/** Blink cell with specific color or theme's neutral movement color.
+* @public
+* @param {tr.grid.Cell} cell
+* @param {string|null} blinkColor
+* @param {Object} rowData to calculate original style e.g. { PCTCHNG: 0.53, CF_NETCHNG: 0.75 }
+* @return {boolean}
+*/
+CellPainter.prototype.flash = function(cell, blinkColor, rowData) {
+	if (!cell) return false;
+
+	let elem = cell.getElement();
+	if (!elem) return false; // Cell has been disposed
+
+	if (!this._blinkCondition) return false;
+
+	let scope = this._prepareScope(cell);
+
+	scope["rowData"] = rowData;
+
+	if (typeof blinkColor !== "string") {
+		blinkColor = ElfUtil.themeColors["level"];
+	}
+
+	return this._blink(scope, elem, blinkColor, CellPainter.getOppositeColor(blinkColor));
+};
+
+/**
+* @public
+* @param {Object} scope
+* @param {Element} elem
+* @param {string} blinkColor
+* @param {string} contrastColor
+* @return {boolean}
+*/
+CellPainter.prototype._blink = function (scope, elem, blinkColor, contrastColor) {
 	let bgBlinking = true;
-	// All conditions are met for blinking
-	if (bc["border"]) {
+
+	if (this._blinkCondition["border"]) {
 		elem.style.border = "1px solid " + blinkColor;
 		bgBlinking = false;
 	} else {
@@ -53926,6 +53713,36 @@ CellPainter.prototype._blinkCell = function(cell, rowData, blinkSignal) {
 	return bgBlinking;
 };
 
+/**
+* @public
+* @param {tr.grid.Cell} cell
+* @param {number} newValue
+* @param {number} oldValue
+* @param {Object} rowData e.g. { PCTCHNG: 0.53, CF_NETCHNG: 0.75 }
+* @return {boolean}
+*/
+CellPainter.prototype.blinkCell = function(cell, newValue, oldValue, rowData) {
+	let bc = this._blinkCondition;
+	if (!bc) return false;
+
+	let blinkSignal = this._blinkCondition._fn(newValue, oldValue);
+	return this.blink(cell, blinkSignal, rowData);
+};
+
+/**
+* @public
+* @ignore
+* @param {number} newValue
+* @param {number} oldValue
+* @return {number}
+*/
+CellPainter.prototype.calcBlinkSignal = function(newValue, oldValue) {
+	if (this._blinkCondition) {
+		return this._blinkCondition._fn(newValue, oldValue);
+	}
+	return 0;
+};
+
 /**
 * @public
 * @param {tr.grid.Cell} cell
@@ -53942,13 +53759,12 @@ CellPainter.prototype.verifyBlinking = function(cell, rowData) {
 		}
 	}
 };
-/**
+/** Deprecated, the state has been moved out to support prioritization.
 * @public
+* @deprecated
 * @param {boolean=} disabled
 */
-CellPainter.prototype.disableLevelColor = function(disabled) {
-	this._levelColorDisabled = disabled !== false;
-};
+CellPainter.prototype.disableLevelColor = function(disabled) {};
 /**
 * @public
 * @param {number} duration