3ae6f7f30c6119f2a47d57095ab6fef609d0c19a Dev: Another attempt at fixi…

…ng column alignment Sync to source repo @3ae6f7f30c6119f2a47d57095ab6fef609d0c19a
DataTables · Oct 15, 2024 · 7336100 · 7336100
1 parent d24c602
commit 7336100
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 7 deletions.
diff --git a/datatables.json b/datatables.json
@@ -11,5 +11,5 @@
     ],
     "src-repo": "http://github.com/DataTables/DataTablesSrc",
     "last-tag": "2.1.8",
-    "last-sync": "ce587f218dddebc1c6fb98c7b1313cd09a731a32"
+    "last-sync": "3ae6f7f30c6119f2a47d57095ab6fef609d0c19a"
 }
diff --git a/js/dataTables.js b/js/dataTables.js
@@ -5252,10 +5252,17 @@
 
 			if (firstTr) {
 				var colSizes = $(firstTr).children('th, td').map(function (vis) {
-					return {
+					var outerWidth = $(this).outerWidth();
+					var ret = {
 						idx: _fnVisibleToColumnIndex(settings, vis),
-						width: $(this).outerWidth()
+						width: outerWidth
+					};
+
+					if (scrollX) {
+						ret.minWidth = outerWidth;
 					}
+
+					return ret;
 				});
 
 				// Check against what the colgroup > col is set to and correct if needed

diff --git a/js/dataTables.min.js b/js/dataTables.min.js
diff --git a/js/dataTables.min.mjs b/js/dataTables.min.mjs
diff --git a/js/dataTables.mjs b/js/dataTables.mjs
@@ -5199,10 +5199,17 @@ function _fnScrollDraw ( settings )
 
 		if (firstTr) {
 			var colSizes = $(firstTr).children('th, td').map(function (vis) {
-				return {
+				var outerWidth = $(this).outerWidth();
+				var ret = {
 					idx: _fnVisibleToColumnIndex(settings, vis),
-					width: $(this).outerWidth()
+					width: outerWidth
+				};
+
+				if (scrollX) {
+					ret.minWidth = outerWidth;
 				}
+
+				return ret;
 			});
 
 			// Check against what the colgroup > col is set to and correct if needed