@refinitiv-ui/efx-grid 6.0.70 → 6.0.72

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

@@ -2,7 +2,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 
 import { Ext } from "../../tr-grid-util/es6/Ext.js";
 import { GridPlugin } from "../../tr-grid-util/es6/GridPlugin.js";
-import { FilterBuilder } from "../../tr-grid-util/es6/FilterBuilder.js";
+import { FilterBuilder, stringToDateObject } from "../../tr-grid-util/es6/FilterBuilder.js";
 import { FilterOperators } from "../../tr-grid-util/es6/FilterOperators.js";
 import { ElfUtil } from "../../tr-grid-util/es6/ElfUtil.js";
 import { injectCss, prettifyCss } from "../../tr-grid-util/es6/Util.js";
@@ -24,6 +24,14 @@ import { injectCss, prettifyCss } from "../../tr-grid-util/es6/Util.js";
 * },
 */
 
+/** @event RowFilteringPlugin#dialogCommitted
+* @description Fired after a user clicks done button from the filter dialog or changes sort order.
+* @property {number} colIndex
+* @property {Object=} value When filter is changed, the change will be passed through this property
+* @property {number=} sortOrder When sort order is changed, the change will be passed through this property
+* @property {string=} fieldDataType
+*/
+
 /** @event RowFilteringPlugin#iconCreated
 * @description iconCreated event is dispatched when a new column filter icon is created.
 * @property {Element} icon Filter icon element
@@ -435,6 +443,7 @@ RowFilteringPlugin.prototype.config = function (options) {
 
     this.addListener(rowFiltering, "click");
     this.addListener(rowFiltering, "beforeDialogOpened");
+    this.addListener(rowFiltering, "dialogCommitted");
     this.addListener(rowFiltering, "iconCreated");
     this.addListener(rowFiltering, "filterChanged");
     this.addListener(rowFiltering, "refreshed");
@@ -1633,6 +1642,7 @@ RowFilteringPlugin.prototype._getDataTable = function (dv) {
   return dt;
 };
 /** @public
+* @ignore
 * @param {string} field A field name for getting raw value from row data
 * @param {Function=} formatter A formatter that takes row data, retrieves data, and modified the data for display.
 * @param {string=} fmtField A field name to be used instead of formatter for getting formatted value
@@ -1777,6 +1787,47 @@ RowFilteringPlugin._getFilteredValue = function (rowData, filters) {
 
   return true;
 };
+/** @private
+* @function
+* @param {Array} exp
+* @param {string} field
+* @param {Function} formatter
+* @returns {Array}
+*/
+
+
+RowFilteringPlugin._formatArrayExpression = function (exp, field, formatter) {
+  if (Array.isArray(exp)) {
+    var ary = exp.slice(); // Clone to avoid modifying original data
+
+    var formattedVal = ary[1];
+    var val = stringToDateObject(formattedVal);
+
+    if (val !== formattedVal) {
+      ary.rawValue = val;
+      ary.formattedValue = formattedVal;
+    }
+
+    if (field && formatter && typeof val !== "string") {
+      if (val != null) {
+        var dummyRow = {};
+        dummyRow[field] = val;
+        formattedVal = formatter(dummyRow);
+
+        if (formattedVal) {
+          ary.rawValue = val;
+          ary.formattedValue = formattedVal;
+          val = formattedVal;
+        }
+      }
+    }
+
+    ary[1] = val;
+    return ary;
+  }
+
+  return null;
+};
 /** @public
 * @param {number} colIndex
 * @param {RowFilteringPlugin~FilterDialogOptions=} runtimeDialogOptions
@@ -1929,6 +1980,8 @@ RowFilteringPlugin.prototype.openDialog = function (colIndex, runtimeDialogOptio
   var formattedDataAccessor = cfo._formattedDataAccessor = dialogConfig.formattedDataAccessor || null;
   var sortLogic = dialogConfig.sortLogic || null; // Populate data for filter dialog based on existing states
 
+  var formatter = this._getFormatter(colIndex);
+
   var condition2D = null;
   var filterMode = ""; // default
 
@@ -1938,8 +1991,10 @@ RowFilteringPlugin.prototype.openDialog = function (colIndex, runtimeDialogOptio
   if (exp) {
     if (Array.isArray(exp)) {
       if (exp.length) {
-        condition2D = Array.isArray(exp[0]) ? exp : [exp]; // Guaranteed condition2D to be a 2D array
+        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);
         filterMode = "advanced";
       }
     } else if (typeof exp === "function" || typeof exp === "string" || _typeof(exp) === "object") {
@@ -1950,7 +2005,7 @@ RowFilteringPlugin.prototype.openDialog = function (colIndex, runtimeDialogOptio
   }
 
   var selectedItems = {};
-  var uniqueValues = cfo.uniqueValues = this.getUniqueValues(field, this._getFormatter(colIndex), "", rawDataAccessor, formattedDataAccessor, filterFuncs, selectedItems);
+  var uniqueValues = cfo.uniqueValues = this.getUniqueValues(field, formatter, "", rawDataAccessor, formattedDataAccessor, filterFuncs, selectedItems);
   var keys = Object.keys(uniqueValues);
 
   if (sortLogic) {
@@ -1968,7 +2023,26 @@ RowFilteringPlugin.prototype.openDialog = function (colIndex, runtimeDialogOptio
       nodes: [],
       checked: selectedItems[formattedVal] ? true : false
     };
-  }); // Initialize dialog
+  }); // Adding inputs from conditions to uniqueValues for mapping back from the dialog
+
+  if (condition2D) {
+    var cond = condition2D[0];
+
+    if (cond && cond.formattedValue) {
+      if (!uniqueValues[cond.formattedValue]) {
+        uniqueValues[cond.formattedValue] = [cond.rawValue];
+      }
+    }
+
+    cond = condition2D[1];
+
+    if (cond && cond.formattedValue) {
+      if (!uniqueValues[cond.formattedValue]) {
+        uniqueValues[cond.formattedValue] = [cond.rawValue];
+      }
+    }
+  } // Initialize dialog
+
 
   if (this._filterDialog.init) {
     // TODO: support initiailization in v1

package/lib/tr-grid-titlewrap/es6/TitleWrap.d.ts

@@ -15,9 +15,9 @@ declare class TitleWrapPlugin extends GridPlugin {
 
     public getConfigObject(gridOptions?: any): any;
 
-    public _adjustRowHeightRefByHost(host: any, sectionRef: any, from?: number, to?: number): boolean;
+    public _adjustRowHeightRefByHost(host: any, sectionRef: any, from?: number|null, to?: number|null): boolean;
 
-    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;
 

package/lib/tr-grid-titlewrap/es6/TitleWrap.js

@@ -155,7 +155,7 @@ TitleWrapPlugin.prototype.getConfigObject = function (gridOptions) {
 
 TitleWrapPlugin.prototype._requestRecalculation = function () {
   if (!this._timerId) {
-    this._timerId = setTimeout(this._onRecalculation, 10);
+    this._timerId = setTimeout(this._onRecalculation, 50);
   }
 };
 /** @private */

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

