From 86e2b7c3555be36f1ac8cd4c28e3bf3657d8e238 Mon Sep 17 00:00:00 2001
From: Rob Garrison <wowmotty@gmail.com>
Date: Thu, 31 Aug 2017 17:18:29 -0500
Subject: [PATCH] Grouping: Fix compatibility with columnSelector widget

---
 js/widgets/widget-grouping.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/js/widgets/widget-grouping.js b/js/widgets/widget-grouping.js
index b7dc09a1..1503edca 100644
--- a/js/widgets/widget-grouping.js
+++ b/js/widgets/widget-grouping.js
@@ -172,7 +172,10 @@
 
 		groupHeaderHTML : function( c, wo, data ) {
 			var name = ( data.currentGroup || '' ).toString().replace(/</g, '&lt;').replace(/>/g, '&gt;');
-			return '<tr class="group-header ' + c.selectorRemove.slice(1) +
+			return '<tr class="group-header ' + c.selectorRemove.slice(1) + ' ' +
+				// prevent grouping row from being hidden by the columnSelector;
+				// classHasSpan option added 2.29.0
+				( wo.columnSelector_classHasSpan || 'hasSpan' ) +
 				'" unselectable="on" ' + ( c.tabIndex ? 'tabindex="0" ' : '' ) + 'data-group-index="' +
 				data.groupIndex + '">' +
 				'<td colspan="' + c.columns + '">' +
@@ -221,6 +224,10 @@
 					}
 				}
 			}
+			if ( ts.hasWidget( c.table, 'columnSelector' ) ) {
+				// make sure to handle the colspan adjustments of the grouping rows
+				ts.columnSelector.setUpColspan( c, wo );
+			}
 		},
 		insertGroupHeader: function( c, wo, data ) {
 			var $header = c.$headerIndexed[ data.column ],