@refinitiv-ui/efx-grid 6.0.71 → 6.0.73

package/lib/core/es6/grid/Core.js

@@ -570,7 +570,7 @@ Core.prototype._firstRendered = false;
 * @return {string}
 */
 Core.getVersion = function () {
-	return "5.1.80";
+	return "5.1.81";
 };
 /** {@link ElementWrapper#dispose}
 * @override
@@ -5441,7 +5441,7 @@ Core.prototype._onRowHeightChanged = function (e) {
 	// TODO: Set row height one by one is not good
 	for(var j = 0; j < len; ++j) {
 		var evt = evts[j];
-		var section = /** @type {ILayoutGrid} */(evt["sender"]);
+		var section = /** @type {ILayoutGrid} */(evt["section"]);
 		if(!this._containsSection(section)) {
 			continue; // The section is no longer contained in this grid
 		}

package/lib/filter-dialog/lib/filter-dialog.js

@@ -676,7 +676,7 @@ class FilterDialog extends BasicElement {
 
 			if(useUTCTime) {
 				ary2D.forEach(function(itm) {
-					item[3] = true;
+					itm[3] = true;
 				});
 			}
 
@@ -812,41 +812,84 @@ class FilterDialog extends BasicElement {
 			}
 		}
 
-		// Params is an array
-		if (Array.isArray(userConditions)) {
-			let conditions = /** @type{Array} */ (userConditions);
-			const con1 = conditions[0] || [];
-			const con2 = conditions[1] || [];
-			const con2Complete = con2.length > 1 && con2[0] && con2[1];
-			const connector = con1[2] || "";
-			const firstRadioState =  connector !== "OR" || !con2Complete;
-			const isDateTimeField = toDateTimeType(this.fieldDataType) ? true : false;
-			if (isDateTimeField) {
-				if (con1[0]) {
-					this._dateTimeComboBoxes[0].value = con1[0];
-					this._dateTimePickers[0].value = con1[1] ? this._getDateString(con1[1]) : "";
-
-					if (con2Complete) {
-						this._dateTimeComboBoxes[1].value = con2[0];
-						this._dateTimePickers[1].value = con2[1] ? this._getDateString(con2[1]) : "";
-					}
+		if (!Array.isArray(userConditions)) {
+			return;
+		}
+
+		const con1 = userConditions[0];
+		var validCon1 = false;
+		var conOp1 = "";
+		var conVal1 = "";
+		var connector = "";
+		if(Array.isArray(con1)) {
+			conOp1 = con1[0];
+			if(con1.length && con1[0]) {
+				conVal1 = con1[1];
+				if(conVal1 || conVal1 === 0 || conVal1 === false) {
+					validCon1 = true;
+					connector = con1[2] || "";
+				} else {
+					conVal1 = "";
 				}
-				this._dateTimeRadioBtns[0].checked = firstRadioState;
-				this._dateTimeRadioBtns[1].checked = !firstRadioState;
-			} else {
-				if (con1[0]) {
-					this._generalComboBoxes[0].value = con1[0];
-					this._generalComboBoxes[1].value = con1[1] || "";
+			}
+		}
 
-					if (con2Complete) {
-						this._generalComboBoxes[2].value = con2[0];
-						this._generalComboBoxes[3].value = con2[1] || "";
-					}
+		const con2 = userConditions[1];
+		var validCon2 = false;
+		var conOp2 = "";
+		var conVal2 = "";
+		if(validCon1 && Array.isArray(con2)) {
+			conOp2 = con2[0];
+			if(con2.length && conOp2) {
+				conVal2 = con2[1];
+				if(conVal2 || conVal2 === 0 || conVal2 === false) {
+					validCon2 = true;
+				} else {
+					conVal2 = "";
 				}
-				this._generalRadioBtns[0].checked = firstRadioState;
-				this._generalRadioBtns[1].checked = !firstRadioState;
 			}
 		}
+
+		var firstRadioState = true;
+		if(validCon1 && validCon2) {
+			firstRadioState = connector !== "OR";
+		}
+
+		if (toDateTimeType(this.fieldDataType)) {
+			if (validCon1) {
+				this._updateConditionUIs(this._dateTimeComboBoxes[0], this._dateTimePickers[0], conOp1, this._getDateString(conVal1));
+			}
+			if (validCon2) {
+				this._updateConditionUIs(this._dateTimeComboBoxes[1], this._dateTimePickers[1], conOp2, this._getDateString(conVal2));
+			}
+			this._updateConnectorUIs(this._dateTimeRadioBtns, firstRadioState);
+		} else {
+			if (validCon1) {
+				this._updateConditionUIs(this._generalComboBoxes[0], this._generalComboBoxes[1], conOp1, conVal1);
+			}
+			if (validCon2) {
+				this._updateConditionUIs(this._generalComboBoxes[2], this._generalComboBoxes[3], conOp2, conVal2);
+			}
+			this._updateConnectorUIs(this._generalRadioBtns, firstRadioState);
+		}
+	}
+	/** @private
+	* @param {Element} opCombobox
+	* @param {Element} valuePicker
+	* @param {string} opValue
+	* @param {string} value
+	*/
+	_updateConditionUIs(opCombobox, valuePicker, opValue, value) {
+		opCombobox.value = opValue;
+		valuePicker.value = value;
+	}
+	/** @private
+	* @param {Array.<Element>} connectors
+	* @param {boolean} connectorValue
+	*/
+	_updateConnectorUIs(connectors, connectorValue) {
+		connectors[0].checked = connectorValue;
+		connectors[1].checked = !connectorValue;
 	}
 	/** @private
 	* @returns {boolean}
@@ -926,14 +969,10 @@ class FilterDialog extends BasicElement {
 	* @return {string}
 	*/
 	_getDateString(date) {
-		var dateString = "";
-		var dateFormat = "yyyy-MM-dd";
 		if(!(date instanceof Date)){
 			date = new Date(date);
 		}
-		dateString = DateTime.format(date.getTime(), dateFormat, this.useUTCTime ? "GMT" : "LOCAL");
-
-		return dateString;
+		return DateTime.format(date.getTime(), "yyyy-MM-dd", this.useUTCTime ? "GMT" : "LOCAL");
 	}
 
 	/**

package/lib/grid/index.js

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

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

@@ -35112,7 +35112,14 @@ VirtualizedLayoutGrid.prototype.getFirstIndexInView = function () {
 
 /** @inheritDoc */
 VirtualizedLayoutGrid.prototype.getLastIndexInView = function () {
-	return this._firstIndex + this._getInnerRowCount() - 1;
+	var li = this._firstIndex + this._getInnerRowCount() - 1;
+	var core = this._grid._getContext();
+	var dv = core.getDataSource();
+	var actualLastIndex = dv ? dv.getRowCount() - 1 : -1;
+	if (li > actualLastIndex) { //Avoid incorrect index because the delay of row count synchronization after filtering
+		return actualLastIndex;
+	}
+	return li;
 };
 
 /** @inheritDoc */
@@ -36228,7 +36235,7 @@ Core.prototype._firstRendered = false;
 * @return {string}
 */
 Core.getVersion = function () {
-	return "5.1.78";
+	return "5.1.80";
 };
 /** {@link ElementWrapper#dispose}
 * @override
@@ -46686,7 +46693,7 @@ Grid.prototype.addStaticDataRows = function(dataRows, fields) {
 /** Insert, update, remove and reorder data based on the given array of records
 * @public
 * @param {Array.<Object>} records Array of records for insert, remove, update, reorder in one operation
-* @param {string} rowIdentifier Check difference data with the row identifier map property for operate record.
+* @param {string=} rowIdentifier Check difference data with the row identifier map property for operate record.
 * @example
 * // Grid data set will be updated to 3 records. All rows in the grid will be cleared and new rows will be inserted
 * grid.updateDataSet([
@@ -46738,14 +46745,25 @@ Grid.prototype.updateDataSet = function(records, rowIdentifier) {
 	var rowDef, id, record, i;
 	var rowDefs = this.getAllRowDefinitions(); // Include the filter/hidden rows
 	var rowDefCount = rowDefs.length;
-	for (i = 0; i < rowDefCount; i++) {
-		rowDef = rowDefs[i];
-		if(rowDef) {
-			id = rowDef.getRowData()[rowIdentifier];
-			if(id || id === 0) {
-				oldDataMap[id] = rowDef;
-			} else { // Any existing rowDef without row identifier should be removed
-				this.removeRow(rowDef); // Slow
+	if(rowIdentifier) {
+		for (i = 0; i < rowDefCount; i++) {
+			rowDef = rowDefs[i];
+			if(rowDef) {
+				id = rowDef.getRowData()[rowIdentifier];
+				if(id || id === 0) {
+					oldDataMap[id] = rowDef;
+				} else { // Any existing rowDef without row identifier should be removed
+					this.removeRow(rowDef); // Slow
+				}
+			}
+		}
+	} else {
+		for (i = 0; i < rowDefCount; i++) {
+			record = records[i];
+			if(record) {
+				oldDataMap[i] = rowDefs[i]; // Use index instead of rowIdentifier
+			} else {
+				this.removeRow(rowDefs[i]); // Need to use rowRef, can't use index in view
 			}
 		}
 	}
@@ -46755,7 +46773,7 @@ Grid.prototype.updateDataSet = function(records, rowIdentifier) {
 	var newDataMap = {};
 	for (i = recordCount - 1; i >= 0; i--) {
 		record = records[i];
-		id = record[rowIdentifier];
+		id = rowIdentifier ? record[rowIdentifier] : i;
 		rowDef = oldDataMap[id];
 		newDataMap[id] = record; // Assign a new data map to compare to the previous data
 		record[fieldSorting] = i;
@@ -46777,8 +46795,9 @@ Grid.prototype.updateDataSet = function(records, rowIdentifier) {
 		}
 	}
 
-	// Sorting
-	this._dt.sortOnce(ROW_DEF, "a", compareNumber, fieldSorting);
+	if(rowIdentifier) {
+		this._dt.sortOnce(ROW_DEF, "a", compareNumber, fieldSorting);
+	}
 };
 /** @private
 * @param {Array|Object} item