tabulator-tables 5.1.0 → 5.1.1

package/src/js/core/column/ColumnComponent.js

@@ -1,3 +1,5 @@
+import Column from './Column.js';
+
 //public column object
 export default class ColumnComponent {
 	constructor (column){

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

@@ -1,5 +1,6 @@
 import CoreFeature from '../CoreFeature.js';
 import Helpers from './Helpers.js';
+import Row from '../row/Row.js';
 
 export default class InteractionManager extends CoreFeature {
 	
@@ -31,7 +32,7 @@ export default class InteractionManager extends CoreFeature {
 			"tabulator-group":"group",
 			"tabulator-col":"column",
 		};
-
+		
 		this.pseudoTrackers = {
 			"row":{
 				subscriber:null,
@@ -50,12 +51,13 @@ export default class InteractionManager extends CoreFeature {
 				target:null,
 			},
 		}
-
+		
 		this.pseudoTracking = false;
 	}
 	
 	initialize(){
 		this.el = this.table.element;
+		
 		this.buildListenerMap();
 		this.bindSubscriptionWatchers();
 	}
@@ -72,55 +74,55 @@ export default class InteractionManager extends CoreFeature {
 		
 		this.listeners = listenerMap;
 	}
-
+	
 	bindPseudoEvents(){
 		Object.keys(this.pseudoTrackers).forEach((key) => {
 			this.pseudoTrackers[key].subscriber = this.pseudoMouseEnter.bind(this, key);
 			this.subscribe(key + "-mouseover", this.pseudoTrackers[key].subscriber);
 		});
-
+		
 		this.pseudoTracking = true;
 	}
-
+	
 	pseudoMouseEnter(key, e, target){
 		if(this.pseudoTrackers[key].target !== target){
 			
 			if(this.pseudoTrackers[key].target){
 				this.dispatch(key + "-mouseleave", e, target);
 			}
-
+			
 			this.pseudoMouseLeave(key, e);
-
+			
 			this.pseudoTrackers[key].target = target;
-
+			
 			this.dispatch(key + "-mouseenter", e, target);
 		}
 	}
-
+	
 	pseudoMouseLeave(key, e){
 		var leaveList = Object.keys(this.pseudoTrackers),
 		linkedKeys = {
 			"row":["cell"],
 			"cell":["row"],
 		};
-
+		
 		leaveList = leaveList.filter((item) => {
 			var links = linkedKeys[key];
 			return item !== key && (!links || (links && !links.includes(item)));
 		});
-
-	
+		
+		
 		leaveList.forEach((key) => {
 			var target = this.pseudoTrackers[key].target;
-
+			
 			if(this.pseudoTrackers[key].target){
 				this.dispatch(key + "-mouseleave", e, target);
-
+				
 				this.pseudoTrackers[key].target = null;
 			}
 		});
 	}
-
+	
 	
 	bindSubscriptionWatchers(){
 		var listeners = Object.keys(this.listeners),
@@ -141,7 +143,7 @@ export default class InteractionManager extends CoreFeature {
 		var listener = this.listeners[key].components,
 		index = listener.indexOf(component),
 		changed = false;
-
+		
 		if(added){
 			if(index === -1){
 				listener.push(component);
@@ -155,7 +157,7 @@ export default class InteractionManager extends CoreFeature {
 				}
 			}
 		}
-
+		
 		if((key === "mouseenter" || key === "mouseleave") && !this.pseudoTracking){
 			this.bindPseudoEvents();
 		}
@@ -189,9 +191,9 @@ export default class InteractionManager extends CoreFeature {
 		
 		var targets = this.findTargets(path);
 		targets = this.bindComponents(type, targets);
-
+		
 		this.triggerEvents(type, e, targets);
-
+		
 		if(this.pseudoTracking && (type == "mouseover" || type == "mouseleave") && !Object.keys(targets).length){
 			this.pseudoMouseLeave("none", e);
 		}
@@ -252,6 +254,10 @@ export default class InteractionManager extends CoreFeature {
 						component = rows.find((row) => {
 							return row.getElement() === target;
 						});
+						
+						if(targets["row"].parentNode && targets["row"].parentNode.closest(".tabulator-row")){
+							targets[key] = false;
+						}
 					}
 					break;
 					
@@ -263,10 +269,12 @@ export default class InteractionManager extends CoreFeature {
 					
 					case "cell":
 					if(listener.components.includes("cell")){
-						if(targets["row"]){
+						if(targets["row"] instanceof Row){
 							component = targets["row"].findCell(target);
-						}else{
-							console.warn("Event Target Lookup Error - The row this cell is attached to cannot be found, has the table been reinitialized without being destroyed first?")
+						}else{	
+							if(targets["row"]){
+								console.warn("Event Target Lookup Error - The row this cell is attached to cannot be found, has the table been reinitialized without being destroyed first?")
+							}
 						}
 					}
 					break;
@@ -300,7 +308,7 @@ export default class InteractionManager extends CoreFeature {
 	clearWatchers(){
 		for(let key in this.listeners){
 			let listener = this.listeners[key];
-		
+			
 			if(listener.handler){
 				this.el.removeEventListener(key, listener.handler)
 				listener.handler = null;

package/src/js/modules/ColumnCalcs/ColumnCalcs.js

@@ -331,12 +331,12 @@ class ColumnCalcs extends Module{
 
 	rowsToData(rows){
 		var data = [];
-
+		
 		rows.forEach((row) => {
 			data.push(row.getData());
 
 			if(this.table.options.dataTree && this.table.options.dataTreeChildColumnCalcs){
-				if(row.modules.dataTree.open){
+				if(row.modules.dataTree && row.modules.dataTree.open){
 					var children = this.rowsToData(this.table.modules.dataTree.getFilteredTreeChildren(row));
 					data = data.concat(children);
 				}

package/src/js/modules/DataTree/DataTree.js

@@ -579,7 +579,6 @@ class DataTree extends Module{
 	}
 
 	redrawNeeded(data){
-		console.log("needed?", data)
 		return (this.field ? typeof data[this.field] !== "undefined" : false) || (this.elementField ? typeof data[this.elementField] !== "undefined" : false);
 	}
 }

package/src/js/modules/Edit/Edit.js

@@ -52,7 +52,7 @@ class Edit extends Module{
 		this.subscribe("column-layout", this.initializeColumnCheck.bind(this));
 		this.subscribe("column-delete", this.columnDeleteCheck.bind(this));
 		this.subscribe("row-deleting", this.rowDeleteCheck.bind(this));
-		this.subscribe("data-refeshing", this.cancelEdit.bind(this));
+		this.subscribe("data-refreshing", this.cancelEdit.bind(this));
 
 		this.subscribe("keybinding-nav-prev", this.navigatePrev.bind(this, undefined));
 		this.subscribe("keybinding-nav-next", this.keybindingNavigateNext.bind(this));
@@ -74,7 +74,7 @@ class Edit extends Module{
 		if(cell){
 			if(!this.navigateNext(cell, e)){
 				if(newRow){
-					// cell.getElement().firstChild.blur();
+					cell.getElement().firstChild.blur();
 
 					if(newRow === true){
 						newRow = this.table.addRow({})

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

@@ -9,7 +9,7 @@ class GroupComponent {
 				if (typeof target[name] !== "undefined") {
 					return target[name];
 				}else{
-					return target._group.table.componentFunctionBinder.handle("row", target._group, name)
+					return target._group.groupManager.table.componentFunctionBinder.handle("row", target._group, name)
 				}
 			}
 		})

package/src/js/modules/Import/Import.js

@@ -123,9 +123,7 @@ class Import extends Module{
 
     structureData(parsedData){
         var data = [];
-
-        console.log("structure", parsedData)
-
+        
         if(Array.isArray(parsedData) && parsedData.length && Array.isArray(parsedData[0])){
             if(this.table.options.autoColumns){
                 data = this.structureArrayToObject(parsedData);

package/src/js/modules/Page/Page.js

@@ -828,9 +828,11 @@ class Page extends Module{
 					margin = this.table.options.progressiveLoadScrollMargin || (this.table.rowManager.element.clientHeight * 2);
 					
 					if(this.table.rowManager.element.scrollHeight <= (this.table.rowManager.element.clientHeight + margin)){
-						setTimeout(() => {
-							this.nextPage();
-						});
+						if(this.page < this.max){
+							setTimeout(() => {
+								this.nextPage();
+							});
+						}
 					}
 					break;
 				}

package/src/js/modules/ResponsiveLayout/ResponsiveLayout.js

@@ -61,14 +61,14 @@ class ResponsiveLayout extends Module{
 		this.hiddenColumns = [];
 
 		//determine level of responsivity for each column
-		this.table.columnManager.columnsByIndex.forEach(function(column, i){
+		this.table.columnManager.columnsByIndex.forEach((column, i) => {
 			if(column.modules.responsive){
 				if(column.modules.responsive.order && column.modules.responsive.visible){
 					column.modules.responsive.index = i;
 					columns.push(column);
 
-					if(!column.visible && self.mode === "collapse"){
-						self.hiddenColumns.push(column);
+					if(!column.visible && this.mode === "collapse"){
+						this.hiddenColumns.push(column);
 					}
 				}
 			}
@@ -76,7 +76,7 @@ class ResponsiveLayout extends Module{
 
 		//sort list by responsivity
 		columns = columns.reverse();
-		columns = columns.sort(function(a, b){
+		columns = columns.sort((a, b) => {
 			var diff = b.modules.responsive.order - a.modules.responsive.order;
 			return diff || (b.modules.responsive.index - a.modules.responsive.index);
 		});

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

@@ -38,7 +38,7 @@ class SelectRow extends Module{
 			this.subscribe("rows-retrieve", this.rowRetrieve.bind(this));
 
 			if(this.table.options.selectable && !this.table.options.selectablePersistence){
-				this.subscribe("data-refeshing", this.deselectRows.bind(this));
+				this.subscribe("data-refreshing", this.deselectRows.bind(this));
 			}
 		}
 	}

package/src/scss/tabulator.scss

@@ -392,15 +392,17 @@ $footerActiveColor:#d00 !default; //footer bottom active text color
 
 			width:100%;
 
-			span{
+			.tabulator-placeholder-contents {
 				display: inline-block;
+				text-align: center;
 
-				margin:0 auto;
 				padding:10px;
 
 				color:#ccc;
 				font-weight: bold;
 				font-size: 20px;
+
+				white-space: normal;
 			}
 		}
 
@@ -432,17 +434,8 @@ $footerActiveColor:#d00 !default; //footer bottom active text color
 		}
 	}
 
-
-
 	//footer element
 	.tabulator-footer{
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: space-between;
-
-		padding:5px 10px;
-
 		border-top:1px solid $footerSeperatorColor;
 		background-color: $footerBackgroundColor;
 		
@@ -456,10 +449,22 @@ $footerActiveColor:#d00 !default; //footer bottom active text color
 		-webkit-user-select: none;
 		-o-user-select: none;
 
+		.tabulator-footer-contents {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: space-between;
+
+			padding:5px 10px;
+
+			&:empty{
+				display: none;
+			}
+		}
+
 		.tabulator-calcs-holder{
 			box-sizing:border-box;
 			width:calc(100% + 20px);
-			margin:-5px -10px 5px -10px;
 
 			text-align: left;