tabulator-tables 5.1.3 → 5.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tabulator-tables",
-  "version": "5.1.3",
+  "version": "5.1.6",
   "description": "Interactive table generation JavaScript library",
   "style": "dist/css/tabulator.css",
   "main": "dist/js/tabulator.js",

package/src/js/core/FooterManager.js

@@ -44,7 +44,7 @@ export default class FooterManager extends CoreFeature{
 					this.containerElement.innerHTML = this.table.options.footerElement;
 				}else{
 					this.external = true;
-					this.element = document.querySelector(this.table.options.footerElement);
+					this.containerElement = document.querySelector(this.table.options.footerElement);
 				}
 				break;
 

package/src/js/core/Tabulator.js

@@ -171,7 +171,7 @@ class Tabulator {
 	_clearObjectPointers(){
 		this.options.columns = this.options.columns.slice(0);
 
-		if(this.options.data && !this.options.reactiveData){
+		if(Array.isArray(this.options.data) && !this.options.reactiveData){
 			this.options.data = this.options.data.slice(0);
 		}
 	}

package/src/js/core/rendering/renderers/VirtualDomHorizontal.js

@@ -17,15 +17,20 @@ export default class VirtualDomHorizontal extends Renderer{
 		
 		this.fitDataColAvg = 0;
 		
-		this.window = 200; //pixel margin to make column visible before it is shown on screen
+		this.windowBuffer = 200; //pixel margin to make column visible before it is shown on screen
 		
+		this.visibleRows = null;
+
 		this.initialized = false;
+		this.isFitData = false;
 		
 		this.columns = [];
 	}
 	
 	initialize(){
 		this.compatibilityCheck();
+		this.layoutCheck();
+		this.vertScrollListen();
 	}
 	
 	compatibilityCheck(){
@@ -66,6 +71,16 @@ export default class VirtualDomHorizontal extends Renderer{
 		return ok;
 	}
 	
+	layoutCheck(){
+		this.isFitData = this.options("layout").startsWith('fitData');
+	}
+
+	vertScrollListen(){
+		this.subscribe("scroll-vertical", () => {
+			this.visibleRows = null;
+		})
+	}
+	
 	//////////////////////////////////////
 	///////// Public Functions ///////////
 	//////////////////////////////////////
@@ -73,21 +88,40 @@ export default class VirtualDomHorizontal extends Renderer{
 	renderColumns(row, force){
 		this.dataChange();
 	}
+
 	
 	scrollColumns(left, dir){
 		if(this.scrollLeft != left){
 			this.scrollLeft = left;
 			
-			this.scroll(left - (this.vDomScrollPosLeft + this.window));
+			this.scroll(left - (this.vDomScrollPosLeft + this.windowBuffer));
 		}
 	}
 	
+	calcWindowBuffer(){
+		var buffer = this.elementVertical.clientWidth;
+		
+		this.table.columnManager.columnsByIndex.forEach((column) => {
+			if(column.visible){
+				var width = column.getWidth();
+				
+				if(width > buffer){
+					buffer = width;
+				}
+			}
+		});
+		
+		this.windowBuffer = buffer * 2;
+	}
+	
 	rerenderColumns(update, blockRedraw){		
 		var old = {
 			cols:this.columns,
 			leftCol:this.leftCol,
 			rightCol:this.rightCol,
-		};
+		},
+		colPos = 0;
+		
 		
 		if(update && !this.initialized){
 			return;
@@ -95,12 +129,12 @@ export default class VirtualDomHorizontal extends Renderer{
 		
 		this.clear();
 		
-		this.scrollLeft = this.elementVertical.scrollLeft;
+		this.calcWindowBuffer();
 		
-		this.vDomScrollPosLeft = this.scrollLeft - this.window;
-		this.vDomScrollPosRight = this.scrollLeft + this.elementVertical.clientWidth + this.window;
+		this.scrollLeft = this.elementVertical.scrollLeft;
 		
-		var colPos = 0;
+		this.vDomScrollPosLeft = this.scrollLeft - this.windowBuffer;
+		this.vDomScrollPosRight = this.scrollLeft + this.elementVertical.clientWidth + this.windowBuffer;
 		
 		this.table.columnManager.columnsByIndex.forEach((column) => {
 			var config = {};
@@ -113,7 +147,7 @@ export default class VirtualDomHorizontal extends Renderer{
 				
 				config.width = width;
 				
-				if (this.options("layout") === "fitData") {
+				if (this.isFitData) {
 					config.fitDataCheck = column.modules.vdomHoz ? column.modules.vdomHoz.fitDataCheck : true;
 				}
 				
@@ -202,7 +236,7 @@ export default class VirtualDomHorizontal extends Renderer{
 		colEnd = 0,
 		group, row, rowEl;
 		
-		if(this.options("layout") === "fitData"){
+		if(this.isFitData){
 			this.table.columnManager.columnsByIndex.forEach((column) => {
 				if(!column.definition.width && column.visible){
 					change = true;
@@ -212,10 +246,10 @@ export default class VirtualDomHorizontal extends Renderer{
 			if(change){
 				if(change && this.table.rowManager.getDisplayRows().length){
 					
-					this.vDomScrollPosRight = this.scrollLeft + this.elementVertical.clientWidth + this.window;
+					this.vDomScrollPosRight = this.scrollLeft + this.elementVertical.clientWidth + this.windowBuffer;
 					
 					var row = this.chain("rows-sample", [1], [], () => {
-						return this.table.rowManager.getDisplayRows()[0];
+						return this.table.rowManager.getDisplayRows();
 					})[0];
 					
 					if(row){
@@ -234,18 +268,18 @@ export default class VirtualDomHorizontal extends Renderer{
 							
 							collsWidth += cell.column.getWidth();
 							
-							if(collsWidth > this.vDomScrollPosRight){
-								break;
-							}
+							// if(collsWidth > this.vDomScrollPosRight){
+							// 	break;
+							// }
 						}
 						
 						rowEl.parentNode.removeChild(rowEl);
 						
-						this.fitDataColAvg = Math.floor(collsWidth / (colEnd + 1));
+						// this.fitDataColAvg = Math.floor(collsWidth / (colEnd + 1));
 						
-						for(colEnd; colEnd < this.table.columnManager.columnsByIndex.length; colEnd++){
-							this.table.columnManager.columnsByIndex[colEnd].setWidth(this.fitDataColAvg);
-						}
+						// for(colEnd; colEnd < this.table.columnManager.columnsByIndex.length; colEnd++){
+						// 	this.table.columnManager.columnsByIndex[colEnd].setWidth(this.fitDataColAvg);
+						// }
 						
 						this.rerenderColumns(false, true);
 					}
@@ -276,17 +310,25 @@ export default class VirtualDomHorizontal extends Renderer{
 	}
 	
 	reinitializeRows(){
-		var rows = this.table.rowManager.getVisibleRows();
+		var rows = this.getVisibleRows();
 		rows.forEach((row) => {
 			this.reinitializeRow(row, true);
 		});
 	}
 	
+	getVisibleRows(){
+		if (!this.visibleRows){
+			this.visibleRows = this.table.rowManager.getVisibleRows();
+		}
+
+		return this.visibleRows;	
+	}
+	
 	scroll(diff){
 		this.vDomScrollPosLeft += diff;
 		this.vDomScrollPosRight += diff;
-		
-		if(diff > (this.elementVertical.clientWidth * .8)){
+
+		if(Math.abs(diff) > (this.windowBuffer / 2)){
 			this.rerenderColumns();
 		}else{
 			if(diff > 0){
@@ -311,131 +353,165 @@ export default class VirtualDomHorizontal extends Renderer{
 	}
 	
 	addColRight(){
-		var column = this.columns[this.rightCol + 1],
-		rows, newWidth, widthDiff;
+		var changes = false;
 		
-		if(column && column.modules.vdomHoz.leftPos <= this.vDomScrollPosRight){
-			rows = this.table.rowManager.getVisibleRows();
-			
-			rows.forEach((row) => {
-				if(row.type !== "group"){
-					var cell = row.getCell(column);
-					row.getElement().appendChild(cell.getElement());
-					cell.cellRendered();
-				}
-			});
+		while(true){
 			
-			this.fitDataColActualWidthCheck(column);
+			let column = this.columns[this.rightCol + 1];
 			
-			this.rightCol++; // Don't move this below the >= check below
-			
-			if(this.rightCol >= (this.columns.length - 1)){
-				this.vDomPadRight = 0;
+			if(column){
+				if(column.modules.vdomHoz.leftPos <= this.vDomScrollPosRight){
+					changes = true;
+					
+					this.getVisibleRows().forEach((row) => {
+						if(row.type !== "group"){
+							var cell = row.getCell(column);
+							row.getElement().appendChild(cell.getElement());
+							cell.cellRendered();
+						}
+					});
+					
+					this.fitDataColActualWidthCheck(column);
+					
+					this.rightCol++; // Don't move this below the >= check below
+					
+					if(this.rightCol >= (this.columns.length - 1)){
+						this.vDomPadRight = 0;
+					}else{
+						this.vDomPadRight -= column.getWidth();
+					}	
+				}else{
+					break;
+				}
 			}else{
-				this.vDomPadRight -= column.getWidth();
+				break;
 			}
-			
+		}
+		
+		if(changes){
 			this.tableElement.style.paddingRight = this.vDomPadRight + "px";
-			
-			this.addColRight();
 		}
 	}
 	
 	addColLeft(){
-		var column = this.columns[this.leftCol - 1],
-		rows;
+		var changes = false;
 		
-		if(column && column.modules.vdomHoz.rightPos >= this.vDomScrollPosLeft){
-			var rows = this.table.rowManager.getVisibleRows();
+		while(true){
+			let column = this.columns[this.leftCol - 1];
 			
-			rows.forEach((row) => {
-				if(row.type !== "group"){
-					var cell = row.getCell(column);
-					row.getElement().prepend(cell.getElement());
-					cell.cellRendered();
+			if(column){
+				if(column.modules.vdomHoz.rightPos >= this.vDomScrollPosLeft){
+					changes = true;
+					
+					this.getVisibleRows().forEach((row) => {
+						if(row.type !== "group"){
+							var cell = row.getCell(column);
+							row.getElement().prepend(cell.getElement());
+							cell.cellRendered();
+						}
+					});
+					
+					this.leftCol--; // don't move this below the <= check below
+					
+					if(this.leftCol <= 0){ // replicating logic in addColRight
+						this.vDomPadLeft = 0;
+					}else{
+						this.vDomPadLeft -= column.getWidth();
+					}
+					
+					let diff = this.fitDataColActualWidthCheck(column);
+					
+					if(diff){
+						this.scrollLeft = this.elementVertical.scrollLeft = this.elementVertical.scrollLeft + diff;
+						this.vDomPadRight -= diff;
+					}
+					
+				}else{
+					break;
 				}
-			});
-			
-			this.fitDataColActualWidthCheck(column);
-			
-			this.leftCol--; // don't move this below the <= check below
-
-			if(this.leftCol <= 0){ // replicating logic in addColRight
-				this.vDomPadLeft = 0;
 			}else{
-				this.vDomPadLeft -= column.getWidth();
+				break;
 			}
-			
+		}
+		
+		if(changes){
 			this.tableElement.style.paddingLeft = this.vDomPadLeft + "px";
-			
-			
-			this.addColLeft();
 		}
 	}
 	
-	removeColRight(column){
-		var column = this.columns[this.rightCol],
-		rows;
+	removeColRight(){
+		var changes = false;
 		
-		if(column && column.modules.vdomHoz.leftPos > this.vDomScrollPosRight){
-			rows = this.table.rowManager.getVisibleRows();
-			
-			column.modules.vdomHoz.visible = false;
+		while(true){
+			let column = this.columns[this.rightCol];
 			
-			rows.forEach((row) => {
-				if(row.type !== "group"){
-					var cell = row.getCell(column);
-					try {
-						row.getElement().removeChild(cell.getElement());
-					} catch (ex) {
-						console.warn("Could not removeColRight", ex.message)
-					}
+			if(column){
+				if(column.modules.vdomHoz.leftPos > this.vDomScrollPosRight){
+					changes = true;
+					
+					this.getVisibleRows().forEach((row) => {
+						if(row.type !== "group"){
+							var cell = row.getCell(column);
+							
+							try {
+								row.getElement().removeChild(cell.getElement());
+							} catch (ex) {
+								console.warn("Could not removeColRight", ex.message)
+							}
+						}
+					});
+					
+					this.vDomPadRight += column.getWidth();
+					this.rightCol --;
+				}else{
+					break;
 				}
-			});
-			
-			this.vDomPadRight += column.getWidth();
+			}else{
+				break;
+			}
+		}
+		
+		if(changes){
 			this.tableElement.style.paddingRight = this.vDomPadRight + "px";
-			
-			this.rightCol --;
-			
-			this.removeColRight();
 		}
 	}
 	
 	removeColLeft(){
-		var column = this.columns[this.leftCol],
-		rows;
+		var changes = false;
 		
-		if(column && column.modules.vdomHoz.rightPos < this.vDomScrollPosLeft){	
-			rows = this.table.rowManager.getVisibleRows();
+		while(true){
+			let column = this.columns[this.leftCol];
 			
-			rows.forEach((row) => {
-				var cell, el;
-
-				if(row.type !== "group"){
-					cell = row.getCell(column);
-
-					if(cell){
-						el = cell.getElement();
-
-						if(el.parentNode){
+			if(column){
+				if(column.modules.vdomHoz.rightPos < this.vDomScrollPosLeft){
+					changes = true;
+					
+					this.getVisibleRows().forEach((row) => {					
+						if(row.type !== "group"){
+							var cell = row.getCell(column);
+							
 							try {
-								row.getElement().removeChild(el);
+								row.getElement().removeChild(cell.getElement());
 							} catch (ex) {
 								console.warn("Could not removeColLeft", ex.message)
 							}
 						}
-					}
+					});
+					
+					this.vDomPadLeft += column.getWidth();
+					this.leftCol ++;
+				}else{
+					break;
 				}
-			});
-			
-			this.vDomPadLeft += column.getWidth();
+			}else{
+				break;
+			}
+		}
+		
+		if(changes){
 			this.tableElement.style.paddingLeft = this.vDomPadLeft + "px";
-			
-			this.leftCol ++;
-			
-			this.removeColLeft();
 		}
+		
 	}
 	
 	fitDataColActualWidthCheck(column){
@@ -450,12 +526,14 @@ export default class VirtualDomHorizontal extends Renderer{
 			if(widthDiff){
 				column.modules.vdomHoz.rightPos += widthDiff;
 				column.modules.vdomHoz.width = newWidth;
-				this.colPositionAdjust(this.rightCol + 2, this.columns.length, widthDiff);
+				this.colPositionAdjust(this.columns.indexOf(column) + 1, this.columns.length, widthDiff);
 			}
 			
 			column.modules.vdomHoz.fitDataCheck = false;
 		}
-	};
+		
+		return widthDiff;
+	}
 	
 	initializeRow(row){
 		if(row.type !== "group"){

package/src/js/core/row/Row.js

@@ -76,6 +76,8 @@ export default class Row extends CoreFeature{
 
 			this.generateCells();
 
+			this.initialized = true;
+
 			this.table.columnManager.renderer.renderRowCells(this);
 
 			if(force){
@@ -84,8 +86,6 @@ export default class Row extends CoreFeature{
 
 			this.dispatch("row-layout", this);
 
-			this.initialized = true;
-
 			if(this.table.options.rowFormatter){
 				this.table.options.rowFormatter(this.getComponent());
 			}

package/src/js/core/tools/InteractionMonitor.js

@@ -255,7 +255,7 @@ export default class InteractionManager extends CoreFeature {
 							return row.getElement() === target;
 						});
 						
-						if(targets["row"].parentNode && targets["row"].parentNode.closest(".tabulator-row")){
+						if(targets["row"] && targets["row"].parentNode && targets["row"].parentNode.closest(".tabulator-row")){
 							targets[key] = false;
 						}
 					}

package/src/js/modules/Export/Export.js

@@ -467,10 +467,10 @@ class Export extends Module{
 		rowEl.classList.add("tabulator-print-table-row");
 
 		row.columns.forEach((col) => {
-
 			if(col){
 				var cellEl = document.createElement("td"),
 				column = col.component._column,
+				index = this.table.columnManager.findColumnIndex(column),
 				value = col.value;
 
 				var cellWrapper = {
@@ -529,8 +529,8 @@ class Export extends Module{
 					cellEl.innerHTML = value;
 				}
 
-				if(styles.firstCell){
-					this.mapElementStyles(styles.firstCell, cellEl, ["padding-top", "padding-left", "padding-right", "padding-bottom", "border-top", "border-left", "border-right", "border-bottom", "color", "font-weight", "font-family", "font-size"]);
+				if(styles.styleCells[index] || styles.firstCell){
+					this.mapElementStyles(styles.styleCells[index] || styles.firstCell, cellEl, ["padding-top", "padding-left", "padding-right", "padding-bottom", "border-top", "border-left", "border-right", "border-bottom", "color", "font-weight", "font-family", "font-size", "text-align"]);
 
 					if(column.definition.align){
 						cellEl.style.textAlign = column.definition.align;

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

@@ -416,7 +416,9 @@ class Filter extends Module{
 				editorElement.addEventListener("focus", (e) => {
 					var left = this.table.columnManager.element.scrollLeft;
 
-					if(left !== this.table.rowManager.element.scrollLeft){
+					var headerPos = this.table.rowManager.element.scrollLeft + parseInt(this.table.columnManager.element.style.marginLeft);
+
+					if(left !== headerPos){
 						this.table.rowManager.scrollHorizontal(left);
 						this.table.columnManager.scrollHorizontal(left);
 					}

package/src/js/modules/Format/defaults/formatters/rowSelection.js

@@ -5,8 +5,9 @@ export default function(cell, formatterParams, onRendered){
 	var blocked = false;
 
 	checkbox.type = 'checkbox';
-	
 
+	checkbox.setAttribute("aria-label", "Select Row");
+	
 	if(this.table.modExists("selectRow", true)){
 
 		checkbox.addEventListener("click", (e) => {