tabulator-tables 5.0.6 → 5.0.7

package/package.json

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

package/src/js/core/ColumnManager.js

@@ -232,8 +232,9 @@ export default class ColumnManager extends CoreFeature {
 		index = nextToColumn ? this.findColumnIndex(nextToColumn) : nextToColumn;
 
 		if(nextToColumn && index > -1){
-			var parentIndex = this.columns.indexOf(nextToColumn.getTopColumn());
-			var nextEl = nextToColumn.getElement();
+			var topColumn = nextToColumn.getTopColumn()
+			var parentIndex = this.columns.indexOf(topColumn);
+			var nextEl = topColumn.getElement();
 
 			if(before){
 				this.columns.splice(parentIndex, 0, column);
@@ -608,13 +609,11 @@ export default class ColumnManager extends CoreFeature {
 
 			this.dispatch("column-add", definition, before, nextToColumn);
 
-			this.redraw(true);
-
 			if(this.layoutMode() != "fitColumns"){
 				column.reinitializeWidth();
 			}
 
-			this.verticalAlignHeaders();
+			this.redraw(true);
 
 			this.table.rowManager.reinitialize();
 

package/src/js/core/Tabulator.js

@@ -409,68 +409,80 @@ class Tabulator {
 
 	//replace data, keeping table in position with same sort
 	replaceData(data, params, config){
-		return this.dataLoader.load(data, params, config, true, true);
+		if(this.initialized){
+			return this.dataLoader.load(data, params, config, true, true);
+		}else{
+			console.warn("replaceData failed - table not yet initialized. Please wait for the `tableBuilt` event before calling this function.");
+		}
 	}
 
 	//update table data
 	updateData(data){
 		var responses = 0;
 
-		return new Promise((resolve, reject) => {
-			this.dataLoader.blockActiveLoad();
+		if(this.initialized){
+			return new Promise((resolve, reject) => {
+				this.dataLoader.blockActiveLoad();
 
-			if(typeof data === "string"){
-				data = JSON.parse(data);
-			}
+				if(typeof data === "string"){
+					data = JSON.parse(data);
+				}
 
-			if(data){
-				data.forEach((item) => {
-					var row = this.rowManager.findRow(item[this.options.index]);
+				if(data){
+					data.forEach((item) => {
+						var row = this.rowManager.findRow(item[this.options.index]);
 
-					if(row){
-						responses++;
+						if(row){
+							responses++;
 
-						row.updateData(item)
-						.then(()=>{
-							responses--;
+							row.updateData(item)
+							.then(()=>{
+								responses--;
 
-							if(!responses){
-								resolve();
-							}
-						});
-					}
-				});
-			}else{
-				console.warn("Update Error - No data provided");
-				reject("Update Error - No data provided");
-			}
-		});
+								if(!responses){
+									resolve();
+								}
+							});
+						}
+					});
+				}else{
+					console.warn("Update Error - No data provided");
+					reject("Update Error - No data provided");
+				}
+			});
+		}else{
+			console.warn("updateData failed - table not yet initialized. Please wait for the `tableBuilt` event before calling this function.");
+		}
 	}
 
 	addData(data, pos, index){
-		return new Promise((resolve, reject) => {
-			this.dataLoader.blockActiveLoad();
+		if(this.initialized){
+			return new Promise((resolve, reject) => {
+				this.dataLoader.blockActiveLoad();
 
-			if(typeof data === "string"){
-				data = JSON.parse(data);
-			}
+				if(typeof data === "string"){
+					data = JSON.parse(data);
+				}
 
-			if(data){
-				this.rowManager.addRows(data, pos, index)
-				.then((rows) => {
-					var output = [];
+				if(data){
+					this.rowManager.addRows(data, pos, index)
+					.then((rows) => {
+						var output = [];
 
-					rows.forEach(function(row){
-						output.push(row.getComponent());
-					});
+						rows.forEach(function(row){
+							output.push(row.getComponent());
+						});
 
-					resolve(output);
-				});
-			}else{
-				console.warn("Update Error - No data provided");
-				reject("Update Error - No data provided");
-			}
-		});
+						resolve(output);
+					});
+				}else{
+					console.warn("Update Error - No data provided");
+					reject("Update Error - No data provided");
+				}
+			});
+		}else{
+			console.warn("addData failed - table not yet initialized. Please wait for the `tableBuilt` event before calling this function.");
+		}
 	}
 
 	//update table data
@@ -478,46 +490,50 @@ class Tabulator {
 		var rows = [],
 		responses = 0;
 
-		return new Promise((resolve, reject) => {
-			this.dataLoader.blockActiveLoad();
-
-			if(typeof data === "string"){
-				data = JSON.parse(data);
-			}
+		if(this.initialized){
+			return new Promise((resolve, reject) => {
+				this.dataLoader.blockActiveLoad();
 
-			if(data){
-				data.forEach((item) => {
-					var row = this.rowManager.findRow(item[this.options.index]);
+				if(typeof data === "string"){
+					data = JSON.parse(data);
+				}
 
-					responses++;
+				if(data){
+					data.forEach((item) => {
+						var row = this.rowManager.findRow(item[this.options.index]);
 
-					if(row){
-						row.updateData(item)
-						.then(()=>{
-							responses--;
-							rows.push(row.getComponent());
+						responses++;
 
-							if(!responses){
-								resolve(rows);
-							}
-						});
-					}else{
-						this.rowManager.addRows(item)
-						.then((newRows)=>{
-							responses--;
-							rows.push(newRows[0].getComponent());
-
-							if(!responses){
-								resolve(rows);
-							}
-						});
-					}
-				});
-			}else{
-				console.warn("Update Error - No data provided");
-				reject("Update Error - No data provided");
-			}
-		});
+						if(row){
+							row.updateData(item)
+							.then(()=>{
+								responses--;
+								rows.push(row.getComponent());
+
+								if(!responses){
+									resolve(rows);
+								}
+							});
+						}else{
+							this.rowManager.addRows(item)
+							.then((newRows)=>{
+								responses--;
+								rows.push(newRows[0].getComponent());
+
+								if(!responses){
+									resolve(rows);
+								}
+							});
+						}
+					});
+				}else{
+					console.warn("Update Error - No data provided");
+					reject("Update Error - No data provided");
+				}
+			});
+		}else{
+			console.warn("updateOrAddData failed - table not yet initialized. Please wait for the `tableBuilt` event before calling this function.");
+		}
 	}
 
 	//get row object
@@ -582,14 +598,18 @@ class Tabulator {
 
 	//add row to table
 	addRow(data, pos, index){
-		if(typeof data === "string"){
-			data = JSON.parse(data);
-		}
+		if(this.initialized){
+			if(typeof data === "string"){
+				data = JSON.parse(data);
+			}
 
-		return this.rowManager.addRows(data, pos, index)
-		.then((rows)=>{
-			return rows[0].getComponent();
-		});
+			return this.rowManager.addRows(data, pos, index)
+			.then((rows)=>{
+				return rows[0].getComponent();
+			});
+		}else{
+			console.warn("addRow failed - table not yet initialized. Please wait for the `tableBuilt` event before calling this function.");
+		}
 	}
 
 	//update a row if it exitsts otherwise create it
@@ -655,7 +675,11 @@ class Tabulator {
 	}
 
 	getRows(active){
-		return this.rowManager.getComponents(active);
+		if(this.initialized){
+			return this.rowManager.getComponents(active);
+		}else{
+			console.warn("getRows failed - table not yet initialized. Please wait for the `tableBuilt` event before calling this function.");
+		}
 	}
 
 	//get position of row in table
@@ -798,8 +822,12 @@ class Tabulator {
 	//////////// General Public Functions ////////////
 	//redraw list without updating data
 	redraw(force){
-		this.columnManager.redraw(force);
-		this.rowManager.redraw(force);
+		if(this.initialized){
+			this.columnManager.redraw(force);
+			this.rowManager.redraw(force);
+		}else{
+			console.warn("redraw failed - table not yet initialized. Please wait for the `tableBuilt` event before calling this function.");
+		}
 	}
 
 	setHeight(height){

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

@@ -94,7 +94,6 @@ export default class InteractionManager extends CoreFeature {
 				if(!listener.handler){
 					listener.handler = this.track.bind(this, key);
 					this.el.addEventListener(key, listener.handler)
-					console.log("add", key)
 					// this.el.addEventListener(key, listener.handler, {passive: true})
 				}
 			}else{

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

@@ -15,6 +15,7 @@ class Filter extends Module{
 		this.prevHeaderFilterChangeCheck = "{}";
 
 		this.changed = false; //has filtering changed since last render
+		this.tableInitialized = false;
 
 		this.registerTableOption("filterMode", "local"); //local or remote filtering
 
@@ -82,6 +83,8 @@ class Filter extends Module{
 				}
 			});
 		}
+
+		this.tableInitialized = true;
 	}
 
 	remoteFilterParams(data, config, silent, params){
@@ -546,10 +549,12 @@ class Filter extends Module{
 	}
 
 	refreshFilter(){
-		if(this.table.options.filterMode === "remote"){
-			this.reloadData();
-		}else{
-			this.refreshData();
+		if(this.tableInitialized){
+			if(this.table.options.filterMode === "remote"){
+				this.reloadData();
+			}else{
+				this.refreshData();
+			}
 		}
 
 		//TODO - Persist left position of row manager

package/src/js/modules/FrozenRows/FrozenRows.js

@@ -99,7 +99,10 @@ class FrozenRows extends Module{
 
 		if(index > -1){
 			var rowEl = row.getElement();
-			rowEl.parentNode.removeChild(rowEl);
+
+			if(rowEl.parentNode){
+				rowEl.parentNode.removeChild(rowEl);
+			}
 
 			this.rows.splice(index, 1);
 		}

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

@@ -45,6 +45,34 @@ class GroupRows extends Module{
 
 	//initialize group configuration
 	initialize(){
+		if(this.table.options.groupBy){
+
+			this.configureGroupSetup();
+
+			if(this.table.options.groupUpdateOnCellEdit){
+				this.subscribe("cell-value-updated", this.cellUpdated.bind(this));
+				this.subscribe("row-data-changed", this.reassignRowToGroup.bind(this), 0);
+			}
+
+			this.subscribe("row-deleting", this.rowDeleting.bind(this));
+			this.subscribe("row-deleted", this.rowsUpdated.bind(this));
+			this.subscribe("scroll-horizontal", this.scrollHeaders.bind(this));
+			this.subscribe("rows-wipe", this.wipe.bind(this));
+			this.subscribe("rows-added", this.rowsUpdated.bind(this));
+			this.subscribe("row-moving", this.rowMoving.bind(this));
+			this.subscribe("row-adding-index", this.rowAddingIndex.bind(this));
+
+			this.subscribe("rows-sample", this.rowSample.bind(this));
+
+			this.subscribe("render-virtual-fill", this.virtualRenderFill.bind(this));
+
+			this.registerDisplayHandler(this.displayHandler, 20);
+
+			this.initialized = true;
+		}
+	}
+
+	configureGroupSetup(){
 		if(this.table.options.groupBy){
 			var groupBy = this.table.options.groupBy,
 			startOpen = this.table.options.groupStartOpen,
@@ -133,27 +161,6 @@ class GroupRows extends Module{
 			if(groupHeader){
 				this.headerGenerator = Array.isArray(groupHeader) ? groupHeader : [groupHeader];
 			}
-
-			if(this.table.options.groupUpdateOnCellEdit){
-				this.subscribe("cell-value-updated", this.cellUpdated.bind(this));
-				this.subscribe("row-data-changed", this.reassignRowToGroup.bind(this), 0);
-			}
-
-			this.subscribe("row-deleting", this.rowDeleting.bind(this));
-			this.subscribe("row-deleted", this.rowsUpdated.bind(this));
-			this.subscribe("scroll-horizontal", this.scrollHeaders.bind(this));
-			this.subscribe("rows-wipe", this.wipe.bind(this));
-			this.subscribe("rows-added", this.rowsUpdated.bind(this));
-			this.subscribe("row-moving", this.rowMoving.bind(this));
-			this.subscribe("row-adding-index", this.rowAddingIndex.bind(this));
-
-			this.subscribe("rows-sample", this.rowSample.bind(this));
-
-			this.subscribe("render-virtual-fill", this.virtualRenderFill.bind(this));
-
-			this.registerDisplayHandler(this.displayHandler, 20);
-
-			this.initialized = true;
 		}
 	}
 
@@ -218,23 +225,23 @@ class GroupRows extends Module{
 
 	setGroupBy(groups){
 		this.table.options.groupBy = groups;
-		this.initialize();
-		this.refreshData(false, "display");
+		this.configureGroupSetup();
+		this.refreshData();
 
 		this.trackChanges();
 	}
 
 	setGroupValues(groupValues){
 		this.table.options.groupValues = groupValues;
-		this.initialize();
-		this.refreshData(false, "display");
+		this.configureGroupSetup();
+		this.refreshData();
 
 		this.trackChanges();
 	}
 
 	setGroupStartOpen(values){
 		this.table.options.groupStartOpen = values;
-		this.initialize();
+		this.configureGroupSetup();
 
 		if(this.table.options.groupBy){
 			this.refreshData();
@@ -247,7 +254,7 @@ class GroupRows extends Module{
 
 	setGroupHeader(values){
 		this.table.options.groupHeader = values;
-		this.initialize();
+		this.configureGroupSetup();
 
 		if(this.table.options.groupBy){
 			this.refreshData();
@@ -328,7 +335,7 @@ class GroupRows extends Module{
 
 	//return appropriate rows with group headers
 	getRows(rows){
-		if(this.groupIDLookups.length){
+		if(this.table.options.groupBy && this.groupIDLookups.length){
 
 			this.dispatchExternal("dataGrouping");
 
@@ -443,7 +450,7 @@ class GroupRows extends Module{
 		var oldGroups = this.groups;
 
 		this.groups = {};
-		this.groupList =[];
+		this.groupList = [];
 
 		if(this.allowedValues && this.allowedValues[0]){
 			this.allowedValues[0].forEach((value) => {

package/src/js/modules/History/History.js

@@ -1,4 +1,6 @@
 import Module from '../../core/Module.js';
+import Row from '../../core/row/Row.js';
+import Cell from '../../core/cell/Cell.js';
 
 import defaultUndoers from './defaults/undoers.js';
 import defaultRedoers from './defaults/redoers.js';
@@ -58,7 +60,7 @@ class History extends Module{
 			}
 		}
 
-		this.history.action("rowDelete", row, {data:row.getData(), pos:!index, index:index});
+		this.action("rowDelete", row, {data:row.getData(), pos:!index, index:index});
 	}
 
 	cellUpdated(cell){

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

@@ -165,7 +165,9 @@ class MoveColumns extends Module{
 	}
 
 	startMove(e, column){
-		var element = column.getElement();
+		var element = column.getElement(),
+		headerElement = this.table.columnManager.getElement(),
+		headersElement = this.table.columnManager.getHeadersElement();
 
 		this.moving = column;
 		this.startX = (this.touchMove ? e.touches[0].pageX : e.pageX) - Helpers.elOffset(element).left;
@@ -186,7 +188,7 @@ class MoveColumns extends Module{
 		this.table.columnManager.getElement().appendChild(this.hoverElement);
 
 		this.hoverElement.style.left = "0";
-		this.hoverElement.style.bottom = "0";
+		this.hoverElement.style.bottom = (headerElement.clientHeight - headersElement.offsetHeight) + "px";
 
 		if(!this.touchMove){
 			this._bindMouseMove();
@@ -224,7 +226,7 @@ class MoveColumns extends Module{
 			column.getCells().forEach(function(cell, i){
 				var cellEl = cell.getElement(true);
 
-				if(cellEl.parentNode){
+				if(cellEl.parentNode && movingCells[i]){
 					cellEl.parentNode.insertBefore(movingCells[i].getElement(), cellEl.nextSibling);
 				}
 			});
@@ -232,7 +234,7 @@ class MoveColumns extends Module{
 			column.getCells().forEach(function(cell, i){
 				var cellEl = cell.getElement(true);
 
-				if(cellEl.parentNode){
+				if(cellEl.parentNode && movingCells[i]){
 					cellEl.parentNode.insertBefore(movingCells[i].getElement(), cellEl);
 				}
 			});

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

@@ -35,7 +35,7 @@ class SelectRow extends Module{
 			this.subscribe("row-init", this.initializeRow.bind(this));
 			this.subscribe("row-deleting", this.rowDeleted.bind(this));
 			this.subscribe("rows-wipe", this.clearSelectionData.bind(this));
-			this.subscribe("rows-retrieve", this.clearSelectionData.bind(this));
+			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));
@@ -51,7 +51,6 @@ class SelectRow extends Module{
 		this._deselectRow(row, true);
 	}
 
-
 	clearSelectionData(silent){
 		this.selecting = false;
 		this.lastClickedRow = false;