tabulator-tables 5.6.0 → 6.0.0

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

@@ -3,7 +3,15 @@ import Module from '../../core/Module.js';
 import ExportRow from './ExportRow.js';
 import ExportColumn from './ExportColumn.js';
 
-class Export extends Module{
+import columnLookups from './defaults/columnLookups.js';
+import rowLookups from './defaults/rowLookups.js';
+
+export default class Export extends Module{
+
+	static moduleName = "export";
+
+	static columnLookups = columnLookups;
+	static rowLookups = rowLookups;
 	
 	constructor(table){
 		super(table);
@@ -11,6 +19,7 @@ class Export extends Module{
 		this.config = {};
 		this.cloneTableStyle = true;
 		this.colVisProp = "";
+		this.colVisPropAttach = "";
 		
 		this.registerTableOption("htmlOutputConfig", false); //html output config
 		
@@ -22,32 +31,32 @@ class Export extends Module{
 		this.registerTableFunction("getHtml", this.getHtml.bind(this));
 	}
 	
-	///////////////////////////////////
-	///////// Table Functions /////////
-	///////////////////////////////////
-	
-	
 	///////////////////////////////////
 	///////// Internal Logic //////////
 	///////////////////////////////////
 	
 	generateExportList(config, style, range, colVisProp){
+		var headers, body, columns, colLookup;
+
 		this.cloneTableStyle = style;
 		this.config = config || {};
 		this.colVisProp = colVisProp;
+		this.colVisPropAttach = this.colVisProp.charAt(0).toUpperCase() + this.colVisProp.slice(1);
+
+		colLookup = Export.columnLookups[range];
+
+		if(colLookup){
+			columns = colLookup.call(this.table);
+			columns = columns.filter(col => this.columnVisCheck(col));
+		}
+
+		headers = this.config.columnHeaders !== false ? this.headersToExportRows(this.generateColumnGroupHeaders(columns)) : [];
 
-		var headers, body;
-		
-		if (range === 'range') {
-			var columns = this.table.modules.selectRange.selectedColumns();
-			headers = this.config.columnHeaders !== false
-				? this.headersToExportRows(this.generateColumnGroupHeaders(columns))
-				: [];
-			body = this.bodyToExportRows(this.rowLookup(range), this.table.modules.selectRange.selectedColumns(true));
-		} else {
-			headers = this.config.columnHeaders !== false ? this.headersToExportRows(this.generateColumnGroupHeaders()) : [];
-			body = this.bodyToExportRows(this.rowLookup(range));
+		if(columns){
+			columns = columns.map(col => col.getComponent());
 		}
+		
+		body = this.bodyToExportRows(this.rowLookup(range), columns);
 
 		return headers.concat(body);
 	}
@@ -59,7 +68,8 @@ class Export extends Module{
 	}
 	
 	rowLookup(range){
-		var rows = [];
+		var rows = [], 
+		rowLookup;
 		
 		if(typeof range == "function"){
 			range.call(this.table).forEach((row) =>{
@@ -70,32 +80,9 @@ class Export extends Module{
 				}
 			});
 		}else{
-			switch(range){
-				case true:
-				case "visible":
-					rows = this.table.rowManager.getVisibleRows(false, true);
-					break;
-				
-				case "all":
-					rows = this.table.rowManager.rows;
-					break;
-				
-				case "selected":
-					rows = this.table.modules.selectRow.selectedRows;
-					break;
+			rowLookup = Export.rowLookups[range] || Export.rowLookups["active"];
 
-				case "range":
-					rows = this.table.modules.selectRange.selectedRows();
-					break;
-
-				case "active":
-				default:
-					if(this.table.options.pagination){
-						rows = this.table.rowManager.getDisplayRows(this.table.rowManager.displayRows.length - 2);
-					}else{
-						rows = this.table.rowManager.getDisplayRows();
-					}
-			}
+			rows = rowLookup.call(this.table);
 		}
 		
 		return Object.assign([], rows);
@@ -116,13 +103,15 @@ class Export extends Module{
 			}
 		});
 
+
+
 		return output;
 	}
 	
 	processColumnGroup(column){
 		var subGroups = column.columns,
 		maxDepth = 0,
-		title = column.definition["title" + (this.colVisProp.charAt(0).toUpperCase() + this.colVisProp.slice(1))] || column.definition.title;
+		title = column.definition["title" + (this.colVisPropAttach)] || column.definition.title;
 		
 		var groupData = {
 			title:title,
@@ -165,12 +154,20 @@ class Export extends Module{
 	
 	columnVisCheck(column){
 		var visProp = column.definition[this.colVisProp];
+
+		if(this.config.rowHeaders === false && column.isRowHeader){
+			return false;
+		}
 		
 		if(typeof visProp === "function"){
 			visProp = visProp.call(this.table, column.getComponent());
 		}
-		
-		return visProp !== false && (column.visible || (!column.visible && visProp));
+
+		if(visProp === false || visProp === true){
+			return visProp;
+		}
+
+		return column.visible && column.field;
 	}
 	
 	headersToExportRows(columns){
@@ -313,7 +310,7 @@ class Export extends Module{
 		headerEl = document.createElement("thead"),
 		bodyEl = document.createElement("tbody"),
 		styles = this.lookupTableStyles(),
-		rowFormatter = this.table.options["rowFormatter" + (this.colVisProp.charAt(0).toUpperCase() + this.colVisProp.slice(1))],
+		rowFormatter = this.table.options["rowFormatter" + (this.colVisPropAttach)],
 		setup = {};
 		
 		setup.rowFormatter = rowFormatter !== null ? rowFormatter : this.table.options.rowFormatter;
@@ -323,7 +320,7 @@ class Export extends Module{
 		}
 		
 		//assign group header formatter
-		setup.groupHeader = this.table.options["groupHeader" + (this.colVisProp.charAt(0).toUpperCase() + this.colVisProp.slice(1))];
+		setup.groupHeader = this.table.options["groupHeader" + (this.colVisPropAttach)];
 		
 		if(setup.groupHeader && !Array.isArray(setup.groupHeader)){
 			setup.groupHeader = [setup.groupHeader];
@@ -332,8 +329,7 @@ class Export extends Module{
 		table.classList.add("tabulator-print-table");
 		
 		this.mapElementStyles(this.table.columnManager.getHeadersElement(), headerEl, ["border-top", "border-left", "border-right", "border-bottom", "background-color", "color", "font-weight", "font-family", "font-size"]);
-		
-		
+
 		if(list.length > 1000){
 			console.warn("It may take a long time to render an HTML table with more than 1000 rows");
 		}
@@ -387,6 +383,7 @@ class Export extends Module{
 			
 			if(styles.firstRow){
 				styles.styleCells = styles.firstRow.getElementsByClassName("tabulator-cell");
+				styles.styleRowHeader = styles.firstRow.getElementsByClassName("tabulator-row-header")[0];
 				styles.firstCell = styles.styleCells[0];
 				styles.lastCell = styles.styleCells[styles.styleCells.length - 1];
 			}
@@ -416,9 +413,9 @@ class Export extends Module{
 					cellEl.classList.add(className);
 				});
 				
-				this.mapElementStyles(column.component.getElement(), cellEl, ["text-align", "border-top", "border-left", "border-right", "border-bottom", "background-color", "color", "font-weight", "font-family", "font-size"]);
+				this.mapElementStyles(column.component.getElement(), cellEl, ["text-align", "border-left", "border-right", "background-color", "color", "font-weight", "font-family", "font-size"]);
 				this.mapElementStyles(column.component._column.contentElement, cellEl, ["padding-top", "padding-left", "padding-right", "padding-bottom"]);
-				
+		
 				if(column.component._column.visible){
 					this.mapElementStyles(column.component.getElement(), cellEl, ["width"]);
 				}else{
@@ -427,8 +424,16 @@ class Export extends Module{
 					}
 				}
 				
-				if(column.component._column.parent){
+				if(column.component._column.parent && column.component._column.parent.isGroup){
 					this.mapElementStyles(column.component._column.parent.groupElement, cellEl, ["border-top"]);
+				}else{
+					this.mapElementStyles(column.component.getElement(), cellEl, ["border-top"]);
+				}
+				
+				if(column.component._column.isGroup){
+					this.mapElementStyles(column.component.getElement(), cellEl, ["border-bottom"]);
+				}else{
+					this.mapElementStyles(this.table.columnManager.getElement(), cellEl, ["border-bottom"]);
 				}
 				
 				rowEl.appendChild(cellEl);
@@ -493,7 +498,7 @@ class Export extends Module{
 				table =  this.table,
 				index = table.columnManager.findColumnIndex(column),
 				value = col.value,
-				cellStyle;
+				cellStyle, styleProps;
 				
 				var cellWrapper = {
 					modules:{},
@@ -552,11 +557,18 @@ class Export extends Module{
 				}else{
 					cellEl.innerHTML = value;
 				}
-				
-				cellStyle = styles.styleCells && styles.styleCells[index] ? styles.styleCells[index] : styles.firstCell;
+
+				styleProps = ["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.isRowHeader){
+					cellStyle = styles.styleRowHeader;
+					styleProps.push("background-color");
+				}else{
+					cellStyle = styles.styleCells && styles.styleCells[index] ? styles.styleCells[index] : styles.firstCell;
+				}
 				
 				if(cellStyle){
-					this.mapElementStyles(cellStyle, 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"]);
+					this.mapElementStyles(cellStyle, cellEl, styleProps);
 					
 					if(column.definition.align){
 						cellEl.style.textAlign = column.definition.align;
@@ -630,7 +642,7 @@ class Export extends Module{
 			
 			if(window.getComputedStyle){
 				var fromStyle = window.getComputedStyle(from);
-				
+
 				props.forEach(function(prop){
 					if(!to.style[lookup[prop]]){
 						to.style[lookup[prop]] = fromStyle.getPropertyValue(prop);
@@ -640,7 +652,3 @@ class Export extends Module{
 		}
 	}
 }
-
-Export.moduleName = "export";
-
-export default Export;

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

@@ -1,4 +1,4 @@
-class ExportColumn{
+export default class ExportColumn{
 	constructor(value, component, width, height, depth){
 		this.value = value;
 		this.component = component || false;
@@ -6,6 +6,4 @@ class ExportColumn{
 		this.height = height;
 		this.depth = depth;
 	}
-}
-
-export default ExportColumn;
+}

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

@@ -1,10 +1,8 @@
-class ExportRow{
+export default class ExportRow{
 	constructor(type, columns, component, indent){
 		this.type = type;
 		this.columns = columns;
 		this.component = component || false;
 		this.indent = indent || 0;
 	}
-}
-
-export default ExportRow;
+}

package/src/js/modules/Export/defaults/columnLookups.js

@@ -0,0 +1,3 @@
+export default {
+
+};

package/src/js/modules/Export/defaults/rowLookups.js

@@ -0,0 +1,18 @@
+export default {
+	visible:function(){
+		return this.rowManager.getVisibleRows(false, true);
+	},
+	all:function(){
+		return this.rowManager.rows;
+	},
+	selected:function(){
+		return this.modules.selectRow.selectedRows;
+	},
+	active:function(){
+		if(this.options.pagination){
+			return this.rowManager.getDisplayRows(this.rowManager.displayRows.length - 2);
+		}else{
+			return this.rowManager.getDisplayRows();
+		}
+	},
+};

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

@@ -2,7 +2,12 @@ import Module from '../../core/Module.js';
 
 import defaultFilters from './defaults/filters.js';
 
-class Filter extends Module{
+export default class Filter extends Module{
+
+	static moduleName = "filter";
+
+	//load defaults
+	static filters = defaultFilters;
 
 	constructor(table){
 		super(table);
@@ -894,11 +899,4 @@ class Filter extends Module{
 
 		return match;
 	}
-}
-
-Filter.moduleName = "filter";
-
-//load defaults
-Filter.filters = defaultFilters;
-
-export default Filter;
+}

package/src/js/modules/Format/Format.js

@@ -2,7 +2,12 @@ import Module from '../../core/Module.js';
 
 import defaultFormatters from './defaults/formatters.js';
 
-class Format extends Module{
+export default class Format extends Module{
+
+	static moduleName = "format";
+
+	//load defaults
+	static formatters = defaultFormatters;
 	
 	constructor(table){
 		super(table);
@@ -206,11 +211,4 @@ class Format extends Module{
 		
 		return formatter;
 	}
-}
-
-Format.moduleName = "format";
-
-//load defaults
-Format.formatters = defaultFormatters;
-
-export default Format;
+}

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

@@ -16,8 +16,6 @@ import buttonTick from './formatters/buttonTick.js';
 import buttonCross from './formatters/buttonCross.js';
 import rownum from './formatters/rownum.js';
 import handle from './formatters/handle.js';
-import responsiveCollapse from './formatters/responsiveCollapse.js';
-import rowSelection from './formatters/rowSelection.js';
 
 export default {
 	plaintext:plaintext,
@@ -38,6 +36,4 @@ export default {
 	buttonCross:buttonCross,
 	rownum:rownum,
 	handle:handle,
-	responsiveCollapse:responsiveCollapse,
-	rowSelection:rowSelection,
 };

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

@@ -1,6 +1,8 @@
 import Module from '../../core/Module.js';
 
-class FrozenColumns extends Module{
+export default class FrozenColumns extends Module{
+
+	static moduleName = "frozenColumns";
 	
 	constructor(table){
 		super(table);
@@ -34,6 +36,7 @@ class FrozenColumns extends Module{
 		this.subscribe("column-deleted", this.reinitializeColumns.bind(this));
 		this.subscribe("column-hide", this.reinitializeColumns.bind(this));
 		this.subscribe("column-show", this.reinitializeColumns.bind(this));
+		this.subscribe("columns-loaded", this.reinitializeColumns.bind(this));
 		
 		this.subscribe("table-redraw", this.layout.bind(this));
 		this.subscribe("layout-refreshing", this.blockLayout.bind(this));
@@ -280,6 +283,10 @@ class FrozenColumns extends Module{
 			this.table.columnManager.getContentsElement().style.width = "calc(100% - " + width + "px)";
 		}
 	}
+
+	getFrozenColumns(){
+		return this.leftColumns.concat(this.rightColumns);
+	}
 	
 	_calcSpace(columns, index){
 		var width = 0;
@@ -292,8 +299,4 @@ class FrozenColumns extends Module{
 		
 		return width;
 	}
-}
-
-FrozenColumns.moduleName = "frozenColumns";
-
-export default FrozenColumns;
+}

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

@@ -1,6 +1,8 @@
 import Module from '../../core/Module.js';
 
-class FrozenRows extends Module{
+export default class FrozenRows extends Module{
+
+	static moduleName = "frozenRows";
 
 	constructor(table){
 		super(table);
@@ -168,8 +170,4 @@ class FrozenRows extends Module{
 			this.table.rowManager.styleRow(row, i);
 		});
 	}
-}
-
-FrozenRows.moduleName = "frozenRows";
-
-export default FrozenRows;
+}

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

@@ -2,7 +2,7 @@ import Helpers from '../../core/tools/Helpers.js';
 import GroupComponent from './GroupComponent.js';
 
 //Group functions
-class Group{
+export default class Group{
 	
 	constructor(groupManager, parent, level, key, field, generator, oldGroup){
 		this.groupManager = groupManager;
@@ -610,6 +610,4 @@ class Group{
 		
 		return this.component;
 	}
-}
-
-export default Group;
+}

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

@@ -1,5 +1,5 @@
 //public group object
-class GroupComponent {
+export default class GroupComponent {
 	constructor (group){
 		this._group = group;
 		this.type = "GroupComponent";
@@ -66,6 +66,4 @@ class GroupComponent {
 	getTable(){
 		return this._group.groupManager.table;
 	}
-}
-
-export default GroupComponent;
+}

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

@@ -2,7 +2,9 @@ import Module from '../../core/Module.js';
 
 import Group from './Group.js';
 
-class GroupRows extends Module{
+export default class GroupRows extends Module{
+
+	static moduleName = "groupRows";
 	
 	constructor(table){
 		super(table);
@@ -633,8 +635,4 @@ class GroupRows extends Module{
 		}
 	}
 	
-}
-
-GroupRows.moduleName = "groupRows";
-
-export default GroupRows;
+}

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

@@ -4,8 +4,16 @@ import Cell from '../../core/cell/Cell.js';
 
 import defaultUndoers from './defaults/undoers.js';
 import defaultRedoers from './defaults/redoers.js';
+import extensions from './extensions/extensions.js';
 
-class History extends Module{
+export default class History extends Module{
+
+	static moduleName = "history";
+	static moduleExtensions = extensions;
+
+	//load defaults
+	static undoers = defaultUndoers;
+	static redoers = defaultRedoers;
 
 	constructor(table){
 		super(table);
@@ -161,12 +169,4 @@ class History extends Module{
 			}
 		});
 	}
-}
-
-History.moduleName = "history";
-
-//load defaults
-History.undoers = defaultUndoers;
-History.redoers = defaultRedoers;
-
-export default History;
+}

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

@@ -0,0 +1,9 @@
+import bindings from './keybindings/bindings.js';
+import actions from './keybindings/actions.js';
+
+export default {
+	keybindings:{
+		bindings:bindings,
+		actions:actions
+	},
+};

package/src/js/modules/History/extensions/keybindings/actions.js

@@ -0,0 +1,27 @@
+export default {
+	undo:function(e){
+		var cell = false;
+		if(this.table.options.history && this.table.modExists("history") && this.table.modExists("edit")){
+
+			cell = this.table.modules.edit.currentCell;
+
+			if(!cell){
+				e.preventDefault();
+				this.table.modules.history.undo();
+			}
+		}
+	},
+
+	redo:function(e){
+		var cell = false;
+		if(this.table.options.history && this.table.modExists("history") && this.table.modExists("edit")){
+
+			cell = this.table.modules.edit.currentCell;
+
+			if(!cell){
+				e.preventDefault();
+				this.table.modules.history.redo();
+			}
+		}
+	},
+};

package/src/js/modules/History/extensions/keybindings/bindings.js

@@ -0,0 +1,4 @@
+export default {
+	undo:["ctrl + 90", "meta + 90"],
+	redo:["ctrl + 89", "meta + 89"],
+};

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

@@ -1,6 +1,8 @@
 import Module from '../../core/Module.js';
 
-class HtmlTableImport extends Module{
+export default class HtmlTableImport extends Module{
+
+	static moduleName = "htmlTableImport";
 
 	constructor(table){
 		super(table);
@@ -175,8 +177,4 @@ class HtmlTableImport extends Module{
 			this.table.options.columns.push(col);
 		}
 	}
-}
-
-HtmlTableImport.moduleName = "htmlTableImport";
-
-export default HtmlTableImport;
+}

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

@@ -2,7 +2,12 @@ import Module from '../../core/Module.js';
 
 import defaultImporters from './defaults/importers.js';
 
-class Import extends Module{
+export default class Import extends Module{
+
+	static moduleName = "import";
+
+	//load defaults
+	static importers = defaultImporters;
     
 	constructor(table){
 		super(table);
@@ -184,11 +189,4 @@ class Import extends Module{
 	setData(data){
 		return this.table.setData(data);
 	}
-}
-
-Import.moduleName = "import";
-
-//load defaults
-Import.importers = defaultImporters;
-
-export default Import;
+}

package/src/js/modules/Import/defaults/importers/array.js

@@ -1,5 +1,3 @@
-function arrayImporter(input){
+export default function (input){
 	return input;
-}
-
-export default arrayImporter;
+}

package/src/js/modules/Import/defaults/importers/csv.js

@@ -1,4 +1,4 @@
-function csvImporter(input){
+export default function(input){
 	var data = [],
 	row = 0, 
 	col = 0,
@@ -58,6 +58,4 @@ function csvImporter(input){
 	}
 
 	return data;
-}
-
-export default csvImporter;
+}

package/src/js/modules/Interaction/Interaction.js

@@ -3,7 +3,9 @@ import Module from '../../core/Module.js';
 import Cell from '../../core/cell/Cell.js';
 import Column from '../../core/column/Column.js';
 
-class Interaction extends Module{
+export default class Interaction extends Module{
+
+	static moduleName = "interaction";
 
 	constructor(table){
 		super(table);
@@ -330,8 +332,4 @@ class Interaction extends Module{
 
 		this.dispatchExternal(action, e, componentObj);
 	}
-}
-
-Interaction.moduleName = "interaction";
-
-export default Interaction;
+}