tabulator-tables 5.2.6 → 5.3.1

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

@@ -1,129 +1,157 @@
 import Module from '../../core/Module.js';
 
 class ReactiveData extends Module{
-
+	
 	constructor(table){
 		super(table);
-
+		
 		this.data = false;
 		this.blocked = false; //block reactivity while performing update
 		this.origFuncs = {}; // hold original data array functions to allow replacement after data is done with
 		this.currentVersion = 0;
-
+		
 		this.registerTableOption("reactiveData", false); //enable data reactivity
 	}
-
+	
 	initialize(){
 		if(this.table.options.reactiveData){
-			this.subscribe("cell-value-save-before", this.block.bind(this));
-			this.subscribe("cell-value-save-after", this.unblock.bind(this));
-			this.subscribe("row-data-save-before", this.block.bind(this));
-			this.subscribe("row-data-save-after", this.unblock.bind(this));
+			this.subscribe("cell-value-save-before", this.block.bind(this, "cellsave"));
+			this.subscribe("cell-value-save-after", this.unblock.bind(this, "cellsave"));
+			this.subscribe("row-data-save-before", this.block.bind(this, "rowsave"));
+			this.subscribe("row-data-save-after", this.unblock.bind(this, "rowsave"));
 			this.subscribe("row-data-init-after", this.watchRow.bind(this));
 			this.subscribe("data-processing", this.watchData.bind(this));
 			this.subscribe("table-destroy", this.unwatchData.bind(this));
 		}
 	}
-
+	
 	watchData(data){
 		var self = this,
-		pushFunc, version;
-
+		version;
+		
 		this.currentVersion ++;
-
+		
 		version = this.currentVersion;
-
+		
 		this.unwatchData();
-
+		
 		this.data = data;
-
+		
 		//override array push function
 		this.origFuncs.push = data.push;
-
+		
 		Object.defineProperty(this.data, "push", {
 			enumerable: false,
 			configurable: true,
 			value: function(){
-				var args = Array.from(arguments);
+				var args = Array.from(arguments),
+				result;
+
+				if(!self.blocked && version === self.currentVersion){	
+					self.block("data-push");
 
-				if(!self.blocked && version === self.currentVersion){
 					args.forEach((arg) => {
 						self.table.rowManager.addRowActual(arg, false);
 					});
+					
+					result = self.origFuncs.push.apply(data, arguments);
+					
+					self.unblock("data-push");
 				}
-
-				return self.origFuncs.push.apply(data, arguments);
+				
+				return result;
 			}
 		});
-
+		
 		//override array unshift function
 		this.origFuncs.unshift = data.unshift;
-
+		
 		Object.defineProperty(this.data, "unshift", {
 			enumerable: false,
 			configurable: true,
 			value: function(){
-				var args = Array.from(arguments);
-
+				var args = Array.from(arguments),
+				result;
+				
 				if(!self.blocked && version === self.currentVersion){
+					self.block("data-unshift");
+					
 					args.forEach((arg) => {
 						self.table.rowManager.addRowActual(arg, true);
 					});
+					
+					result = self.origFuncs.unshift.apply(data, arguments);
+					
+					self.unblock("data-unshift");
 				}
-
-				return self.origFuncs.unshift.apply(data, arguments);
+				
+				return result;
 			}
 		});
-
-
+		
+		
 		//override array shift function
 		this.origFuncs.shift = data.shift;
-
+		
 		Object.defineProperty(this.data, "shift", {
 			enumerable: false,
 			configurable: true,
 			value: function(){
-				var row;
-
+				var row, result;
+				
 				if(!self.blocked && version === self.currentVersion){
+					self.block("data-shift");
+					
 					if(self.data.length){
 						row = self.table.rowManager.getRowFromDataObject(self.data[0]);
-
+						
 						if(row){
 							row.deleteActual();
 						}
 					}
-				}
 
-				return self.origFuncs.shift.call(data);
+					result = self.origFuncs.shift.call(data);
+
+					self.unblock("data-shift");
+				}
+				
+				return result;
 			}
 		});
-
+		
 		//override array pop function
 		this.origFuncs.pop = data.pop;
-
+		
 		Object.defineProperty(this.data, "pop", {
 			enumerable: false,
 			configurable: true,
 			value: function(){
-				var row;
+				var row, result;
+			
 				if(!self.blocked && version === self.currentVersion){
+					self.block("data-pop");
+					
 					if(self.data.length){
 						row = self.table.rowManager.getRowFromDataObject(self.data[self.data.length - 1]);
-
+						
 						if(row){
 							row.deleteActual();
 						}
 					}
+
+					result = self.origFuncs.pop.call(data);
+					
+					self.unblock("data-pop");
 				}
-				return self.origFuncs.pop.call(data);
+
+				return result;
 			}
 		});
-
-
+		
+		
 		//override array splice function
 		this.origFuncs.splice = data.splice;
-
+		
 		Object.defineProperty(this.data, "splice", {
 			enumerable: false,
 			configurable: true,
@@ -132,50 +160,54 @@ class ReactiveData extends Module{
 				start = args[0] < 0 ? data.length + args[0] : args[0],
 				end = args[1],
 				newRows = args[2] ? args.slice(2) : false,
-				startRow;
-
+				startRow, result;
+				
 				if(!self.blocked && version === self.currentVersion){
-
+					self.block("data-splice");
 					//add new rows
 					if(newRows){
 						startRow = data[start] ? self.table.rowManager.getRowFromDataObject(data[start]) : false;
-
+						
 						if(startRow){
 							newRows.forEach((rowData) => {
 								self.table.rowManager.addRowActual(rowData, true, startRow, true);
 							});
 						}else{
 							newRows = newRows.slice().reverse();
-
+							
 							newRows.forEach((rowData) => {
 								self.table.rowManager.addRowActual(rowData, true, false, true);
 							});
 						}
 					}
-
+					
 					//delete removed rows
 					if(end !== 0){
 						var oldRows = data.slice(start, typeof args[1] === "undefined" ? args[1] : start + end);
-
+						
 						oldRows.forEach((rowData, i) => {
 							var row = self.table.rowManager.getRowFromDataObject(rowData);
-
+							
 							if(row){
 								row.deleteActual(i !== oldRows.length - 1);
 							}
 						});
 					}
-
+					
 					if(newRows || end !== 0){
 						self.table.rowManager.reRenderInPosition();
 					}
-				}
 
-				return self.origFuncs.splice.apply(data, arguments);
+					result = self.origFuncs.splice.apply(data, arguments);
+					
+					self.unblock("data-splice");
+				}
+				
+				return result ;
 			}
 		});
 	}
