tabulator-tables 5.0.2 → 5.0.7

package/src/js/modules/Ajax/defaults/contentTypeFormatters.js

@@ -1,3 +1,23 @@
+function generateParamsList(data, prefix){
+	var output = [];
+
+	prefix = prefix || "";
+
+	if(Array.isArray(data)){
+		data.forEach((item, i) => {
+			output = output.concat(generateParamsList(item, prefix ? prefix + "[" + i + "]" : i));
+		});
+	}else if (typeof data === "object"){
+		for (var key in data){
+			output = output.concat(generateParamsList(data[key], prefix ? prefix + "[" + key + "]" : key));
+		}
+	}else{
+		output.push({key:prefix, value:data});
+	}
+
+	return output;
+}
+
 export default {
 	"json":{
 		headers:{
@@ -11,7 +31,8 @@ export default {
 		headers:{
 		},
 		body:function(url, config, params){
-			var output = this.generateParamsList(params),
+
+			var output = generateParamsList(params),
 			form = new FormData();
 
 			output.forEach(function(item){

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

@@ -557,7 +557,7 @@ class DataTree extends Module{
 
 	checkForRestyle(cell){
 		if(!cell.row.cells.indexOf(cell)){
-			cell.row.reinitialize();
+			this.layoutRow(cell.row);
 		}
 	}
 

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

@@ -1,4 +1,5 @@
 import Module from '../../core/Module.js';
+import Helpers from '../../core/tools/Helpers.js';
 
 import defaultEditors from './defaults/editors.js';
 
@@ -150,7 +151,7 @@ class Edit extends Module{
 					nextCell = this.findNextEditableCell(prevRow, prevRow.cells.length);
 
 					if(nextCell){
-						nextCell.edit();
+						nextCell.getComponent().edit();
 						return true;
 					}
 				}
@@ -181,7 +182,7 @@ class Edit extends Module{
 					nextCell = this.findNextEditableCell(nextRow, -1);
 
 					if(nextCell){
-						nextCell.edit();
+						nextCell.getComponent().edit();
 						return true;
 					}
 				}
@@ -205,7 +206,7 @@ class Edit extends Module{
 			nextCell = this.findPrevEditableCell(cell.row, index);
 
 			if(nextCell){
-				nextCell.edit();
+				nextCell.getComponent().edit();
 				return true;
 			}
 		}
@@ -227,7 +228,7 @@ class Edit extends Module{
 			nextCell = this.findNextEditableCell(cell.row, index);
 
 			if(nextCell){
-				nextCell.edit();
+				nextCell.getComponent().edit();
 				return true;
 			}
 		}
@@ -249,7 +250,7 @@ class Edit extends Module{
 			nextRow = this.table.rowManager.prevDisplayRow(cell.row, true);
 
 			if(nextRow){
-				nextRow.cells[index].edit();
+				nextRow.cells[index].getComponent().edit();
 				return true;
 			}
 		}
@@ -271,7 +272,7 @@ class Edit extends Module{
 			nextRow = this.table.rowManager.nextDisplayRow(cell.row, true);
 
 			if(nextRow){
-				nextRow.cells[index].edit();
+				nextRow.cells[index].getComponent().edit();
 				return true;
 			}
 		}

package/src/js/modules/Edit/defaults/editors/progress.js

@@ -1,8 +1,8 @@
 //draggable progress bar
 export default function(cell, onRendered, success, cancel, editorParams){
 	var element = cell.getElement(),
-	max = typeof editorParams.max === "undefined" ? ( element.getElementsByTagName("div")[0].getAttribute("max") || 100) : editorParams.max,
-	min = typeof editorParams.min === "undefined" ? ( element.getElementsByTagName("div")[0].getAttribute("min") || 0) : editorParams.min,
+	max = typeof editorParams.max === "undefined" ? ( element.getElementsByTagName("div")[0]?.getAttribute("max") || 100) : editorParams.max,
+	min = typeof editorParams.min === "undefined" ? ( element.getElementsByTagName("div")[0]?.getAttribute("min") || 0) : editorParams.min,
 	percent = (max - min) / 100,
 	value = cell.getValue() || 0,
 	handle = document.createElement("div"),

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/Format/defaults/formatters/money.js

@@ -1,9 +1,11 @@
 export default function(cell, formatterParams, onRendered){
 	var floatVal = parseFloat(cell.getValue()),
+	sign = "",
 	number, integer, decimal, rgx;
 
 	var decimalSym = formatterParams.decimal || ".";
 	var thousandSym = formatterParams.thousand || ",";
+	var negativeSign = formatterParams.negativeSign || "-";
 	var symbol = formatterParams.symbol || "";
 	var after = !!formatterParams.symbolAfter;
 	var precision = typeof formatterParams.precision !== "undefined" ? formatterParams.precision : 2;
@@ -12,6 +14,11 @@ export default function(cell, formatterParams, onRendered){
 		return this.emptyToSpace(this.sanitizeHTML(cell.getValue()));
 	}
 
+	if(floatVal < 0){
+		floatVal = Math.abs(floatVal);
+		sign = negativeSign;
+	}
+
 	number = precision !== false ? floatVal.toFixed(precision) : floatVal;
 	number = String(number).split(".");
 
@@ -24,5 +31,5 @@ export default function(cell, formatterParams, onRendered){
 		integer = integer.replace(rgx, "$1" + thousandSym + "$2");
 	}
 
-	return after ? integer + decimal + symbol : symbol + integer + decimal;
+	return after ? sign + integer + decimal + symbol : sign + symbol + integer + decimal;
 };

package/src/js/modules/FrozenColumns/FrozenColumns.js

@@ -135,12 +135,33 @@ class FrozenColumns extends Module{
 			if(this.table.modules.columnCalcs.topInitialized && this.table.modules.columnCalcs.topRow){
 				this.layoutRow(this.table.modules.columnCalcs.topRow);
 			}
+
 			if(this.table.modules.columnCalcs.botInitialized && this.table.modules.columnCalcs.botRow){
 				this.layoutRow(this.table.modules.columnCalcs.botRow);
 			}
+
+			if(this.table.modExists("groupRows")){
+				this.layoutGroupCalcs(this.table.modules.groupRows.getGroups())
+			}
 		}
 	}
 
+	layoutGroupCalcs(groups){
+		groups.forEach((group) => {
+			if(group.calcs.top){
+				this.layoutRow(group.calcs.top);
+			}
+
+			if(group.calcs.bottom){
+				this.layoutRow(group.calcs.bottom);
+			}
+
+			if(group.groupList && group.groupList.length){
+				this.layoutGroupCalcs(group.groupList && group.groupList);
+			}
+		});
+	}
+
 	//calculate column positions and layout headers
 	layoutColumnPosition(allCells){
 

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/Group.js

@@ -638,6 +638,8 @@ class Group{
 
 	clearCellHeight(){}
 
+	deinitializeHeight(){}
+
 	//////////////// Object Generation /////////////////
 	getComponent(){
 		if(!this.component){

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,16 +335,14 @@ class GroupRows extends Module{
 
 	//return appropriate rows with group headers
 	getRows(rows){
-		if(this.groupIDLookups.length){
+		if(this.table.options.groupBy && this.groupIDLookups.length){
 
-			if(!Object.keys(this.groups).length){
-				this.dispatchExternal("dataGrouping");
+			this.dispatchExternal("dataGrouping");
 
-				this.generateGroups(rows);
+			this.generateGroups(rows);
 
-				if(this.subscribedExternal("dataGrouped")){
-					this.dispatchExternal("dataGrouped", this.getGroups(true));
-				}
+			if(this.subscribedExternal("dataGrouped")){
+				this.dispatchExternal("dataGrouped", this.getGroups(true));
 			}
 
 			return this.updateGroupRows();
@@ -445,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/History/defaults/redoers.js

@@ -1,6 +1,7 @@
 export default {
 	cellEdit: function(action){
 		action.component.setValueProcessData(action.data.newValue);
+		action.component.cellRendered();
 	},
 
 	rowAdd: function(action){

package/src/js/modules/History/defaults/undoers.js

@@ -1,6 +1,7 @@
 export default {
 	cellEdit: function(action){
 		action.component.setValueProcessData(action.data.oldValue);
+		action.component.cellRendered();
 	},
 
 	rowAdd: function(action){

package/src/js/modules/HtmlTableImport/HtmlTableImport.js

@@ -1,4 +1,5 @@
 import Module from '../../core/Module.js';
+import Column from '../../core/column/Column.js';
 
 class HtmlTableImport extends Module{
 
@@ -10,17 +11,17 @@ class HtmlTableImport extends Module{
 	}
 
 	initialize(){
-		this.subscribe("table-building", this.tableElementCheck.bind(this));
+		this.tableElementCheck();
 	}
 
 	tableElementCheck(){
-		if(this.table.element.tagName === "TABLE"){
+		if(this.table.originalElement && this.table.originalElement.tagName === "TABLE"){
 			this.parseTable();
 		}
 	}
 
 	parseTable(){
-		var element = this.table.element,
+		var element = this.table.originalElement,
 		options = this.table.options,
 		columns = options.columns,
 		headers = element.getElementsByTagName("th"),
@@ -65,28 +66,9 @@ class HtmlTableImport extends Module{
 			data.push(item);
 		}
 
-		//create new element
-		var newElement = document.createElement("div");
-
-		//transfer attributes to new element
-		var attributes = element.attributes;
-
-		// loop through attributes and apply them on div
-
-		for(var i in attributes){
-			if(typeof attributes[i] == "object"){
-				newElement.setAttribute(attributes[i].name, attributes[i].value);
-			}
-		}
-
-		// replace table with div element
-		element.parentNode.replaceChild(newElement, element);
-
 		options.data = data;
 
 		this.dispatchExternal("htmlImported");
-
-		this.table.element = newElement;
 	}
 
 	//extract tabulator attribute options

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/Page/Page.js

@@ -260,8 +260,6 @@ class Page extends Module{
 				pageSizes = this.table.options.paginationSizeSelector;
 				this.pageSizes = pageSizes;
 
-				console.log("gen",this.size)
-
 				if(this.pageSizes.indexOf(this.size) == -1){
 					pageSizes.unshift(this.size);
 				}
@@ -521,8 +519,6 @@ class Page extends Module{
 			this.generatePageSizeSelectList();
 		}
 
-		console.log("set", size, this.size)
-
 		this.trackChanges();
 	}
 

package/src/js/modules/ReactiveData/ReactiveData.js

@@ -26,7 +26,8 @@ class ReactiveData extends Module{
 	}
 
 	watchData(data){
-		var pushFunc, version;
+		var self = this,
+		pushFunc, version;
 
 		this.currentVersion ++;
 
@@ -42,16 +43,16 @@ class ReactiveData extends Module{
 		Object.defineProperty(this.data, "push", {
 			enumerable: false,
 			configurable: true,
-			value: () => {
+			value: function(){
 				var args = Array.from(arguments);
 
-				if(!this.blocked && version === this.currentVersion){
+				if(!self.blocked && version === self.currentVersion){
 					args.forEach((arg) => {
-						this.table.rowManager.addRowActual(arg, false);
+						self.table.rowManager.addRowActual(arg, false);
 					});
 				}
 
-				return this.origFuncs.push.apply(data, arguments);
+				return self.origFuncs.push.apply(data, arguments);
 			}
 		});
 
@@ -61,16 +62,16 @@ class ReactiveData extends Module{
 		Object.defineProperty(this.data, "unshift", {
 			enumerable: false,
 			configurable: true,
-			value: () => {
+			value: function(){
 				var args = Array.from(arguments);
 
-				if(!this.blocked && version === this.currentVersion){
+				if(!self.blocked && version === self.currentVersion){
 					args.forEach((arg) => {
-						this.table.rowManager.addRowActual(arg, true);
+						self.table.rowManager.addRowActual(arg, true);
 					});
 				}
 
-				return this.origFuncs.unshift.apply(data, arguments);
+				return self.origFuncs.unshift.apply(data, arguments);
 			}
 		});
 
@@ -81,12 +82,12 @@ class ReactiveData extends Module{
 		Object.defineProperty(this.data, "shift", {
 			enumerable: false,
 			configurable: true,
-			value: () => {
+			value: function(){
 				var row;
 
-				if(!this.blocked && version === this.currentVersion){
-					if(this.data.length){
-						row = this.table.rowManager.getRowFromDataObject(this.data[0]);
+				if(!self.blocked && version === self.currentVersion){
+					if(self.data.length){
+						row = self.table.rowManager.getRowFromDataObject(self.data[0]);
 
 						if(row){
 							row.deleteActual();
@@ -94,7 +95,7 @@ class ReactiveData extends Module{
 					}
 				}
 
-				return this.origFuncs.shift.call(data);
+				return self.origFuncs.shift.call(data);
 			}
 		});
 
@@ -104,18 +105,18 @@ class ReactiveData extends Module{
 		Object.defineProperty(this.data, "pop", {
 			enumerable: false,
 			configurable: true,
-			value: () => {
+			value: function(){
 				var row;
-				if(!this.blocked && version === this.currentVersion){
-					if(this.data.length){
-						row = this.table.rowManager.getRowFromDataObject(this.data[this.data.length - 1]);
+				if(!self.blocked && version === self.currentVersion){
+					if(self.data.length){
+						row = self.table.rowManager.getRowFromDataObject(self.data[self.data.length - 1]);
 
 						if(row){
 							row.deleteActual();
 						}
 					}
 				}
-				return this.origFuncs.pop.call(data);
+				return self.origFuncs.pop.call(data);
 			}
 		});
 
@@ -126,28 +127,28 @@ class ReactiveData extends Module{
 		Object.defineProperty(this.data, "splice", {
 			enumerable: false,
 			configurable: true,
-			value: () => {
+			value: function(){
 				var args = Array.from(arguments),
 				start = args[0] < 0 ? data.length + args[0] : args[0],
 				end = args[1],
 				newRows = args[2] ? args.slice(2) : false,
 				startRow;
 
-				if(!this.blocked && version === this.currentVersion){
+				if(!self.blocked && version === self.currentVersion){
 
 					//add new rows
 					if(newRows){
-						startRow = data[start] ? this.table.rowManager.getRowFromDataObject(data[start]) : false;
+						startRow = data[start] ? self.table.rowManager.getRowFromDataObject(data[start]) : false;
 
 						if(startRow){
 							newRows.forEach((rowData) => {
-								this.table.rowManager.addRowActual(rowData, true, startRow, true);
+								self.table.rowManager.addRowActual(rowData, true, startRow, true);
 							});
 						}else{
 							newRows = newRows.slice().reverse();
 
 							newRows.forEach((rowData) => {
-								this.table.rowManager.addRowActual(rowData, true, false, true);
+								self.table.rowManager.addRowActual(rowData, true, false, true);
 							});
 						}
 					}
@@ -157,7 +158,7 @@ class ReactiveData extends Module{
 						var oldRows = data.slice(start, typeof args[1] === "undefined" ? args[1] : start + end);
 
 						oldRows.forEach((rowData, i) => {
-							var row = this.table.rowManager.getRowFromDataObject(rowData);
+							var row = self.table.rowManager.getRowFromDataObject(rowData);
 
 							if(row){
 								row.deleteActual(i !== oldRows.length - 1);
@@ -166,11 +167,11 @@ class ReactiveData extends Module{
 					}
 
 					if(newRows || end !== 0){
-						this.table.rowManager.reRenderInPosition();
+						self.table.rowManager.reRenderInPosition();
 					}
 				}
 
-				return this.origFuncs.splice.apply(data, arguments);
+				return self.origFuncs.splice.apply(data, arguments);
 			}
 		});
 	}