tabulator-tables 5.5.2 → 5.5.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tabulator-tables",
-  "version": "5.5.2",
+  "version": "5.5.3",
   "description": "Interactive table generation JavaScript library",
   "style": "dist/css/tabulator.css",
   "main": "dist/js/tabulator.js",
@@ -54,7 +54,6 @@
     "eslint-plugin-only-warn": "^1.0.3",
     "fs-extra": "^9.0.1",
     "globby": "^11.0.2",
-    "node-sass": "^7.0.3",
     "postcss": "^8.2.4",
     "postcss-prettify": "^0.3.4",
     "rollup": "^2.36.1",
@@ -62,5 +61,7 @@
     "rollup-plugin-postcss": "^4.0.0",
     "rollup-plugin-terser": "^7.0.2"
   },
-  "dependencies": {}
+  "dependencies": {
+    "node-sass": "^9.0.0"
+  }
 }

package/src/js/core/ColumnManager.js

@@ -387,7 +387,7 @@ export default class ColumnManager extends CoreFeature {
 		var matches = [];
 		
 		Object.keys(this.columnsByField).forEach((field) => {
-			var fieldRoot = field.split(".")[0];
+			var fieldRoot = this.table.options.nestedFieldSeparator ? field.split(this.table.options.nestedFieldSeparator)[0] : field;
 			if(fieldRoot === root){
 				matches.push(this.columnsByField[field]);
 			}

package/src/js/core/RowManager.js

@@ -714,7 +714,7 @@ export default class RowManager extends CoreFeature{
 	refreshPipelines(handler, stage, index, renderInPosition){
 		this.dispatch("data-refreshing");
 		
-		if(!handler){
+		if(!handler || !this.activeRowsPipeline[0]){
 			this.activeRowsPipeline[0] = this.rows.slice(0);
 		}
 		
@@ -724,7 +724,6 @@ export default class RowManager extends CoreFeature{
 			//handle case where all data needs refreshing
 			
 			case "dataPipeline":
-			
 				for(let i = index; i < this.dataPipeline.length; i++){
 					let result = this.dataPipeline[i].handler(this.activeRowsPipeline[i].slice(0));
 				

package/src/js/core/tools/Helpers.js

@@ -13,6 +13,25 @@ export default class Helpers{
 		};
 	}
 
+	static retrieveNestedData(separator, field, data){
+		var structure = separator ? field.split(separator) : [field],
+		length = structure.length,
+		output;
+
+		for(let i = 0; i < length; i++){
+
+			data = data[structure[i]];
+
+			output = data;
+
+			if(!data){
+				break;
+			}
+		}
+
+		return output;
+	}
+
 	static deepClone(obj, clone, list = []){
 		var objectProto = {}.__proto__,
 		arrayProto = [].__proto__;

package/src/js/modules/Ajax/Ajax.js

@@ -57,7 +57,7 @@ class Ajax extends Module{
 				ajaxParams = ajaxParams.call(this.table);
 			}
 			
-			params = Object.assign(params, ajaxParams);
+			params = Object.assign(Object.assign({}, ajaxParams), params);
 		}		
 		
 		return params;

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

@@ -78,21 +78,24 @@ class Edit extends Module{
 				if(newRow){
 					cell.getElement().firstChild.blur();
 					
-					if(newRow === true){
-						newRow = this.table.addRow({});
-					}else{
-						if(typeof newRow == "function"){
-							newRow = this.table.addRow(newRow(cell.row.getComponent()));
+					if(!this.invalidEdit){
+						
+						if(newRow === true){
+							newRow = this.table.addRow({});
 						}else{
-							newRow = this.table.addRow(Object.assign({}, newRow));
+							if(typeof newRow == "function"){
+								newRow = this.table.addRow(newRow(cell.row.getComponent()));
+							}else{
+								newRow = this.table.addRow(Object.assign({}, newRow));
+							}
 						}
-					}
-					
-					newRow.then(() => {
-						setTimeout(() => {
-							cell.getComponent().navigateNext();
+						
+						newRow.then(() => {
+							setTimeout(() => {
+								cell.getComponent().navigateNext();
+							});
 						});
-					});
+					}
 				}
 			}
 		}
@@ -348,7 +351,7 @@ class Edit extends Module{
 			this.cancelEdit();
 		}
 	}
-
+	
 	rowEditableCheck(row){
 		row.getCells().forEach((cell) => {
 			if(cell.column.modules.edit && typeof cell.column.modules.edit.check === "function"){
@@ -535,7 +538,7 @@ class Edit extends Module{
 	
 	allowEdit(cell) {
 		var check = cell.column.modules.edit ? true : false;
-
+		
 		if(cell.column.modules.edit){
 			switch(typeof cell.column.modules.edit.check){
 				case "function":
@@ -543,17 +546,17 @@ class Edit extends Module{
 						check = cell.column.modules.edit.check(cell.getComponent());
 					}
 					break;
-
+				
 				case "string":
 					check = !!cell.row.data[cell.column.modules.edit.check];
 					break;
-
+				
 				case "boolean":
 					check = cell.column.modules.edit.check;
 					break;
 			}
 		}
-
+		
 		return check;
 	}
 	
@@ -565,7 +568,7 @@ class Edit extends Module{
 		cellEditor, component, params;
 		
 		//prevent editing if another cell is refusing to leave focus (eg. validation fail)
-
+		
 		if(this.currentCell){
 			if(!this.invalidEdit && this.currentCell !== cell){
 				this.cancelEdit();

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

@@ -1,3 +1,6 @@
+import Helpers from '../../../../core/tools/Helpers.js';
+
+
 export default function(cell, formatterParams, onRendered){
 	var value = cell.getValue(),
 	urlPrefix = formatterParams.urlPrefix || "",
@@ -37,7 +40,8 @@ export default function(cell, formatterParams, onRendered){
 	if(label){
 		if(formatterParams.urlField){
 			data = cell.getData();
-			value = data[formatterParams.urlField];
+
+			value = Helpers.retrieveNestedData(this.table.options.nestedFieldSeparator, formatterParams.urlField, data);
 		}
 
 		if(formatterParams.url){

package/src/js/modules/Page/Page.js

@@ -178,7 +178,7 @@ class Page extends Module{
 	
 	userSetPageToRow(row){
 		if(this.table.options.pagination){
-			row = this.rowManager.findRow(row);
+			row = this.table.rowManager.findRow(row);
 			
 			if(row){
 				return this.setPageToRow(row);

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

@@ -201,7 +201,7 @@ class Persistence extends Module{
 	}
 
 	setColumnLayout(layout){
-		this.table.columnManager.setColumns(this.mergeDefinition(this.table.options.columns, layout));
+		this.table.columnManager.setColumns(this.mergeDefinition(this.table.options.columns, layout, true));
 		return true;
 	}
 
@@ -267,7 +267,7 @@ class Persistence extends Module{
 	}
 
 	//merge old and new column definitions
-	mergeDefinition(oldCols, newCols){
+	mergeDefinition(oldCols, newCols, mergeAllNew){
 		var output = [];
 
 		newCols = newCols || [];
@@ -277,7 +277,9 @@ class Persistence extends Module{
 			keys;
 
 			if(from){
-				if(this.config.columns === true || this.config.columns == undefined){
+				if(mergeAllNew){
+					keys = Object.keys(column);
+				}else if(this.config.columns === true || this.config.columns == undefined){
 					keys =  Object.keys(from);
 					keys.push("width");
 				}else{

package/src/scss/tabulator.scss

@@ -578,7 +578,7 @@ $footerActiveColor:#d00 !default; //footer bottom active text color
 				opacity:.5;
 			}
 			
-			&:not(.disabled){
+			&:not(disabled){
 				@media (hover:hover) and (pointer:fine){
 					&:hover{
 						cursor:pointer;