@refinitiv-ui/efx-grid 6.0.63 → 6.0.65

package/lib/grid/index.js

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

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

@@ -136,7 +136,6 @@ RowSegmentingPlugin.prototype.initialize = function (host, options) {
 	}
 
 	ExpanderIcon.loadExpanderStyles();
-	ExpanderIcon.injectExpanderStyles(host.getElement());
 
 	this._hosts.push(host);
 	host.listen("preSectionDataBinding", this._onPreSectionDataBinding);
@@ -178,12 +177,13 @@ RowSegmentingPlugin.prototype._refreshSegmentSeparator = function () {
 	}
 	var dv = this._getDataView();
 	if(dv) {
-		var rowIds = dv.getAllRowIds();
+		var dt = dv.getDataSource();
+		var rowIds = dt.getAllRowIds();
 		var rowCount = rowIds.length;
 		var separatorMapping = {};
 		for (var i = 0; i < rowCount; i++) {
 			var rowId = rowIds[i];
-			var rowData = this._rowGetter(dv.getRowData(rowId));
+			var rowData = this._rowGetter(dt.getRowData(rowId));
 			var segmentId = rowData[this._segmentIdField];
 			// TODO: supports collapsed and expanded for save/restore
 

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

@@ -129,10 +129,12 @@ var ColumnStackPlugin = function () {
 	this._onStackButtonClicked = this._onStackButtonClicked.bind(this);
 	this._updateUI = this._updateUI.bind(this);
 	this._toColumnId = this._toColumnId.bind(this);
+	this._requestFilterRefresh = this._requestFilterRefresh.bind(this);
 
 	this._hosts = [];
 	this._groupDefs = new GroupDefinitions();
 
+	this._filterConflator = new Conflator(50, this._requestFilterRefresh);
 	this._conflator = new Conflator(50, this._updateUI);
 };
 
@@ -275,6 +277,7 @@ ColumnStackPlugin.prototype.unload = function (host) {
 
 	if(this._hosts.length <= 0) {
 		this._conflator.reset();
+		this._filterConflator.reset();
 		this._groupDefs.removeAllGroups();
 	}
 	this._dispose();
@@ -537,9 +540,24 @@ ColumnStackPlugin.prototype._hideStackedColumns = function(stack, colRefs, activ
 */
 ColumnStackPlugin.prototype._setColumnVisibility = function(colIndex, shown) {
 	if(colIndex >= 0) {
+		var dirty = false;
 		for(var g = this._hosts.length; --g >= 0;) {
-			this._hosts[g].setColumnVisibility(colIndex, shown, 2);
+			dirty |= this._hosts[g].setColumnVisibility(colIndex, shown, 2);
 		}
+
+		if(dirty){
+			this._requestFilterRefresh();
+		}
+	}
+};
+/** @private */
+ColumnStackPlugin.prototype._requestFilterRefresh = function() {
+	if(this._filterConflator.conflate()) {
+		return;
+	}
+	var rfp = this._getPlugin("RowFilteringPlugin");
+	if(rfp && rfp["refresh"]) {
+		rfp["refresh"]();
 	}
 };
 /** @private
@@ -1042,10 +1060,6 @@ ColumnStackPlugin.prototype.stackColumns = function(colRefs, stackId, options) {
 
 	this._groupDefs.setGroup(sid, stack);
 
-	var cfp = this._getPlugin("ColumnFilterPlugin");
-	if(cfp) {
-		cfp["refresh"]();
-	}
 	this._updateUI(); // asyncronuos
 	return true;
 };
@@ -1205,10 +1219,6 @@ ColumnStackPlugin.prototype.unstackColumns = function(colIndices) {
 		}
 	}
 	if(dirty) {
-		var cfp = this._getPlugin("ColumnFilterPlugin");
-		if(cfp) {
-			cfp["refresh"]();
-		}
 		this._updateUI(); // asyncronuos
 	}
 
@@ -1345,10 +1355,6 @@ ColumnStackPlugin.prototype._setActiveColumn = function(stack, newActiveColumn)
 			csp.dispatchSelectionChanged();
 		}
 	}
-	var cfp = this._getPlugin("ColumnFilterPlugin");
-	if(cfp) {
-		cfp["refresh"]();
-	}
 	return true;
 };
 

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

@@ -1301,38 +1301,23 @@ RowFilteringPlugin.prototype._setTimerForUpdatingIcons = function () {
 
 RowFilteringPlugin.prototype.refresh = function () {
   this._dvTimerId = 0;
+  this._activeColFilters = this._columnFilters; //check cstp
 
-  var cstkp = this._getPlugin("ColumnStackingPlugin");
+  var cstkp = this._getPlugin("ColumnStackPlugin");
 
-  this._activeColFilters = this._columnFilters;
-
-  if (cstkp && this._activeColFilters.length) {
+  if (cstkp) {
     var colIndex, cfo;
+    var host = this._hosts[0];
 
     var colCount = this._getColumnCount();
 
-    var hasInactiveColumn = false;
+    this._activeColFilters = [];
 
     for (colIndex = 0; colIndex < colCount; ++colIndex) {
       cfo = this._getColumnFilterOption(colIndex);
 
-      if (cfo) {
-        if (cstkp.isInactiveStackedColumn(colIndex)) {
-          hasInactiveColumn = true;
-          break;
-        }
-      }
-    }
-
-    if (hasInactiveColumn) {
-      this._activeColFilters = [];
-
-      for (colIndex = 0; colIndex < colCount; ++colIndex) {
-        cfo = this._getColumnFilterOption(colIndex);
-
-        if (cfo && !cstkp.isInactiveStackedColumn(colIndex)) {
-          this._activeColFilters.push(cfo);
-        }
+      if (cfo && host.getColumnVisibility(colIndex, 2)) {
+        this._activeColFilters.push(cfo);
       }
     }
   }

package/lib/tr-grid-row-grouping/es6/RowGrouping.js

@@ -399,7 +399,6 @@ RowGroupingPlugin.prototype.initialize = function (host, options) {
 	this._hosts.push(host);
 
 	ExpanderIcon.loadExpanderStyles();
-	ExpanderIcon.injectExpanderStyles(host.getElement());
 
 	host.unloadPlugin("CollapsibleHeaderPlugin");
 	host.listen("columnMoved", this._onColumnIndexChanged);

package/lib/tr-grid-util/es6/ExpanderIcon.d.ts

@@ -1,5 +1,4 @@
 import { Ext } from "./Ext.js";
-import { injectCss, prettifyCss } from "./Util.js";
 import { ElementWrapper } from "./ElementWrapper.js";
 import { ElfUtil } from "./ElfUtil.js";
 
@@ -9,8 +8,6 @@ declare class ExpanderIcon extends ElementWrapper {
 
     public static loadExpanderStyles(): void;
 
-    public static injectExpanderStyles(elem: Element|null): void;
-
     public expand(): void;
 
     public collapse(): void;

package/lib/tr-grid-util/es6/ExpanderIcon.js

@@ -1,9 +1,7 @@
 import { Ext } from "./Ext.js";
-import { injectCss, prettifyCss } from "./Util.js";
 import { ElementWrapper } from "./ElementWrapper.js";
 import { ElfUtil } from "./ElfUtil.js";
 
-
 /**
 * @constructor
 * @extends {ElementWrapper}
@@ -33,44 +31,6 @@ Ext.inherits(ExpanderIcon, ElementWrapper);
 */
 ExpanderIcon._iconName = ""; // static variable
 
-/** @description .expander is the actual arrow <br>
-* .folder is an element hosting .expander arrow
-* @type {string}
-* @private
-*/
-ExpanderIcon._styles = prettifyCss([
-	".tr-grid.expander-disabled .expander", [
-		"cursor: default;"
-	],
-	".tr-grid.folder-disabled .cell.folder", [
-		"cursor: default;"
-	],
-	".tr-grid .expander", [
-		"cursor: pointer;",
-		"display: inline-block;" // For transformation
-	],
-	".tr-grid .folder .expander:before", [
-		"content: none !important;" // Prevent deprecated styling
-	],
-	".tr-grid .fallback-arrow", [
-		"vertical-align: middle;",
-		"font-size: 7px;",
-		"line-height: 1;",
-		"display: inline-block;", // For transformation
-		"transform: scaleX(1.5);",
-		"font-family: Arial;"
-	],
-	".tr-grid .expander.closed", [
-		"transform: translate(0px, -1px) rotate(-90deg);"
-	],
-	".tr-grid .cell.closed .expander", [
-		"transform: translate(0px, -1px) rotate(-90deg);"
-	],
-	".tr-grid .tr-lg .cell.folder.content-header", [ // Used for header row in contentAsHeader mode, espectially with solar theme
-	  "background-color: inherit;"
-	]
-]);
-
 /** @private
 * @param {Event} e
 */
@@ -98,15 +58,6 @@ ExpanderIcon.loadExpanderStyles = function() {
 		}
 	}
 };
-/** @public
-* @param {Element} elem
-*/
-ExpanderIcon.injectExpanderStyles = function(elem) {
-	if(elem && elem.nodeType === 1 && !elem._expanderStyles) {
-		elem._expanderStyles = true; // Prevent loading the same style twice
-		injectCss(ExpanderIcon._styles, elem);
-	}
-};
 
 /** @private
 * @param {Object} cell

package/lib/tr-grid-util/es6/RowPainter.js

@@ -120,6 +120,36 @@ RowPainter._styles = prettifyCss([
 		"--grid-expanded-tag-bg-color: #4D4D4D;",
 		"--grid-row-menu-icon-color: #CCCCCC;",
 		"--grid-row-menu-icon-hover-color: #FFFFFF;"
+	],
+	".tr-grid.expander-disabled .expander", [
+		"cursor: default;"
+	],
+	".tr-grid.folder-disabled .cell.folder", [
+		"cursor: default;"
+	],
+	".tr-grid .expander", [
+		"cursor: pointer;",
+		"display: inline-block;" // For transformation
+	],
+	".tr-grid .folder .expander:before", [
+		"content: none !important;" // Prevent deprecated styling
+	],
+	".tr-grid .fallback-arrow", [
+		"vertical-align: middle;",
+		"font-size: 7px;",
+		"line-height: 1;",
+		"display: inline-block;", // For transformation
+		"transform: scaleX(1.5);",
+		"font-family: Arial;"
+	],
+	".tr-grid .expander.closed", [
+		"transform: translate(0px, -1px) rotate(-90deg);"
+	],
+	".tr-grid .cell.closed .expander", [
+		"transform: translate(0px, -1px) rotate(-90deg);"
+	],
+	".tr-grid .tr-lg .cell.folder.content-header", [ // Used for header row in contentAsHeader mode, espectially with solar theme
+	  "background-color: inherit;"
 	]
 ]);
 

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

@@ -1,6 +1,7 @@
 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 {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";
 

package/lib/versions.json

@@ -1,8 +1,8 @@
 {
-	"tr-grid-util": "1.3.129",
+	"tr-grid-util": "1.3.130",
 	"tr-grid-printer": "1.0.16",
 	"@grid/column-dragging": "1.0.14",
-	"@grid/row-segmenting": "1.0.26",
+	"@grid/row-segmenting": "1.0.28",
 	"@grid/statistics-row": "1.0.15",
 	"@grid/zoom": "1.0.11",
 	"tr-grid-auto-tooltip": "1.1.6",
@@ -13,7 +13,7 @@
 	"tr-grid-column-grouping": "1.0.55",
 	"tr-grid-column-resizing": "1.0.28",
 	"tr-grid-column-selection": "1.0.29",
-	"tr-grid-column-stack": "1.0.70",
+	"tr-grid-column-stack": "1.0.71",
 	"tr-grid-conditional-coloring": "1.0.62",
 	"tr-grid-content-wrap": "1.0.20",
 	"tr-grid-contextmenu": "1.0.39",
@@ -24,8 +24,8 @@
 	"tr-grid-percent-bar": "1.0.22",
 	"tr-grid-range-bar": "2.0.5",
 	"tr-grid-row-dragging": "1.0.29",
-	"tr-grid-row-filtering": "1.0.59",
-	"tr-grid-row-grouping": "1.0.81",
+	"tr-grid-row-filtering": "1.0.60",
+	"tr-grid-row-grouping": "1.0.82",
 	"tr-grid-row-selection": "1.0.23",
 	"tr-grid-rowcoloring": "1.0.24",
 	"tr-grid-textformatting": "1.0.46",

package/package.json

@@ -66,5 +66,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"version": "6.0.63"
+	"version": "6.0.65"
 }