-
+	
 	unwatchData(){
 		if(this.data !== false){
 			for(var key in this.origFuncs){
@@ -188,152 +220,183 @@ class ReactiveData extends Module{
 			}
 		}
 	}
-
+	
 	watchRow(row){
 		var data = row.getData();
-
-		this.blocked = true;
-
+		
 		for(var key in data){
 			this.watchKey(row, data, key);
 		}
-
+		
 		if(this.table.options.dataTree){
 			this.watchTreeChildren(row);
 		}
-
-		this.blocked = false;
 	}
-
+	
 	watchTreeChildren (row){
-		var childField = row.getData()[this.table.options.dataTreeChildField],
+		var self = this,
+		childField = row.getData()[this.table.options.dataTreeChildField],
 		origFuncs = {};
-
-		function rebuildTree(){
-			this.table.modules.dataTree.initializeRow(row);
-			this.table.modules.dataTree.layoutRow(row);
-			this.table.rowManager.refreshActiveData("tree", false, true);
-		}
-
+		
 		if(childField){
-
+			
 			origFuncs.push = childField.push;
-
+			
 			Object.defineProperty(childField, "push", {
 				enumerable: false,
 				configurable: true,
 				value: () => {
-					var result = origFuncs.push.apply(childField, arguments);
-
-					rebuildTree();
-
+					if(!self.blocked){
+						self.block("tree-push");
+						
+						var result = origFuncs.push.apply(childField, arguments);
+						this.rebuildTree(row);
+						
+						self.unblock("tree-push");
+					}
+					
 					return result;
 				}
 			});
-
+			
 			origFuncs.unshift = childField.unshift;
-
+			
 			Object.defineProperty(childField, "unshift", {
 				enumerable: false,
 				configurable: true,
 				value: () => {
-					var result =  origFuncs.unshift.apply(childField, arguments);
-
-					rebuildTree();
-
+					if(!self.blocked){
+						self.block("tree-unshift");
+						
+						var result =  origFuncs.unshift.apply(childField, arguments);
+						this.rebuildTree(row);
+						
+						self.unblock("tree-unshift");
+					}
+					
 					return result;
 				}
 			});
-
+			
 			origFuncs.shift = childField.shift;
-
+			
 			Object.defineProperty(childField, "shift", {
 				enumerable: false,
 				configurable: true,
 				value: () => {
-					var result =  origFuncs.shift.call(childField);
-
-					rebuildTree();
-
+					if(!self.blocked){
+						self.block("tree-shift");
+						
+						var result =  origFuncs.shift.call(childField);
+						this.rebuildTree(row);
+						
+						self.unblock("tree-shift");
+					}
+					
 					return result;
 				}
 			});
-
+			
 			origFuncs.pop = childField.pop;
-
+			
 			Object.defineProperty(childField, "pop", {
 				enumerable: false,
 				configurable: true,
 				value: () => {
-					var result =  origFuncs.pop.call(childField);
-
-					rebuildTree();
-
+					if(!self.blocked){
+						self.block("tree-pop");
+						
+						var result =  origFuncs.pop.call(childField);
+						this.rebuildTree(row);
+						
+						self.unblock("tree-pop");
+					}
+					
 					return result;
 				}
 			});
-
+			
 			origFuncs.splice = childField.splice;
-
+			
 			Object.defineProperty(childField, "splice", {
 				enumerable: false,
 				configurable: true,
 				value: () => {
-					var result =  origFuncs.splice.apply(childField, arguments);
-
-					rebuildTree();
-
+					if(!self.blocked){
+						self.block("tree-splice");
+						
+						var result =  origFuncs.splice.apply(childField, arguments);
+						this.rebuildTree(row);
+						
+						self.unblock("tree-splice");
+					}
+					
 					return result;
 				}
 			});
 		}
 	}
-
+	
+	rebuildTree(row){
+		this.table.modules.dataTree.initializeRow(row);
+		this.table.modules.dataTree.layoutRow(row);
+		this.table.rowManager.refreshActiveData("tree", false, true);
+	}
+	
 	watchKey(row, data, key){
-		var props = Object.getOwnPropertyDescriptor(data, key),
+		var self = this,
+		props = Object.getOwnPropertyDescriptor(data, key),
 		value = data[key],
 		version = this.currentVersion;
-
+		
 		Object.defineProperty(data, key, {
 			set: (newValue) => {
 				value = newValue;
-				if(!this.blocked && version === this.currentVersion){
+				if(!self.blocked && version === self.currentVersion){
+					self.block("key");
+					
 					var update = {};
 					update[key] = newValue;
 					row.updateData(update);
+					
+					self.unblock("key");
 				}
-
+				
 				if(props.set){
 					props.set(newValue);
 				}
 			},
 			get:() => {
-
+				
 				if(props.get){
 					props.get();
 				}
-
+				
 				return value;
 			}
 		});
 	}
-
+	
 	unwatchRow(row){
 		var data = row.getData();
-
+		
 		for(var key in data){
 			Object.defineProperty(data, key, {
 				value:data[key],
 			});
 		}
 	}
-
-	block(){
-		this.blocked = true;
+	
+	block(key){
+		if(!this.blocked){
+			this.blocked = key;
+		}
 	}
-
-	unblock(){
-		this.blocked = false;
+	
+	unblock(key){
+		if(this.blocked === key){
+			this.blocked = false;
+		}
 	}
 }
 

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

@@ -84,7 +84,7 @@ class ResizeColumns extends Module{
 	
 	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){
@@ -236,7 +236,7 @@ class ResizeColumns extends Module{
 				}
 			}
 			
-			self.table.columnManager.renderer.rerenderColumns(true);
+			self.table.columnManager.rerenderColumns(true);
 			
 			if(!self.table.browserSlow && column.modules.resize && column.modules.resize.variableHeight){
 				column.checkCellHeights();
@@ -268,7 +268,7 @@ class ResizeColumns extends Module{
 			}
 		}
 		
-		e.stopPropagation(); //prevent resize from interfereing with movable columns
+		e.stopPropagation(); //prevent resize from interfering with movable columns
 		
 		//block editor from taking action while resizing is taking place
 		if(self.startColumn.modules.edit){

package/src/js/modules/ResizeRows/ResizeRows.js

@@ -89,7 +89,7 @@ class ResizeRows extends Module{
 			self.dispatchExternal("rowResized", row.getComponent());
 		}
 
-		e.stopPropagation(); //prevent resize from interfereing with movable columns
+		e.stopPropagation(); //prevent resize from interfering with movable columns
 
 		//block editor from taking action while resizing is taking place
 		// if(self.startColumn.modules.edit){