ensure that auto column resize on double click get counted as a user …

…choice
olifolkerd · Jan 19, 2025 · 48ee66a · 48ee66a
1 parent 76b6946
commit 48ee66a
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 15 deletions.
diff --git a/dist/js/tabulator_esm.js b/dist/js/tabulator_esm.js
@@ -2968,10 +2968,15 @@ class Column extends CoreFeature{
 
 			if(maxWidth){
 				var setTo = maxWidth + 1;
-				if (this.maxInitialWidth && !force) {
-					setTo = Math.min(setTo, this.maxInitialWidth);
+
+				if(force){
+					this.setWidth(setTo);
+				}else {
+					if (this.maxInitialWidth && !force) {
+						setTo = Math.min(setTo, this.maxInitialWidth);
+					}
+					this.setWidthActual(setTo);
 				}
-				this.setWidthActual(setTo);
 			}
 		}
 	}
@@ -5263,7 +5268,6 @@ class Download extends Module{
 		this.registerTableOption("downloadEncoder", function(data, mimeType){
 			return new Blob([data],{type:mimeType});
 		}); //function to manipulate download data
-		// this.registerTableOption("downloadReady", undefined); //warn of function deprecation
 		this.registerTableOption("downloadConfig", {}); //download config
 		this.registerTableOption("downloadRowRange", "active"); //restrict download to active rows only
 
@@ -5279,7 +5283,7 @@ class Download extends Module{
 	}
 
 	deprecatedOptionsCheck(){
-		// this.deprecationCheck("downloadReady", "downloadEncoder");
+
 	}	
 
 	///////////////////////////////////

diff --git a/dist/js/tabulator_esm.js.map b/dist/js/tabulator_esm.js.map
diff --git a/dist/js/tabulator_esm.mjs b/dist/js/tabulator_esm.mjs
@@ -2968,10 +2968,15 @@ class Column extends CoreFeature{
 
 			if(maxWidth){
 				var setTo = maxWidth + 1;
-				if (this.maxInitialWidth && !force) {
-					setTo = Math.min(setTo, this.maxInitialWidth);
+
+				if(force){
+					this.setWidth(setTo);
+				}else {
+					if (this.maxInitialWidth && !force) {
+						setTo = Math.min(setTo, this.maxInitialWidth);
+					}
+					this.setWidthActual(setTo);
 				}
-				this.setWidthActual(setTo);
 			}
 		}
 	}
@@ -5263,7 +5268,6 @@ class Download extends Module{
 		this.registerTableOption("downloadEncoder", function(data, mimeType){
 			return new Blob([data],{type:mimeType});
 		}); //function to manipulate download data
-		// this.registerTableOption("downloadReady", undefined); //warn of function deprecation
 		this.registerTableOption("downloadConfig", {}); //download config
 		this.registerTableOption("downloadRowRange", "active"); //restrict download to active rows only
 
@@ -5279,7 +5283,7 @@ class Download extends Module{
 	}
 
 	deprecatedOptionsCheck(){
-		// this.deprecationCheck("downloadReady", "downloadEncoder");
+
 	}	
 
 	///////////////////////////////////

diff --git a/dist/js/tabulator_esm.mjs.map b/dist/js/tabulator_esm.mjs.map
diff --git a/src/js/core/column/Column.js b/src/js/core/column/Column.js
@@ -907,10 +907,15 @@ export default class Column extends CoreFeature{
 
 			if(maxWidth){
 				var setTo = maxWidth + 1;
-				if (this.maxInitialWidth && !force) {
-					setTo = Math.min(setTo, this.maxInitialWidth);
+
+				if(force){
+					this.setWidth(setTo);
+				}else{
+					if (this.maxInitialWidth && !force) {
+						setTo = Math.min(setTo, this.maxInitialWidth);
+					}
+					this.setWidthActual(setTo);
 				}
-				this.setWidthActual(setTo);
 			}
 		}
 	}