@refinitiv-ui/efx-grid 6.0.150 → 6.0.152

package/lib/formatters/es6/EFRadioButtonFormatter.js

@@ -5,21 +5,76 @@ import FormatterBuilder from "./FormatterBuilder.js";
 * @property {number=} initialIndex
 */
 
+/** @private
+* @function
+* @param {number|string} rowRef
+* @param {boolean=} checked
+* @returns {boolean} Returns true if there is a change
+*/
+let _selectRadio = function (rowRef, checked) {
+	if(!this.grid) {
+		return false;
+	}
+	let dv = this.grid.getDataSource();
+	if(!dv) {
+		return false;
+	}
+
+	let rowIndex = -1;
+	let rid = "";
+	if(typeof rowRef == "string") {
+		rid = rowRef;
+		rowIndex = dv.getRowIndex(rid);
+	} else {
+		rowIndex = rowRef;
+		rid = dv.getRowId(rowIndex);
+	}
+	if(!(rowIndex >= 0) || !rid) {
+		return false;
+	}
+
+	let dirty = false;
+	if (checked !== false) {
+		if (this.previousId && this.previousId !== rid) {
+			this.rowIndex = dv.getRowIndex(this.previousId);
+			this.setData(this.field, false);
+		}
+		this.rowIndex = rowIndex;
+		this.previousId = rid;
+		this.setData(this.field, true);
+		this.value = checked;
+		dirty = true;
+	} else if(this.previousId == rid) {
+		this.rowIndex = rowIndex;
+		this.previousId = "";
+		this.setData(this.field, false);
+		this.value = false;
+		dirty = true;
+	}
+	return dirty;
+};
+
 /** @private
 * @function
 * @param {Element} element
 * @param {Object} ctx
 */
 let onElementCreated = function (element, ctx) {
-	let dv = ctx.grid.getDataSource();
-	let rid = dv.getRowId(ctx.rowIndex);
-	let index = dv.getRowIndex(rid);
-	let checked = index === ctx.initialIndex;
+	let checked = false;
+	let rid = "";
+	if(ctx.initialIndex >= 0) {
+		let dv = ctx.grid.getDataSource();
+		rid = dv.getRowId(ctx.rowIndex);
+		if(!ctx.initialRid) {
+			ctx.initialRid = dv.getRowId(ctx.initialIndex);
+		}
+		checked = (rid === ctx.initialRid);
+	}
 	if (checked) {
 		ctx.previousId = rid;
 		ctx.setData(ctx.field, checked);
+		ctx.value = checked;
 	}
-	ctx.value = checked;
 };
 
 /** @private
@@ -28,9 +83,10 @@ let onElementCreated = function (element, ctx) {
 * @param {Object} ctx
 */
 let onElementUpdated = function (element, ctx) {
-	let dv = ctx.grid.getDataSource();
-	let rid = dv.getRowId(ctx.rowIndex);
-	let checked = (rid === ctx.previousId) && ctx.value;
+	let checked = ctx.value ? true : false;
+	if(checked) {
+		checked = (ctx.grid.getDataSource().getRowId(ctx.rowIndex) === ctx.previousId);
+	}
 	element.checked = checked;
 };
 
