tabulator-tables 5.4.1 → 5.4.3

package/src/js/modules/Filter/Filter.js

@@ -182,11 +182,6 @@ class Filter extends Module{
 		var def = column.definition;
 
 		if(def.headerFilter){
-
-			if(typeof def.headerFilterPlaceholder !== "undefined" && def.field){
-				this.module("localize").setHeaderFilterColumnPlaceholder(def.field, def.headerFilterPlaceholder);
-			}
-
 			this.initializeColumn(column);
 		}
 	}
@@ -298,13 +293,17 @@ class Filter extends Module{
 		var self = this,
 		success = column.modules.filter.success,
 		field = column.getField(),
-		filterElement, editor, editorElement, cellWrapper, typingTimer, searchTrigger, params;
+		filterElement, editor, editorElement, cellWrapper, typingTimer, searchTrigger, params, onRenderedCallback;
 
 		column.modules.filter.value = initialValue;
 
 		//handle aborted edit
 		function cancel(){}
 
+		function onRendered(callback){
+			onRenderedCallback = callback;
+		}
+
 		if(column.modules.filter.headerElement && column.modules.filter.headerElement.parentNode){
 			column.contentElement.removeChild(column.modules.filter.headerElement.parentNode);
 		}
@@ -389,7 +388,7 @@ class Filter extends Module{
 
 				params = typeof params === "function" ? params.call(self.table, cellWrapper) : params;
 
-				editorElement = editor.call(this.table.modules.edit, cellWrapper, function(){}, success, cancel, params);
+				editorElement = editor.call(this.table.modules.edit, cellWrapper, onRendered, success, cancel, params);
 
 				if(!editorElement){
 					console.warn("Filter Error - Cannot add filter to " + field + " column, editor returned a value of false");
@@ -403,7 +402,7 @@ class Filter extends Module{
 
 				//set Placeholder Text
 				self.langBind("headerFilters|columns|" + column.definition.field, function(value){
-					editorElement.setAttribute("placeholder", typeof value !== "undefined" && value ? value : self.langText("headerFilters|default"));
+					editorElement.setAttribute("placeholder", typeof value !== "undefined" && value ? value : (column.definition.headerFilterPlaceholder || self.langText("headerFilters|default")));
 				});
 
 				//focus on element on click
@@ -485,6 +484,10 @@ class Filter extends Module{
 				if(!reinitialize){
 					self.headerFilterColumns.push(column);
 				}
+
+				if(onRenderedCallback){
+					onRenderedCallback();
+				}
 			}
 		}else{
 			console.warn("Filter Error - Cannot add header filter, column has no field set:", column.definition.title);

package/src/js/modules/GroupRows/Group.js

@@ -38,17 +38,19 @@ class Group{
 		this.createValueGroups();
 	}
 	
-	wipe(){
-		if(this.groupList.length){
-			this.groupList.forEach(function(group){
-				group.wipe();
-			});
-		}else{
-			this.rows.forEach((row) => {
-				if(row.modules){
-					delete row.modules.group;
-				}
-			});
+	wipe(elementsOnly){
+		if(!elementsOnly){
+			if(this.groupList.length){
+				this.groupList.forEach(function(group){
+					group.wipe();
+				});
+			}else{
+				this.rows.forEach((row) => {
+					if(row.modules){
+						delete row.modules.group;
+					}
+				});
+			}
 		}
 		
 		this.element = false;
@@ -69,7 +71,7 @@ class Group{
 		this.arrowElement = document.createElement("div");
 		this.arrowElement.classList.add("tabulator-group-toggle");
 		this.arrowElement.appendChild(arrow);
-		
+
 		//setup movable rows
 		if(this.groupManager.table.options.movableRows !== false && this.groupManager.table.modExists("moveRow")){
 			this.groupManager.table.modules.moveRow.initializeGroupHeader(this);
@@ -207,19 +209,22 @@ class Group{
 				this.parent.removeGroup(this);
 			}else{
 				this.groupManager.removeGroup(this);
-			}
+			}		
 			
 			this.groupManager.updateGroupRows(true);
+			
 		}else{
 			
 			if(el.parentNode){
 				el.parentNode.removeChild(el);
 			}
-			
-			this.generateGroupHeaderContents();
-			
-			if(this.groupManager.table.modExists("columnCalcs") && this.groupManager.table.options.columnCalcs != "table"){
-				this.groupManager.table.modules.columnCalcs.recalcGroup(this);
+
+			if(!this.groupManager.blockRedraw){
+				this.generateGroupHeaderContents();
+				
+				if(this.groupManager.table.modExists("columnCalcs") && this.groupManager.table.options.columnCalcs != "table"){
+					this.groupManager.table.modules.columnCalcs.recalcGroup(this);
+				}
 			}
 			
 		}

package/src/js/modules/GroupRows/GroupRows.js

@@ -15,6 +15,8 @@ class GroupRows extends Module{
 		this.groups = {}; //hold row groups
 		
 		this.displayHandler = this.getRows.bind(this);
+
+		this.blockRedraw = false;
 		
 		//register table options
 		this.registerTableOption("groupBy", false); //enable table grouping and set field to group by
@@ -43,6 +45,10 @@ class GroupRows extends Module{
 	
 	//initialize group configuration
 	initialize(){
+		this.subscribe("table-destroy", this._blockRedrawing.bind(this));
+		this.subscribe("rows-wipe", this._blockRedrawing.bind(this));
+		this.subscribe("rows-wiped", this._restore_redrawing.bind(this));
+
 		if(this.table.options.groupBy){
 			if(this.table.options.groupUpdateOnCellEdit){
 				this.subscribe("cell-value-updated", this.cellUpdated.bind(this));
@@ -69,6 +75,14 @@ class GroupRows extends Module{
 		}
 	}
 	
+	_blockRedrawing(){
+		this.blockRedraw = true;
+	}
+
+	_restore_redrawing(){
+		this.blockRedraw = false;
+	}
+
 	configureGroupSetup(){
 		if(this.table.options.groupBy){
 			var groupBy = this.table.options.groupBy,
@@ -92,7 +106,7 @@ class GroupRows extends Module{
 			
 			this.groupIDLookups = [];
 			
-			if(Array.isArray(groupBy)){
+			if(groupBy){
 				if(this.table.modExists("columnCalcs") && this.table.options.columnCalcs != "table" && this.table.options.columnCalcs != "both"){
 					this.table.modules.columnCalcs.removeCalcs();
 				}
@@ -233,6 +247,10 @@ class GroupRows extends Module{
 		}
 		
 		this.configureGroupSetup();
+
+		if(!groups && this.table.modExists("columnCalcs") && this.table.options.columnCalcs === true){
+			this.table.modules.columnCalcs.reinitializeCalcs();
+		}
 		
 		this.refreshData();
 		
@@ -479,7 +497,7 @@ class GroupRows extends Module{
 		}
 		
 		Object.values(oldGroups).forEach((group) => {
-			group.wipe();
+			group.wipe(true);
 		});	
 	}
 	
@@ -551,13 +569,15 @@ class GroupRows extends Module{
 	
 	updateGroupRows(force){
 		var output = [];
-		
-		this.groupList.forEach((group) => {
-			output = output.concat(group.getHeadersAndRows());
-		});
-		
-		if(force){
-			this.refreshData(true, this.displayHandler);
+
+		if(!this.blockRedraw){
+			this.groupList.forEach((group) => {
+				output = output.concat(group.getHeadersAndRows());
+			});
+			
+			if(force){
+				this.refreshData(true);
+			}
 		}
 		
 		return output;

package/src/js/modules/Localize/Localize.js

@@ -41,15 +41,6 @@ class Localize extends Module{
 		this.langList.default.headerFilters.default = placeholder;
 	}
 
-	//set header filter placeholder by column
-	setHeaderFilterColumnPlaceholder(column, placeholder){
-		this.langList.default.headerFilters.columns[column] = placeholder;
-
-		if(this.lang && !this.lang.headerFilters.columns[column]){
-			this.lang.headerFilters.columns[column] = placeholder;
-		}
-	}
-
 	//setup a lang description object
 	installLang(locale, lang){
 		if(this.langList[locale]){

package/src/js/modules/MoveColumns/MoveColumns.js

@@ -50,7 +50,7 @@ class MoveColumns extends Module{
 			
 			config.mousemove = function(e){
 				if(column.parent === self.moving.parent){
-					if((((self.touchMove ? e.touches[0].pageX : e.pageX) - Helpers.elOffset(colEl).left) + self.table.columnManager.element.scrollLeft) > (column.getWidth() / 2)){
+					if((((self.touchMove ? e.touches[0].pageX : e.pageX) - Helpers.elOffset(colEl).left) + self.table.columnManager.contentsElement.scrollLeft) > (column.getWidth() / 2)){
 						if(self.toCol !== column || !self.toColAfter){
 							colEl.parentNode.insertBefore(self.placeholderElement, colEl.nextSibling);
 							self.moveColumn(column, true);

package/src/js/modules/Print/Print.js

@@ -7,6 +7,8 @@ class Print extends Module{
 
 		this.element = false;
 		this.manualBlock = false;
+		this.beforeprintEventHandler = null;
+		this.afterprintEventHandler = null;
 
 		this.registerTableOption("printAsHtml", false); //enable print as html
 		this.registerTableOption("printFormatter", false); //printing page formatter
@@ -22,13 +24,24 @@ class Print extends Module{
 
 	initialize(){
 		if(this.table.options.printAsHtml){
-			window.addEventListener("beforeprint", this.replaceTable.bind(this));
-			window.addEventListener("afterprint", this.cleanup.bind(this));
+			this.beforeprintEventHandler = this.replaceTable.bind(this);
+			this.afterprintEventHandler = this.cleanup.bind(this);
+
+			window.addEventListener("beforeprint", this.beforeprintEventHandler );
+			window.addEventListener("afterprint", this.afterprintEventHandler);
+			this.subscribe("table-destroy", this.destroy.bind(this));
 		}
 
 		this.registerTableFunction("print", this.printFullscreen.bind(this));
 	}
 
+	destroy(){
+		if(this.table.options.printAsHtml){
+			window.removeEventListener( "beforeprint", this.beforeprintEventHandler );
+			window.removeEventListener( "afterprint", this.afterprintEventHandler );
+		}
+	}
+
 	///////////////////////////////////
 	///////// Table Functions /////////
 	///////////////////////////////////

package/src/js/modules/SelectRow/SelectRow.js

@@ -79,7 +79,7 @@ class SelectRow extends Module{
 		row.modules.select = {selected:false};
 		
 		//set row selection class
-		if(self.table.options.selectableCheck.call(this.table, row.getComponent())){
+		if(self.checkRowSelectability(row)){
 			element.classList.add("tabulator-selectable");
 			element.classList.remove("tabulator-unselectable");
 			
@@ -190,10 +190,18 @@ class SelectRow extends Module{
 			this.lastClickedRow = row;
 		}
 	}
+
+	checkRowSelectability(row){
+		if(row.type === "row"){
+			return this.table.options.selectableCheck.call(this.table, row.getComponent());
+		}
+
+		return false;
+	}
 	
 	//toggle row selection
 	toggleRow(row){
-		if(this.table.options.selectableCheck.call(this.table, row.getComponent())){
+		if(this.checkRowSelectability(row)){
 			if(row.modules.select && row.modules.select.selected){
 				this._deselectRow(row);
 			}else{

package/src/scss/tabulator.scss

@@ -412,6 +412,7 @@ $footerActiveColor:#d00 !default; //footer bottom active text color
 			box-sizing:border-box;
 			display: flex;
 			align-items:center;
+			justify-content: center;
 			
 			&[tabulator-render-mode="virtual"]{
 				min-height:100%;