c5876413be0fdb125cb0e05db5c2ca770a436a1b Dev: Tweak to auto column wi…

…dth updating - need to account for the container being hidden, but having a resolvable width Sync to source repo @c5876413be0fdb125cb0e05db5c2ca770a436a1b
DataTables · Jan 6, 2025 · eaff715 · eaff715
1 parent c274f08
commit eaff715
Show file tree

Hide file tree

Showing 5 changed files with 19 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": "5a05ebd839add77d82207f90478871cb3c69546c"
+    "last-sync": "c5876413be0fdb125cb0e05db5c2ca770a436a1b"
 }
diff --git a/js/dataTables.js b/js/dataTables.js
@@ -5536,10 +5536,16 @@
 		}
 
 		if ( (tableWidthAttr || scrollX) && ! settings._reszEvt ) {
-			settings.containerWidth = $(settings.nTableWrapper).width();
+			var wrapperWidth = function () {
+				return $(settings.nTableWrapper).is(':visible')
+					? $(settings.nTableWrapper).width()
+					: 0;
+			}
+
+			settings.containerWidth = wrapperWidth();
 
 			var resize = DataTable.util.throttle( function () {
-				var newWidth = $(settings.nTableWrapper).width();
+				var newWidth = wrapperWidth();
 
 				// Don't do it if destroying, is the same size as last time, or the container
 				// width is 0

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
@@ -5483,10 +5483,16 @@ function _fnCalculateColumnWidths ( settings )
 	}
 
 	if ( (tableWidthAttr || scrollX) && ! settings._reszEvt ) {
-		settings.containerWidth = $(settings.nTableWrapper).width();
+		var wrapperWidth = function () {
+			return $(settings.nTableWrapper).is(':visible')
+				? $(settings.nTableWrapper).width()
+				: 0;
+		}
+
+		settings.containerWidth = wrapperWidth();
 
 		var resize = DataTable.util.throttle( function () {
-			var newWidth = $(settings.nTableWrapper).width();
+			var newWidth = wrapperWidth();
 
 			// Don't do it if destroying, is the same size as last time, or the container
 			// width is 0