@refinitiv-ui/efx-grid 6.0.64 → 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.64" };
+window.EFX_GRID = { version: "6.0.65" };

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

@@ -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,7 +24,7 @@
 	"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-filtering": "1.0.60",
 	"tr-grid-row-grouping": "1.0.82",
 	"tr-grid-row-selection": "1.0.23",
 	"tr-grid-rowcoloring": "1.0.24",

package/package.json

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