@refinitiv-ui/efx-grid 6.0.138 → 6.0.139

package/lib/grid/index.js

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

package/lib/row-segmenting/es6/RowSegmenting.d.ts

@@ -49,8 +49,6 @@ declare class RowSegmentingPlugin extends GridPlugin {
 
     public getSegmentParentRowId(rowRef: string|number|null): string;
 
-    public _resolveDisplayColumn(): number;
-
     public setSegmentSeparators(rowIds: (string)[]|null, enabled?: boolean|null): boolean;
 
     public setSegmentSeparator(rowRef: string|number|null, enabled?: boolean|null): boolean;

package/lib/row-segmenting/es6/RowSegmenting.js

@@ -17,8 +17,8 @@ import { Conflator } from "../../tr-grid-util/es6/Conflator.js";
 * @property {Function=} segmentSeparatorBinding=null Logic that will be executed on each segment separator row
 * @property {Function=} nonSegmentSeparatorBinding=null Logic that will be executed for all non segment separator row
 * @property {Function=} sortingLogic=null Logic to be used by sortSegments method
-* @property {string=} rowSpanningField="ROW_SPANNING" selected field for apply row spanning in row separator
-* @property {string=} segmentIdField="SEGMENT_ID" selected field for set segment separator row
+* @property {string=} rowSpanningField="ROW_SPANNING" Field to be used for spanning segment header rows based on the field values
+* @property {string=} segmentIdField="" Field to be used for initializing segments based on text id
 * @property {(string|number)=} displayColumn=null Render tags in the given column. It can be either the column index, column ID, or field.
 */
 
@@ -33,15 +33,15 @@ import { Conflator } from "../../tr-grid-util/es6/Conflator.js";
 * @param {RowSegmentingPlugin~Options=} options
 * @extends {GridPlugin}
 */
-var RowSegmentingPlugin = function (options) {
-	var t = this;
+let RowSegmentingPlugin = function (options) {
+	let t = this;
 	t._onPreSectionDataBinding = t._onPreSectionDataBinding.bind(t);
 	t._updateHeader = t._updateHeader.bind(t);
 	t._onArrowClick = t._onArrowClick.bind(t);
 	t._onColumnIndexChanged = t._onColumnIndexChanged.bind(t);
 	t._rtSortingLogic = t._rtSortingLogic.bind(t);
-	t._refreshSegmentSeparator = t._refreshSegmentSeparator.bind(t);
-	t._separatorRefreshConflator = new Conflator(10, t._refreshSegmentSeparator);
+	t.requestSeparatorRefresh = t.requestSeparatorRefresh.bind(t);
+	t._separatorRefreshConflator = new Conflator(10, t.requestSeparatorRefresh);
 	t._columnIndexChangedConflator = new Conflator(10, t._onColumnIndexChanged);
 
 	t._hosts = [];
@@ -92,7 +92,7 @@ RowSegmentingPlugin.prototype._rowSpanningField = "ROW_SPANNING";
 /** @type {string}
 * @private
 */
-RowSegmentingPlugin.prototype._segmentIdField = "SEGMENT_ID";
+RowSegmentingPlugin.prototype._segmentIdField = "";
 /** @type {number}
 * @private
 */
@@ -155,7 +155,7 @@ RowSegmentingPlugin.prototype.initialize = function (host, options) {
 
 	this.config(options);
 
-	var enabled = this._colorTag != null ? this._colorTag : ElfUtil.isHaloTheme();
+	let enabled = this._colorTag != null ? this._colorTag : ElfUtil.isHaloTheme();
 	RowPainter.disableColorTag(host, enabled === false);
 
 	if (this._predefinedColors != null) {
@@ -170,35 +170,32 @@ RowSegmentingPlugin.prototype.initialize = function (host, options) {
 	RowPainter.enableHeaderMenu(host, enabled ? true : false);
 };
 
-/** request to set the segment separator with the segment ID field in row data
+/** Request for updating the segment separators based on values from segment Id field in row data
  * @public
 */
 RowSegmentingPlugin.prototype.requestSeparatorRefresh = function () {
+	if(!this._segmentIdField) {
+		return;
+	}
 	if(this._separatorRefreshConflator.conflate()) {
 		return;
 	}
-	this._refreshSegmentSeparator();
-};
 
-/** remove all segment separators then set the segment separator with the segment ID field in row data
-* @private
-*/
-RowSegmentingPlugin.prototype._refreshSegmentSeparator = function () {
-	var dv = this._getDataView();
+	let dv = this._getDataView();
 	if (!dv) { return; }
 
-	var collapsingMap = {};
+	let collapsingMap = {};
 	if (this._collapsingMap) {
 		collapsingMap = this._collapsingMap;
 		this._collapsingMap = null;
 	}
 
-	var rowId, rowData, segmentId;
-	var dt = dv.getDataSource();
-	var segmentRowIds = this.getSegmentIds() || [];
-	var segmentCount = segmentRowIds.length;
+	let rowId, rowData, segmentId;
+	let dt = dv.getDataSource();
+	let segmentRowIds = this.getSegmentIds() || [];
+	let segmentCount = segmentRowIds.length;
 	if (segmentCount){
-		for(var s = 0; s < segmentCount; s++) {
+		for(let s = 0; s < segmentCount; s++) {
 			rowId = segmentRowIds[s];
 			rowData = this._rowGetter(dt.getRowData(rowId));
 			segmentId = rowData[this._segmentIdField];
@@ -217,13 +214,13 @@ RowSegmentingPlugin.prototype._refreshSegmentSeparator = function () {
 		// because their children has no segment-id.
 	}
 
-	var rowIds = dt.getAllRowIds();
-	var rowCount = rowIds.length;
-	var separatorMap = {};
-	var segmentArr = [];
-	var separatorArr = [];
-	var collapseArr = [];
-	for(var i = 0; i < rowCount; i++) {
+	let rowIds = dt.getAllRowIds();
+	let rowCount = rowIds.length;
+	let separatorMap = {};
+	let segmentArr = [];
+	let separatorArr = [];
+	let collapseArr = [];
+	for(let i = 0; i < rowCount; i++) {
 		rowId = rowIds[i];
 		rowData = this._rowGetter(dt.getRowData(rowId));
 		segmentId = rowData[this._segmentIdField];
@@ -254,7 +251,7 @@ RowSegmentingPlugin.prototype._refreshSegmentSeparator = function () {
 * @param {Object=} host core grid instance
 */
 RowSegmentingPlugin.prototype.unload = function (host) {
-	var at = this._hosts.indexOf(host);
+	let at = this._hosts.indexOf(host);
 	if (at < 0) {
 		return;
 	}
@@ -276,7 +273,7 @@ RowSegmentingPlugin.prototype.unload = function (host) {
 RowSegmentingPlugin.prototype.config = function (options) {
 	if (!options) { return; }
 
-	var option = options.rowSegmenting;
+	let option = options.rowSegmenting;
 	if (!option) { return; }
 
 	if (typeof option.sortingLogic === "function") {
@@ -321,20 +318,18 @@ RowSegmentingPlugin.prototype.config = function (options) {
 	this.addListener(option, "nonSegmentSeparatorBinding");
 
 	// Collect collapsing states from configuration
-	var collapsingMap = {};
-	var dirty = false;
-	var rows = options.rows;
-	if (rows && rows.length) {
-		var len = rows.length;
-		for (var i = 0; i < len; i++) {
-			var row = rows[i];
-			if (row && typeof row === "object") {
-				var segmentId = row.values ? row.values[this._segmentIdField] : null;
-				if (segmentId && collapsingMap[segmentId] == null) {
-					if (row["collapsed"] != null) {
-						dirty = true;
-						collapsingMap[segmentId] = row["collapsed"] ? true : false;
-					}
+	let collapsingMap = {};
+	let dirty = false;
+	let rows = this._segmentIdField ? options.rows : null; // If there is no segment Id, collapsing states cannot be mapped to the inexistence segments
+	let len = rows ? rows.length : 0;
+	for (let i = 0; i < len; i++) {
+		let row = rows[i];
+		if (row && typeof row === "object") {
+			let segmentId = row.values ? row.values[this._segmentIdField] : null;
+			if (segmentId && collapsingMap[segmentId] == null) {
+				if (row["collapsed"] != null) {
+					dirty = true;
+					collapsingMap[segmentId] = row["collapsed"] ? true : false;
 				}
 			}
 		}
@@ -352,9 +347,9 @@ RowSegmentingPlugin.prototype.config = function (options) {
 * @return {!Object}
 */
 RowSegmentingPlugin.prototype.getConfigObject = function (gridOptions) {
-	var obj = gridOptions || {};
+	let obj = gridOptions || {};
 
-	var extOptions = obj.rowSegmenting;
+	let extOptions = obj.rowSegmenting;
 	if(!extOptions) {
 		extOptions = obj.rowSegmenting = {};
 	}
@@ -373,7 +368,7 @@ RowSegmentingPlugin.prototype.getConfigObject = function (gridOptions) {
 	if(this._rowSpanningField != "ROW_SPANNING") {
 		extOptions.rowSpanningField = this._rowSpanningField;
 	}
-	if(this._segmentIdField != "SEGMENT_ID") {
+	if(this._segmentIdField) {
 		extOptions.segmentIdField = this._segmentIdField;
 	}
 
@@ -407,8 +402,7 @@ RowSegmentingPlugin.prototype.getConfigObject = function (gridOptions) {
 * @return {!Object} return row config object with update special field data
 */
 RowSegmentingPlugin.prototype.getRowConfigObject = function (rowData, rowId) {
-
-	var obj = rowData || {};
+	let obj = rowData || {};
 
 	if(!this._segmentIdField) {
 		return obj;
@@ -430,7 +424,7 @@ RowSegmentingPlugin.prototype.getRowConfigObject = function (rowData, rowId) {
 		}
 		obj.values[this._segmentIdField] = ++this._runningId;
 	} else {
-		var parentId = this.getSegmentParentRowId(rowId);
+		let parentId = this.getSegmentParentRowId(rowId);
 		if(parentId) {
 			if(!obj.values) {
 				obj.values = {};
@@ -446,10 +440,10 @@ RowSegmentingPlugin.prototype.getRowConfigObject = function (rowData, rowId) {
 * @param {Object} predefinedColors Predefined color object map
 */
 RowSegmentingPlugin.prototype._injectStyles = function(predefinedColors) {
-	var prefix = ".tr-grid." + RowSegmentingPlugin._controlClass + " .tr-lg .cell";
-	var css = [];
-	var value;
-	for (var className in predefinedColors) {
+	let prefix = ".tr-grid." + RowSegmentingPlugin._controlClass + " .tr-lg .cell";
+	let css = [];
+	let value;
+	for (let className in predefinedColors) {
 		css.push(prefix + "." + className + "::before");
 		value = predefinedColors[className]["backgroundColor"];
 		if (value) {
@@ -457,7 +451,7 @@ RowSegmentingPlugin.prototype._injectStyles = function(predefinedColors) {
 		}
 	}
 
-	var host = this._hosts[0];
+	let host = this._hosts[0];
 
 	if (this._styleTag) {
 		if (this._styleTag.parentNode) {
@@ -516,12 +510,12 @@ RowSegmentingPlugin.prototype._clearSectionHeaderStyle = function () {
 
 /** @public */
 RowSegmentingPlugin.prototype.updateHeaders = function () {
-	var host = this._hosts[0];
+	let host = this._hosts[0];
 	if (!host) {
 		return;
 	}
-	var settingList = host.getAllSectionSettings("content");
-	for (var i = settingList.length; --i >= 0;) {
+	let settingList = host.getAllSectionSettings("content");
+	for (let i = settingList.length; --i >= 0;) {
 		this._updateHeader(settingList[i]);
 	}
 };
@@ -532,7 +526,7 @@ RowSegmentingPlugin.prototype.updateHeaders = function () {
 */
 RowSegmentingPlugin.prototype._hasSegmentation = function (settings) {
 	if (settings && settings.getType() === "content") {
-		var dv = settings.getDataSource();
+		let dv = settings.getDataSource();
 		if (dv) {
 			if(dv.hasSegmentation()) {
 				dv._previouslyHasSegmentation = true; // Allow one more cycle to clean up styling
@@ -551,9 +545,9 @@ RowSegmentingPlugin.prototype._hasSegmentation = function (settings) {
 * @return {string} parent row id of this segmentation. If the parent row id for this segmentation cannot be found, return ""
 */
 RowSegmentingPlugin.prototype.getSegmentParentRowId = function (rowRef) {
-	var dv = this._getDataView();
+	let dv = this._getDataView();
 	if(dv) {
-		var rowId = "";
+		let rowId = "";
 		if(typeof rowRef === "number") {
 			rowId = dv.getRowId(rowRef); // WARNING: This is very slow
 		} else {
@@ -564,7 +558,7 @@ RowSegmentingPlugin.prototype.getSegmentParentRowId = function (rowRef) {
 	return "";
 };
 
-/** @public
+/** @private
 * @description Resolve display column from column id to column index
 * @return {number} return column index of display column
 */
@@ -600,32 +594,32 @@ RowSegmentingPlugin.prototype._updateHeader = function (settings, firstRowIndex,
 		return;
 	}
 
-	var headerColumn = this._resolveDisplayColumn();
+	let headerColumn = this._resolveDisplayColumn();
 	if(headerColumn < 0) {
 		return;
 	}
-	var dv = settings.getDataSource();
-	var dt = dv.getDataSource();
-	var section = settings.getSection();
-	var fi = (firstRowIndex != null) ? firstRowIndex : section.getFirstIndexInView();
-	var li = (lastRowIndex != null) ? lastRowIndex : section.getLastIndexInView();
+	let dv = settings.getDataSource();
+	let dt = dv.getDataSource();
+	let section = settings.getSection();
+	let fi = (firstRowIndex != null) ? firstRowIndex : section.getFirstIndexInView();
+	let li = (lastRowIndex != null) ? lastRowIndex : section.getLastIndexInView();
 
-	var arg = {};
+	let arg = {};
 	arg.section = section;
 	arg.colIndex = headerColumn;
 
-	var colCount = section.getColumnCount();
-	for (var c = 0; c < colCount; c++) {
+	let colCount = section.getColumnCount();
+	for (let c = 0; c < colCount; c++) {
 		if(this._getColumnOption(c, "isCheckboxColumn")) {
 			arg.checkboxColumnIndex = c;
 			break;
 		}
 	}
-	var cssField = this._cssField;
-	var rowPainter = this._rowPainter;
-	var parentRows = {};
-	for (var r = fi; r <= li; r++) {
-		var cell = section.getCell(headerColumn, r, false); // Work only one row
+	let cssField = this._cssField;
+	let rowPainter = this._rowPainter;
+	let parentRows = {};
+	for (let r = fi; r <= li; r++) {
+		let cell = section.getCell(headerColumn, r, false); // Work only one row
 		if (!cell) { // There may be no header to be updated
 			continue;
 		}
@@ -635,22 +629,22 @@ RowSegmentingPlugin.prototype._updateHeader = function (settings, firstRowIndex,
 		arg.rowData = this._getRow(dv, r); // Support composite and rt-grid
 		arg.spanning = null;
 		arg.content = null;
-		var rowId = arg.rowId = dv.getRowId(r); // Slow
+		let rowId = arg.rowId = dv.getRowId(r); // Slow
 		// TODO: Getting segment once for better performance
-		var segmentSeparator = arg.segmentSeparator = dv.isSegmentSeparator(rowId);
+		let segmentSeparator = arg.segmentSeparator = dv.isSegmentSeparator(rowId);
 		arg.collapsedSegment = arg.collapsed = segmentSeparator ? dv.isSegmentCollapsed(rowId) : false;
 
 		if (segmentSeparator) {
 			arg.groupLevel = dv.getSegmentLevel ? dv.getSegmentLevel(rowId) : 1;
 			arg.indentSize = this._getIndentSize(arg.groupLevel - 1, true); // Group level starts from 1
 			if(dv.getSegment) {
-				var segment = dv.getSegment(rowId);
+				let segment = dv.getSegment(rowId);
 				if(segment && arg.groupLevel > 1) { // Sub segment always has name
 					arg.content = segment.getSubSegmentName();
 				}
 			}
 
-			var spanning = arg.rowData[this._rowSpanningField];
+			let spanning = arg.rowData[this._rowSpanningField];
 			if(spanning != null) {
 				arg.spanning = !!spanning;
 			}
@@ -662,12 +656,12 @@ RowSegmentingPlugin.prototype._updateHeader = function (settings, firstRowIndex,
 			this._dispatch("segmentSeparatorBinding", arg);
 		} else {
 			arg.groupLevel = 0;
-			var indentLevel = 0;
-			var parentId = this.getSegmentParentRowId(rowId);
+			let indentLevel = 0;
+			let parentId = this.getSegmentParentRowId(rowId);
 			if(parentId) {
 				indentLevel = 1; // TODO: Provide a way for segmenting multiple levels. Currently, just one level is supported.
 				arg.nonGroupRow = false;
-				var parentRowData = parentRows[parentId];
+				let parentRowData = parentRows[parentId];
 				if (!parentRowData) {
 					parentRowData = parentRows[parentId] = this._rowGetter(dt.getRowData(parentId)); // We need to use Datable because parent row may be hidden
 				}
@@ -690,11 +684,11 @@ RowSegmentingPlugin.prototype._updateHeader = function (settings, firstRowIndex,
 * @return {number}
 */
 RowSegmentingPlugin.prototype._getIndentSize = function (indentLevel, groupRow) {
-	var indentSize = 0;
+	let indentSize = 0;
 	if(this._indentSizes) {
 		indentSize = this._indentSizes[0];
 		if(indentLevel > 0) {
-			var indentLimit = this._indentSizes.length;
+			let indentLimit = this._indentSizes.length;
 			indentSize = indentLevel < indentLimit ? this._indentSizes[indentLevel] : this._indentSizes[indentLimit - 1];
 		}
 	} else if(indentLevel > 0) {
@@ -709,15 +703,15 @@ RowSegmentingPlugin.prototype._getIndentSize = function (indentLevel, groupRow)
 * @param {MouseEvent} e
 */
 RowSegmentingPlugin.prototype._onArrowClick = function (e) {
-	var host = this._hosts[0];
-	var info = host.getRelativePosition(e);
-	var cellElem = info.cell ? info.cell.getElement() : null;
+	let host = this._hosts[0];
+	let info = host.getRelativePosition(e);
+	let cellElem = info.cell ? info.cell.getElement() : null;
 	if(!cellElem) {
 		return;
 	}
 
-	var rowIndex = info.rowIndex;
-	var collapsedSegment = this.isSegmentCollapsed(rowIndex); // current state
+	let rowIndex = info.rowIndex;
+	let collapsedSegment = this.isSegmentCollapsed(rowIndex); // current state
 	collapsedSegment = !collapsedSegment; // Toggle state
 
 	if (collapsedSegment) {
@@ -735,7 +729,7 @@ RowSegmentingPlugin.prototype._onArrowClick = function (e) {
 * @return {Object} DataView instance
 */
 RowSegmentingPlugin.prototype._getDataView = function () {
-	var host = this._hosts[0];
+	let host = this._hosts[0];
 	return host ? host.getDataSource() : null;
 };
 
@@ -746,7 +740,7 @@ RowSegmentingPlugin.prototype._getDataView = function () {
 * @return {boolean} Return true if there is any change
 */
 RowSegmentingPlugin.prototype.setSegmentSeparators = function(rowIds, enabled) {
-	var dv = this._getDataView();
+	let dv = this._getDataView();
 	if(dv) {
 		return dv.setSegmentSeparators(rowIds, enabled);
 	}
@@ -760,7 +754,7 @@ RowSegmentingPlugin.prototype.setSegmentSeparators = function(rowIds, enabled) {
 * @return {boolean} Return true if there is any change
 */
 RowSegmentingPlugin.prototype.setSegmentSeparator = function(rowRef, enabled) {
-	var dv = this._getDataView();
+	let dv = this._getDataView();
 	if(dv) {
 		return dv.setSegmentSeparator(rowRef, enabled);
 	}
@@ -773,7 +767,7 @@ RowSegmentingPlugin.prototype.setSegmentSeparator = function(rowRef, enabled) {
 * @return {boolean}
 */
 RowSegmentingPlugin.prototype.setSegmentClassification = function(rowRef, fields) {
-	var dv = this._getDataView();
+	let dv = this._getDataView();
 	if(dv) {
 		return dv.setSegmentClassification(rowRef, fields);
 	}
@@ -784,7 +778,7 @@ RowSegmentingPlugin.prototype.setSegmentClassification = function(rowRef, fields
 * @return {boolean} Return true if there is any change
 */
 RowSegmentingPlugin.prototype.unsetAllSegmentSeparators = function() {
-	var dv = this._getDataView();
+	let dv = this._getDataView();
 	if(dv) {
 		return dv.unsetAllSegmentSeparators();
 	}
@@ -795,7 +789,7 @@ RowSegmentingPlugin.prototype.unsetAllSegmentSeparators = function() {
 * @return {boolean}
 */
 RowSegmentingPlugin.prototype.hasSegmentation = function() {
-	var dv = this._getDataView();
+	let dv = this._getDataView();
 	if(dv) {
 		return dv.hasSegmentation();
 	}
@@ -807,9 +801,9 @@ RowSegmentingPlugin.prototype.hasSegmentation = function() {
 * @return {boolean}
 */
 RowSegmentingPlugin.prototype.isSegmentSeparator = function(rowRef) {
-	var dv = this._getDataView();
+	let dv = this._getDataView();
 	if(dv) {
-		var rowId = "";
+		let rowId = "";
 		if(typeof rowRef === "number") {
 			rowId = dv.getRowId(rowRef); // WARNING: This is very slow
 		} else {
@@ -829,7 +823,7 @@ RowSegmentingPlugin.prototype.isSegmentSeparator = function(rowRef) {
 * @return {boolean} Return true if there is any change
 */
 RowSegmentingPlugin.prototype.collapseSegments = function(rowIds, collapsed) {
-	var dv = this._getDataView();
+	let dv = this._getDataView();
 	if(dv) {
 		return dv.collapseSegments(rowIds, collapsed);
 	}
@@ -843,7 +837,7 @@ RowSegmentingPlugin.prototype.collapseSegments = function(rowIds, collapsed) {
 * @return {boolean} Return true if there is any change
 */
 RowSegmentingPlugin.prototype.collapseSegment = function(rowRef, collapsed) {
-	var dv = this._getDataView();
+	let dv = this._getDataView();
 	if(dv) {
 		return dv.collapseSegment(rowRef, collapsed);
 	}
@@ -855,7 +849,7 @@ RowSegmentingPlugin.prototype.collapseSegment = function(rowRef, collapsed) {
 * @return {boolean} Return true if there is any change
 */
 RowSegmentingPlugin.prototype.expandSegment = function(rowRef, expanded) {
-	var dv = this._getDataView();
+	let dv = this._getDataView();
 	if(dv) {
 		return dv.expandSegment(rowRef, expanded);
 	}
@@ -865,7 +859,7 @@ RowSegmentingPlugin.prototype.expandSegment = function(rowRef, expanded) {
 * @return {boolean} Return true if there is any change
 */
 RowSegmentingPlugin.prototype.expandAllSegments = function() {
-	var dv = this._getDataView();
+	let dv = this._getDataView();
 	if(dv) {
 		return dv.expandAllSegments();
 	}
@@ -876,7 +870,7 @@ RowSegmentingPlugin.prototype.expandAllSegments = function() {
 * @return {boolean} Return true if only the given row is a collapsed segment separator
 */
 RowSegmentingPlugin.prototype.isSegmentCollapsed = function(rowRef) {
-	var dv = this._getDataView();
+	let dv = this._getDataView();
 	if(dv) {
 		return dv.isSegmentCollapsed(rowRef);
 	}
@@ -886,7 +880,7 @@ RowSegmentingPlugin.prototype.isSegmentCollapsed = function(rowRef) {
 * @param {Function} func By default, all row members are hidden in a collapsed segment
 */
 RowSegmentingPlugin.prototype.setSegmentCollapsingLogic = function(func) {
-	var dv = this._getDataView();
+	let dv = this._getDataView();
 	if(dv) {
 		dv.setSegmentCollapsingLogic(func);
 	}
@@ -897,7 +891,7 @@ RowSegmentingPlugin.prototype.setSegmentCollapsingLogic = function(func) {
 * @param {string|number} segmentRef Row id or row index
 */
 RowSegmentingPlugin.prototype.fillSegment = function(segmentRef) {
-	var dv = this._getDataView();
+	let dv = this._getDataView();
 	if(dv) {
 		dv.fillSegment(segmentRef);
 	}
@@ -906,7 +900,7 @@ RowSegmentingPlugin.prototype.fillSegment = function(segmentRef) {
 * @public
 */
 RowSegmentingPlugin.prototype.fillSegments = function() {
-	var dv = this._getDataView();
+	let dv = this._getDataView();
 	if(dv) {
 		dv.fillSegments();
 	}
@@ -916,11 +910,11 @@ RowSegmentingPlugin.prototype.fillSegments = function() {
 * @param {string|number} rowRef Row id, row index
 */
 RowSegmentingPlugin.prototype.addSegmentChild = function(segmentRef, rowRef) {
-	var dv = this._getDataView();
+	let dv = this._getDataView();
 	if(dv) {
-		var dataId;
+		let dataId;
 		if(this._realTimeGrid) {
-			var rowDef = this._realTimeGrid.getRowDefinition(rowRef);
+			let rowDef = this._realTimeGrid.getRowDefinition(rowRef);
 			if(rowDef) {
 				dataId = rowDef.getDataId();
 			}
@@ -944,15 +938,15 @@ RowSegmentingPlugin.prototype.setSegmentChildren = function(segmentArr) {
 * @param {Array.<string|number>} rowRefs Array of row ids or row indices.  If null is given, no child will be removed.
 */
 RowSegmentingPlugin.prototype.addSegmentChildren = function(segmentRef, rowRefs) {
-	var dv = this._getDataView();
+	let dv = this._getDataView();
 	if(dv) {
-		var dataIds;
+		let dataIds;
 		if(this._realTimeGrid) {
 			rowRefs = Array.isArray(rowRefs) ? rowRefs : [rowRefs];
-			var len = rowRefs.length;
+			let len = rowRefs.length;
 			dataIds = new Array(len);
-			for(var i = 0; i < len; i++) {
-				var rowDef = this._realTimeGrid.getRowDefinition(rowRefs[i]);
+			for(let i = 0; i < len; i++) {
+				let rowDef = this._realTimeGrid.getRowDefinition(rowRefs[i]);
 				if(rowDef) {
 					dataIds[i] = rowDef.getDataId();
 				}
@@ -966,7 +960,7 @@ RowSegmentingPlugin.prototype.addSegmentChildren = function(segmentRef, rowRefs)
 * @param {string|number} rowRef Row id, row index
 */
 RowSegmentingPlugin.prototype.removeSegmentChild = function(segmentRef, rowRef) {
-	var dv = this._getDataView();
+	let dv = this._getDataView();
 	if(dv) {
 		dv.removeSegmentChild(segmentRef, rowRef);
 	}
@@ -976,7 +970,7 @@ RowSegmentingPlugin.prototype.removeSegmentChild = function(segmentRef, rowRef)
 * @param {Array.<string|number>} rowRefs Array of row ids or row indices
 */
 RowSegmentingPlugin.prototype.removeSegmentChildren = function(segmentRef, rowRefs) {
-	var dv = this._getDataView();
+	let dv = this._getDataView();
 	if(dv) {
 		dv.removeSegmentChildren(segmentRef, rowRefs);
 	}
@@ -984,7 +978,7 @@ RowSegmentingPlugin.prototype.removeSegmentChildren = function(segmentRef, rowRe
 /** @public
 */
 RowSegmentingPlugin.prototype.removeAllSegmentChildren = function() {
-	var dv = this._getDataView();
+	let dv = this._getDataView();
 	if(dv) {
 		dv.removeAllSegmentChildren();
 	}
@@ -994,7 +988,7 @@ RowSegmentingPlugin.prototype.removeAllSegmentChildren = function() {
 * @return {Array.<string>} Return null if there is no segment separator
 */
 RowSegmentingPlugin.prototype.getSegmentIds = function() {
-	var dv = this._getDataView();
+	let dv = this._getDataView();
 	if(dv) {
 		return dv.getSegmentIds();
 	}
@@ -1006,7 +1000,7 @@ RowSegmentingPlugin.prototype.getSegmentIds = function() {
 * @return {Array.<string>} Returns array of row ids. Returns null if there is no child or no segment separator found
 */
 RowSegmentingPlugin.prototype.getSegmentChildIds = function(segmentRef) {
-	var dv = this._getDataView();
+	let dv = this._getDataView();
 	if(dv) {
 		return dv.getSegmentChildIds(segmentRef);
 	}
@@ -1027,9 +1021,9 @@ RowSegmentingPlugin.prototype.sortSegments = function (sortFunction) {
 		this.setSortingLogic(sortFunction);
 	}
 	if (this._userSortingLogic) {
-		var dv = this._getDataView();
+		let dv = this._getDataView();
 		if (dv) {
-			var sortingLogic = this._realTimeGrid ? this._rtSortingLogic : this._userSortingLogic;
+			let sortingLogic = this._realTimeGrid ? this._rtSortingLogic : this._userSortingLogic;
 			dv.sortSegments(sortingLogic);
 		}
 	}
@@ -1061,7 +1055,7 @@ RowSegmentingPlugin.prototype.setPredefinedColors = function(predefinedColors) {
 * @param {boolean|null} spanning if set true when rowRef is row separator, then span that row
 */
 RowSegmentingPlugin.prototype.spanSegmentSeparator = function(rowRef, spanning) {
-	var dv = this._getDataView();
+	let dv = this._getDataView();
 	if(!dv) { return; }
 
 	if(typeof rowRef === "string") {

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

@@ -38,7 +38,8 @@ declare namespace RowFilteringPlugin {
         additionalItems?: any[]|null,
         compactMode?: boolean|null,
         blankValues?: (boolean|string)|null,
-        dateTimeFormat?: string|null
+        dateTimeFormat?: string|null,
+        showOnlyFilteredItems?: boolean|null
     };
 
     type FilterEntry = {

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/versions.json

@@ -2,7 +2,7 @@
 	"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.13",
 	"tr-grid-auto-tooltip": "1.1.9",
@@ -24,7 +24,7 @@
 	"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",

package/package.json

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