tabulator-tables 5.2.1 → 5.2.4

package/package.json

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

package/src/js/core/CoreFeature.js

@@ -8,8 +8,8 @@ export default class CoreFeature{
 	/////////////// DataLoad /////////////////
 	//////////////////////////////////////////
 
-	reloadData(data, silent){
-		return this.table.dataLoader.load(data, undefined, undefined, undefined, silent);
+	reloadData(data, silent, columnsChanged){
+		return this.table.dataLoader.load(data, undefined, undefined, undefined, silent, columnsChanged);
 	}
 
 	//////////////////////////////////////////

package/src/js/core/RowManager.js

@@ -848,7 +848,9 @@ export default class RowManager extends CoreFeature{
 				this.redrawBlockRenderInPosition = true;
 			}
 		}else{
+			this.dispatchExternal("renderStarted");
 			this.renderer.rerenderRows(callback);
+			this.dispatchExternal("renderComplete");
 		}
 	}
 	

package/src/js/core/rendering/Renderer.js

@@ -186,6 +186,8 @@ export default class Renderer extends CoreFeature{
 						this.elementVertical.scrollTop = this.elementVertical.scrollTop - this.elementVertical.clientHeight + rowEl.offsetHeight;
 					}
 
+					case "top":
+					this.elementVertical.scrollTop = rowEl.offsetTop;					
 					break;
 				}
 

package/src/js/core/tools/DataLoader.js

