@refinitiv-ui/efx-grid 6.0.28 → 6.0.30

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

@@ -536,7 +536,7 @@ Core.prototype._groupDefs = null;
 * @return {string}
 */
 Core.getVersion = function () {
-	return "5.1.38";
+	return "5.1.39";
 };
 /** {@link ElementWrapper#dispose}
 * @override
@@ -4979,7 +4979,7 @@ Core.prototype.getColumnField = function (colIndex) {
 	return "";
 };
 /** @public
-* @return {!Array.<string>} Return all column ids from existing column
+* @return {!Array.<string>} Return all column fields from existing columns
 */
 Core.prototype.getColumnFields = function () {
 	var colCount = this.getColumnCount();

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

@@ -1867,6 +1867,7 @@ LayoutGrid.prototype.setRowOffset = function (index) {
 LayoutGrid.prototype.updateLayout = function () {
 	this._calculateViewSize(true); // Column bounds will be updated by trigger from Core
 
+	this._stretchedCells.updateCells();
 	this._updateRightSpaceStyle();
 };
 

package/lib/grid/index.js

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

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

@@ -13072,12 +13072,12 @@ DataTable._proto = DataTable.prototype;
 */
 
 /** @typedef {Object} RowDefinition~RowTypes
-* @property {string} CONTENT="CONTENT"
-* @property {string} CHAIN="CHAIN"
-* @property {string} CONSTITUENT="CONSTITUENT"
-* @property {string} GROUP_HEADER="GROUP_HEADER"
-* @property {string} SUBGROUP_HEADER="SUBGROUP_HEADER"
-* @property {string} GROUP_MEMBER="GROUP_MEMBER"
+* @property {string} CONTENT="CONTENT" Regular row
+* @property {string} CHAIN="CHAIN" Chain RIC row
+* @property {string} CONSTITUENT="CONSTITUENT" Constituent row
+* @property {string} GROUP_HEADER="GROUP_HEADER" Row of segment separator at the very top
+* @property {string} SUBGROUP_HEADER="SUBGROUP_HEADER" Row of nested segment separator
+* @property {string} GROUP_MEMBER="GROUP_MEMBER" Child row displayed under segment separator
 */
 
 /** @type {string}
@@ -13086,7 +13086,7 @@ DataTable._proto = DataTable.prototype;
 */
 var ROW_DEF = "ROW_DEF";
 
-/** @type {RowDefinition~RowTypes}
+/** @type {!RowDefinition~RowTypes}
 * @public
 * @const
 */
@@ -14374,6 +14374,11 @@ FieldDefinition._lang = 'en';
 * @private
 */
 FieldDefinition._caching = false;
+/**
+* @type {boolean}
+* @private
+*/
+FieldDefinition._timeSeriesExpansion = true;
 
 /**
  * @type {Object.<string, boolean>}
@@ -14461,6 +14466,14 @@ FieldDefinition.setFieldCaching = function (caching) {
 	FieldDefinition._caching = caching;
 };
 
+/** @public
+* @function
+* @param {boolean} disabled=true if disable it, time series will not be expand
+*/
+FieldDefinition.disableTimeSeriesExpansion = function(disabled) {
+	FieldDefinition._timeSeriesExpansion = disabled != false ? false : true;
+};
+
 /** @public
 * @param {string} field
 * @return {boolean}
@@ -14493,7 +14506,7 @@ FieldDefinition.isRealTimeField = function(field) {
 		return false;
 	}
 
-	if(FieldDefinition.getFieldProperty(field, "timeSeriesChild")) {
+	if(FieldDefinition.isTimeSeriesChild(field)) {
 		return false;
 	}
 
@@ -14504,6 +14517,14 @@ FieldDefinition.isRealTimeField = function(field) {
 	return FieldDefinition.getFieldProperty(field, "IsRealtimeField") !== false;
 };
 
+/** @public
+* @param {string} field
+* @return {boolean}
+*/
+FieldDefinition.isTimeSeriesChild = function(field) {
+	return FieldDefinition.getFieldProperty(field, "timeSeriesChild") ? true : false;
+};
+
 /** @public
 * @param {string} field
 * @return {boolean}=true if field is time series field
@@ -14513,6 +14534,11 @@ FieldDefinition.isTimeSeries = function (field) {
 		return false;
 	}
 
+	// If we disable time series expansion, the grid won't have a time series field.
+	if(!FieldDefinition._timeSeriesExpansion) {
+		return false;
+	}
+
 	// We can check time series using a cache to avoid duplicating checks in regular expressions.
 	var timeSeriesField = FieldDefinition.getFieldProperty(field, "timeSeries");
 	if (timeSeriesField != null) {
@@ -15387,6 +15413,12 @@ ColumnDefinition.prototype.isTimeSeries = function() {
 /** @public
 * @return {boolean}
 */
+ColumnDefinition.prototype.isTimeSeriesChild = function() {
+	return js_FieldDefinition.isTimeSeriesChild(this.getField());
+};
+/** @public
+* @return {boolean}
+*/
 ColumnDefinition.prototype.isFormulaField = function() {
 	return this._formula ? true : false;
 };
@@ -16321,6 +16353,9 @@ SnapshotFiller.prototype._onRTKSuccess = function (fields, serverResult) {
 		var dataRow = data2D[i];
 		ric = dataRow[0];
 
+		if (ricMap[ric]) {
+			continue; // we interested only first row of ric
+		}
 		var snapData = ricMap[ric] = {};
 
 		// loop for create rowData for update
@@ -25655,6 +25690,7 @@ LayoutGrid.prototype.setRowOffset = function (index) {
 LayoutGrid.prototype.updateLayout = function () {
 	this._calculateViewSize(true); // Column bounds will be updated by trigger from Core
 
+	this._stretchedCells.updateCells();
 	this._updateRightSpaceStyle();
 };
 
@@ -35372,7 +35408,7 @@ Core.prototype._groupDefs = null;
 * @return {string}
 */
 Core.getVersion = function () {
-	return "5.1.38";
+	return "5.1.39";
 };
 /** {@link ElementWrapper#dispose}
 * @override
@@ -39815,7 +39851,7 @@ Core.prototype.getColumnField = function (colIndex) {
 	return "";
 };
 /** @public
-* @return {!Array.<string>} Return all column ids from existing column
+* @return {!Array.<string>} Return all column fields from existing columns
 */
 Core.prototype.getColumnFields = function () {
 	var colCount = this.getColumnCount();
@@ -43060,6 +43096,7 @@ SortableTitlePlugin._proto = SortableTitlePlugin.prototype;
 * @property {boolean=} formulaEngine=false If enabled, field with leading equal sign will be treated as a formula and rows will be filled with the calculated values.
 * @property {number=} adcPollingInterval=0 Length of polling interval for refreshing ADC data in milliseconds. The default value (0) means no polling.
 * @property {boolean=} fieldCaching=false If enabled, field definition will be caching internal mechanism
+* @property {boolean=} timeSeriesExpansion=true If disabled, the time series field will be treated as a normal field and not expanded.
 * @property {string=} childDataField=CHILD_VALUES The given field will be used to store children's static data, such as row color assignment.
 * @property {boolean=} topSection=true If disabled, title section will not be rendered
 */
@@ -43506,6 +43543,11 @@ Grid.prototype._pollingEnabled = true;
 * @private
 */
 Grid.prototype._fieldCaching = false;
+/** @type {boolean}
+* @private
+*/
+Grid.prototype._timeSeriesExpansion = true;
+
 /** @type {string}
 * @private
 */
@@ -43766,6 +43808,11 @@ Grid.prototype.initialize = function(gridOption) {
 		js_FieldDefinition.setFieldCaching(t._fieldCaching);
 	}
 
+	if(gridOption["timeSeriesExpansion"] != null) {
+		t._timeSeriesExpansion = gridOption["timeSeriesExpansion"];
+		js_FieldDefinition.disableTimeSeriesExpansion(!t._timeSeriesExpansion);
+	}
+
 	if (gridOption["icons"] && gridOption["icons"]["rowGrouping"] && gridOption["icons"]["rowGrouping"]["expander"]) {
 		js_StyleLoader.chainIcon = gridOption["icons"]["rowGrouping"]["expander"];
 	}
@@ -44088,6 +44135,9 @@ Grid.prototype.getConfigObject = function (gridOptions) {
 	if(this._fieldCaching) {
 		obj["fieldCaching"] = this._fieldCaching;
 	}
+	if(this._timeSeriesExpansion != true) {
+		obj["timeSeriesExpansion"] = this._timeSeriesExpansion;
+	}
 
 	if(this._childDataField) {
 		obj["childDataField"] = this._childDataField;
@@ -49208,7 +49258,7 @@ Adc.request = function (payload, mockResponse) {
 	} else {
 
 		identifiers = payload.identifiers;
-		formula = payload.formula.trim().split(","); // TODO: check each field with another way, this doesn't work when user use some comma (,) formula
+		formula = Adc.splitFields(payload.formula);
 		fields = [];
 
 		// _invalidFieldDict is a dictionary of non exist field
@@ -49286,6 +49336,34 @@ Adc.request = function (payload, mockResponse) {
 	}));
 };
 
+/**
+ * Splits a string of comma-separated fields into an array of individual field names with optional parentheses and contents.
+ *
+ * @param {string} strFields - The string of comma-separated fields to split.
+ * @returns {Array<string>} - An array of individual field names with optional parentheses and contents.
+ */
+Adc.splitFields = function(strFields) {
+	 if(!strFields) {
+		return [];
+	 }
+
+	// Split the input string using the regular expression
+	// regex is match commas that are not inside parentheses
+	/*
+		,          		- matches a comma
+		(?![^()]*\) 	- negative lookahead assertion that matches if the comma is not followed by:
+			[^()]*   	- any characters that are not opening or closing parentheses
+			\)			- a closing parenthesis
+		)          		- ending delimiter of the regular expression
+	*/
+	var fields = strFields.split(/,(?![^()]*\))/);
+	fields = fields.map(function(field) {
+		return field.trim();
+	});
+
+	return fields;
+};
+
 /** @public
 * @function
 * @param {string} dataType
@@ -49438,6 +49516,7 @@ var TickFields = {
 * @property {string=} fontStyle
 * @property {string=} textAlign
 * @property {string=} textDecoration
+* @property {string=} cssClass Predefined color class name
 */
 
 /** @typedef {Object.<string, string>} CellPainter~ThemeColors
@@ -49937,14 +50016,21 @@ CellPainter.prototype.renderForPrinting = function(cell, rowData, min, max) {
 		return;
 	}
 	var styles = this._getStyles(rowData, min, max);
-	var c = styles["backgroundColor"];
-	if(c) {
-		cell.style.backgroundColor = c;
-	}
-
-	c = styles["color"];
-	if(c) {
-		cell.style.color = c;
+	var cssClass = styles["cssClass"];
+	if (cssClass) {
+		if (cell._coloringCssClass !== cssClass) {
+			cell.classList.remove(cell._coloringCssClass);
+			cell._coloringCssClass = null;
+		}
+		cell.classList.add(cssClass);
+		cell._coloringCssClass = cssClass;
+	} else {
+		if (cell._coloringCssClass) {
+			cell.classList.remove(cell._coloringCssClass);
+			cell._coloringCssClass = null;
+		}
+		cell.style.backgroundColor = styles["backgroundColor"] || "";
+		cell.style.color = styles["color"] || "";
 	}
 };
 
@@ -50070,8 +50156,24 @@ CellPainter._cellRestorer = function(scope) {
 		}
 
 		var styles = this._getStyles(rowData, min, max);
-		elem.style.backgroundColor = styles["backgroundColor"] || "";
-		elem.style.color = styles["color"] || "";
+		var cssClass = styles["cssClass"];
+		if (cssClass) {
+			if (elem._coloringCssClass && elem._coloringCssClass !== cssClass) {
+				elem.classList.remove(elem._coloringCssClass);
+				elem._coloringCssClass = null;
+			}
+			elem.classList.add(cssClass);
+			elem._coloringCssClass = cssClass;
+			elem.style.backgroundColor = "";
+			elem.style.color = "";
+		} else {
+			if (elem._coloringCssClass) {
+				elem.classList.remove(elem._coloringCssClass);
+				elem._coloringCssClass = null;
+			}
+			elem.style.backgroundColor = styles["backgroundColor"] || "";
+			elem.style.color = styles["color"] || "";
+		}
 	}
 };
 
@@ -50420,11 +50522,25 @@ CellPainter.prototype._paintCell = function(cell, rowData, min, max) {
 	}
 
 	var styles = this._getStyles(rowData, min, max);
-	var ss = CellPainter.bgStyles;
-	var elStyle = elem.style;
-	for (var n = ss.length; --n >= 0;) {
-		var styleName = ss[n];
-		elStyle[styleName] = styles[styleName] || "";
+	var cssClass = styles["cssClass"];
+	if (cssClass) {
+		if (elem._coloringCssClass !== cssClass) {
+			elem.classList.remove(elem._coloringCssClass);
+			elem._coloringCssClass = null;
+		}
+		elem.classList.add(cssClass);
+		elem._coloringCssClass = cssClass;
+	} else {
+		if (elem._coloringCssClass) {
+			elem.classList.remove(elem._coloringCssClass);
+			elem._coloringCssClass = null;
+		}
+		var ss = CellPainter.bgStyles;
+		var elStyle = elem.style;
+		for (var n = ss.length; --n >= 0;) {
+			var styleName = ss[n];
+			elStyle[styleName] = styles[styleName] || "";
+		}
 	}
 };