@refinitiv-ui/efx-grid 6.0.41 → 6.0.43

package/lib/column-format-dialog/lib/column-format-dialog.d.ts

@@ -20,6 +20,7 @@ import "@refinitiv-ui/elements/item";
 import "@refinitiv-ui/elements/color-dialog";
 import ElfUtil from "../../tr-grid-util/es6/ElfUtil.js";
 import { DATE_TIME, toDateTimeType } from "../../tr-grid-util/es6/FieldFormatter.js";
+import ExpressionParser from "../../tr-grid-util/es6/ExpressionParser.js";
 import translation from "./locale/translation.js";
 import { PercentBar } from "../../tr-grid-util/es6/PercentBar.js";
 import ElementObserver from "../../tr-grid-util/es6/ElementObserver.js";

package/lib/column-format-dialog/lib/column-format-dialog.js

@@ -20,6 +20,7 @@ import "@refinitiv-ui/elements/item";
 import "@refinitiv-ui/elements/color-dialog";
 import ElfUtil from "../../tr-grid-util/es6/ElfUtil.js";
 import { DATE_TIME, toDateTimeType } from "../../tr-grid-util/es6/FieldFormatter.js";
+import ExpressionParser from "../../tr-grid-util/es6/ExpressionParser.js";
 import translation from "./locale/translation.js";
 import { PercentBar } from "../../tr-grid-util/es6/PercentBar.js";
 import ElementObserver from "../../tr-grid-util/es6/ElementObserver.js";
@@ -1640,7 +1641,7 @@ class ColumnFormatDialog extends BasicElement {
 						color: e.color,
 						backgroundColor: e.backgroundColor
 					};
-					e.conditionSequence = this._parseRowCondition(e.expression.text);
+					e.conditionSequence = ExpressionParser.parse(e.expression.text);
 					e.expressionObject = e.expression;
 					return e;
 				});
@@ -1651,28 +1652,6 @@ class ColumnFormatDialog extends BasicElement {
 		}
 	}
 
