Fixed the builtin menus sometimes not closing

The built in menus assume only 1 menu at a time, and opening a new menu
closes the previous one, so replicate this behavior when adapting the menu
interface.

Author: AshleighAdams

src/UniversalMenu.Compat.CSSharp.Shared/CSSSharpCompatPluginShared.cs

@@ -1,3 +1,5 @@
+using System;
+using System.Collections.Generic;
 using System.Linq;
 
 using AngleSharp.Dom;
@@ -6,20 +8,25 @@
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Menu;
 
+using CS2ScreenMenuAPI;
+
 using CSSUniversalMenuAPI;
 using CSSUniversalMenuAPI.Extensions;
 
 using HarmonyLib;
 
+using IUniversalMenu = CSSUniversalMenuAPI.IMenu;
+
 namespace UniversalMenu.Compat.CSSharp;
 
 public static class CSSSharpCompatPluginShared
 {
 	private static Harmony? Harmony { get; set; }
+	private static Dictionary<nint, IUniversalMenu> ActiveMenus { get; } = new();
 
 	public static void Patch()
 	{
-		Harmony = new Harmony("com.universalmenu.cssharp");
+		Harmony = new Harmony("com.universalmenu.compat.cssharp");
 
 		{
 			var original = AccessTools.Method(typeof(MenuManager), nameof(MenuManager.OpenCenterHtmlMenu));
@@ -29,13 +36,19 @@ public static void Patch()
 
 		{
 			var original = AccessTools.Method(typeof(MenuManager), nameof(MenuManager.OpenChatMenu));
-			var pre = SymbolExtensions.GetMethodInfo(() => MenuManager_OpenChatMenu(null!, null!, null!));
+			var pre = SymbolExtensions.GetMethodInfo(() => MenuManager_OpenChatMenu(null!, null!));
 			Harmony.Patch(original, prefix: new HarmonyMethod(pre));
 		}
 
 		{
 			var original = AccessTools.Method(typeof(MenuManager), nameof(MenuManager.OpenConsoleMenu));
-			var pre = SymbolExtensions.GetMethodInfo(() => MenuManager_OpenConsoleMenu(null!, null!, null!));
+			var pre = SymbolExtensions.GetMethodInfo(() => MenuManager_OpenConsoleMenu(null!, null!));
+			Harmony.Patch(original, prefix: new HarmonyMethod(pre));
+		}
+
+		{
+			var original = AccessTools.Method(typeof(MenuManager), nameof(MenuManager.CloseActiveMenu));
+			var pre = SymbolExtensions.GetMethodInfo(() => MenuManager_CloseActiveMenu(null!));
 			Harmony.Patch(original, prefix: new HarmonyMethod(pre));
 		}
 	}
@@ -45,8 +58,16 @@ public static void Unpatch()
 		Harmony?.UnpatchAll();
 	}
 
-	public static bool BaseMenu_Open(BasePlugin plugin, CCSPlayerController player, BaseMenu menu)
+	public static bool BaseMenu_Open(BasePlugin? plugin, CCSPlayerController player, BaseMenu menu)
 	{
+		// this API  assumes there may only be 1 menu at a time, so tell the implementation
+		// that this menu is expected to be closed
+		if (ActiveMenus.TryGetValue(player.Handle, out var activeMenu))
+		{
+			ActiveMenus.Remove(player.Handle);
+			activeMenu.Close();
+		}
+
 		var api = IMenuAPI.PluginCapability.Get();
 
 		if (api is null) // fall back to builtin menu
@@ -77,29 +98,46 @@ public static bool BaseMenu_Open(BasePlugin plugin, CCSPlayerController player,
 			if (item.OnSelect is not null)
 				newItem.Selected += (selectedItem) =>
 				{
+					item.OnSelect(player, item);
 					if (menu.PostSelectAction == PostSelectAction.Close)
+					{
+						if (ActiveMenus.TryGetValue(player.Handle, out var activeMenu) && activeMenu == newMenu)
+							ActiveMenus.Remove(player.Handle);
 						newMenu.Close();
-					item.OnSelect(player, item);
+					}
 				};
 		}
 
+		ActiveMenus[player.Handle] = newMenu;
 		newMenu.Display();
 		return false;
 	}
 
+	public static bool MenuManager_CloseActiveMenu(CCSPlayerController player)
+	{
+		Console.WriteLine($"Close active menu 1");
+		if (ActiveMenus.TryGetValue(player.Handle, out var activeMenu))
+		{
+			Console.WriteLine($"Close active menu 2");
+			ActiveMenus.Remove(player.Handle);
+			activeMenu.Close();
+		}
+		return true;
+	}
+
 	public static bool MenuManager_OpenCenterHtmlMenu(BasePlugin plugin, CCSPlayerController player, CenterHtmlMenu menu)
 	{
 		return BaseMenu_Open(plugin, player, menu);
 	}
 
-	public static bool MenuManager_OpenChatMenu(BasePlugin plugin, CCSPlayerController player, ChatMenu menu)
+	public static bool MenuManager_OpenChatMenu(CCSPlayerController player, ChatMenu menu)
 	{
-		return BaseMenu_Open(plugin, player, menu);
+		return BaseMenu_Open(null, player, menu);
 	}
 
-	public static bool MenuManager_OpenConsoleMenu(BasePlugin plugin, CCSPlayerController player, ConsoleMenu menu)
+	public static bool MenuManager_OpenConsoleMenu(CCSPlayerController player, ConsoleMenu menu)
 	{
-		return BaseMenu_Open(plugin, player, menu);
+		return BaseMenu_Open(null, player, menu);
 	}
 
 	private static readonly HtmlParser HtmlParser = new(new HtmlParserOptions() { IsStrictMode = false });