@refinitiv-ui/efx-grid 6.0.28 → 6.0.30

package/lib/tr-grid-util/es6/CellPainter.js

@@ -18,6 +18,7 @@ import { ElfUtil } from "./ElfUtil.js";
 * @property {string=} fontStyle
 * @property {string=} textAlign
 * @property {string=} textDecoration
+* @property {string=} cssClass Predefined color class name
 */
 
 /** @typedef {Object.<string, string>} CellPainter~ThemeColors
@@ -517,14 +518,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"] || "";
 	}
 };
 
@@ -650,8 +658,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"] || "";
+		}
 	}
 };
 
@@ -1000,11 +1024,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] || "";
+		}
 	}
 };
 

package/lib/tr-grid-util/es6/jet/mockDataAPI.js

@@ -266,7 +266,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
@@ -344,6 +344,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

package/lib/types/es6/ColumnStack.d.ts

@@ -129,6 +129,12 @@ declare class ColumnStackPlugin extends GridPlugin {
 
     public moveColumnById(srcCol: number|string|null, destCol?: (number|string)|null): boolean;
 
+    public hideStack(stackId: string): void;
+
+    public showStack(stackId: string): void;
+
+    public isStackHidden(stackId: string): boolean|null|null;
+
 }
 
 export default ColumnStackPlugin;

package/lib/types/es6/ConditionalColoring.d.ts

@@ -1,39 +1,44 @@
 import {Ext} from '../../tr-grid-util/es6/Ext.js';
-import { GridPlugin } from '../../tr-grid-util/es6/GridPlugin.js';
-import { extendObject } from '../../tr-grid-util/es6/Util.js';
+import {GridPlugin} from '../../tr-grid-util/es6/GridPlugin.js';
+import {extendObject, injectCss, prettifyCss} from '../../tr-grid-util/es6/Util.js';
 import {CellPainter} from '../../tr-grid-util/es6/CellPainter.js';
 import {FilterBuilder} from '../../tr-grid-util/es6/FilterBuilder.js';
 import {ElfUtil} from '../../tr-grid-util/es6/ElfUtil.js';
 
 declare namespace ConditionalColoringPlugin {
 
+    type Options = {
+        predefinedColors?: any
+    };
+
     type ColumnOptions = {
-        conditions?: (ConditionalColoringPlugin.Condition)[],
-        colorText?: (string|boolean),
-        tickColor?: (string|boolean),
-        blinking?: (ConditionalColoringPlugin.Blinking|boolean),
-        field?: string
+        conditions?: (ConditionalColoringPlugin.Condition)[]|null,
+        colorText?: (string|boolean)|null,
+        tickColor?: (string|boolean)|null,
+        blinking?: (ConditionalColoringPlugin.Blinking|boolean)|null,
+        field?: string|null
     };
 
     type ConditionalColoringOptions = {
-        conditions?: (ConditionalColoringPlugin.Condition)[],
-        colorText?: (string|boolean),
-        tickColor?: (string|boolean),
-        field?: string
+        conditions?: (ConditionalColoringPlugin.Condition)[]|null,
+        colorText?: (string|boolean)|null,
+        tickColor?: (string|boolean)|null,
+        field?: string|null
     };
 
     type Condition = {
-        expression?: (string|((...params: any[]) => any)),
-        backgroundColor?: string,
-        color?: string
+        expression?: (string|((...params: any[]) => any))|null,
+        backgroundColor?: string|null,
+        color?: string|null,
+        cssClass?: string|null
     };
 
     type Blinking = {
-        border?: boolean,
-        field?: string,
-        up?: string,
-        down?: string,
-        level?: (string|boolean)
+        border?: boolean|null,
+        field?: string|null,
+        up?: string|null,
+        down?: string|null,
+        level?: (string|boolean)|null
     };
 
 }
@@ -56,21 +61,23 @@ declare class ConditionalColoringPlugin extends GridPlugin {
 
     public getColumnColoring(colIndex: number, options?: any): ConditionalColoringPlugin.ColumnOptions;
 
-    public setColumnColoring(colIndex: number, columnOptions?: (ConditionalColoringPlugin.ColumnOptions|null)): void;
+    public setColumnColoring(colIndex: number, columnOptions?: (ConditionalColoringPlugin.ColumnOptions|null)|null): void;
 
-    public setConditionalColoring(colIndex: number, coloringOptions?: (ConditionalColoringPlugin.ConditionalColoringOptions|null)): void;
+    public setConditionalColoring(colIndex: number, coloringOptions?: (ConditionalColoringPlugin.ConditionalColoringOptions|null)|null): void;
 
-    public setColumnBlinking(colIndex: number, blinkingOptions?: (boolean|ConditionalColoringPlugin.Blinking), field?: string): void;
+    public setColumnBlinking(colIndex: number, blinkingOptions?: (boolean|ConditionalColoringPlugin.Blinking)|null, field?: string|null): void;
 
     public blinkRow(rowIndex: number, blinkSignal: number, host?: any): void;
 
+    public setPredefinedColors(predefinedColors: any): void;
+
     public getColumnPainter(colIndex: number): CellPainter|null;
 
     public applyColor(colIndex: number, cell: any, rowData?: any): void;
 
     public static cleanUpPrevRows(): void;
 
-    public static setThemeColors(colors: { [key: string]:  string }): void;
+    public static setThemeColors(colors: { [key: string]:  string }|null): void;
 
     public reloadThemeColors(): Promise<any>|null;
 

package/lib/types/es6/ExtensionOptions.d.ts

@@ -9,6 +9,7 @@ import ColumnGrouping from "../../tr-grid-column-grouping/es6/ColumnGrouping.js"
 import ColumnResizing from "../../tr-grid-column-resizing/es6/ColumnResizing.js";
 import ColumnSelection from "../../tr-grid-column-selection/es6/ColumnSelection.js";
 import ColumnStack from "../../tr-grid-column-stack/es6/ColumnStack.js";
+import ConditionalColoring from "../../tr-grid-conditional-coloring/es6/ConditionalColoring.js";
 import ContentWrap from "../../tr-grid-content-wrap/es6/ContentWrap.js";
 import ContextMenu from "../../tr-grid-contextmenu/es6/ContextMenu.js";
 import FilterInput from "../../tr-grid-filter-input/es6/FilterInput.js";
@@ -34,6 +35,7 @@ type ExtensionOptions = {
     columnResizing?: ColumnResizing.Options,
     columnSelection?: ColumnSelection.Options,
     columnStack?: ColumnStack.Options,
+    conditionalColoring?: ConditionalColoring.Options,
     contentWrap?: ContentWrap.Options,
     contextMenu?: ContextMenu.Options,
     filterInput?: FilterInput.Options,

package/lib/types/es6/RealtimeGrid/RowDefinition.d.ts

@@ -136,7 +136,7 @@ declare class RowDefinition {
 
 declare const ROW_DEF: string;
 
-declare const ROW_TYPES: RowDefinition.RowTypes|null;
+declare const ROW_TYPES: RowDefinition.RowTypes;
 
 declare function rowData(userInput: string): boolean;
 

package/lib/utils/index.d.ts

@@ -0,0 +1,3 @@
+import {DataGenerator} from "../tr-grid-util/es6/jet/DataGenerator.js"
+import {MockRTK} from "../tr-grid-util/es6/jet/MockRTK.js"
+export {DataGenerator, MockRTK}

package/lib/utils/index.js

@@ -0,0 +1,3 @@
+import {DataGenerator} from "../tr-grid-util/es6/jet/DataGenerator.js"
+import {MockRTK} from "../tr-grid-util/es6/jet/MockRTK.js"
+export {DataGenerator, MockRTK}

package/lib/versions.json

@@ -1,5 +1,5 @@
 {
-	"tr-grid-util": "1.3.87",
+	"tr-grid-util": "1.3.89",
 	"@grid/column-dragging": "1.0.11",
 	"@grid/row-segmenting": "1.0.23",
 	"@grid/statistics-row": "1.0.13",
@@ -12,13 +12,13 @@
 	"tr-grid-column-grouping": "1.0.46",
 	"tr-grid-column-resizing": "1.0.28",
 	"tr-grid-column-selection": "1.0.26",
-	"tr-grid-column-stack": "1.0.52",
-	"tr-grid-conditional-coloring": "1.0.57",
+	"tr-grid-column-stack": "1.0.54",
+	"tr-grid-conditional-coloring": "1.0.58",
 	"tr-grid-content-wrap": "1.0.19",
 	"tr-grid-contextmenu": "1.0.38",
 	"tr-grid-filter-input": "0.9.31",
 	"tr-grid-heat-map": "1.0.28",
-	"tr-grid-in-cell-editing": "1.0.75",
+	"tr-grid-in-cell-editing": "1.0.77",
 	"tr-grid-pagination": "1.0.24",
 	"tr-grid-percent-bar": "1.0.22",
 	"tr-grid-printer": "1.0.16",

package/package.json

@@ -24,6 +24,9 @@
 			"grid": [
 				"lib/grid/lib/efx-grid.d.ts"
 			],
+			"utils": [
+				"lib/utils/index.d.ts"
+			],
 			"*": [
 				"lib/types/index.d.ts"
 			]
@@ -53,7 +56,8 @@
 		"./extensions": "./lib/index.js",
 		"./window-exporter": "./lib/window-exporter.js",
 		"./grid": "./lib/grid/lib/efx-grid.js",
-		"./formatters/": "./lib/formatters/es6/"
+		"./formatters/": "./lib/formatters/es6/",
+		"./utils": "./lib/utils/index.js"
 	},
 	"peerDependencies": {
 		"@refinitiv-ui/core": "^6.2.0",
@@ -62,5 +66,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"version": "6.0.28"
+	"version": "6.0.30"
 }