tabulator-tables 5.0.3 → 5.0.8

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

@@ -6,7 +6,7 @@ export default class InteractionManager extends CoreFeature {
 	constructor (table){
 		super(table);
 
-		this.el = this.table.element;
+		this.el = null;
 
 		this.abortClasses = ["tabulator-headers", "tabulator-table"];
 
@@ -31,7 +31,10 @@ export default class InteractionManager extends CoreFeature {
 			"tabulator-group":"group",
 			"tabulator-col":"column",
 		};
+	}
 
+	initialize(){
+		this.el = this.table.element;
 		this.buildListenerMap();
 		this.bindSubscriptionWatchers();
 	}

package/src/js/core/tools/OptionsList.js

@@ -1,8 +1,8 @@
 export default class OptionsList {
-	constructor(table, msgType){
+	constructor(table, msgType, defaults = {}){
 		this.table = table;
 		this.msgType = msgType;
-		this.registeredDefaults = {};
+		this.registeredDefaults = Object.assign({}, defaults)
 	}
 
 	register(option, value){

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

@@ -354,7 +354,7 @@ class ColumnCalcs extends Module{
 
 		row.getComponent = () => {
 			if(!row.component){
-				row.component = new CalcComponent(this);
+				row.component = new CalcComponent(row);
 			}
 
 			return row.component;

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] && element.getElementsByTagName("div")[0].getAttribute("max")) || 100) : editorParams.max,
+	min = typeof editorParams.min === "undefined" ? ((element.getElementsByTagName("div")[0] && 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(true);
+			}
 		}
 
 		//TODO - Persist left position of row manager

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

@@ -6,7 +6,7 @@ export default function(cell, formatterParams, onRendered){
 	var value = cell.getValue();
 
 	if(typeof DT != "undefined"){
-		var newDatetime = (window.DateTime || luxon.DateTime).fromFormat(value, inputFormat);
+		var newDatetime = DT.fromFormat(String(value), inputFormat);
 
 		if(newDatetime.isValid){
 
@@ -17,7 +17,7 @@ export default function(cell, formatterParams, onRendered){
 			return newDatetime.toFormat(outputFormat);
 		}else{
 
-			if(invalid === true){
+			if(invalid === true || !value){
 				return value;
 			}else if(typeof invalid === "function"){
 				return invalid(value);

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

@@ -9,7 +9,7 @@ export default function (cell, formatterParams, onRendered) {
 	var value = cell.getValue();
 
 	if(typeof DT != "undefined"){
-		var newDatetime = DT.fromFormat(value, inputFormat);
+		var newDatetime = DT.fromFormat(String(value), inputFormat);
 
 		if (newDatetime.isValid){
 			if(humanize){

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

@@ -43,10 +43,16 @@ class Group{
 				group.wipe();
 			});
 		}else{
-			this.element = false;
-			this.arrowElement = false;
-			this.elementContents = false;
+			this.rows.forEach((row) => {
+				if(row.modules){
+					delete row.modules.group;
+				}
+			});
 		}
+
+		this.element = false;
+		this.arrowElement = false;
+		this.elementContents = false;
 	}
 
 	createElements(){
@@ -268,7 +274,7 @@ class Group{
 			}
 
 			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

@@ -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,28 @@ class GroupRows extends Module{
 
 	setGroupBy(groups){
 		this.table.options.groupBy = groups;
-		this.initialize();
-		this.refreshData(false, "display");
+		if(!this.initialized){
+			this.initialize();
+		}else{
+			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 +259,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 +340,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 +455,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"),
@@ -34,7 +35,7 @@ class HtmlTableImport extends Module{
 
 		rows = rows ? rows.getElementsByTagName("tr") : [];
 
-		//check for tablator inline options
+		//check for Tabulator inline options
 		this._extractOptions(element, options);
 
 		if(headers.length){
@@ -65,34 +66,15 @@ 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
 	_extractOptions(element, options, defaultOptions){
 		var attributes = element.attributes;
-		var optionsArr = defaultOptions ? Object.assign([], defaultOptions) : Object.keys(options);
+		var optionsArr = defaultOptions ? Object.keys(defaultOptions) : Object.keys(options);
 		var optionsList = {};
 
 		optionsArr.forEach((item) => {
@@ -159,11 +141,8 @@ class HtmlTableImport extends Module{
 				col.width = width;
 			}
 
-			//check for tablator inline options
-			attributes = header.attributes;
-
-			// //check for tablator inline options
-			this._extractOptions(header, col, Column.prototype.defaultOptionList);
+			//check for Tabulator inline options
+			this._extractOptions(header, col, this.table.columnManager.optionsList.registeredDefaults);
 
 			this.fieldIndex[index] = col.field;