@@ -10,7 +10,7 @@ export default class DataLoader extends CoreFeature{
 
 	initialize(){}
 
-	load(data, params, config, replace, silent){
+	load(data, params, config, replace, silent, columnsChanged){
 		var requestNo = ++this.requestOrder;
 
 		this.dispatchExternal("dataLoading", data);
@@ -46,7 +46,7 @@ export default class DataLoader extends CoreFeature{
 
 					if(rowData !== false){
 						this.dispatchExternal("dataLoaded", rowData);
-						this.table.rowManager.setData(rowData,  replace, !replace);
+						this.table.rowManager.setData(rowData,  replace, typeof columnsChanged === "undefined" ? !replace : columnsChanged);
 					}
 				}else{
 					console.warn("Data Load Response Blocked - An active data load request was blocked by an attempt to change table data while the request was being made");
@@ -73,7 +73,7 @@ export default class DataLoader extends CoreFeature{
 				data = [];
 			}
 
-			this.table.rowManager.setData(data, replace, !replace);
+			this.table.rowManager.setData(data, replace, typeof columnsChanged === "undefined" ? !replace : columnsChanged);
 			return Promise.resolve();
 		}
 	}

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

@@ -122,11 +122,24 @@ class DataTree extends Module{
 			this.subscribe("edit-cancelled", this.cellValueChanged.bind(this));
 			this.subscribe("column-moving-rows", this.columnMoving.bind(this));
 			this.subscribe("table-built", this.initializeElementField.bind(this));
+			this.subscribe("table-redrawing", this.tableRedrawing.bind(this));
 
 			this.registerDisplayHandler(this.getRows.bind(this), 30);
 		}
 	}
 
+	tableRedrawing(force){
+		var rows;
+
+		if(force){
+			rows = this.table.rowManager.getRows();
+			
+			rows.forEach((row) => {
+				this.reinitializeRowChildren(row);
+			});
+		}
+	}
+
 	initializeElementField(){
 		var firstCol = this.table.columnManager.getFirstVisibleColumn();
 
@@ -419,6 +432,10 @@ class DataTree extends Module{
 		return row.modules.dataTree.parent ? row.modules.dataTree.parent.getComponent() : false;
 	}
 
+	getTreeParentRoot(row){
+		return row.modules.dataTree.parent ? this.getTreeParentRoot(row.modules.dataTree.parent) : row;
+	}
+
 	getFilteredTreeChildren(row){
 		var config = row.modules.dataTree,
 		output = [], children;

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

@@ -475,7 +475,7 @@ export default class Edit{
             values = this._ajaxRequest(this.params.valuesURL, this.input.value);
         }else{
             if(typeof this.params.valuesLookup === "function"){
-                values = this.params.valuesLookup(cell, this.input.value);
+                values = this.params.valuesLookup(this.cell, this.input.value);
             }else if(this.params.valuesLookup){
                 values = this._uniqueColumnValues(this.params.valuesLookupField);
             }
@@ -990,8 +990,8 @@ export default class Edit{
         this.actions.success(output);
         
         if(this.isFilter){
-            this.initialValues = output;
+            this.initialValues = output && !Array.isArray[output] ? [output] : output;
         }
     }
     
-}
+}

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

@@ -556,7 +556,7 @@ class Filter extends Module{
 	refreshFilter(){
 		if(this.tableInitialized){
 			if(this.table.options.filterMode === "remote"){
-				this.reloadData();
+				this.reloadData(null, false, false);
 			}else{
 				this.refreshData(true);
 			}

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

@@ -12,7 +12,6 @@ class FrozenColumns extends Module{
 		this.rightPadding = 0;
 		this.initializationMode = "left";
 		this.active = false;
-		this.scrollEndTimer = false;
 		this.blocked = true;
 		
 		this.registerColumnOption("frozen");
@@ -41,10 +40,10 @@ class FrozenColumns extends Module{
 		this.subscribe("scroll-horizontal", this.scrollHorizontal.bind(this));
 		this.subscribe("scroll-horizontal", this.scrollHorizontal.bind(this));
 		this.subscribe("columns-loading", this.reset.bind(this));
-
+		
 		this.subscribe("column-add", this.reinitializeColumns.bind(this));
 		this.subscribe("column-delete", this.reinitializeColumns.bind(this));
-
+		
 		this.subscribe("table-redraw", this.layout.bind(this));
 		this.subscribe("layout-refreshing", this.blockLayout.bind(this));
 		this.subscribe("layout-refreshed", this.unblockLayout.bind(this));
@@ -61,10 +60,10 @@ class FrozenColumns extends Module{
 	layoutCell(cell){
 		this.layoutElement(cell.element, cell.column)
 	}
-
+	
 	reinitializeColumns(){
 		this.reset();
-
+		
 		this.table.columnManager.columnsByIndex.forEach((column) => {
 			this.initializeColumn(column);
 		});
@@ -111,22 +110,14 @@ class FrozenColumns extends Module{
 	scrollHorizontal(){
 		var rows;
 		
-		if(this.active){
-			clearTimeout(this.scrollEndTimer);
-
-			rows = this.table.rowManager.getVisibleRows();
-			
+		if(this.active){		
 			this.calcMargins(true);
 			
 			this.layoutColumnPosition();
 			
 			this.layoutCalcRows();
 			
-			rows.forEach((row) => {
-				if(row.type === "row"){
-					this.layoutRow(row);
-				}
-			});
+			this.reinitializeRows();
 		}
 	}
 	
@@ -138,7 +129,7 @@ class FrozenColumns extends Module{
 			this.rightMargin = this._calcSpace(this.rightColumns, this.rightColumns.length) + "px";	
 			this.table.rowManager.tableElement.style.marginRight = this.rightMargin;
 		}
-	
+		
 		//calculate right frozen columns
 		this.rightPadding = this.table.rowManager.element.clientWidth + this.table.columnManager.scrollLeft;
 	}
@@ -185,10 +176,11 @@ class FrozenColumns extends Module{
 		
 		this.table.columnManager.headersElement.style.marginLeft = this.leftMargin;
 		this.table.columnManager.element.style.paddingRight = this.rightMargin;
-
+		
 		this.leftColumns.forEach((column, i) => {	
-			column.modules.frozen.margin = (leftMargin + this.table.columnManager.scrollLeft) + "px";
-
+			column.modules.frozen.marginValue = leftMargin + this.table.columnManager.scrollLeft;
+			column.modules.frozen.margin = column.modules.frozen.marginValue + "px";
+			
 			if(column.visible){
 				leftMargin += column.getWidth();
 			}
@@ -221,12 +213,13 @@ class FrozenColumns extends Module{
 		});
 		
 		this.rightColumns.forEach((column, i) => {
-
+			
 			if(column.visible){
 				rightMargin += column.getWidth();
 			}
-
-			column.modules.frozen.margin = (this.rightPadding - rightMargin) + "px";
+			
+			column.modules.frozen.marginValue = this.rightPadding - rightMargin;
+			column.modules.frozen.margin = column.modules.frozen.marginValue + "px";
 			
 			if(i == this.rightColumns.length - 1){
 				column.modules.frozen.edge = true;
@@ -254,36 +247,35 @@ class FrozenColumns extends Module{
 	}
 	
 	//layout columns appropriately
-	layout(){
-		var visibleRows = [],
-		otherRows = [];
-
+	layout(){	
 		if(this.active && !this.blocked){
 			//calculate row padding
 			this.calcMargins();
-
+			
 			//calculate left columns
 			this.layoutColumnPosition();
 
-			visibleRows = this.table.rowManager.getVisibleRows();
-			otherRows = this.table.rowManager.getDisplayRows().filter(row => !visibleRows.includes(row));
-
-			otherRows.forEach((row) =>{
-				row.deinitialize();
-			});
-
-			visibleRows.forEach((row) =>{
-				if(row.type === "row"){
-					this.layoutRow(row);
-				}
-			});
+			this.reinitializeRows();
 			
 			this.layoutCalcRows();
-			
-
 		}
 	}
 	
+	reinitializeRows(){
+		var visibleRows = this.table.rowManager.getVisibleRows();
+		var otherRows = this.table.rowManager.getRows().filter(row => !visibleRows.includes(row));
+
+		otherRows.forEach((row) =>{
+			row.deinitialize();
+		});
+		
+		visibleRows.forEach((row) =>{
+			if(row.type === "row"){
+				this.layoutRow(row);
+			}
+		});
+	}
+	
 	layoutRow(row){
 		// console.trace("row")
 		var rowEl = row.getElement();

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

@@ -436,6 +436,10 @@ class GroupRows extends Module{
 	getRowGroup(row){
 		var match = false;
 
+		if(this.options("dataTree")){
+			row = this.table.modules.dataTree.getTreeParentRoot(row);
+		}
+
 		this.groupList.forEach((group) => {
 			var result = group.getRowGroup(row);
 

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

@@ -45,7 +45,7 @@ class MoveColumns extends Module{
 		config = {},
 		colEl;
 		
-		if(!column.modules.frozen){
+		if(!column.modules.frozen && !column.isGroup){
 			colEl = column.getElement();
 			
 			config.mousemove = function(e){

package/src/js/modules/Persistence/Persistence.js

@@ -421,6 +421,7 @@ class Persistence extends Module{
 				if(this.config.columns === true || this.config.columns == undefined){
 					keys =  Object.keys(colDef);
 					keys.push("width");
+					keys.push("visible");
 				}else{
 					keys = this.config.columns;
 				}

package/src/js/modules/ResizeColumns/ResizeColumns.js

@@ -33,6 +33,7 @@ class ResizeColumns extends Module{
 			
 			this.subscribe("column-hide", this.deInitializeColumn.bind(this));
 			this.subscribe("column-show", this.columnLayoutUpdated.bind(this));
+			this.subscribe("column-width", this.columnWidthUpdated.bind(this));
 			
 			this.subscribe("column-delete", this.deInitializeComponent.bind(this));
 			this.subscribe("column-height", this.resizeHandle.bind(this));
@@ -67,14 +68,39 @@ class ResizeColumns extends Module{
 		}
 	}
 	
+	columnWidthUpdated(column){
+		if(column.modules.frozen){
+			if(this.table.modules.frozenColumns.leftColumns.includes(column)){
+				this.table.modules.frozenColumns.leftColumns.forEach((col) => {
+					this.reinitializeColumn(col);
+				});
+			}else if(this.table.modules.frozenColumns.rightColumns.includes(column)){
+				this.table.modules.frozenColumns.rightColumns.forEach((col) => {
+					this.reinitializeColumn(col);
+				});
+			}
+		}
+	}
+	
 	reinitializeColumn(column){
+		var frozenOffset = column.modules.frozen ? (column.modules.frozen.marginValue + column.getWidth() + "px") : false;
+		;
+		
 		column.cells.forEach((cell) => {
 			if(cell.modules.resize && cell.modules.resize.handleEl){
+				if(frozenOffset){
+					cell.modules.resize.handleEl.style.left = frozenOffset;
+				}
+				
 				cell.element.after(cell.modules.resize.handleEl);
 			}
 		});
 		
 		if(column.modules.resize && column.modules.resize.handleEl){
+			if(frozenOffset){
+				column.modules.resize.handleEl.style.left = frozenOffset;
+			}
+			
 			column.element.after(column.modules.resize.handleEl);
 		}
 	}
@@ -94,7 +120,7 @@ class ResizeColumns extends Module{
 		
 		if((mode === true || mode == type) && this._checkResizability(nearestColumn)){
 			
-			var handle = document.createElement('div');
+			var handle = document.createElement('span');
 			handle.className = "tabulator-col-resize-handle";
 			
 			handle.addEventListener("click", function(e){
@@ -123,6 +149,11 @@ class ResizeColumns extends Module{
 				}
 			});
 			
+			if(column.modules.frozen){
+				handle.style.position = "absolute";
+				handle.style.left = column.modules.frozen.marginValue + column.getWidth() + "px";
+			}
+			
 			config.handleEl = handle;
 			
 			if(element.parentNode){
@@ -173,27 +204,27 @@ class ResizeColumns extends Module{
 			startDiff = x - self.startX,
 			moveDiff = x - self.latestX,
 			blockedBefore, blockedAfter;
-
+			
 			self.latestX = x;
 			
 			if(self.table.rtl){
 				startDiff = -startDiff;
 				moveDiff = -moveDiff;
 			}
-
+			
 			blockedBefore = column.width == column.minWidth || column.width == column.maxWidth;
-
+			
 			column.setWidth(self.startWidth + startDiff);
-
+			
 			blockedAfter = column.width == column.minWidth || column.width == column.maxWidth;
-
+			
 			if(moveDiff < 0){
 				self.nextColumn = self.initialNextColumn;
 			}
 			
 			if(self.table.options.resizableColumnFit && self.nextColumn && !(blockedBefore && blockedAfter)){
 				let colWidth = self.nextColumn.getWidth();
-
+				
 				if(moveDiff > 0){
 					if(colWidth <= self.nextColumn.minWidth){
 						self.nextColumn = self.nextColumn.nextColumn();

package/src/js/modules/Sort/Sort.js

@@ -204,7 +204,7 @@ class Sort extends Module{
 
 	refreshSort(){
 		if(this.table.options.sortMode === "remote"){
-			this.reloadData();
+			this.reloadData(null, false, false);
 		}else{
 			this.refreshData(true);
 		}

package/src/js/modules/Sort/defaults/sorters/datetime.js

@@ -17,7 +17,7 @@ export default function(a, b, aRow, bRow, column, dir, params){
 		if(DT.isDateTime(b)){
 			 b = b;
 		}else if(format === "iso"){
-			 a = DT.fromISO(String(b));
+			 b = DT.fromISO(String(b));
 		}else{
 			 b = DT.fromFormat(String(b), format);
 		}

package/src/js/modules/Validate/Validate.js

@@ -89,7 +89,7 @@ class Validate extends Module{
 		var invalid = [];
 		
 		column.cells.forEach((cell) => {
-			if(!this.cellValidate(cell)){
+			if(this.cellValidate(cell) !== true){
 				invalid.push(cell.getComponent());
 			}
 		});
@@ -105,7 +105,7 @@ class Validate extends Module{
 		var invalid = [];
 		
 		row.cells.forEach((cell) => {
-			if(!this.cellValidate(cell)){
+			if(this.cellValidate(cell) !== true){
 				invalid.push(cell.getComponent());
 			}
 		});
@@ -305,4 +305,4 @@ Validate.moduleName = "validate";
 //load defaults
 Validate.validators = defaultValidators;
 
-export default Validate;
+export default Validate;

package/src/scss/tabulator.scss

@@ -562,7 +562,7 @@ $footerActiveColor:#d00 !default; //footer bottom active text color
 			cursor:ew-resize;
 		}
 
-		&:last-child{
+		&:last-of-type{
 			width:3px;
 			margin-right:0;
 		}

package/src/scss/themes/bootstrap/tabulator_bootstrap5.scss

@@ -543,4 +543,24 @@ $table-cell-padding-sm: 5px;
 			}
 		}
 	}
+}
+
+.tabulator-popup-container{
+	background:#fff;
+}
+
+.tabulator-edit-list{
+	.tabulator-edit-list-item{
+		&.active{
+			color:#fff;
+
+			&.focused{
+				outline:1px solid rgba(#fff, .5);
+			}
+		}
+
+		&:hover{
+			color:#fff;
+		}
+	}
 }