@refinitiv-ui/efx-grid 6.0.135 → 6.0.137

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

@@ -515,8 +515,7 @@ RowDefinition.prototype.getConfigObject = function(rowOptions) {
 		obj["collapsed"] = val;
 	}
 
-	// check row hidden
-	val = this._view.isHiddenRow(this._rowId);
+	val = this._view ? this._view.isHiddenRow(this._rowId) : false;
 	if(val) {
 		obj["hidden"] = val;
 	}
@@ -1090,19 +1089,6 @@ RowDefinition.deregisterFromView = function(rowIds, rowDef) {
 	rowDef._deregisterFromView(rowIds);
 	return rowIds;
 };
-/** @private
-* @param {string} ric
-* @return {Object}
-*/
-RowDefinition.prototype._getChildStaticRowData = function(ric) {
-	if(this._staticValues) {
-		let childValues = this._staticValues[RowDefinition._childDataField];
-		if(childValues) {
-			return childValues[ric] || null;
-		}
-	}
-	return null;
-};
 
 /** @public
 * @ignore
@@ -1157,9 +1143,16 @@ RowDefinition.prototype.addConstituent = function(ric) {
 		"parent": this
 	};
 
-	let staticData = this._getChildStaticRowData(ric); // TODO: Remove the child's static data from parent
-	if(staticData) {
-		rowOptions["values"] = staticData;
+	// Get child static values stored in this row
+	if(this._staticValues) {
+		let children = this._staticValues[RowDefinition._childDataField];
+		if(children) {
+			let childValues = children[ric];
+			if(childValues) {
+				rowOptions["values"] = childValues;
+				children[ric] = null;
+			}
+		}
 	}
 
 	return new RowDefinition(rowOptions); // childDef is added to this._children in the constructor

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

@@ -37,7 +37,8 @@ declare namespace RowFilteringPlugin {
         itemList?: any[]|null,
         additionalItems?: any[]|null,
         compactMode?: boolean|null,
-        blankValues?: (boolean|string)|null
+        blankValues?: (boolean|string)|null,
+        dateTimeFormat?: string|null
     };
 
     type FilterEntry = {

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

@@ -91,7 +91,8 @@ The expression can take various forms:<br>
 * @property {Array=} itemList Item list to be shown in the dialog. If this is not specified, the list will be collected from existing data on the grid
 * @property {Array=} additionalItems Additional items to be put on the itemList
 * @property {boolean=} compactMode=false force compact mode in dialog
-* @property {(boolean|string)=} blankValues Display a "(Blanks)" item in the filter dialog to represent an empty value. If a string is passed, it will be used as the label for the blank item
+* @property {(boolean|string)=} blankValues=false Display a "(Blanks)" item in the filter dialog to represent an empty value. If a string is passed, it will be used as the label for the blank item
+* @property {string=} dateTimeFormat="dd-MM-yy" Specifies the string format for the date time picker in the filter dialog based on date-fns format, follow https://date-fns.org/v3.6.0/docs/format.
 */
 
 /** @typedef {Object} RowFilteringPlugin~FilterEntry
@@ -1721,7 +1722,9 @@ RowFilteringPlugin._createDialog = function() {
 	}
 	return tag ? document.createElement(tag) : null;
 };
-/** @private
+/** Prepare user's array expression to be displayed in Filter Dialog. Convert date string to date object. Format raw value for text input
+* @public
+* @ignore
 * @function
 * @param {Array} exp
 * @param {string} field
@@ -1748,11 +1751,12 @@ RowFilteringPlugin._formatArrayExpression = function(exp, field, formatter) {
 			if(formattedVal) {
 				ary.rawValue = val;
 				ary.formattedValue = formattedVal;
+				ary[1] = formattedVal;
 			} else {
-				formattedVal = val;
+				ary[1] = val;
 			}
+
 		}
-		ary[1] = formattedVal;
 		return ary;
 	}
 	return null;
@@ -1869,6 +1873,7 @@ RowFilteringPlugin.prototype.openDialog = function(colIndex, runtimeDialogOption
 		advancedFilter: true,
 		compactMode: false,
 		fieldDataType: "",
+		dateTimeFormat: "dd-MM-yy",
 		lang: "",
 		rawDataAccessor: null,
 		formattedDataAccessor: null,
@@ -2033,6 +2038,11 @@ RowFilteringPlugin._overrideConfig = function(config, userConfig) {
 	  config.advancedFilter = advancedFilter;
 	}
 
+	let dateTimeFormat = userConfig["dateTimeFormat"];
+	if (dateTimeFormat != null) {
+	  config.dateTimeFormat = dateTimeFormat;
+	}
+
 	let compactMode = userConfig["compactMode"];
 	if (compactMode != null) {
 	  config.compactMode = compactMode;

package/lib/versions.json

@@ -19,12 +19,12 @@
 	"tr-grid-contextmenu": "1.0.44",
 	"tr-grid-filter-input": "0.9.43",
 	"tr-grid-heat-map": "1.0.30",
-	"tr-grid-in-cell-editing": "1.0.92",
+	"tr-grid-in-cell-editing": "1.0.93",
 	"tr-grid-pagination": "1.0.24",
 	"tr-grid-percent-bar": "1.0.24",
 	"tr-grid-range-bar": "2.0.9",
 	"tr-grid-row-dragging": "1.0.38",
-	"tr-grid-row-filtering": "1.0.85",
+	"tr-grid-row-filtering": "1.0.87",
 	"tr-grid-row-grouping": "1.0.88",
 	"tr-grid-row-selection": "1.0.33",
 	"tr-grid-rowcoloring": "1.0.26",
@@ -32,6 +32,6 @@
 	"tr-grid-titlewrap": "1.0.22",
 	"@grid/formatters": "1.0.55",
 	"@grid/column-selection-dialog": "4.0.57",
-	"@grid/filter-dialog": "4.0.75",
+	"@grid/filter-dialog": "4.0.79",
 	"@grid/column-format-dialog": "4.0.45"
 }

package/package.json

@@ -69,5 +69,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"version": "6.0.135"
+	"version": "6.0.137"
 }