@@ -40,22 +96,7 @@ let onElementUpdated = function (element, ctx) {
 * @param {*} ctx
 */
 let _changeHandler = function (e, ctx) {
-	ctx.value = e.detail.value;
-	ctx.setData(ctx.field, ctx.value);
-
-	let dv = ctx.grid.getDataSource();
-	let rid = dv.getRowId(ctx.rowIndex);
-	if (ctx.previousId && ctx.previousId !== rid) {
-		let row = dv.getRowData(ctx.previousId);
-		if (row) {
-			if (row["ROW_DEF"]) {
-				row["ROW_DEF"].setData(ctx.field, false);
-			} else {
-				dv.setData(ctx.previousId, ctx.field, false);
-			}
-		}
-	}
-	ctx.previousId = dv.getRowId(ctx.rowIndex);
+	ctx.selectRadio(ctx.rowIndex, true);
 };
 
 /** @constructor
@@ -76,6 +117,7 @@ EFRadioButtonFormatter.create = function (options) {
 		styles: {
 			margin: 0
 		},
+		selectRadio: _selectRadio,
 		onElementCreated: onElementCreated,
 		onElementUpdated: onElementUpdated,
 		changeHook: "checked-changed",

package/lib/grid/index.js

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

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

@@ -61,7 +61,8 @@ declare namespace RowFilteringPlugin {
         filterChanged?: ((...params: any[]) => any)|null,
         beforeDialogOpened?: ((...params: any[]) => any)|null,
         dialogCommitted?: ((...params: any[]) => any)|null,
-        refreshed?: ((...params: any[]) => any)|null
+        refreshed?: ((...params: any[]) => any)|null,
+        activeIconState?: boolean|null
     };
 
 }
@@ -120,6 +121,10 @@ declare class RowFilteringPlugin extends GridPlugin {
 
     public getColumnFilterIcons(colIndex: number): (Element)[]|null;
 
+    public setColumnFilterIconState(colIndex: number, active: boolean): void;
+
+    public getColumnFilterIconState(colIndex: number): boolean;
+
     public updateAllColumnIcons(): void;
 
     public addDataView(dv: any): void;

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

@@ -118,6 +118,7 @@ The expression can take various forms:<br>
 * @property {Function=} beforeDialogOpened=null Event handler dispatched before dialog opening.
 * @property {Function=} dialogCommitted=null Event handler dispatched whenever the new settings from dialog are applied.
 * @property {Function=} refreshed=null Event handler dispatched after new filter is applied to grid's data view.
+* @property {boolean=} activeIconState=true If disabled, filter icon won't be automatically changed its state when filter in a column is changed.
 */
 
 /** @private
@@ -336,12 +337,15 @@ RowFilteringPlugin._filterBuilder = null;
 * @private
 */
 RowFilteringPlugin._dialogTagName; // intentionally left undefined
-
 /** Array of DataView objects
 * @type {!Array.<Object>}
 * @private
 */
 RowFilteringPlugin.prototype._dvs;
+/** @type {boolean}
+* @private
+*/
+RowFilteringPlugin.prototype._activeIconState = true;
 
 
 /** @public
@@ -552,6 +556,9 @@ RowFilteringPlugin.prototype.config = function (options) {
 		if(rowFiltering["dialogOptions"]){
 			this._dialogOptions = rowFiltering["dialogOptions"];
 		}
+		if(rowFiltering["activeIconState"] != null){
+			this._activeIconState = !!rowFiltering["activeIconState"];
+		}
 		if(rowFiltering["clicked"]) {
 			rowFiltering["click"] = rowFiltering["clicked"];
 		}
@@ -635,6 +642,10 @@ RowFilteringPlugin.prototype.getConfigObject = function (gridOptions) {
 		extOptions.dialogOptions = this._dialogOptions; // TODO: dialogOptions should not contain any function
 		dirty = true;
 	}
+	if(!this._activeIconState) {
+		extOptions.activeIconState = false;
+		dirty = true;
+	}
 	// TODO: get emptySegmentFiltering setting from DataView
 	// TODO: get separatorFiltering setting from DataView
 	if(dirty) {
@@ -1211,26 +1222,74 @@ RowFilteringPlugin.prototype.setFilterExpressions = function(filterExps) {
 RowFilteringPlugin.prototype.hasColumnFilter = function() {
 	return (this._columnFilters.length > 0);
 };
-/** @public
+
+/** @private
 * @param {number} colIndex
-* @return {Array.<Element>} icons
+* @return {Array.<Element>} Bottom cells from title section of all grids
 */
-RowFilteringPlugin.prototype.getColumnFilterIcons = function(colIndex) {
-	let icons = [];
+RowFilteringPlugin.prototype._getBottomTitleCells = function(colIndex) {
+	var cells = [];
 	for(let i = this._hosts.length; --i >= 0;) {
 		let host = this._hosts[i];
 		let tsect = host.getSection("title");
-		if(!tsect) {
-			continue;
+		if(tsect) {
+			let rowCount = tsect.getRowCount();
+			let cell = tsect.getCell(colIndex, rowCount - 1, true); // Get bottom cell
+			if(cell) {
+				cells.push(cell);
+			}
 		}
-		let rCount = tsect.getRowCount();
-		let cell = tsect.getCell(colIndex, rCount - 1, true); // Get bottom cell
-		if(cell && cell._filterIcon) {
+	}
+	return cells;
+};
+/** @public
+* @param {number} colIndex
+* @return {Array.<Element>} icons
+*/
+RowFilteringPlugin.prototype.getColumnFilterIcons = function(colIndex) {
+	let icons = [];
+	let cells = this._getBottomTitleCells(colIndex);
+	let len = cells.length;
+	for(let i = 0; i < len; ++i) {
+		let cell = cells[i];
+		if(cell._filterIcon) {
 			icons.push(cell._filterIcon);
 		}
 	}
 	return icons;
 };
+/** Change specified filter icon state regardless of existing filter in the column. This method does NOT change the visibility of the icon.
+* @public
+* @param {number} colIndex
+* @param {boolean} active
+*/
+RowFilteringPlugin.prototype.setColumnFilterIconState = function(colIndex, active) {
+	let cells = this._getBottomTitleCells(colIndex);
+	let len = cells.length;
+	for(let i = 0; i < len; ++i) {
+		let cell = cells[i];
+		if(cell._filterIcon) {
+			cell.enableClass("active-filter", active);
+		}
+	}
+};
+/** @public
+* @param {number} colIndex
+* @returns {boolean} active
+*/
+RowFilteringPlugin.prototype.getColumnFilterIconState = function(colIndex) {
+	let cells = this._getBottomTitleCells(colIndex);
+	let len = cells.length;
+	for(let i = 0; i < len; ++i) {
+		let cell = cells[i];
+		if(cell._filterIcon) {
+			if(cell.hasClass("active-filter")) {
+				return true;
+			}
+		}
+	}
+	return false;
+};
 /** @public */
 RowFilteringPlugin.prototype.updateAllColumnIcons = function() {
 	if(this._uiTimerId) {
@@ -1451,16 +1510,20 @@ RowFilteringPlugin.prototype._updateColumnIcon = function(colIndex) {
 				cell.insertFloatingIcon(filterIcon, 10);
 				cell._filterIcon = filterIcon;
 			}
-			if(hasFilter){
-				cell.enableClass("active-filter", true);
-			}else{
-				cell.enableClass("active-filter", false);
+			if(this._activeIconState) {
+				if(hasFilter){
+					cell.enableClass("active-filter", true);
+				}else{
+					cell.enableClass("active-filter", false);
+				}
 			}
 		} else {
 			if(cell._filterIcon) {
 				cell.removeFloatingIcon(cell._filterIcon);
 				cell._filterIcon = null;
-				cell.enableClass("active-filter", false);
+				if(this._activeIconState) {
+					cell.enableClass("active-filter", false);
+				}
 			}
 		}
 	}

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

@@ -61,7 +61,8 @@ declare namespace RowFilteringPlugin {
         filterChanged?: ((...params: any[]) => any)|null,
         beforeDialogOpened?: ((...params: any[]) => any)|null,
         dialogCommitted?: ((...params: any[]) => any)|null,
-        refreshed?: ((...params: any[]) => any)|null
+        refreshed?: ((...params: any[]) => any)|null,
+        activeIconState?: boolean|null
     };
 
 }
@@ -120,6 +121,10 @@ declare class RowFilteringPlugin extends GridPlugin {
 
     public getColumnFilterIcons(colIndex: number): (Element)[]|null;
 
+    public setColumnFilterIconState(colIndex: number, active: boolean): void;
+
+    public getColumnFilterIconState(colIndex: number): boolean;
+
     public updateAllColumnIcons(): void;
 
     public addDataView(dv: any): void;

package/lib/versions.json

@@ -24,13 +24,13 @@
 	"tr-grid-percent-bar": "1.0.24",
 	"tr-grid-range-bar": "2.0.9",
 	"tr-grid-row-dragging": "1.0.39",
-	"tr-grid-row-filtering": "1.0.89",
+	"tr-grid-row-filtering": "1.0.90",
 	"tr-grid-row-grouping": "1.0.88",
 	"tr-grid-row-selection": "1.0.33",
 	"tr-grid-rowcoloring": "1.0.26",
 	"tr-grid-textformatting": "1.0.49",
 	"tr-grid-titlewrap": "1.0.22",
-	"@grid/formatters": "1.0.55",
+	"@grid/formatters": "1.0.56",
 	"@grid/column-selection-dialog": "4.0.59",
 	"@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.150"
+	"version": "6.0.152"
 }