@refinitiv-ui/efx-grid 6.0.65 → 6.0.67

package/lib/tr-grid-row-filtering/es6/RowFiltering.d.ts

@@ -35,6 +35,7 @@ declare namespace RowFilteringPlugin {
 
     type Options = {
         emptySegmentFiltering?: boolean|null,
+        separatorFiltering?: boolean|null,
         disabledUI?: boolean|null,
         iconActivation?: string|null,
         dialogOptions?: RowFilteringPlugin.FilterDialogOptions|null,
@@ -118,6 +119,8 @@ declare class RowFilteringPlugin extends GridPlugin {
 
     public enableEmptySegmentFiltering(enabled?: boolean|null): void;
 
+    public enableSeparatorFiltering(enabled?: boolean|null): void;
+
 }
 
 declare function field(colIndex: number, exp: RowFilteringPlugin.Expression|null, ctx?: (any|string)|null): boolean;

package/lib/tr-grid-row-filtering/es6/RowFiltering.js

@@ -87,7 +87,8 @@ The expression can take various forms:<br>
 
 /** @typedef {Object} RowFilteringPlugin~Options
 * @description The options can be specified by `rowFiltering` property of the main grid's options
-* @property {boolean=} emptySegmentFiltering=false If enabled, the filter will automatically hide empty segment when all of its member are filtered out. If there is no active filter, any empty segment will not be hidden. Collapsed segment does not count as having a filter.
+* @property {boolean=} emptySegmentFiltering=false If enabled, the filter will automatically hide empty segment when all of its member are filtered out. If there is no active filter, any empty segment will not be hidden. Collapsed segment does not count as having a filter. A segment with no child is treated the same way as an empty segment.
+* @property {boolean=} separatorFiltering=false If enabled, segment separators will be filtered as if they were normal rows. Note that even if a separator row is filtered out, its child row may remain in the view and not be filtered out.
 * @property {boolean=} disabledUI=false Deprecated in favor of `iconActivation`. Set iconActivation to none instead.
 * @property {string=} iconActivation=onActiveFilter Filter icon redering behavior, can be set to `always`,`onHover`,`onActiveFilter`,or `none`
 * @property {RowFilteringPlugin~FilterDialogOptions=} dialogOptions=null Default configuration for Filter Dialog, applying to all columns.
@@ -371,6 +372,11 @@ RowFilteringPlugin.prototype.config = function (options) {
       this.enableEmptySegmentFiltering(rowFiltering["emptySegmentFiltering"] ? true : false);
     }
 
+    if (rowFiltering["separatorFiltering"] != null) {
+      // TODO: there is a chance that there is no DataView during the configuration
+      this.enableSeparatorFiltering(rowFiltering["separatorFiltering"] ? true : false);
+    }
+
     if (rowFiltering["iconActivation"]) {
       this._iconActivation = rowFiltering["iconActivation"];
 
@@ -479,6 +485,7 @@ RowFilteringPlugin.prototype.getConfigObject = function (gridOptions) {
 
     dirty = true;
   } // TODO: get emptySegmentFiltering setting from DataView
+  // TODO: get separatorFiltering setting from DataView
 
 
   if (dirty) {
@@ -2137,7 +2144,7 @@ RowFilteringPlugin.prototype._onColumnRemoved = function (e) {
     this._requestFilterRefresh();
   }
 };
-/** the filter will automatically hide empty segment when all of its member are filtered out. If there is no active filter, any empty segment will not be hidden. Collapsed segment does not count as having a filter.
+/** the filter will automatically hide empty segment when all of its member are filtered out. If there is no active filter, any empty segment will not be hidden. Collapsed segment does not count as having a filter. A segment with no child is treated the same way as an empty segment.
 * @public
 * @param {boolean=} enabled=true
 */
@@ -2151,6 +2158,20 @@ RowFilteringPlugin.prototype.enableEmptySegmentFiltering = function (enabled) {
     dv.enableEmptySegmentFiltering(enabled);
   }
 };
+/** the filter will automatically hide empty segment when all of its member are filtered out. If there is no active filter, any empty segment will not be hidden. Collapsed segment does not count as having a filter.
+* @public
+* @param {boolean=} enabled=true
+*/
+
+
+RowFilteringPlugin.prototype.enableSeparatorFiltering = function (enabled) {
+  var host = this._hosts[0];
+  var dv = host ? host.getDataSource() : null;
+
+  if (dv && dv.enableSeparatorFiltering) {
+    dv.enableSeparatorFiltering(enabled);
+  }
+};
 
 export default RowFilteringPlugin;
 export { RowFilteringPlugin, RowFilteringPlugin as RowFiltering, RowFilteringPlugin as RowFilteringExtension };

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

@@ -12,8 +12,8 @@ declare namespace CellPainter {
     };
 
     type Condition = {
-        field: string,
-        expression: CellPainter.Expression|string|null,
+        expression: string|((...params: any[]) => any)|null,
+        field?: string|null,
         backgroundColor?: string|null,
         color?: string|null,
         fontSize?: string|null,
@@ -136,6 +136,8 @@ declare class CellPainter {
 
     public disableLevelColor(disabled?: boolean|null): void;
 
+    public setBlinkingDuration(duration: number): void;
+
 }
 
 export default CellPainter;

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

@@ -4,14 +4,16 @@ import { ElfUtil } from "./ElfUtil.js";
 import { ExpressionParser } from "./ExpressionParser.js";
 
 /** @typedef {Object} CellPainter~Expression
+* @ignore
+* @description This form of expression is deprecated
 * @property {string=} name
 * @property {string} text Text describes condition e.g. [FIELD] > 10
 * @property {Array=} values
 */
 
 /** @typedef {Object} CellPainter~Condition
-* @property {string} field Field to be used in the condition
-* @property {CellPainter~Expression|string} expression Text describes condition e.g. [FIELD] > 10
+* @property {string|Function} expression A function, text, or an object with text property that describes the condition
+* @property {string=} field Field to be used in the condition
 * @property {string=} backgroundColor CSS color string
 * @property {string=} color CSS color string
 * @property {string=} fontSize
@@ -79,17 +81,16 @@ CellPainter.prototype._columnStats = null;
 * @private
 */
 CellPainter.prototype._levelColorDisabled = false;
-
 /** @type {number}
 * @private
 */
-CellPainter._runningBlinkId = 0;
-
+CellPainter.prototype._blinkingDuration = 250;
 
 /** @type {number}
 * @private
 */
-CellPainter._blinkingDuration = 250;
+CellPainter._runningBlinkId = 0;
+
 /** @type {Array.<CellPainter>}
 * @private
 * @const
@@ -325,7 +326,7 @@ CellPainter.prototype.getColumnStats = function() {
 	return this._columnStats;
 };
 /** @private
-* @param {CellPainter~Condition|Object} condition
+* @param {CellPainter~Condition} condition
 */
 CellPainter.prototype._addCondition = function(condition) {
 	var exp = condition["expression"];
@@ -1165,7 +1166,7 @@ CellPainter.prototype._blinkCell = function(cell, rowData, blinkSignal) {
 	}
 
 	CellPainter._clearBlinkTimer(scope);
-	scope["blinkTimer"] = setTimeout(scope._restorer, CellPainter._blinkingDuration);
+	scope["blinkTimer"] = setTimeout(scope._restorer, this._blinkingDuration);
 
 	return bgBlinking;
 };
@@ -1193,6 +1194,15 @@ CellPainter.prototype.verifyBlinking = function(cell, rowData) {
 CellPainter.prototype.disableLevelColor = function(disabled) {
 	this._levelColorDisabled = disabled !== false;
 };
+/**
+* @public
+* @param {number} duration
+*/
+CellPainter.prototype.setBlinkingDuration = function(duration) {
+	if(typeof duration === "number"){
+		this._blinkingDuration = duration;
+	}
+};
 
 export default CellPainter;
 export {CellPainter};

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

@@ -195,6 +195,19 @@ var FilterOperators = {
 FilterOperators.TXTEQ = FilterOperators.EQ;
 FilterOperators.BLANK = FilterOperators.EQ_BLANK;
 FilterOperators.NBLANK = FilterOperators.EQ_NBLANK;
+FilterOperators.NEQ_BLANK = FilterOperators.EQ_NBLANK;
+
+FilterOperators.GREATER_THAN = FilterOperators.GT;
+FilterOperators.GREATER_THAN_OR_EQUAL_TO = FilterOperators.GTE;
+FilterOperators.EQUAL_TO = FilterOperators.EQ;
+FilterOperators.LESS_THAN = FilterOperators.LT;
+FilterOperators.LESS_THAN_OR_EQUAL_TO = FilterOperators.LTE;
+// FilterOperators.BETWEEN = // No equivalent operator
+FilterOperators.TEXT_THAT_CONTAINS = FilterOperators.CONT;
+FilterOperators.TEXT_THAT_NOT_CONTAINS = FilterOperators.NCONT;
+FilterOperators.TEXT_IS = FilterOperators.EQ;
+// FilterOperators.BLANK = FilterOperators.EQ_BLANK;
+FilterOperators.NOT_BLANK = FilterOperators.EQ_NBLANK;
 
 
 /** @type {!Object.<string, Function>}

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

@@ -142,7 +142,7 @@ declare class ColumnStackPlugin extends GridPlugin {
 
     public moveColumnById(srcCol: number|string|null, destCol?: (number|string)|null): boolean;
 
-    public hideStack(stackId: string): void;
+    public hideStack(stackId: string, hidden?: boolean|null): void;
 
     public showStack(stackId: string): void;
 

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

@@ -8,7 +8,9 @@ import {ElfUtil} from '../../tr-grid-util/es6/ElfUtil.js';
 declare namespace ConditionalColoringPlugin {
 
     type Options = {
-        predefinedColors?: any
+        predefinedColors?: any,
+        blinkingDuration?: number|null,
+        insertionBlinking?: boolean|null
     };
 
     type ColumnOptions = {
@@ -27,10 +29,11 @@ declare namespace ConditionalColoringPlugin {
     };
 
     type Condition = {
-        expression?: (string|((...params: any[]) => any))|null,
+        expression?: (string|((...params: any[]) => any)|any[])|null,
         backgroundColor?: string|null,
         color?: string|null,
-        cssClass?: string|null
+        cssClass?: string|null,
+        field?: string|null
     };
 
     type Blinking = {
@@ -38,7 +41,8 @@ declare namespace ConditionalColoringPlugin {
         field?: string|null,
         up?: string|null,
         down?: string|null,
-        level?: (string|boolean)|null
+        level?: (string|boolean)|null,
+        duration?: number|null
     };
 
     type ColorText = {
@@ -70,7 +74,7 @@ declare class ConditionalColoringPlugin extends GridPlugin {
 
     public setColumnColoring(colIndex: number, columnOptions?: (ConditionalColoringPlugin.ColumnOptions|null)|null): void;
 
-    public setConditionalColoring(colIndex: number, coloringOptions?: (ConditionalColoringPlugin.ConditionalColoringOptions|null)|null): void;
+    public setConditionalColoring(colIndex: number, coloringOptions?: ConditionalColoringPlugin.ConditionalColoringOptions|null): void;
 
     public setColumnBlinking(colIndex: number, blinkingOptions?: (boolean|ConditionalColoringPlugin.Blinking)|null, field?: string|null): void;
 
@@ -78,6 +82,8 @@ declare class ConditionalColoringPlugin extends GridPlugin {
 
     public setPredefinedColors(predefinedColors: any): void;
 
+    public setInsertionBlinking(blinking: boolean): void;
+
     public getColumnPainter(colIndex: number): CellPainter|null;
 
     public applyColor(colIndex: number, cell: any, rowData?: any): void;

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

@@ -49,7 +49,8 @@ declare namespace ContextMenuPlugin {
     type OnMenuEvent = {
         cell: any,
         colIndex: number,
-        columnDef: object|null,
+        field: string,
+        colId: string,
         context: ContextMenuPlugin.Context|null,
         items: object|null,
         menu: MenuEventAPI|null,

package/lib/types/es6/Core/data/DataView.d.ts

@@ -278,6 +278,8 @@ declare class DataView extends EventDispatcher {
 
     public enableEmptySegmentFiltering(enabled?: boolean|null): void;
 
+    public enableSeparatorFiltering(enabled?: boolean|null): void;
+
     public setSegmentClassification(segmentRef: string|number|null, fields: string|(string)[]|null): boolean;
 
     public getWrapSize(): number;

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

@@ -56,8 +56,6 @@ declare class ColumnDefinition {
 
     public dispose(): void;
 
-    public _initializeTimeSeriesChild(columnOption?: ColumnDefinition.Options|string|null): void;
-
     public initialize(columnOption?: ColumnDefinition.Options|null): void;
 
     public getId(): string;

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

@@ -181,8 +181,6 @@ declare class Grid extends EventDispatcher {
 
     public setColumnSorter(colRef: Grid.ColumnReference|null, func?: ColumnDefinition.SortLogic|null): void;
 
-    public _initDuplicateRicData(rowDef: RowDefinition|null): void;
-
     public insertRow(rowOption?: (RowDefinition.Options|string)|null, rowRef?: Grid.RowReference|null): RowDefinition|null;
 
     public insertRows(rowOptions: (RowDefinition.Options|string)[]|null, rowRef?: Grid.RowReference|null, opt_fields?: (string)[]|null): void;

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

@@ -35,6 +35,7 @@ declare namespace RowFilteringPlugin {
 
     type Options = {
         emptySegmentFiltering?: boolean|null,
+        separatorFiltering?: boolean|null,
         disabledUI?: boolean|null,
         iconActivation?: string|null,
         dialogOptions?: RowFilteringPlugin.FilterDialogOptions|null,
@@ -118,6 +119,8 @@ declare class RowFilteringPlugin extends GridPlugin {
 
     public enableEmptySegmentFiltering(enabled?: boolean|null): void;
 
+    public enableSeparatorFiltering(enabled?: boolean|null): void;
+
 }
 
 declare function field(colIndex: number, exp: RowFilteringPlugin.Expression|null, ctx?: (any|string)|null): boolean;

package/lib/versions.json

@@ -1,5 +1,5 @@
 {
-	"tr-grid-util": "1.3.130",
+	"tr-grid-util": "1.3.131",
 	"tr-grid-printer": "1.0.16",
 	"@grid/column-dragging": "1.0.14",
 	"@grid/row-segmenting": "1.0.28",
@@ -9,14 +9,14 @@
 	"tr-grid-cell-selection": "1.0.33",
 	"tr-grid-checkbox": "1.0.60",
 	"tr-grid-column-fitter": "1.0.39",
-	"tr-grid-column-formatting": "0.9.34",
+	"tr-grid-column-formatting": "0.9.35",
 	"tr-grid-column-grouping": "1.0.55",
 	"tr-grid-column-resizing": "1.0.28",
 	"tr-grid-column-selection": "1.0.29",
-	"tr-grid-column-stack": "1.0.71",
-	"tr-grid-conditional-coloring": "1.0.62",
+	"tr-grid-column-stack": "1.0.72",
+	"tr-grid-conditional-coloring": "1.0.65",
 	"tr-grid-content-wrap": "1.0.20",
-	"tr-grid-contextmenu": "1.0.39",
+	"tr-grid-contextmenu": "1.0.40",
 	"tr-grid-filter-input": "0.9.33",
 	"tr-grid-heat-map": "1.0.29",
 	"tr-grid-in-cell-editing": "1.0.80",
@@ -24,7 +24,7 @@
 	"tr-grid-percent-bar": "1.0.22",
 	"tr-grid-range-bar": "2.0.5",
 	"tr-grid-row-dragging": "1.0.29",
-	"tr-grid-row-filtering": "1.0.60",
+	"tr-grid-row-filtering": "1.0.61",
 	"tr-grid-row-grouping": "1.0.82",
 	"tr-grid-row-selection": "1.0.23",
 	"tr-grid-rowcoloring": "1.0.24",

package/package.json

@@ -66,5 +66,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"version": "6.0.65"
+	"version": "6.0.67"
 }