@refinitiv-ui/efx-grid 6.0.100 → 6.0.101

package/lib/grid/index.js

@@ -1,3 +1,3 @@
 import {Grid} from "./lib/efx-grid.js";
 export {Grid}
-window.EFX_GRID = { version: "6.0.100" };
+window.EFX_GRID = { version: "6.0.101" };

package/lib/rt-grid/dist/rt-grid.js

@@ -15285,7 +15285,7 @@ PredefinedFormula.remove = function(field) {
 * @property {boolean=} leftPinned=false If enabled, the column will not be part of the scrollable area and is pinned to the left side
 * @property {boolean=} rightPinned=false If enabled, the column will not be part of the scrollable area and is pinned to the right side
 * @property {Object=} info=null For storing any additional information to the column
-* @property {boolean} focusable=false If enabled, the column will be used to find focusable element when pressing tab key
+* @property {boolean=} focusable=false If enabled, the column will be used to find focusable element when pressing tab key
 */
 
 /** mapping of field type to javascript type

package/lib/rt-grid/es6/ColumnDefinition.d.ts

@@ -44,7 +44,7 @@ declare namespace ColumnDefinition {
         leftPinned?: boolean|null,
         rightPinned?: boolean|null,
         info?: any,
-        focusable: boolean
+        focusable?: boolean|null
     };
 
 }

package/lib/rt-grid/es6/ColumnDefinition.js

@@ -50,7 +50,7 @@ import Engine from "../../tr-grid-util/es6/formula/Engine.js";
 * @property {boolean=} leftPinned=false If enabled, the column will not be part of the scrollable area and is pinned to the left side
 * @property {boolean=} rightPinned=false If enabled, the column will not be part of the scrollable area and is pinned to the right side
 * @property {Object=} info=null For storing any additional information to the column
-* @property {boolean} focusable=false If enabled, the column will be used to find focusable element when pressing tab key
+* @property {boolean=} focusable=false If enabled, the column will be used to find focusable element when pressing tab key
 */
 
 /** mapping of field type to javascript type

package/lib/tr-grid-in-cell-editing/es6/InCellEditing.js

@@ -884,10 +884,13 @@ InCellEditingPlugin.prototype.unload = function (host) {
 			clearTimeout(this._editorTimerId);
 		}
 		window.removeEventListener("scroll", this._onScroll);
+		if(this._starterTextPopup) {
+			this._starterTextPopup.dispose();
+		}
 	}
-
-	if(this._starterTextPopup) {
-		this._starterTextPopup.dispose();
+	if(this.isEditing()) {
+		this.closeRowEditor(false);
+		this.closeCellEditor(false);
 	}
 	this._dispose();
 };

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

@@ -136,6 +136,42 @@ let _arrayConcat = function(ary, val) {
 	}
 	return ary;
 };
+
+/** @type {Object}
+* @private
+* @const
+*/
+const BlankValues = {
+	"": true,
+	"null": true,
+	"undefined": true,
+	"NaN": true
+};
+/** @private
+* @function
+* @param {Array} ary
+* @param {string} str
+* @returns {boolean} Returns true if there is any change
+*/
+let _pushRawValue = function(ary, str) {
+	if(str) {
+		if(!BlankValues[str]) {
+			let dateObj = stringToDateObject(str);
+			if(dateObj !== str) {
+				ary.push(dateObj);
+			} else {
+				try {
+					ary.push(JSON.parse(str));
+				} catch (err) {
+					ary.push(str);
+				}
+			}
+			return true;
+		}
+	}
+	return false;
+};
+
 /** @private
 * @function
 * @param {Object} obj
@@ -670,8 +706,8 @@ RowFilteringPlugin.prototype._parseFilter = function(exp, colIndex, ctx) {
 			rawDataAccessor = ctx.rawDataAccessor || null;
 			formattedDataAccessor = ctx.formattedDataAccessor || null;
 		}
-		if(!Array.isArray(exp)) {
-			if(exp[BLANKS] || (ctx && ctx.blankValues)) {
+		if(!Array.isArray(exp)) { // If exp is an object
+			if(exp[BLANKS] || (ctx && ctx.blankValues)) { // it contains BLANKS key or context object has blank option
 				exp[""] = exp["null"] = exp["undefined"] = exp["NaN"] = true;
 				delete exp[BLANKS];
 			}
@@ -1485,7 +1521,7 @@ let _valueToString = function(formattedVal, rawVal) {
 		} else if(formattedVal instanceof Date) {
 			return formattedVal.toLocaleString("en-GB");
 		} else { // Object type cannot be converted to string
-			return"";
+			return "";
 		}
 	} else if(formattedVal === 0) {
 		return "0";
@@ -1650,19 +1686,22 @@ RowFilteringPlugin._formatArrayExpression = function(exp, field, formatter) {
 			ary.rawValue = val;
 			ary.formattedValue = formattedVal;
 		}
-		if(field && formatter && typeof val !== "string") {
-			if(val != null) {
+		if(typeof val !== "string" && val != null) {
+			if(field && formatter) {
 				let dummyRow = {};
 				dummyRow[field] = val;
 				formattedVal = formatter(dummyRow);
-				if(formattedVal) {
-					ary.rawValue = val;
-					ary.formattedValue = formattedVal;
-					val = formattedVal;
-				}
+			} else {
+				formattedVal = _valueToString(val, val);
+			}
+			if(formattedVal) {
+				ary.rawValue = val;
+				ary.formattedValue = formattedVal;
+			} else {
+				formattedVal = val;
 			}
 		}
-		ary[1] = val;
+		ary[1] = formattedVal;
 		return ary;
 	}
 	return null;
@@ -1802,22 +1841,36 @@ RowFilteringPlugin.prototype.openDialog = function(colIndex, runtimeDialogOption
 	let filterFuncs = null;
 	let exp = colSettings.expression;
 	if(exp) {
+		let userInputs = [];
+		if(cfo._filters && cfo._filters.length) {
+			filterFuncs = cfo._filters;
+		}
 		if(Array.isArray(exp)) {
 			if(exp.length) {
 				condition2D = Array.isArray(exp[0]) ? exp.slice() : [exp]; // Guaranteed condition2D to be a 2D array
-				condition2D[0] = RowFilteringPlugin._formatArrayExpression(condition2D[0], field, formatter);
-				condition2D[1] = RowFilteringPlugin._formatArrayExpression(condition2D[1], field, formatter);
+				let conditionAry = null;
+				conditionAry = RowFilteringPlugin._formatArrayExpression(condition2D[0], field, formatter);
+				condition2D[0] = conditionAry;
+				if(conditionAry) {
+					_pushRawValue(userInputs, conditionAry.rawValue != null ? conditionAry.rawValue : conditionAry[1]);
+				}
+
+				conditionAry = RowFilteringPlugin._formatArrayExpression(condition2D[1], field, formatter);
+				condition2D[1] = conditionAry;
+				if(conditionAry) {
+					_pushRawValue(userInputs, conditionAry.rawValue != null ? conditionAry.rawValue : conditionAry[1]);
+				}
+
 				filterMode = "advanced";
 			}
 		} else if(typeof exp === "function" || typeof exp === "string" || typeof exp === "object") {
-			if(cfo._filters && cfo._filters.length) {
-				filterFuncs = cfo._filters;
-			}
 			if(typeof exp === "object") {
-				exp = _handledBlankProperties(exp);
-				dialogConfig.additionalItems = _arrayConcat(dialogConfig.additionalItems, Object.keys(exp));
+				for(let expKey in exp) {
+					_pushRawValue(userInputs, expKey);
+				}
 			}
 		}
+		dialogConfig.additionalItems = _arrayConcat(dialogConfig.additionalItems, userInputs);
 	}
 
 	let selectedItems = {};

package/lib/types/es6/Core/grid/Core.d.ts

@@ -327,6 +327,8 @@ declare class Core extends ElementWrapper {
 
     public scrollToRow(sectionRef: Core.SectionReference|null, rowIndex: number, topOfView?: boolean|null): void;
 
+    public getVerticalViewInfo(): any;
+
     public getVScrollView(): any;
 
     public getScrollTop(): number;

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

@@ -45,7 +45,8 @@ declare namespace ColumnDefinition {
         stationary?: boolean|null,
         leftPinned?: boolean|null,
         rightPinned?: boolean|null,
-        info?: any
+        info?: any,
+        focusable?: boolean|null
     };
 
 }
@@ -160,6 +161,8 @@ declare class ColumnDefinition {
 
     public getColumnInfo(): any;
 
+    public isFocusable(): boolean;
+
 }
 
 declare const COL_DEF: string;

package/lib/versions.json

@@ -19,12 +19,12 @@
 	"tr-grid-contextmenu": "1.0.41",
 	"tr-grid-filter-input": "0.9.39",
 	"tr-grid-heat-map": "1.0.29",
-	"tr-grid-in-cell-editing": "1.0.85",
+	"tr-grid-in-cell-editing": "1.0.86",
 	"tr-grid-pagination": "1.0.24",
 	"tr-grid-percent-bar": "1.0.24",
 	"tr-grid-range-bar": "2.0.8",
 	"tr-grid-row-dragging": "1.0.35",
-	"tr-grid-row-filtering": "1.0.74",
+	"tr-grid-row-filtering": "1.0.75",
 	"tr-grid-row-grouping": "1.0.87",
 	"tr-grid-row-selection": "1.0.30",
 	"tr-grid-rowcoloring": "1.0.25",

package/package.json

@@ -66,5 +66,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"version": "6.0.100"
+	"version": "6.0.101"
 }