-	/**
-	 * @private
-	 * @param {string} expression - expression string
-	 * @return {Function} - condition function
-	 */
-	_parseRowCondition(expression) {
-		if (!expression) {
-			return null;
-		}
-
-		var regEx = new RegExp(/\[[^[]*\]/g); // Regex for matching the field token E.g. "[CF_BID]"
-		expression = expression.replace(regEx, "value");
-		var finalExp = "(function(value) { return " + expression + "; })";
-
-		var fn = null;
-		try {
-			// TODO: find a better way to avoid using eval
-			fn = eval(finalExp); // eslint-disable-line
-		} catch (err) { }
-		return fn;
-	}
-
 	/**
 	 * @private
 	 * @param {Object} item - condition item
@@ -2179,7 +2158,7 @@ class ColumnFormatDialog extends BasicElement {
 	_setConditionalColor() {
 		var conditionFunctions = this.conditions.map(e => {
 			return {
-				conditionSequence: this._parseRowCondition(e.expression.text),
+				conditionSequence: ExpressionParser.parse(e.expression.text),
 				colors: {
 					color: e.color,
 					backgroundColor: e.backgroundColor

package/lib/column-format-dialog/lib/preview-table.d.ts

@@ -123,7 +123,7 @@ declare class PreviewTable extends ElementWrapper {
 
     public setDisplayStylePercentBarIsUsedMovement(isUsedMovement: boolean): void;
 
-    public setDisplayStyleConditional(condition: PreviewTable.Conditional|null): void;
+    public setDisplayStyleConditional(conditionDefs: (PreviewTable.Conditional)[]|null): void;
 
     public setFormatType(type: string): void;
 

package/lib/column-format-dialog/lib/preview-table.js

@@ -175,7 +175,7 @@ var PreviewTable = function (elem) {
 
 	this._numberFormatter = new NumberFormatter();
 
-	ElfUtil.getThemeColors().then(this._onThemeLoaded).catch(this._onThemeLoaded);
+	ElfUtil.getThemeColors().then(this._onThemeLoaded);
 	setInterval(this._onIntervalUpdate, 1500);
 
 	this._formatSampleValue();
@@ -344,26 +344,12 @@ PreviewTable.prototype.setDisplayStylePercentBarIsUsedMovement = function (isUse
 };
 
 /** @public
- * @param {PreviewTable~Conditional} condition - condition function
+ * @param {Array.<PreviewTable~Conditional>} conditionDefs - condition function
  */
-PreviewTable.prototype.setDisplayStyleConditional = function (condition) {
-	var isEmpty = true;
-
-	// Loop for check empty object
-	for (var key in condition) {
-		if (Object.hasOwnProperty.call(condition, key)) {
-			isEmpty = false;
-		}
-	}
-	if(!isEmpty) {
-		this._configDisplayStyle.conditionFunction = condition;
-		this._formatSampleValue();
-	} else {
-		// Set conditional false when object empty
-		this._configDisplayStyle.conditionFunction = false;
-		this._formatSampleValue();
-	}
-
+PreviewTable.prototype.setDisplayStyleConditional = function (conditionDefs) {
+	var count = conditionDefs ? conditionDefs.length : 0;
+	this._configDisplayStyle.conditionFunction = count ? conditionDefs : null;
+	this._formatSampleValue();
 };
 
 
@@ -831,14 +817,15 @@ PreviewTable.prototype._getSampleStyleObjects = function (blinking) {
 	// conditional color section
 	if (this._configDisplayStyle.mode === "conditionalColor") {
 		if (this._configDisplayStyle.conditionFunction) {
+			var valObj = {"value": NaN};
 			for (r = 0; r < rc; ++r) {
 				for (c = 0; c < cc; ++c) {
 					for (var i = 0; i < this._configDisplayStyle.conditionFunction.length; i++) {
 						obj = objs[r][c];
-						val = curDataset[r][c];
+						valObj["value"] = curDataset[r][c];
 						var ret = null;
 						try {
-							ret = this._configDisplayStyle.conditionFunction[i].conditionSequence(val); // check value with function pass from another module
+							ret = this._configDisplayStyle.conditionFunction[i].conditionSequence(valObj); // check value with function pass from another module
 						} catch (error) { } // do nothing
 						if (ret) {
 							obj.color = this._configDisplayStyle.conditionFunction[i].colors.color;
@@ -878,15 +865,15 @@ PreviewTable.prototype._getSampleStyleObjects = function (blinking) {
 				var prevVal = prevDataset[r][c];
 				var blinkColor = "";
 				if (curVal >= prevVal) {
-					blinkColor = this._configUpdateStyleValue.colors ? this._configUpdateStyleValue.colors.tickUp : "var(--color-scheme-tickup)";
+					blinkColor = this._colors ? this._colors.tickUp : "var(--color-scheme-tickup)";
 				} else {
-					blinkColor = this._configUpdateStyleValue.colors ? this._configUpdateStyleValue.colors.tickDown : "var(--color-scheme-tickdown)";
+					blinkColor = this._colors ? this._colors.tickDown : "var(--color-scheme-tickdown)";
 				}
 
 				// Blink border or background when value change
 				if (this._configUpdateStyleValue.isBackgroundBlink) {
 					obj.backgroundColor = blinkColor;
-					obj.color = this._configUpdateStyleValue.colors ? CellPainter.getOppositeColor(blinkColor) : "";
+					obj.color = this._colors ? CellPainter.getOppositeColor(blinkColor) : "";
 				} else {
 					obj.borderColor = blinkColor;
 				}
@@ -985,9 +972,10 @@ PreviewTable.prototype._updateValueFormatExample = function (val) {
 
 /**
  * @private
+ * @param {Object} colors
  */
-PreviewTable.prototype._onThemeLoaded = function () {
-	this._configUpdateStyleValue.colors = ElfUtil.getColors();
+PreviewTable.prototype._onThemeLoaded = function (colors) {
+	this._colors = colors;
 };
 
 export default PreviewTable;