From 24d9d3ef53f1fb2ad333cbf0fba2a1bccffa3b39 Mon Sep 17 00:00:00 2001
From: nathan <nathangray.bsc+github@gmail.com>
Date: Wed, 17 Aug 2022 16:26:22 -0600
Subject: [PATCH] Fix search letter cannot be disabled

---
 .../etemplate/Et2Nextmatch/ColumnSelection.ts |  9 ++++
 api/js/etemplate/et2_extension_nextmatch.ts   | 46 +++++++++----------
 2 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/api/js/etemplate/Et2Nextmatch/ColumnSelection.ts b/api/js/etemplate/Et2Nextmatch/ColumnSelection.ts
index 7bc02464f9..173c846ca5 100644
--- a/api/js/etemplate/Et2Nextmatch/ColumnSelection.ts
+++ b/api/js/etemplate/Et2Nextmatch/ColumnSelection.ts
@@ -270,6 +270,15 @@ export class Et2ColumnSelection extends Et2InputWidget(LitElement)
 				}
 			}
 		});
+
+		// Add in letters
+		this.shadowRoot.querySelectorAll("[part='columns'] > :not(.column)").forEach((i : SlMenuItem) =>
+		{
+			if(i.checked)
+			{
+				value.push(i.value);
+			}
+		})
 		return value;
 	}
 
diff --git a/api/js/etemplate/et2_extension_nextmatch.ts b/api/js/etemplate/et2_extension_nextmatch.ts
index fc8cdab716..5b6509e3b0 100644
--- a/api/js/etemplate/et2_extension_nextmatch.ts
+++ b/api/js/etemplate/et2_extension_nextmatch.ts
@@ -1978,35 +1978,35 @@ export class et2_nextmatch extends et2_DOMWidget implements et2_IResizeable, et2
 				if(col.caption && col.visibility !== et2_dataview_column.ET2_COL_VISIBILITY_ALWAYS_NOSELECT &&
 					col.visibility !== et2_dataview_column.ET2_COL_VISIBILITY_DISABLED)
 				{
-						visibility[col.id] = {visible: false};
-					}
+					visibility[col.id] = {visible: false};
+				}
 			}
 			const value = selectPopup.value;
 
-				// Update & remove letter filter
-				if(self.header.lettersearch)
+			// Update & remove letter filter
+			if(self.header.lettersearch)
+			{
+				var show_letters = true;
+				if(value.indexOf(LETTERS) >= 0)
 				{
-					var show_letters = true;
-					if(value.indexOf(LETTERS) >= 0)
-					{
-						value.splice(value.indexOf(LETTERS), 1);
-					}
-					else
-					{
-						show_letters = false;
-					}
-					self._set_lettersearch(show_letters);
+					value.splice(value.indexOf(LETTERS), 1);
 				}
-			self.sortedColumnsList = [];
-				for(var i = 0; i < value.length; i++)
+				else
 				{
-					// Handle skipped columns
-					let column = 0;
-					while(value[i] != "col_" + column && column < columnMgr.columns.length)
-					{
-						column++;
-					}
-					if(visibility[value[i]])
+					show_letters = false;
+				}
+				self._set_lettersearch(show_letters);
+			}
+			self.sortedColumnsList = [];
+			for(var i = 0; i < value.length; i++)
+			{
+				// Handle skipped columns
+				let column = 0;
+				while(value[i] != "col_" + column && column < columnMgr.columns.length)
+				{
+					column++;
+				}
+				if(visibility[value[i]])
 					{
 						visibility[value[i]].visible = true;
 					}