@refinitiv-ui/efx-grid 6.0.29 → 6.0.31

package/lib/tr-grid-util/es6/Popup.d.ts

@@ -69,11 +69,13 @@ declare class Popup extends EventDispatcher {
 
     public disableAutoHiding(opt_disabled?: boolean|null): void;
 
+    public disableAutoRepositioning(opt_disabled?: boolean|null): void;
+
     public disableAutoClipping(opt_disabled?: boolean|null): void;
 
     public disableHideOnScroll(opt_disabled?: boolean|null): void;
 
-    public updatePosition(): void;
+    public updatePosition(fallback?: boolean|null): void;
 
     public enableUIBlocking(bool?: boolean|null): boolean;
 

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

@@ -221,6 +221,10 @@ Popup.prototype._uiBlocking = false;
 * @private
 */
 Popup.prototype._hideOnScroll = true;
+/** @type {boolean}
+* @private
+*/
+Popup.prototype._autoRepositioning = true;
 
 /** @public */
 Popup.prototype.dispose = function () {
@@ -303,6 +307,10 @@ Popup.prototype.init = function (options) {
 		this._hideOnScroll = false;
 	}
 
+	if (options["autoRepositioning"] == false) {
+		this._autoRepositioning = false;
+	}
+
 	this.addListener(options, "show");
 	this.addListener(options, "hide");
 	this.addListener(options, "shown");
@@ -573,6 +581,15 @@ Popup.prototype.disableAutoHiding = function (opt_disabled) {
 /** @public
 * @param {boolean=} opt_disabled
 */
+Popup.prototype.disableAutoRepositioning = function (opt_disabled) {
+	var autoRepositioning = (opt_disabled === false);
+	if (this._autoRepositioning !== autoRepositioning) {
+		this._autoRepositioning = autoRepositioning;
+	}
+};
+/** @public
+* @param {boolean=} opt_disabled
+*/
 Popup.prototype.disableAutoClipping = function (opt_disabled) {
 	var autoClipping = (opt_disabled === false);
 	if (this._autoClipping !== autoClipping) {
@@ -592,8 +609,12 @@ Popup.prototype.disableHideOnScroll = function (opt_disabled) {
 
 /** @public
 * @fires Popup#positioning
+* @param {boolean=} fallback=true
 */
-Popup.prototype.updatePosition = function () {
+Popup.prototype.updatePosition = function (fallback) {
+	if(fallback == null){
+		fallback = true;
+	}
 	var t = this;
 	t._resizeTimer = 0;
 
@@ -630,34 +651,48 @@ Popup.prototype.updatePosition = function () {
 		if (t._positioning == "right") {
 			x = px + aw + this._gap;
 			y = py;
-			// Re-position, if the popup exceeds the bounds
-			if ((x + ew > rb) && (px - ew > sx)) {
-				x = px - ew - this._gap;
-			}
-			if ((y + eh > bb) && (py + ah - eh > sy)) {
-				y = py + ah - eh;
-			}
 		} else if (t._positioning == "over") {
 			x = px;
 			y = py;
-			// Re-position, if the popup exceeds the bounds
-			if ((x + ew > rb) && (px + aw - ew > sx)) {
-				x = px + aw - ew;
-			}
-			if ((y + eh > bb) && (py + aw - eh > sy)) {
-				y = py + aw - eh;
-			}
 		} else { // under, bottom, or etc.
 			x = px;
 			y = py + ah;
-			// Re-position, if the popup exceeds the bounds
-			if ((x + ew > rb) && (px + aw - ew > sx)) {
-				x = px + aw - ew;
-			}
-			if ((y + eh > bb) && (py - eh > sy)) {
-				y = py - eh;
+		}
+
+		if(fallback){
+			// Re-position for each type of positioning, if the popup exceeds the bounds
+			if (t._positioning == "right") {
+				if ((x + ew > rb) && (px - ew > sx)) {
+					x = px - ew - this._gap;
+				}
+				if ((y + eh > bb) && (py + ah - eh > sy)) {
+					y = py + ah - eh;
+				}
+			} else if (t._positioning == "over") {
+				if ((x + ew > rb) && (px + aw - ew > sx)) {
+					x = px + aw - ew;
+				}
+				if ((y + eh > bb) && (py + aw - eh > sy)) {
+					y = py + aw - eh;
+				}
+			} else { // under, bottom, or etc.
+				if ((x + ew > rb) && (px + aw - ew > sx)) {
+					x = px + aw - ew;
+				}
+				if (y + eh > bb) {
+					// If popup is exceeded bottom bound
+					if(py - eh > sy){
+						y = py - eh; // move popup to top of attached element, if it has enough space
+					} else {
+						y = y - (y + eh - bb); // shift the popup up to make everything in popup visible
+						if(y < 0){
+							y = 0; // popup should not shift beyond top bound
+						}
+					}
+				}
 			}
 		}
+
 		if (t._autoClipping) { // Last resort of positioning
 			if (x + ew > rb) {
 				if (t._origW == null) {
@@ -685,7 +720,6 @@ Popup.prototype.updatePosition = function () {
 	t._dispatch(evtType, t._evtArg);
 };
 
-
 /** @public
 * @param {boolean=} bool
 * @return {boolean} previous uiBlocking state
@@ -759,7 +793,7 @@ Popup.prototype._onBlurTimer = function () {
 * @fires Popup#positioning
 */
 Popup.prototype._onResize = function () {
-	if (!this._resizeTimer && this._inDoc) {
+	if (!this._resizeTimer && this._inDoc && this._autoRepositioning) {
 		this._resizeTimer = setTimeout(this.updatePosition, 50);
 	}
 };

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/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/ContentWrap.d.ts

@@ -4,11 +4,11 @@ import { GridPlugin } from '../../tr-grid-util/es6/GridPlugin.js';
 declare namespace ContentWrapPlugin {
 
     type Options = {
-        evenRowHeight?: boolean
+        evenRowHeight?: boolean|null
     };
 
     type ColumnOptions = {
-        contentWrap?: boolean
+        contentWrap?: boolean|null
     };
 
 }
@@ -29,11 +29,11 @@ declare class ContentWrapPlugin extends GridPlugin {
 
     public getConfigObject(gridOptions?: any): any;
 
-    public adjustRowHeight(sectionRef: any, from?: number, to?: number): boolean;
+    public adjustRowHeight(sectionRef: any, from?: number|null, to?: number|null): boolean;
 
     public adjustRowHeightAt(sectionRef: any, rowIndex: number): boolean;
 
-    public enableContentWrapping(colIndex: number, bool?: boolean): void;
+    public enableContentWrapping(colIndex: number, bool?: boolean|null): void;
 
     public isWrappingContent(colIndex: number): boolean;
 

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/ColumnDefinition.d.ts

@@ -93,6 +93,8 @@ declare class ColumnDefinition {
 
     public isTimeSeries(): boolean;
 
+    public isTimeSeriesChild(): boolean;
+
     public isFormulaField(): boolean;
 
     public static isFormulaField(field: string): boolean;

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

@@ -20,12 +20,16 @@ declare namespace FieldDefinition {
 
     function setFieldCaching(caching: boolean): void;
 
+    function disableTimeSeriesExpansion(disabled: boolean): void;
+
     function isFormula(field: string): boolean;
 
     function isAdc(field: string): boolean;
 
     function isRealTimeField(field: string): boolean;
 
+    function isTimeSeriesChild(field: string): boolean;
+
     function isTimeSeries(field: string): boolean;
 
 }

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

@@ -83,6 +83,7 @@ declare namespace Grid {
         formulaEngine?: boolean|null,
         adcPollingInterval?: number|null,
         fieldCaching?: boolean|null,
+        timeSeriesExpansion?: boolean|null,
         childDataField?: string|null,
         topSection?: boolean|null
     };

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/versions.json

@@ -1,5 +1,5 @@
 {
-	"tr-grid-util": "1.3.88",
+	"tr-grid-util": "1.3.92",
 	"@grid/column-dragging": "1.0.11",
 	"@grid/row-segmenting": "1.0.23",
 	"@grid/statistics-row": "1.0.13",
@@ -12,9 +12,9 @@
 	"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.53",
+	"tr-grid-column-stack": "1.0.54",
 	"tr-grid-conditional-coloring": "1.0.58",
-	"tr-grid-content-wrap": "1.0.19",
+	"tr-grid-content-wrap": "1.0.20",
 	"tr-grid-contextmenu": "1.0.38",
 	"tr-grid-filter-input": "0.9.31",
 	"tr-grid-heat-map": "1.0.28",
@@ -32,6 +32,6 @@
 	"tr-grid-titlewrap": "1.0.19",
 	"@grid/formatters": "1.0.49",
 	"@grid/column-selection-dialog": "4.0.46",
-	"@grid/filter-dialog": "4.0.56",
+	"@grid/filter-dialog": "4.0.57",
 	"@grid/column-format-dialog": "4.0.43"
 }

package/package.json

@@ -66,5 +66,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"version": "6.0.29"
+	"version": "6.0.31"
 }