@refinitiv-ui/efx-grid 6.0.40 → 6.0.41

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

@@ -36,6 +36,7 @@
 */
 var FilterOperators = {
 	EQ: {
+		id: "EQ",
 		name: "Equal to",
 		type: "string",
 		positive: 1,
@@ -43,6 +44,7 @@ var FilterOperators = {
 		formula: "str == input"
 	},
 	NEQ: {
+		id: "NEQ",
 		name: "Not equal to",
 		type: "string",
 		positive: 0,
@@ -50,6 +52,7 @@ var FilterOperators = {
 		formula: "str != input"
 	},
 	NUMEQ: {
+		id: "NUMEQ",
 		name: "Number equal to",
 		type: "number",
 		positive: 1,
@@ -57,6 +60,7 @@ var FilterOperators = {
 		formula: "val == input"
 	},
 	NUMNEQ: {
+		id: "NUMNEQ",
 		name: "Number not equal to",
 		type: "number",
 		positive: 0,
@@ -64,6 +68,7 @@ var FilterOperators = {
 		formula: "val != input"
 	},
 	GT: {
+		id: "GT",
 		name: "Greater than",
 		type: "number",
 		positive: 1,
@@ -71,6 +76,7 @@ var FilterOperators = {
 		formula: "val > input"
 	},
 	GTE: {
+		id: "GTE",
 		name: "Greater than or equal to",
 		type: "number",
 		positive: 1,
@@ -78,6 +84,7 @@ var FilterOperators = {
 		formula: "val >= input"
 	},
 	LT: {
+		id: "LT",
 		name: "Less than",
 		type: "number",
 		positive: 1,
@@ -85,6 +92,7 @@ var FilterOperators = {
 		formula: "val < input"
 	},
 	LTE: {
+		id: "LTE",
 		name: "Less than or equal to",
 		type: "number",
 		positive: 1,
@@ -92,6 +100,7 @@ var FilterOperators = {
 		formula: "val <= input"
 	},
 	BEGIN: {
+		id: "BEGIN",
 		name: "Begin with",
 		type: "string",
 		positive: 1,
@@ -99,6 +108,7 @@ var FilterOperators = {
 		formula: "str.indexOf(input) === 0"
 	},
 	NBEGIN: {
+		id: "NBEGIN",
 		name: "Not begin with",
 		type: "string",
 		positive: 0,
@@ -106,6 +116,7 @@ var FilterOperators = {
 		formula: "str.indexOf(input) !== 0"
 	},
 	END: {
+		id: "END",
 		name: "End with",
 		type: "string",
 		positive: 1,
@@ -113,6 +124,7 @@ var FilterOperators = {
 		formula: "(str.length >= input.length) && str.lastIndexOf(input) === (str.length - input.length)"
 	},
 	NEND: {
+		id: "NEND",
 		name: "Not end with",
 		type: "string",
 		positive: 0,
@@ -120,6 +132,7 @@ var FilterOperators = {
 		formula: "(str.length < input.length) || str.lastIndexOf(input) !== (str.length - input.length)"
 	},
 	CONT: {
+		id: "CONT",
 		name: "Contain",
 		type: "string",
 		positive: 1,
@@ -127,6 +140,7 @@ var FilterOperators = {
 		formula: "str.indexOf(input) >= 0"
 	},
 	NCONT: {
+		id: "NCONT",
 		name: "Not contain",
 		type: "string",
 		positive: 0,
@@ -134,6 +148,7 @@ var FilterOperators = {
 		formula: "str.indexOf(input) < 0"
 	},
 	EQ_BLANK: {
+		id: "EQ_BLANK",
 		name: "Equal to blank value",
 		type: "blank", // Blank checking
 		positive: 1,
@@ -141,14 +156,15 @@ var FilterOperators = {
 		formula: "!val && val !== 0" // false boolean value would not pass
 	},
 	EQ_NBLANK: {
+		id: "EQ_NBLANK",
 		name: "Equal to non blank value",
 		type: "blank", // Blank checking
 		positive: 1,
 		caseSensitive: 1,
 		formula: "(val || val === 0) ? true : false"
 	},
-	// 86400000 is millisecond in a day. It is used to remove time part from date object for comparison
 	DT: {
+		id: "DT",
 		name: "Date is",
 		type: "date",
 		positive: 1,
@@ -156,6 +172,7 @@ var FilterOperators = {
 		formula: "ts === input"
 	},
 	DTA: {
+		id: "DTA",
 		name: "Date is After",
 		type: "date",
 		positive: 1,
@@ -163,6 +180,7 @@ var FilterOperators = {
 		formula: "ts > input"
 	},
 	DTB: {
+		id: "DTB",
 		name: "Date is Before",
 		type: "date",
 		positive: 1,
@@ -177,5 +195,36 @@ FilterOperators.TXTEQ = FilterOperators.EQ;
 FilterOperators.BLANK = FilterOperators.EQ_BLANK;
 FilterOperators.NBLANK = FilterOperators.EQ_NBLANK;
 
+
+/** @type {Object.<string, Function>}
+* @public
+* @const
+*/
+var OperatorFunctions = {
+	EQ: function(str, input) { return str == input; },
+	NEQ: function(str, input) { return str != input; },
+	NUMEQ: function(num, input) { return num == input; },
+	NUMNEQ: function(num, input) { return num != input; },
+	GT: function(num, input) { return num > input; },
+	GTE: function(num, input) { return num >= input; },
+	LT: function(num, input) { return num < input; },
+	LTE: function(num, input) { return num <= input; },
+	BEGIN: function(str, input) { return str.indexOf(input) === 0; },
+	NBEGIN: function(str, input) { return str.indexOf(input) !== 0; },
+	END: function(str, input) {
+		return (str.length >= input.length) && str.lastIndexOf(input) === (str.length - input.length);
+	},
+	NEND: function(str, input) {
+		return (str.length < input.length) || str.lastIndexOf(input) !== (str.length - input.length);
+	},
+	CONT: function(str, input) { return str.indexOf(input) >= 0; },
+	NCONT: function(str, input) { return str.indexOf(input) < 0; },
+	EQ_BLANK: function(val, input) { return !val && val !== 0; },
+	EQ_NBLANK: function(val, input) { return (val || val === 0) ? true : false; },
+	DT: function(ts, input) { return ts === input; },
+	DTA: function(ts, input) { return ts > input; },
+	DTB: function(ts, input) { return ts < input; }
+};
+
 export default FilterOperators;
-export { FilterOperators };
+export { FilterOperators, OperatorFunctions };

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

@@ -28,8 +28,6 @@ declare function deepEqual(obj1: any, obj2: any): boolean;
 
 declare function extendArrayProperty(obj: any, propName: string, ary: any): any[]|null;
 
-declare function parseCondition(expression: string|((...params: any[]) => any)|null): ((...params: any[]) => any)|null;
-
 declare function prettifyCss(css: string|any[]|null): string;
 
 declare function getShadowRoot(elem: Element|null): DocumentFragment|null;
@@ -58,7 +56,6 @@ export {
 	arrayToObject,
 	extendProperty,
 	extendArrayProperty,
-	parseCondition,
 	prettifyCss,
 	getShadowRoot,
 	injectCss,

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

@@ -301,58 +301,6 @@ var extendArrayProperty = function (obj, propName, ary) {
 	return objAry;
 };
 
-
-/** Regex for matching the field token E.g. '[CF_BID]'
-* @type {!RegExp}
-* @private
-* @const
-*/
-var _bracketExp = new RegExp(/\[[^\[]*\]/g); // eslint-disable-line no-useless-escape
-/** @public
-* @function
-* @param {string|Function} expression
-* @return {Function}
-* @example
-* var fn = parseCondition("[CF_BID] >= 10 && [CF_BID] <= 100");
-* window.console.log(fn(25));
-*/
-var parseCondition = function(expression) {
-	if(!expression) {
-		return null;
-	}
-	if(typeof expression !== "string") {
-		return (typeof expression == "function") ? /** @type {Function} */(expression) : null;
-	}
-
-	var brackets = expression.match(_bracketExp); // Retrieving field tokens (anything in between brackets)
-	var map = {}; // For checking duplication
-	var fields = [];
-	var len = brackets ? brackets.length : 0;
-	for(var i = len; --i >= 0;) {
-		var field = brackets[i];
-		if(!map[field]) {
-			map[field] = "f[" + fields.length + "]"; // Create mapping of field token to array with index E.g. { "[CF_BID]": "f[0]" }
-			fields.push(field.substring(1, field.length - 1)); // Strip '[' and ']' of field token to get field name
-		}
-	}
-
-	// Replace the field tokens with rowData of array with index E.g. [CF_BID] ==> rowData[f[0]]
-	expression = expression.replace(_bracketExp, function(match) {
-		return "rowData[" + map[match] + "]";
-	});
-	var finalExp = "(function(f, rowData) { return (" + expression + "); })";
-
-	var fn = null;
-	try {
-		fn = eval(finalExp);
-		fn = fn.bind(null, fields); // Bind fields for matching field name
-	} catch(err) {
-		console.log(err.message);
-	}
-	return (fn) ? fn : null;
-};
-
-
 /** @private
 * @param {string|Array.<string>} item
 * @return {string}
@@ -583,7 +531,6 @@ export {
 	arrayToObject,
 	extendProperty,
 	extendArrayProperty,
-	parseCondition,
 	prettifyCss,
 	getShadowRoot,
 	injectCss,

package/lib/tr-grid-util/es6/formula/Formula.js

@@ -93,7 +93,7 @@ Formula.prototype._alias = ""; // Alias name of formula
 /** @private
 * @type {Function}
 */
-Formula.prototype._main = null; // Function resulted from eval(expression)
+Formula.prototype._main = null; // Function resulted from resolving an expression
 
 /** @private
 * @type {Array.<Function>}
@@ -201,7 +201,7 @@ Formula.prototype.calculate = function(rowData) {
 	return null;
 };
 
-/** Function resulted from eval(expression)
+/** Function resulted from resolving an expression
 * @public
 * @return {Function} Returns function that takes an JSON object as a parameter. Return null if function is not valid JavaScript codes.
 */
@@ -673,7 +673,7 @@ Formula.prototype._parse = function(exp) {
 Formula.prototype._createFunction = function (expression) {
 	var func = null;
 	try {
-		func = /** @type{Function} */(eval("(function (__R) { return " + expression + "; })"));
+		func = new Function("__R", "return " + expression + ";");
 		func = func.bind(this);
 		func({}); // Try to execute the method once to check error
 	} catch(err) {

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

@@ -0,0 +1,51 @@
+import { Ext } from "../../tr-grid-util/es6/Ext.js";
+import { preventDefault } from "../../tr-grid-util/es6/EventDispatcher.js";
+import { GridPlugin } from "../../tr-grid-util/es6/GridPlugin.js";
+import { ElfUtil } from "../../tr-grid-util/es6/ElfUtil.js";
+import { cloneObject } from "../../tr-grid-util/es6/Util.js";
+import { DragUI } from "../../tr-grid-util/es6/DragUI.js";
+
+declare namespace ColumnDraggingPlugin {
+
+    type Options = {
+        dragStart?: ((...params: any[]) => any)|null,
+        drag?: ((...params: any[]) => any)|null,
+        dragEnd?: ((...params: any[]) => any)|null,
+        preColumnMoved?: ((...params: any[]) => any)|null,
+        columnMoved?: ((...params: any[]) => any)|null,
+        dragInterval?: ((...params: any[]) => any)|null,
+        dragBoxRenderer?: ((...params: any[]) => any)|null
+    };
+
+}
+
+declare class ColumnDraggingPlugin extends GridPlugin {
+
+    constructor(options?: ColumnDraggingPlugin.Options|null);
+
+    public getName(): string;
+
+    public hasMultiTableSupport(): boolean;
+
+    public initialize(host: any, options?: any): void;
+
+    public unload(host?: any): void;
+
+    public config(options?: any): void;
+
+    public getConfigObject(gridOptions?: any): any;
+
+    public lockFrozenColumn(lock: boolean): void;
+
+    public disable(disabled?: boolean|null): void;
+
+    public isDisabled(): boolean;
+
+    public disableMoving(disabled?: boolean|null): void;
+
+    public disableDragBox(disabled?: boolean|null): void;
+
+}
+
+export default ColumnDraggingPlugin;
+export { ColumnDraggingPlugin, ColumnDraggingPlugin as ColumnDragging, ColumnDraggingPlugin as ColumnDraggingExtension };

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

@@ -1,3 +1,4 @@
+import ColumnDragging from "../../column-dragging/es6/ColumnDragging.js";
 import RowSegmenting from "../../row-segmenting/es6/RowSegmenting.js";
 import StatisticsRow from "../../statistics-row/es6/StatisticsRow.js";
 import Zoom from "../../zoom/es6/Zoom.js";
@@ -24,6 +25,7 @@ import RowColoring from "../../tr-grid-rowcoloring/es6/RowColoring.js";
 import TextFormatting from "../../tr-grid-textformatting/es6/TextFormatting.js";
 
 type ExtensionOptions = {
+    columnDragging?: ColumnDragging.Options,
     rowSegmenting?: RowSegmenting.Options,
     statisticsRow?: StatisticsRow.Options,
     zoom?: Zoom.Options,

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

@@ -1,3 +1,4 @@
+import ColumnDragging from "../../column-dragging/es6/ColumnDragging.js";
 import RowSegmenting from "../../row-segmenting/es6/RowSegmenting.js";
 import StatisticsRow from "../../statistics-row/es6/StatisticsRow.js";
 import Zoom from "../../zoom/es6/Zoom.js";
@@ -27,7 +28,8 @@ import RowColoring from "../../tr-grid-rowcoloring/es6/RowColoring.js";
 import TextFormatting from "../../tr-grid-textformatting/es6/TextFormatting.js";
 import TitleWrap from "../../tr-grid-titlewrap/es6/TitleWrap.js";
 
-type Extensions = RowSegmenting |
+type Extensions = ColumnDragging |
+  RowSegmenting |
   StatisticsRow |
   Zoom |
   AutoTooltip |

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

@@ -104,7 +104,7 @@ declare class RowDefinition {
 
     public resetUpdates(): void;
 
-    public registerToView(view: DataTable|null, rowId?: string|null): void;
+    public registerToView(view: DataView|null, rowId?: string|null): void;
 
     public static deregisterFromView(rowIds: (string)[]|null, rowDef: RowDefinition|null): (string)[]|null;
 
@@ -142,7 +142,7 @@ declare const ROW_DEF: string;
 
 declare const ROW_TYPES: RowDefinition.RowTypes;
 
-declare function rowData(userInput: string, permId?: string|null, asChain?: boolean|null, expanded?: boolean|null): boolean;
+declare function rowData(userInput: string, extractedOptions: any): boolean;
 
 export {RowDefinition, ROW_DEF, ROW_TYPES};
 export default RowDefinition;

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

@@ -1,4 +1,5 @@
 // Extensions
+export { ColumnDragging } from "./ColumnDragging";
 export { CoralButtonFormatter } from "./CoralButtonFormatter";
 export { CoralCheckboxFormatter } from "./CoralCheckboxFormatter";
 export { CoralComboBoxFormatter } from "./CoralComboBoxFormatter";

package/lib/versions.json

@@ -1,5 +1,5 @@
 {
-	"tr-grid-util": "1.3.107",
+	"tr-grid-util": "1.3.109",
 	"@grid/column-dragging": "1.0.14",
 	"@grid/row-segmenting": "1.0.24",
 	"@grid/statistics-row": "1.0.14",
@@ -9,7 +9,7 @@
 	"tr-grid-checkbox": "1.0.60",
 	"tr-grid-column-fitter": "1.0.39",
 	"tr-grid-column-formatting": "0.9.34",
-	"tr-grid-column-grouping": "1.0.49",
+	"tr-grid-column-grouping": "1.0.50",
 	"tr-grid-column-resizing": "1.0.28",
 	"tr-grid-column-selection": "1.0.28",
 	"tr-grid-column-stack": "1.0.63",
@@ -31,7 +31,7 @@
 	"tr-grid-textformatting": "1.0.45",
 	"tr-grid-titlewrap": "1.0.19",
 	"@grid/formatters": "1.0.49",
-	"@grid/column-selection-dialog": "4.0.46",
+	"@grid/column-selection-dialog": "4.0.48",
 	"@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.40"
+	"version": "6.0.41"
 }