@refinitiv-ui/efx-grid 6.0.70 → 6.0.72

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

@@ -570,7 +570,7 @@ Core.prototype._firstRendered = false;
 * @return {string}
 */
 Core.getVersion = function () {
-	return "5.1.78";
+	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/core/es6/grid/VirtualizedLayoutGrid.js

@@ -775,7 +775,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 */

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

@@ -137,7 +137,7 @@ class FilterDialog extends BasicElement {
 	constructor() {
 		super();
 
-		this._updateDialogHeight = this._updateDialogHeight.bind(this);
+		this._onWindowResized = this._onWindowResized.bind(this);
 		this._afterDialogOpened = this._afterDialogOpened.bind(this);
 
 		this.lang = "en";
@@ -155,7 +155,7 @@ class FilterDialog extends BasicElement {
 			"autoRepositioning": false,
 			"uiBlocking": true
 		});
-		this._dialogHeightTimerId = 0;
+		this._winResizedTimer = 0;
 		ElementObserver.addLanguageListener(this);
 	}
 
@@ -436,13 +436,7 @@ class FilterDialog extends BasicElement {
 		}
 
 		this._cancelBtn.focus(); // Keep focus on cancel button when open dialog
-		var positionUpdated = this._updateDialogHeight(true);
-		if(!this._firstRendered) {
-			this._firstRendered = true;
-			if(!positionUpdated) {
-				this._popup.updatePosition();
-			}
-		}
+		this._updateDialogHeight(); // position of the popup element will always be updated
 
 		var popupElem = this._popup.getElement();
 		if(popupElem) {// After all changes, ensure that visibility is reset back
@@ -488,9 +482,9 @@ class FilterDialog extends BasicElement {
 	*/
 	_onPopupHidden() {
 		this.isShown = false; // For backward compatability
-		if (this._dialogHeightTimerId) {
-			clearTimeout(this._dialogHeightTimerId);
-			this._dialogHeightTimerId = 0;
+		if (this._winResizedTimer) {
+			clearTimeout(this._winResizedTimer);
+			this._winResizedTimer = 0;
 		}
 	}
 
@@ -498,10 +492,18 @@ class FilterDialog extends BasicElement {
 	* @private
 	*/
 	_onWindowResize() {
-		if(!this._dialogHeightTimerId && this.isShown){
-			this._dialogHeightTimerId = setTimeout(this._updateDialogHeight, 500);
+		if(!this._winResizedTimer && this.isShown){
+			this._winResizedTimer = setTimeout(this._onWindowResized, 400);
 		}
 	}
+	/**
+	* @private
+	*/
+	_onWindowResized() {
+		this._winResizedTimer = 0;
+		this._updateDialogHeight();
+	}
+
 
 	/**
 	* @public
@@ -577,7 +579,7 @@ class FilterDialog extends BasicElement {
 		e.preventDefault();
 		e.stopPropagation();
 		this._updateFilterModeSelectionUI();
-		this._updateDialogHeight(true);
+		this._updateDialogHeight();
 	}
 
 	/**
@@ -674,7 +676,7 @@ class FilterDialog extends BasicElement {
 
 			if(useUTCTime) {
 				ary2D.forEach(function(itm) {
-					item[3] = true;
+					itm[3] = true;
 				});
 			}
 
@@ -810,63 +812,102 @@ 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 {boolean=} afterOpened
+	/** @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}
 	*/
-	_updateDialogHeight(afterOpened) {
-		if(!afterOpened) {
-			this._dialogHeightTimerId = 0;
-		}
-
-		this._popup.updatePosition(false); // update position without fallback
+	_updateDialogHeight() {
 		this._rootContainer.classList.remove("compact");
 		this._rootContainer.style.height = "";
+		this._popup.updatePosition(false); // update position without fallback
 
 		const position = Dom.getRelativePosition(this, document.body);
 		const dialogHeight = this.offsetHeight;
-		const windowHeight = window.innerHeight;
+		const windowHeight = window.innerHeight - 5; // Add some buffer
 		const dialogCoverage = position.y + dialogHeight;
 		const heightDiff = dialogCoverage - windowHeight;
 
+		var heightChange = false;
 		if(heightDiff > 0) {
+			heightChange = true;
 			const isAdvancedFilter = this._isAdvancedFilterMode();
 			const minHeight = isAdvancedFilter ? 262 : 216;
 			let newHeight = dialogHeight - heightDiff;
@@ -879,10 +920,10 @@ class FilterDialog extends BasicElement {
 			if(newHeight < compactThreshold){
 				this._rootContainer.classList.add("compact");
 			}
-			this._popup.updatePosition();
-			return true;
 		}
-		return false;
+
+		this._popup.updatePosition(); // This must be called to apply fallback or height change
+		return heightChange;
 	}
 	/**
 	* @private
@@ -928,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.70" };
+window.EFX_GRID = { version: "6.0.72" };

package/lib/tr-grid-column-stack/es6/ColumnStack.js

@@ -677,6 +677,12 @@ ColumnStackPlugin.prototype._updateUI = function() {
 	}
 	this._updating = false;
 };
+/** @private */
+ColumnStackPlugin.prototype._forceUpdateUI = function() {
+	this._conflator.disable();
+	this._updateUI();
+	this._conflator.enable();
+};
 /** @private
 * @param {number} colIndex
 * @param {boolean} collapsed
@@ -1365,7 +1371,7 @@ ColumnStackPlugin.prototype._onPreSectionRender = function (e) {
 	if (e["sectionType"] !== "title") {
 		return;
 	}
-	this._updateUI(); // asyncronuos
+	this._forceUpdateUI();
 };
 /** @private
 * @param {Object} e

package/lib/tr-grid-filter-input/es6/FilterInput.js

@@ -564,7 +564,6 @@ FilterInputPlugin.prototype._createFilterUI = function (colOpt) {
     case "ef-combo-box":
       elem.multiple = true;
       elem.data = CoralItems.create(colOpt.entries);
-      elem.addEventListener("opened-changed", this._onOpenedChanged, false);
 
       if (elemTrigger != false && elemTrigger != "") {
         elem.addEventListener("value-changed", this._onInputChanged, false);
@@ -664,6 +663,13 @@ FilterInputPlugin.prototype._retrieveColumnOption = function (colIndex, colDef)
     var option = this._newExtColumnOption(colIndex);
 
     if (filterOption) {
+      var type = filterOption["type"];
+
+      if (typeof type == "string") {
+        type = type.toLowerCase();
+        option["type"] = type;
+      }
+
       var defaultLogic = filterOption["filterLogic"] || filterOption["defaultLogic"];
 
       if (defaultLogic != null) {
@@ -674,6 +680,10 @@ FilterInputPlugin.prototype._retrieveColumnOption = function (colIndex, colDef)
         }
       }
 
+      if (type == "multiselect" && option._comparingLogic === FilterInputPlugin._containingFilter) {
+        option._comparingLogic = FilterInputPlugin._multiSelectionFilter;
+      }
+
       var disabled = filterOption["disabled"];
 
       if (disabled != null) {
@@ -686,17 +696,6 @@ FilterInputPlugin.prototype._retrieveColumnOption = function (colIndex, colDef)
         option["placeholder"] = placeholder;
       }
 
-      var type = filterOption["type"];
-
-      if (typeof type == "string") {
-        type = type.toLowerCase();
-        option["type"] = type;
-
-        if (type == "multiselect") {
-          option._comparingLogic = FilterInputPlugin._multiSelectionFilter;
-        }
-      }
-
       var entries = filterOption["entries"];
 
       if (Array.isArray(entries)) {
@@ -981,10 +980,13 @@ FilterInputPlugin.prototype._onInputChanged = function (e) {
 FilterInputPlugin.prototype._onOpenedChanged = function (e) {
   if (e.detail.value) {
     //open
-    e.currentTarget.style.setProperty('pointer-events', 'none');
+    e.currentTarget.style.pointerEvents = "none";
   } else {
     //close
-    e.currentTarget.style.removeProperty('pointer-events');
+    var ect = e.currentTarget;
+    setTimeout(function () {
+      ect.style.pointerEvents = "";
+    });
   }
 };
 /** @private
@@ -1023,7 +1025,7 @@ FilterInputPlugin._rtCompareRow = function (filterOptions, rowData, rid) {
 };
 /** @private
 * @function
-* @param {Array<string>} ary
+* @param {Array<string|number>} ary
 * @return {Object}
 */
 
@@ -1035,7 +1037,14 @@ FilterInputPlugin._createMapObject = function (ary) {
     var count = ary.length;
 
     for (var i = 0; i < count; i++) {
-      var str = ary[i].toLowerCase();
+      var key = ary[i];
+
+      if (key == null || key === "") {
+        continue;
+      }
+
+      var str = FilterInputPlugin._transformToLowercaseString(key);
+
       textMap[str] = true;
     }
   }

package/lib/tr-grid-in-cell-editing/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/tr-grid-in-cell-editing/es6/InCellEditing.js

@@ -17,7 +17,7 @@ import { CoralItems } from "../../tr-grid-util/es6/CoralItems.js";
 * @property {Element=} popupElement=null Element to be attached under the editor
 * @property {boolean=} doubleClick=true If disabled, double click will not trigger editor
 * @property {boolean=} tabToMove=false If enabled, pressing tab key while editor is active will open editor on the next editable cell.
-* @property {boolean=} contentSource="textContent" By default, the text in the editor will be populated with textContent of the target cell. Use "field" to populated data from grid's data model. Use "empty" to shows empty editor.
+* @property {string=} contentSource="textContent" By default, the text in the editor will be populated with textContent of the target cell. Use "field" to populated data from grid's data model. Use "empty" to shows empty editor.
 * @property {boolean=} inlineStyling=false force inline styles regardless of elf version.
 * @property {boolean=} disablingScroll=false Scrollbar will be frozen when editor opened. Deprecated in favor of uiBlocking
 * @property {boolean=} uiBlocking=false append transparent overlay to block ui interaction
@@ -29,7 +29,8 @@ import { CoralItems } from "../../tr-grid-util/es6/CoralItems.js";
 * @property {Function=} beforeRowCommit=null Handler before committing from all editors in the row
 * @property {Function=} rowEditorClosed=null Handler after closing of all editors
 * @property {Element=} autoSuggest=null Element of ef-autosuggest or atlas-autosuggest for handled with input cell
-* @property {boolean=} closingOnScroll=true If disabled, scrolling will not automatically close editor. autoHiding, closingOnScroll
+* @property {boolean=} closingOnScroll=true If disabled, the editor will not be automatically closed when scrolling grid.
+* @property {boolean=} autoHiding=true If disabled, the editor will not be automatically closed when losing its focus.
 */
 
 /** @typedef {Object} InCellEditingPlugin~Cache
@@ -337,6 +338,10 @@ InCellEditingPlugin.prototype._rowClosing = false;
 * @private
 */
 InCellEditingPlugin.prototype._closingOnScroll = true;
+/** @type {boolean}
+* @private
+*/
+InCellEditingPlugin.prototype._autoHiding = true;
 /** @type {number}
 * @private
 */
@@ -627,6 +632,9 @@ InCellEditingPlugin.prototype.config = function (options) {
   if (pluginOption["closingOnScroll"] == false) {
     t._closingOnScroll = false;
   }
+  if (pluginOption["autoHiding"] == false) {
+    t._autoHiding = false;
+  }
 
   // event callback
   t.addListener(pluginOption, "preEditorOpening");
@@ -638,6 +646,25 @@ InCellEditingPlugin.prototype.config = function (options) {
   t.addListener(pluginOption, "rowEditorClosed");
 };
 
+/** @private
+* @param {Object} obj
+* @param {string} propName
+* @param {boolean} propValue
+* @param {boolean} defaultValue
+* @returns {number} dirty
+*/
+var _setBooleanOption = function _setBooleanOption(obj, propName, propValue, defaultValue) {
+  if (defaultValue) {
+    if (!propValue) {
+      obj[propName] = false;
+      return true;
+    }
+  } else if (propValue) {
+    obj[propName] = true;
+    return true;
+  }
+  return false;
+};
 /** Get a current state of grid and extension config
  * @public
  * @param {Object=} out_obj
@@ -680,20 +707,28 @@ InCellEditingPlugin.prototype.getConfigObject = function (out_obj) {
     }
   }
   var extOptions = obj.inCellEditing;
+  var dirty = 0;
   if (!extOptions) {
-    extOptions = obj.inCellEditing = {};
-  }
-  extOptions.balloonMode = this._balloonMode;
-  extOptions.editableTitle = this._editableTitle;
-  extOptions.editableContent = this._editableContent;
-  extOptions.tabToMove = this._tabToMove;
-  extOptions.autoCommitText = this._autoCommitText;
-  extOptions.dataBinding = this._dataBinding;
-  extOptions.contentSource = this._contentSource;
-  extOptions.doubleClick = this._dblClick;
-  extOptions.inlineStyling = this._inlineStyling;
-  extOptions.disablingScroll = this._disablingScroll;
-  extOptions.uiBlocking = this._uiBlocking;
+    extOptions = {};
+  }
+  dirty |= _setBooleanOption(extOptions, "balloonMode", this._balloonMode, false);
+  dirty |= _setBooleanOption(extOptions, "editableTitle", this._editableTitle, false);
+  dirty |= _setBooleanOption(extOptions, "tabToMove", this._tabToMove, false);
+  dirty |= _setBooleanOption(extOptions, "autoCommitText", this._autoCommitText, false);
+  dirty |= _setBooleanOption(extOptions, "dataBinding", this._dataBinding, true);
+  dirty |= _setBooleanOption(extOptions, "doubleClick", this._dblClick, true);
+  dirty |= _setBooleanOption(extOptions, "inlineStyling", this._inlineStyling, false);
+  dirty |= _setBooleanOption(extOptions, "disablingScroll", this._disablingScroll, false);
+  dirty |= _setBooleanOption(extOptions, "uiBlocking", this._uiBlocking, false);
+  dirty |= _setBooleanOption(extOptions, "closingOnScroll", this._closingOnScroll, true);
+  dirty |= _setBooleanOption(extOptions, "autoHiding", this._autoHiding, true);
+  if (this._contentSource !== "textContent") {
+    dirty = 1;
+    extOptions.contentSource = this._contentSource;
+  }
+  if (dirty) {
+    obj.inCellEditing = extOptions;
+  }
   return obj;
 };
 
@@ -1081,6 +1116,9 @@ InCellEditingPlugin.prototype._openEditor = function (e, host, arg) {
     arg["segmentSeparator"] = dataSource.isSegmentSeparator(rowId);
     arg["groupHeader"] = dataSource.getGroupByRowId(rowId);
     arg["rowData"] = this._getRow(dataSource, rowId);
+    if (dataSource["stall"]) {
+      dataSource["stall"](true);
+    }
   }
 
   // Initialize UIs
@@ -1142,7 +1180,7 @@ InCellEditingPlugin.prototype._openEditor = function (e, host, arg) {
   }
   balloonPopup.enableUIBlocking(t._uiBlocking);
   balloonPopup.addEventListener("hidden", t._onPopupHide);
-  balloonPopup.disableAutoHiding(false);
+  balloonPopup.disableAutoHiding(!t._autoHiding);
   balloonPopup.disableHideOnScroll(true);
   balloonPopup.attachTo(cell.getElement());
   balloonPopup.show(true, parentElement);
@@ -1675,8 +1713,17 @@ InCellEditingPlugin.prototype._commitText = function (committed, suggestionDetai
     t._activeInCellCache.balloonPopup.hide();
   }
   Dom.removeParent(t._customElement);
-  t._freezeScrolling(arg["grid"], false);
-  arg["grid"].focus();
+  var grid = arg["grid"];
+  if (grid) {
+    t._freezeScrolling(grid, false);
+    grid.focus();
+  }
+  var dataSource = arg["dataSource"];
+  if (dataSource) {
+    if (dataSource["stall"]) {
+      dataSource["stall"](false);
+    }
+  }
   t._activePos = t._activeCell = t._prevContent = t._lastActiveGrid = t._activeInCellCache = null;
 };
 

package/lib/tr-grid-row-filtering/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;