@refinitiv-ui/efx-grid 6.0.137 → 6.0.139

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

@@ -93,6 +93,7 @@ The expression can take various forms:<br>
 * @property {boolean=} compactMode=false force compact mode in dialog
 * @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.
+* @property {boolean=} showOnlyFilteredItems=false If enabled, rows that are filtered out by other columns will not appear in the list, regardless of the current filter settings.
 */
 
 /** @typedef {Object} RowFilteringPlugin~FilterEntry
@@ -1134,17 +1135,31 @@ RowFilteringPlugin.prototype.getFilters = function() {
 * @see {@link RowFilteringPlugin.getConfigObject}
 */
 RowFilteringPlugin.prototype.getAllColumnFilters = function() {
+	return this._getAllColumnFilters();
+};
+/**
+* @private
+* @param {Object=} excludedMap
+* @return {!Array.<Function>} All column filters
+*/
+RowFilteringPlugin.prototype._getAllColumnFilters = function(excludedMap) {
+	if(!excludedMap || typeof excludedMap !== "object") {
+		excludedMap = {};
+	}
 	let filters = [];
 	let len = this._columnFilters.length;
 	for(let i = 0; i < len; ++i) {
 		let cfo = this._columnFilters[i];
-		let jLen = cfo._filters.length;
-		for(let j = 0; j < jLen; ++j) {
-			filters.push(cfo._filters[j]);
+		if(!excludedMap[cfo._field]) {
+			let jLen = cfo._filters.length;
+			for(let j = 0; j < jLen; ++j) {
+				filters.push(cfo._filters[j]);
+			}
 		}
 	}
 	return filters;
 };
+
 /** Deprecated in favor of getConfigObject(). Get existing filter expressions for saving and restoring.
 * @public
 * @return {Array.<RowFilteringPlugin~FilterExpression>} Return null if there is no column filter
@@ -1613,6 +1628,24 @@ let _collectUniqueValue = function(uniqueValues, formattedVal, rawVal) {
 		uniqueValues[formattedVal] = [rawVal];
 	}
 };
+
+/** @private
+* @param {Object} row
+* @param {Array.<Function>} filterFuncs
+* @return {boolean}
+*/
+let isFilteredOutRow = function(row, filterFuncs) {
+	let len = filterFuncs.length;
+	if(len) {
+		for(let i = 0; i < len; i++) {
+			if(!filterFuncs[i](row)) {
+				return true;
+			}
+		}
+	}
+	return false;
+};
+
 /** @private
 * @param {string} field A field name for getting raw value from row data
 * @param {!Object} dialogConfig
@@ -1636,6 +1669,10 @@ RowFilteringPlugin.prototype._getUniqueValues = function(field, dialogConfig, fo
 	let blankAtLeastOne = false;
 	if(!Array.isArray(userItemList)) {
 		userItemList = null;
+		let excludedMap = {};
+		excludedMap[field] = true;
+		let funcs = this._getAllColumnFilters(excludedMap);
+		let showOnlyFilteredItems = dialogConfig.showOnlyFilteredItems;
 		let dvs = this._getAvailableDataViews();
 		let dts = dvs.map(this._getDataTable);
 		let tblCount = dts.length;
@@ -1650,6 +1687,9 @@ RowFilteringPlugin.prototype._getUniqueValues = function(field, dialogConfig, fo
 				if(this._rowTransform) {
 					row = this._rowTransform(row);
 				}
+				if(showOnlyFilteredItems && isFilteredOutRow(row, funcs)) {
+					continue;
+				}
 				let fieldVal = row[field];
 				rawVal = fieldVal;
 				if(rawDataAccessor) {
@@ -1879,7 +1919,8 @@ RowFilteringPlugin.prototype.openDialog = function(colIndex, runtimeDialogOption
 		formattedDataAccessor: null,
 		sortLogic: null,
 		blankValues: false,
-		blankValuesChecked: false
+		blankValuesChecked: false,
+		showOnlyFilteredItems: false
 	};
 
 	let columnDialogOptions = null;
@@ -1932,7 +1973,7 @@ RowFilteringPlugin.prototype.openDialog = function(colIndex, runtimeDialogOption
 				filterMode = "advanced";
 			}
 		} else if(typeof exp === "function" || typeof exp === "string" || typeof exp === "object") {
-			if(typeof exp === "object") {
+			if(typeof exp === "object" && !dialogConfig.showOnlyFilteredItems) {
 				for(let expKey in exp) {
 					_pushRawValue(userInputs, expKey, exp[expKey]);
 				}
@@ -2058,6 +2099,11 @@ RowFilteringPlugin._overrideConfig = function(config, userConfig) {
 		config.lang = lang;
 	}
 
+	let showOnlyFilteredItems = userConfig["showOnlyFilteredItems"];
+	if(showOnlyFilteredItems != null) {
+		config.showOnlyFilteredItems = showOnlyFilteredItems;
+	}
+
 	let rawDataAccessor = userConfig["rawDataAccessor"];
 	if(typeof rawDataAccessor === "function" || rawDataAccessor === null) { // Allow null value
 		config.rawDataAccessor = rawDataAccessor;

package/lib/types/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/types/es6/Zoom.d.ts

@@ -4,23 +4,23 @@ import Ext from "../../tr-grid-util/es6/Ext.js";
 declare namespace ZoomPlugin {
 
     type Options = {
-        zoomFactor?: number,
-        step?: number,
-        wheel?: boolean,
-        maxFactor?: number,
-        minFactor?: number,
-        zoomChanged?: ((...params: any[]) => any)
+        zoomFactor?: number|null,
+        step?: number|null,
+        wheel?: boolean|null,
+        maxFactor?: number|null,
+        minFactor?: number|null,
+        zoomChanged?: ((...params: any[]) => any)|null
     };
 
 }
 
 declare class ZoomPlugin extends GridPlugin {
 
-    constructor(options?: ZoomPlugin.Options);
+    constructor(options?: ZoomPlugin.Options|null);
 
     public hasMultiTableSupport(): boolean;
 
-    public config(options?: ZoomPlugin.Options): void;
+    public config(options?: ZoomPlugin.Options|null): void;
 
     public getConfigObject(gridOptions?: any): any;
 
@@ -30,21 +30,21 @@ declare class ZoomPlugin extends GridPlugin {
 
     public zoomOut(): number;
 
-    public zoomTo(factor?: number): number;
+    public zoomTo(factor?: number|null): number;
 
     public setStep(step: number): void;
 
-    public zoomDefault(zoomFactor?: number): number;
+    public zoomDefault(zoomFactor?: number|null): number;
 
-    public addElement(elem: Element): void;
+    public addElement(elem: Element|null): void;
 
-    public removeElement(elem: Element): Element;
+    public removeElement(elem: Element|null): Element|null;
 
     public updateZoomedLayout(): void;
 
-    public enableWheelToZoom(bool?: boolean): void;
+    public enableWheelToZoom(bool?: boolean|null): void;
 
-    public getDefaultMouseWheelLogic(): ((...params: any[]) => any);
+    public getDefaultMouseWheelLogic(): ((...params: any[]) => any)|null;
 
 }
 

package/lib/versions.json

@@ -2,9 +2,9 @@
 	"tr-grid-util": "1.3.168",
 	"tr-grid-printer": "1.0.18",
 	"@grid/column-dragging": "1.0.21",
-	"@grid/row-segmenting": "1.0.35",
+	"@grid/row-segmenting": "2.0.0",
 	"@grid/statistics-row": "1.0.17",
-	"@grid/zoom": "1.0.11",
+	"@grid/zoom": "1.0.13",
 	"tr-grid-auto-tooltip": "1.1.9",
 	"tr-grid-cell-selection": "1.0.39",
 	"tr-grid-checkbox": "1.0.70",
@@ -24,14 +24,14 @@
 	"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.87",
+	"tr-grid-row-filtering": "1.0.88",
 	"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/column-selection-dialog": "4.0.57",
+	"@grid/column-selection-dialog": "4.0.59",
 	"@grid/filter-dialog": "4.0.79",
 	"@grid/column-format-dialog": "4.0.45"
 }

package/lib/zoom/es6/Zoom.d.ts

@@ -4,23 +4,23 @@ import Ext from "../../tr-grid-util/es6/Ext.js";
 declare namespace ZoomPlugin {
 
     type Options = {
-        zoomFactor?: number,
-        step?: number,
-        wheel?: boolean,
-        maxFactor?: number,
-        minFactor?: number,
-        zoomChanged?: ((...params: any[]) => any)
+        zoomFactor?: number|null,
+        step?: number|null,
+        wheel?: boolean|null,
+        maxFactor?: number|null,
+        minFactor?: number|null,
+        zoomChanged?: ((...params: any[]) => any)|null
     };
 
 }
 
 declare class ZoomPlugin extends GridPlugin {
 
-    constructor(options?: ZoomPlugin.Options);
+    constructor(options?: ZoomPlugin.Options|null);
 
     public hasMultiTableSupport(): boolean;
 
-    public config(options?: ZoomPlugin.Options): void;
+    public config(options?: ZoomPlugin.Options|null): void;
 
     public getConfigObject(gridOptions?: any): any;
 
@@ -30,21 +30,21 @@ declare class ZoomPlugin extends GridPlugin {
 
     public zoomOut(): number;
 
-    public zoomTo(factor?: number): number;
+    public zoomTo(factor?: number|null): number;
 
     public setStep(step: number): void;
 
-    public zoomDefault(zoomFactor?: number): number;
+    public zoomDefault(zoomFactor?: number|null): number;
 
-    public addElement(elem: Element): void;
+    public addElement(elem: Element|null): void;
 
-    public removeElement(elem: Element): Element;
+    public removeElement(elem: Element|null): Element|null;
 
     public updateZoomedLayout(): void;
 
-    public enableWheelToZoom(bool?: boolean): void;
+    public enableWheelToZoom(bool?: boolean|null): void;
 
-    public getDefaultMouseWheelLogic(): ((...params: any[]) => any);
+    public getDefaultMouseWheelLogic(): ((...params: any[]) => any)|null;
 
 }
 

package/lib/zoom/es6/Zoom.js

@@ -24,8 +24,8 @@ import Ext from "../../tr-grid-util/es6/Ext.js";
 * @param {ZoomPlugin.Options=} options
 * @extends {GridPlugin}
 */
-var ZoomPlugin = function (options) {
-	var t = this;
+let ZoomPlugin = function (options) {
+	let t = this;
 
 	t._updateZoomedLayout = t._updateZoomedLayout.bind(t);
 	t._updateElementLayout = t._updateElementLayout.bind(t);
@@ -81,7 +81,7 @@ ZoomPlugin.prototype.getName = function () {
 
 /** @override */
 ZoomPlugin.prototype.initialize = function (host, options) {
-	var t = this;
+	let t = this;
 	if (t._hosts.indexOf(host) >= 0) {
 		return;
 	}
@@ -104,8 +104,8 @@ ZoomPlugin.prototype.initialize = function (host, options) {
 
 /** @override */
 ZoomPlugin.prototype.unload = function (host) {
-	var t = this;
-	var at = t._hosts.indexOf(host);
+	let t = this;
+	let at = t._hosts.indexOf(host);
 	if (at < 0) { return; }
 
 	if(t._hosts.length === 1) {
@@ -123,14 +123,14 @@ ZoomPlugin.prototype.unload = function (host) {
 ZoomPlugin.prototype.config = function (options) {
 	if (!options) { return; }
 
-	var extOptions = options["zoom"];
+	let extOptions = options["zoom"];
 
 	if (!extOptions) {
 		return;
 	}
-	var t = this;
+	let t = this;
 
-	var val = extOptions["wheel"];
+	let val = extOptions["wheel"];
 	if (val != null) {
 		t._wheel = !!val;
 	}
@@ -163,14 +163,16 @@ ZoomPlugin.prototype.config = function (options) {
 * @return {!Object}
 */
 ZoomPlugin.prototype.getConfigObject = function (gridOptions) {
-	var obj = gridOptions || {};
+	let obj = gridOptions || {};
 
-	var extOptions = obj.zoom;
+	let extOptions = obj.zoom;
 	if(!extOptions) {
 		extOptions = obj.zoom = {};
 	}
 
-	extOptions.wheel = this._wheel;
+	if(!this._wheel) {
+		extOptions.wheel = false;
+	}
 
 	if (this._step !== 0.25) {
 		extOptions.step = this._step;
@@ -201,7 +203,7 @@ ZoomPlugin.prototype.getZoomFactor = function () {
 * @return {number} zoomFactor
 */
 ZoomPlugin.prototype.zoomIn = function () {
-	var t = this;
+	let t = this;
 	t.zoomTo(t._zoomFactor + t._step);
 	return t._zoomFactor;
 };
@@ -210,7 +212,7 @@ ZoomPlugin.prototype.zoomIn = function () {
 * @return {number} zoomFactor
 */
 ZoomPlugin.prototype.zoomOut = function () {
-	var t = this;
+	let t = this;
 	t.zoomTo(t._zoomFactor - t._step);
 	return t._zoomFactor;
 };
@@ -220,7 +222,7 @@ ZoomPlugin.prototype.zoomOut = function () {
 * @return {number} factor
 */
 ZoomPlugin.prototype.zoomTo = function (factor) {
-	var t = this;
+	let t = this;
 
 	if (!factor) { // 0, NaN, undefined, empty string, and null
 		factor = 1;
@@ -239,11 +241,11 @@ ZoomPlugin.prototype.zoomTo = function (factor) {
 		return factor;
 	}
 
-	var prevZoomFactor = t._zoomFactor;
+	let prevZoomFactor = t._zoomFactor;
 	t._zoomFactor = factor;
 
 	// TODO: Refactor the logic, so that the zoom styles are applied directly to the parent element, eliminating margin-right styling
-	var i;
+	let i;
 	for (i = t._elems.length; --i >= 0;) {
 		t._applyZoom(t._elems[i]);
 	}
@@ -264,7 +266,7 @@ ZoomPlugin.prototype.zoomTo = function (factor) {
 * @param {number} step
 */
 ZoomPlugin.prototype.setStep = function (step) {
-	var s = step;
+	let s = step;
 	if (s != null) {
 		if (typeof s !== "number") {
 			s = parseFloat(s);
@@ -285,7 +287,7 @@ ZoomPlugin.prototype.zoomDefault = ZoomPlugin.prototype.zoomTo;
 * @param {Element} elem
 */
 ZoomPlugin.prototype.addElement = function (elem) {
-	var t = this;
+	let t = this;
 	if (elem && t._elems.indexOf(elem) < 0) {
 		t._applyZoom(elem);
 		t._elems.push(elem);
@@ -298,8 +300,8 @@ ZoomPlugin.prototype.addElement = function (elem) {
 * @returns {Element}
 */
 ZoomPlugin.prototype.removeElement = function (elem) {
-	var t = this;
-	var at = t._elems.indexOf(elem);
+	let t = this;
+	let at = t._elems.indexOf(elem);
 	if (at >= 0) {
 		t._elems.splice(at, 1);
 		t._clearZoomStyles(elem);
@@ -317,11 +319,11 @@ ZoomPlugin.prototype.updateZoomedLayout = function() {
 * @param {Element|tr.Grid} obj
 */
 ZoomPlugin.prototype._applyZoom = function (obj) {
-	if (!obj) { return; }
-
-	var t = this;
-
-	var elem = (obj instanceof Object) ? /** @type{Element} */(obj.getElement()) : /** @type{Element} */(obj);
+	let t = this;
+	let elem = (obj && obj.getElement) ? obj.getElement() : obj;
+	if(!elem) {
+		return;
+	}
 
 	// This type of css scale is most compatable options
 	// alternative css can be more promising but not the most copatable (like: zoom)
@@ -343,7 +345,7 @@ ZoomPlugin.prototype._applyZoom = function (obj) {
 * @param {Element} elem
 */
 ZoomPlugin.prototype._updateElementLayout = function (elem) {
-	var domStyle = /** @type{CSSStyleDeclaration} */(elem.style);
+	let domStyle = /** @type{CSSStyleDeclaration} */(elem.style);
 	if(this._zoomFactor !== 1) {
 		// After scaling there is empty space between elem and it's parent
 		// So it needs to correct the transformation shift of an inline-element
@@ -356,7 +358,7 @@ ZoomPlugin.prototype._updateElementLayout = function (elem) {
 /** @private
 */
 ZoomPlugin.prototype._updateZoomedLayout = function() {
-	var i, elem;
+	let i, elem;
 	for(i = this._elems.length; --i >= 0;) {
 		elem = this._elems[i];
 		this._updateElementLayout(elem);
@@ -371,7 +373,7 @@ ZoomPlugin.prototype._updateZoomedLayout = function() {
 * @param {Element} elem
 */
 ZoomPlugin.prototype._clearZoomStyles = function (elem) {
-	var domStyle = /** @type{CSSStyleDeclaration} */(elem.style);
+	let domStyle = /** @type{CSSStyleDeclaration} */(elem.style);
 	domStyle["transform"] = "";
 	domStyle["transformOrigin"] = "";
 	domStyle["marginRight"] = "";
@@ -382,11 +384,11 @@ ZoomPlugin.prototype._clearZoomStyles = function (elem) {
 * @param {boolean=} bool
 */
 ZoomPlugin.prototype.enableWheelToZoom = function (bool) {
-	var t = this;
+	let t = this;
 	bool = !!bool; // Force boolean
 	if (t._wheel !== bool) {
 		t._wheel = bool;
-		for (var i = t._hosts.length; --i >= 0;) {
+		for (let i = t._hosts.length; --i >= 0;) {
 			if (bool) {
 				t._hosts[i].listen("wheel", t._onWheel);
 			} else {
@@ -402,7 +404,7 @@ ZoomPlugin.prototype.enableWheelToZoom = function (bool) {
 ZoomPlugin.prototype._onWheel = function (e) {
 	if (!e.ctrlKey || e.shiftKey || e.altKey) { return; } // Only handle Ctrl+wheel
 
-	var delta = e["deltaY"]; // Provided by WheelEvent >> https://developer.mozilla.org/en-US/docs/Web/API/WheelEvent
+	let delta = e["deltaY"]; // Provided by WheelEvent >> https://developer.mozilla.org/en-US/docs/Web/API/WheelEvent
 	if (!delta) { return; }
 
 	e.preventDefault(); // Disable browser default zoom behaviour
@@ -420,6 +422,16 @@ ZoomPlugin.prototype.getDefaultMouseWheelLogic = function () {
 	return this._onWheel;
 };
 
+/** @public
+* @ignore
+* @return {!Object}
+*/
+ZoomPlugin.prototype._getEventHandlers = function() {
+	return {
+		"wheel": this._onWheel
+	};
+};
+
 
 
 export default ZoomPlugin;

package/package.json

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