@refinitiv-ui/efx-grid 6.0.83 → 6.0.84

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

@@ -563,6 +563,10 @@ Core.prototype._batches = null;
 * @private
 */
 Core.prototype._firstRendered = false;
+/** @type {boolean}
+* @private
+*/
+Core.prototype._hasPendingRowChange = false;
 //#region Public Methods
 
 /**
@@ -570,7 +574,7 @@ Core.prototype._firstRendered = false;
 * @return {string}
 */
 Core.getVersion = function () {
-	return "5.1.86";
+	return "5.1.87";
 };
 /** {@link ElementWrapper#dispose}
 * @override
@@ -4772,8 +4776,8 @@ Core.prototype._setColumnWidth = function (colIndex, px, opt_scalable) {
 * @param {*=} ctx
 */
 Core.prototype._dispatchColumnAddedEvent = function (at, count, atTheMiddle, ctx) {
+	var e = {};
 	if (this._hasListener("columnAdded")) {
-		var e = {};
 		e["atTheMiddle"] = atTheMiddle;
 		if(count === 1) {
 			e["colIndex"] = at;
@@ -4789,7 +4793,11 @@ Core.prototype._dispatchColumnAddedEvent = function (at, count, atTheMiddle, ctx
 		}
 	}
 
-	this._dispatchColumnRenderEvent({},
+	if(this._frozenLayout){
+		e["noDataUpdate"] = true;
+	}
+
+	this._dispatchColumnRenderEvent(e,
 		at, at + count,
 		0, this._settings.length,
 		NaN, NaN);
@@ -5399,9 +5407,13 @@ Core.prototype._onRowCountChanged = function (e) {
 		}
 	}
 
+	var noBinding = e["noBinding"];
 	var paneChanged = (sectionIndex <= this._startVScrollbarIndex) || (sectionIndex >= this._getFooterStartIndex());
 	var forceUpdate = this._frozenFooterCount > 0 ? true : false; // Prevent from footer section flashing
-	var viewChanged = this._updateScrollbarHeight(paneChanged, forceUpdate, e["noBinding"]); // Virtualization is triggered
+	var viewChanged = this._updateScrollbarHeight(paneChanged, forceUpdate, noBinding); // Virtualization is triggered
+	if(noBinding){
+		this._hasPendingRowChange = true;
+	}
 	if(!this._frozenLayout && !viewChanged) { // Grid must activate newly created section if no event is dispatched from the row virtualizer
 		if(this._rowVirtualizer.isVirtualizable()) {
 			section.activateRows(this._rowVirtualizer.getFirstIndexInView(),
@@ -5410,6 +5422,7 @@ Core.prototype._onRowCountChanged = function (e) {
 			section.activateRows();
 		}
 	}
+	this._hasPendingRowChange = false;
 
 	if(!forceUpdate) {
 		this._updateVScrollbar(); // Asynchronous
@@ -5493,6 +5506,9 @@ Core.prototype._containsSection = function (s) {
 * @param {!Object} e
 */
 Core.prototype._onRowAvailable = function (e) {
+	if(this._hasPendingRowChange){
+		return;
+	}
 	var sectionIndex = /** @type{number} */(e["sectionIndex"]);
 	this._dispatchColumnRenderEvent(e,
 		0, this.getColumnCount(),

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

@@ -2478,7 +2478,6 @@ LayoutGrid.prototype.updateColumnSeparators = function () {
 		}
 	}
 };
-
 /** @private
 * @return {Element}
 */

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

@@ -35,7 +35,8 @@ const _toItemStates = function(val, idx) {
 		label: _toLabelText(val),
 		checked: (val && val.checked) ? true : false,
 		index: idx,
-		elem: null
+		elem: null,
+		value: val.value
 	};
 };
 /** @private
@@ -270,7 +271,8 @@ class CheckboxList extends BasicElement {
 			if(_getCheckedState(state)) {
 				items.push({
 					title: state.label,
-					index: i
+					index: i,
+					value: state.value
 				});
 			}
 		}

package/lib/filter-dialog/lib/filter-dialog.d.ts

@@ -27,6 +27,7 @@ declare namespace FilterDialog {
         sortState?: string|null,
         sortUI?: boolean|null,
         filterUI?: boolean|null,
+        blankValues?: (string|boolean)|null,
         filterChanged?: ((...params: any[]) => any)|null,
         confirm?: ((...params: any[]) => any)|null,
         cancel?: ((...params: any[]) => any)|null,

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

@@ -25,12 +25,20 @@ import "./checkbox-list.js";
  * @property {string=} sortState "a" for ascending or "d" for descending
  * @property {boolean=} sortUI Show Sort area
  * @property {boolean=} filterUI Show Filter area
+ * @property {(string|boolean)=} 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 {Function=} filterChanged Filter changed handler
  * @property {Function=} confirm Alias of filterChanged
  * @property {Function=} cancel Alias of dialog cancel
  * @property {Function=} sortChanged Sort changed handler
 */
 
+
+/** @type {string}
+* @private
+* @constant
+*/
+const BLANKS = "(Blanks)";
+
 /** @type {number}
 * @private
 * @constant
@@ -58,6 +66,14 @@ const DEFAULT_FILTERS = [
 * @private
 * @constant
 */
+const BLANK_FILTERS = [
+	["EQ_BLANK", "Equal To Blank Value"],
+	["NEQ_BLANK", "Does Not Equal To Blank Value"]
+];
+/** @type {Array.<Array>}
+* @private
+* @constant
+*/
 const DATE_FILTERS = [
 	["DT", "Date is"],
 	["DTB", "Date is Before"],
@@ -150,6 +166,8 @@ class FilterDialog extends BasicElement {
 		this.isShown = false;
 		this.sortState = "n";
 		this.fieldDataType = "";
+		this._blankValues = false;
+		this._blankValuesChecked = false;
 		this.useUTCTime = true;
 		this._popup = new Popup({
 			"shown": this._onPopupShown.bind(this),
@@ -193,6 +211,19 @@ class FilterDialog extends BasicElement {
 					this.hiddenFilterUI = options.filterUI === false;
 				}
 
+				if(options.blankValues != null ) {
+					this._blankValues = options.blankValues;
+				}
+
+				this._blankValuesChecked = false;
+				if(options.blankValuesChecked != null) {
+					this._blankValuesChecked = options.blankValuesChecked;
+				}
+
+				if(this._blankValues) {
+					this._addBlankItem();
+				}
+
 				if (options.target) {
 					this.target = options.target;
 					this._popup.attachTo(this.target);
@@ -594,6 +625,8 @@ class FilterDialog extends BasicElement {
 		if(oper) {
 			if(val || val === 0) {
 				return true;
+			} else { // Blank operations don't need value
+				return oper === BLANK_FILTERS[0][0] || oper === BLANK_FILTERS[1][0];
 			}
 		}
 		return false;
@@ -743,6 +776,9 @@ class FilterDialog extends BasicElement {
 			} else {
 				filterItems = DEFAULT_FILTERS;
 			}
+			if(this._blankValues) {
+				filterItems = filterItems.concat(BLANK_FILTERS);
+			}
 			var translated = this._translateFilters(filterItems);
 			this._generalComboBoxes[0].data = createComboBoxData(translated);
 			this._generalComboBoxes[2].data = createComboBoxData(translated);
@@ -827,7 +863,7 @@ class FilterDialog extends BasicElement {
 			conOp1 = con1[0];
 			if(con1.length && con1[0]) {
 				conVal1 = con1[1];
-				if(conVal1 || conVal1 === 0 || conVal1 === false) {
+				if(conVal1 || conVal1 === 0 || conVal1 === false || conOp1 === BLANK_FILTERS[0][0] || conOp1 === BLANK_FILTERS[1][0]) {
 					validCon1 = true;
 					connector = con1[2] || "";
 				} else {
@@ -844,7 +880,7 @@ class FilterDialog extends BasicElement {
 			conOp2 = con2[0];
 			if(con2.length && conOp2) {
 				conVal2 = con2[1];
-				if(conVal2 || conVal2 === 0 || conVal2 === false) {
+				if(conVal2 || conVal2 === 0 || conVal2 === false || conOp2 === BLANK_FILTERS[0][0] || conOp2 === BLANK_FILTERS[1][0]) {
 					validCon2 = true;
 				} else {
 					conVal2 = "";
@@ -929,9 +965,10 @@ class FilterDialog extends BasicElement {
 	}
 	/**
 	* @private
+	* @param {Array.<Object>|Object} data data for convert into array
+	* @return {Array.<Object>}
 	*/
-	_updateValueSelector() {
-		let data = this.data;
+	_dataToArray(data) {
 		let ary = null;
 		if (Array.isArray(data)) {
 			ary = data;
@@ -940,16 +977,48 @@ class FilterDialog extends BasicElement {
 		} else {
 			ary = [];
 		}
+		return ary;
+	}
 
-		// Data selector can take large number of items
+	/**
+	* @private
+	*/
+	_addBlankItem() {
+		var ary = this._dataToArray(this.data);
+		if(this._blankValues) {
+			let blankItem = {
+				id: "_blank",
+				title: this._blankValues,
+				nodes: [],
+				value: BLANKS, // The ".value" property is currently only usable with blank item abilities
+				checked: this._blankValuesChecked || false
+			};
+			this.data = [blankItem].concat(ary);
+		} else {
+			// Data selector can take large number of items
+			this.data = ary; // Preserve original referencing
+		}
+	}
+	/**
+	* @private
+	*/
+	_updateValueSelector() {
+		var ary = this._dataToArray(this.data);
 		this._dataSelector.data = ary; // Preserve original referencing
-
 		// Value selector for Filter by Condition
 		if(ary.length > ITEM_LIMIT) {
 			ary = ary.slice(0, ITEM_LIMIT); // Prevent combo box from over population
 		}
-		this._generalComboBoxes[1].data = ary.map(this._toComboBoxItem);
-		this._generalComboBoxes[3].data = ary.map(this._toComboBoxItem);
+		// Advance items
+		var advanceItems = ary.map(this._toComboBoxItem);
+		if(this._blankValues) {
+			var basicItems = advanceItems.slice(1);
+			this._generalComboBoxes[1].data = basicItems;
+			this._generalComboBoxes[3].data = basicItems;
+		} else {
+			this._generalComboBoxes[1].data = advanceItems;
+			this._generalComboBoxes[3].data = advanceItems;
+		}
 	}
 	/**
 	* @private

package/lib/filter-dialog/lib/locale/translation-de.js

@@ -29,6 +29,9 @@ var translationDe = {
 	"Equals": "Gleich",
 	"Does Not Equal": "Stimmt nicht überein",
 
+	"Equal To Blank Value": "Equal To Blank Value",
+	"Does Not Equal To Blank Value": "Does Not Equal To Blank Value",
+
 	"Date is": "Datum ist",
 	"Date is Before": "Datum ist vor",
 	"Date is After": "Datum ist nach"

package/lib/filter-dialog/lib/locale/translation-en.js

@@ -29,6 +29,9 @@ var translationEn = {
 	"Equals": "Equals",
 	"Does Not Equal": "Does Not Equal",
 
+	"Equal To Blank Value": "Equal To Blank Value",
+	"Does Not Equal To Blank Value": "Does Not Equal To Blank Value",
+
 	"Date is": "Date is",
 	"Date is Before": "Date is Before",
 	"Date is After": "Date is After"

package/lib/filter-dialog/lib/locale/translation-ja.js

@@ -29,6 +29,9 @@ var translationJa = {
 	"Equals": "指定の値に等しい",
 	"Does Not Equal": "指定の値に等しくない",
 
+	"Equal To Blank Value": "Equal To Blank Value",
+	"Does Not Equal To Blank Value": "Does Not Equal To Blank Value",
+
 	"Date is": "日付が指定の値に等しい",
 	"Date is Before": "日付が指定の値より前",
 	"Date is After": "日付が指定の値より後"

package/lib/filter-dialog/lib/locale/translation-zh-hant.js

@@ -29,6 +29,9 @@ var translationZhHant = {
 	"Equals": "等於",
 	"Does Not Equal": "不等於",
 
+	"Equal To Blank Value": "Equal To Blank Value",
+	"Does Not Equal To Blank Value": "Does Not Equal To Blank Value",
+
 	"Date is": "日期",
 	"Date is Before": "日期小於",
 	"Date is After": "日期大於"

package/lib/filter-dialog/lib/locale/translation-zh.js

@@ -29,6 +29,9 @@ var translationZh = {
 	"Equals": "等于",
 	"Does Not Equal": "不等于",
 
+	"Equal To Blank Value": "Equal To Blank Value",
+	"Does Not Equal To Blank Value": "Does Not Equal To Blank Value",
+
 	"Date is": "日期",
 	"Date is Before": "日期小于",
 	"Date is After": "日期大于"

package/lib/grid/index.js

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

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

@@ -3,7 +3,7 @@ import {GridPlugin} from "../../tr-grid-util/es6/GridPlugin.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";
+import { injectCss, prettifyCss, cloneObject } from "../../tr-grid-util/es6/Util.js";
 
 declare namespace RowFilteringPlugin {
 
@@ -32,7 +32,8 @@ declare namespace RowFilteringPlugin {
         formattedDataAccessor?: ((...params: any[]) => any)|null,
         sortLogic?: ((...params: any[]) => any)|null,
         itemList?: any[]|null,
-        additionalItems?: any[]|null
+        additionalItems?: any[]|null,
+        blankValues?: (boolean|string)|null
     };
 
     type Options = {