@@ -46,7 +46,9 @@ declare class FilterBuilder {
 
 }
 
+declare function stringToDateObject(str: any): any;
+
 declare function buildFilterFromObjectMap(obj: any, field: string, rawDataAccessor?: ((...params: any[]) => any)|null): ((...params: any[]) => any)|null;
 
 export default FilterBuilder;
-export { FilterBuilder, buildFilterFromObjectMap };
+export { FilterBuilder, buildFilterFromObjectMap, stringToDateObject };

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

@@ -44,8 +44,9 @@ var convertToNumber = function(val) {
 	}
 	if(val) {
 		// WARNING: spaces (" ") and newline ("\n") characters could be parsed as 0
+		// Date object will have value of Date.getTime(). True value will be converted to 1
 		// TODO: Check if we need to use parseFloat instead of Number
-		return Number(val); // Could return NaN. true value will be converted to 1
+		return Number(val); // Could return NaN.
 	}
 	if(val === false) {
 		return 0;
@@ -53,6 +54,28 @@ var convertToNumber = function(val) {
 	return NaN; // null, NaN, undefined, empty string
 };
 /** @private
+* @type {RegExp}
+*/
+var _dateStringRule = /^\w{3} \w{3}/;
+/** Convert default string natively generated from a Date object to a Date object. For instance, string "Sun Sep 09 2001 08:46:40 GMT+0700 (Indochina Time)" can be converted, while string "2001-09-09" cannot be converted.
+* @public
+* @function
+* @param {*} str
+* @return {*} Return Date object for successful conversion, otherwise the same input string
+*/
+var stringToDateObject = function(str) {
+	if(typeof str === "string") {
+		var dateObj = new Date(str);
+		var t = dateObj.getTime();
+		if(t === t) {
+			if(_dateStringRule.test(str)) {
+				return dateObj;
+			}
+		}
+	}
+	return str; // Return the user input for unsuccessful conversion
+};
+/** @private
 * @function
 * @param {*} val
 * @return {string}
@@ -441,6 +464,7 @@ FilterBuilder.prototype.buildFilter = function() {
 		var value = cond.origValue;
 
 		if(opType === "number") {
+			value = stringToDateObject(value);
 			value = convertToNumber(value);
 		} else if(opType === "date") {
 			var dateObj = null;
@@ -554,4 +578,4 @@ FilterBuilder.prototype.parse = function(condition, field, formatter, formattedF
 };
 
 export default FilterBuilder;
-export { FilterBuilder, buildFilterFromObjectMap };
+export { FilterBuilder, buildFilterFromObjectMap, stringToDateObject };

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

@@ -18,7 +18,7 @@ declare namespace InCellEditingPlugin {
         popupElement?: Element|null,
         doubleClick?: boolean|null,
         tabToMove?: boolean|null,
-        contentSource?: boolean|null,
+        contentSource?: string|null,
         inlineStyling?: boolean|null,
         disablingScroll?: boolean|null,
         uiBlocking?: boolean|null,
@@ -30,7 +30,8 @@ declare namespace InCellEditingPlugin {
         beforeRowCommit?: ((...params: any[]) => any)|null,
         rowEditorClosed?: ((...params: any[]) => any)|null,
         autoSuggest?: Element|null,
-        closingOnScroll?: boolean|null
+        closingOnScroll?: boolean|null,
+        autoHiding?: boolean|null
     };
 
     type Cache = {

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

@@ -1,6 +1,6 @@
 import {Ext} from "../../tr-grid-util/es6/Ext.js";
 import {GridPlugin} from "../../tr-grid-util/es6/GridPlugin.js";
-import {FilterBuilder} from "../../tr-grid-util/es6/FilterBuilder.js";
+import {FilterBuilder, stringToDateObject} from "../../tr-grid-util/es6/FilterBuilder.js";
 import {FilterOperators} from "../../tr-grid-util/es6/FilterOperators.js";
 import {ElfUtil} from "../../tr-grid-util/es6/ElfUtil.js";
 import { injectCss, prettifyCss } from "../../tr-grid-util/es6/Util.js";
@@ -113,8 +113,6 @@ declare class RowFilteringPlugin extends GridPlugin {
 
     public getColumnFilterStates(): any[];
 
-    public getUniqueValues(field: string, formatter?: ((...params: any[]) => any)|null, fmtField?: string|null, rawDataAccessor?: ((...params: any[]) => any)|null, formattedDataAccessor?: ((...params: any[]) => any)|null, filterFuncs?: ((...params: any[]) => any)|null, selectedItems?: any): any;
-
     public openDialog(colIndex: number, runtimeDialogOptions?: RowFilteringPlugin.FilterDialogOptions|null): void;
 
     public enableEmptySegmentFiltering(enabled?: boolean|null): void;

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

@@ -15,9 +15,9 @@ declare class TitleWrapPlugin extends GridPlugin {
 
     public getConfigObject(gridOptions?: any): any;
 
-    public _adjustRowHeightRefByHost(host: any, sectionRef: any, from?: number, to?: number): boolean;
+    public _adjustRowHeightRefByHost(host: any, sectionRef: any, from?: number|null, to?: number|null): boolean;
 
-    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;
 

package/lib/versions.json

@@ -1,5 +1,5 @@
 {
-	"tr-grid-util": "1.3.133",
+	"tr-grid-util": "1.3.134",
 	"tr-grid-printer": "1.0.17",
 	"@grid/column-dragging": "1.0.14",
 	"@grid/row-segmenting": "1.0.29",
@@ -13,25 +13,25 @@
 	"tr-grid-column-grouping": "1.0.57",
 	"tr-grid-column-resizing": "1.0.28",
 	"tr-grid-column-selection": "1.0.31",
-	"tr-grid-column-stack": "1.0.72",
+	"tr-grid-column-stack": "1.0.73",
 	"tr-grid-conditional-coloring": "1.0.66",
 	"tr-grid-content-wrap": "1.0.20",
 	"tr-grid-contextmenu": "1.0.40",
-	"tr-grid-filter-input": "0.9.33",
+	"tr-grid-filter-input": "0.9.36",
 	"tr-grid-heat-map": "1.0.29",
-	"tr-grid-in-cell-editing": "1.0.80",
+	"tr-grid-in-cell-editing": "1.0.81",
 	"tr-grid-pagination": "1.0.24",
 	"tr-grid-percent-bar": "1.0.22",
 	"tr-grid-range-bar": "2.0.5",
-	"tr-grid-row-dragging": "1.0.30",
-	"tr-grid-row-filtering": "1.0.62",
+	"tr-grid-row-dragging": "1.0.31",
+	"tr-grid-row-filtering": "1.0.64",
 	"tr-grid-row-grouping": "1.0.82",
 	"tr-grid-row-selection": "1.0.25",
 	"tr-grid-rowcoloring": "1.0.25",
 	"tr-grid-textformatting": "1.0.46",
-	"tr-grid-titlewrap": "1.0.19",
+	"tr-grid-titlewrap": "1.0.20",
 	"@grid/formatters": "1.0.50",
 	"@grid/column-selection-dialog": "4.0.54",
-	"@grid/filter-dialog": "4.0.58",
+	"@grid/filter-dialog": "4.0.60",
 	"@grid/column-format-dialog": "4.0.44"
 }

package/package.json

@@ -66,5 +66,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"version": "6.0.70"
+	"version": "6.0.72"
 }