From 0f774caa93ec7fe7a30e86ad95ff471d1438cefb Mon Sep 17 00:00:00 2001
From: Shewatipa Tseisi <shewatipa@chips.co.zw>
Date: Sat, 3 Oct 2026 17:08:15 +0200
Subject: [PATCH 1/7] fix: stop SidebarProvider logging JSDisconnectedException
 on page reload

DisposeAsync only caught JSException. After a reload or tab close the circuit is gone, so ShellUI.disposeSidebar throws JSDisconnectedException and Blazor logged it twice per page load.
---
 .../BlazorInteractiveServer/Components/UI/SidebarProvider.razor  | 1 +
 src/ShellUI.Templates/Templates/SidebarProviderTemplate.cs       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/NET10/BlazorInteractiveServer/Components/UI/SidebarProvider.razor b/NET10/BlazorInteractiveServer/Components/UI/SidebarProvider.razor
index c833970..8b2184c 100644
--- a/NET10/BlazorInteractiveServer/Components/UI/SidebarProvider.razor
+++ b/NET10/BlazorInteractiveServer/Components/UI/SidebarProvider.razor
@@ -111,6 +111,7 @@
         {
             try { await JSRuntime.InvokeVoidAsync("ShellUI.disposeSidebar", _handle); }
             catch (JSException) { }
+            catch (JSDisconnectedException) { }
         }
 
         _dotnetRef?.Dispose();
diff --git a/src/ShellUI.Templates/Templates/SidebarProviderTemplate.cs b/src/ShellUI.Templates/Templates/SidebarProviderTemplate.cs
index 15a19da..59d78a0 100644
--- a/src/ShellUI.Templates/Templates/SidebarProviderTemplate.cs
+++ b/src/ShellUI.Templates/Templates/SidebarProviderTemplate.cs
@@ -128,6 +128,7 @@ public async ValueTask DisposeAsync()
         {
             try { await JSRuntime.InvokeVoidAsync(""ShellUI.disposeSidebar"", _handle); }
             catch (JSException) { }
+            catch (JSDisconnectedException) { }
         }
 
         _dotnetRef?.Dispose();

From 7c911c8800e8a0a8ed7613fa8895ea9be813ec47 Mon Sep 17 00:00:00 2001
From: Shewatipa Tseisi <shewatipa@chips.co.zw>
Date: Sat, 3 Oct 2026 17:08:16 +0200
Subject: [PATCH 2/7] fix: run CommandItem.Action when a Command item is
 selected

Command only raised CommandSelected, so items with an Action did nothing on click or Enter. It now runs Action, then raises CommandSelected. CommandPalette is built on Command and gets the same behavior.
---
 src/ShellUI.Components/Components/Command.razor    | 1 +
 src/ShellUI.Templates/Templates/CommandTemplate.cs | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/ShellUI.Components/Components/Command.razor b/src/ShellUI.Components/Components/Command.razor
index 847ade6..f94d672 100644
--- a/src/ShellUI.Components/Components/Command.razor
+++ b/src/ShellUI.Components/Components/Command.razor
@@ -233,6 +233,7 @@ else if (IsOpen)
     private async Task SelectAsync(CommandItem command)
     {
         await CloseAsync();
+        if (command.Action is not null) await command.Action();
         await CommandSelected.InvokeAsync(command);
     }
 
diff --git a/src/ShellUI.Templates/Templates/CommandTemplate.cs b/src/ShellUI.Templates/Templates/CommandTemplate.cs
index 6f3449f..4ab038f 100644
--- a/src/ShellUI.Templates/Templates/CommandTemplate.cs
+++ b/src/ShellUI.Templates/Templates/CommandTemplate.cs
@@ -249,6 +249,7 @@ private async Task OnKeyDownAsync(KeyboardEventArgs e)
     private async Task SelectAsync(CommandItem command)
     {
         await CloseAsync();
+        if (command.Action is not null) await command.Action();
         await CommandSelected.InvokeAsync(command);
     }
 

From f96d41752ecdca6db1b0c5bcb22c17b003f46047 Mon Sep 17 00:00:00 2001
From: Shewatipa Tseisi <shewatipa@chips.co.zw>
Date: Sat, 3 Oct 2026 17:09:01 +0200
Subject: [PATCH 3/7] fix: make init --tailwind explicit and validate it before
 changing the project

An explicit --tailwind now skips the prompt (it was ignored in interactive mode), an unknown value fails before init touches the project, and with --yes init says that standalone is the default and how to choose npm.
---
 docs/CLI_SYNTAX.md                      |  2 +-
 src/ShellUI.CLI/Program.cs              |  8 +++-----
 src/ShellUI.CLI/Services/InitService.cs | 16 ++++++++++++----
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/docs/CLI_SYNTAX.md b/docs/CLI_SYNTAX.md
index ab60258..246622f 100644
--- a/docs/CLI_SYNTAX.md
+++ b/docs/CLI_SYNTAX.md
@@ -44,7 +44,7 @@ Options:
 
 - `--force` reinitializes a project that already has `shellui.json`.
 - `--style <style>` selects `default`, `new-york`, or `minimal`.
-- `--tailwind standalone|npm` selects the Tailwind setup method.
+- `--tailwind standalone|npm` selects the Tailwind setup method and skips the prompt. With `--yes` and no `--tailwind`, `init` uses standalone.
 - `--yes` runs without prompts and uses the selected defaults. Without an explicit method, the default is `standalone`.
 - `--dashboard 01|02|none` sets up a dashboard layout: `02` has a sticky header, `01` a scrolling one. Without the option, `init` asks; with `--yes` alone, no dashboard is added.
 - `--replace-layout` makes the dashboard the default layout even when the app already uses a custom layout. See [Dashboard layouts](#dashboard-layouts).
diff --git a/src/ShellUI.CLI/Program.cs b/src/ShellUI.CLI/Program.cs
index 88267bf..ab9c62f 100644
--- a/src/ShellUI.CLI/Program.cs
+++ b/src/ShellUI.CLI/Program.cs
@@ -48,8 +48,7 @@ static Command CreateThemeInitCommand()
         var forceOpt = new Option<bool>("--force", "Reinitialize even if already initialized");
         var styleOpt = new Option<string>("--style", getDefaultValue: () => "default",
             "Component style: default, new-york, minimal");
-        var tailwindOpt = new Option<string>("--tailwind", getDefaultValue: () => "standalone",
-            "Tailwind method: standalone, npm");
+        var tailwindOpt = new Option<string?>("--tailwind", "Tailwind method: standalone (default with --yes) or npm");
         var yesOpt = new Option<bool>("--yes", "Non-interactive mode with default options");
         var dashboardOpt = CreateDashboardOption();
         var replaceLayoutOpt = CreateReplaceLayoutOption();
@@ -188,10 +187,9 @@ static Command CreateInitCommand()
             "--style",
             getDefaultValue: () => "default",
             "Choose component style (default, new-york, minimal)");
-        var tailwindOption = new Option<string>(
+        var tailwindOption = new Option<string?>(
             "--tailwind",
-            getDefaultValue: () => "standalone",
-            "Choose Tailwind method (standalone, npm)");
+            "Choose Tailwind method: standalone (default with --yes) or npm");
         var nonInteractiveOption = new Option<bool>(
             "--yes",
             "Run in non-interactive mode with default options");
diff --git a/src/ShellUI.CLI/Services/InitService.cs b/src/ShellUI.CLI/Services/InitService.cs
index e5d77b3..3dd8ea8 100644
--- a/src/ShellUI.CLI/Services/InitService.cs
+++ b/src/ShellUI.CLI/Services/InitService.cs
@@ -9,11 +9,14 @@ namespace ShellUI.CLI.Services;
 
 public class InitService
 {
-    public static async Task InitializeAsync(string style, bool force, string tailwindMethod = "standalone", bool nonInteractive = false,
+    public static async Task InitializeAsync(string style, bool force, string? tailwindMethod = null, bool nonInteractive = false,
         string? dashboard = null, LayoutSwitch layoutSwitch = LayoutSwitch.Ask)
     {
         var configPath = Path.Combine(Directory.GetCurrentDirectory(), "shellui.json");
         var dashboardChoice = DashboardSetup.ParseDashboardOption(dashboard) ?? (nonInteractive ? "none" : null);
+        var tailwindChoice = tailwindMethod?.Trim().ToLowerInvariant();
+        if (tailwindChoice is not (null or "standalone" or "npm"))
+            throw new ArgumentException($"Unknown --tailwind value '{tailwindMethod}'. Use standalone or npm.");
 
         if (File.Exists(configPath) && !force)
         {
@@ -31,10 +34,15 @@ public static async Task InitializeAsync(string style, bool force, string tailwi
         AnsiConsole.MarkupLine("[cyan]Setting up Tailwind CSS...[/]");
         string method;
 
-        if (nonInteractive)
+        if (tailwindChoice != null)
         {
-            method = tailwindMethod;
-            AnsiConsole.MarkupLine($"[green]✅ Selected:[/] {method} (non-interactive mode)");
+            method = tailwindChoice;
+            AnsiConsole.MarkupLine($"[green]✅ Tailwind:[/] {method}");
+        }
+        else if (nonInteractive)
+        {
+            method = "standalone";
+            AnsiConsole.MarkupLine("[green]✅ Tailwind:[/] standalone [dim](default with --yes; pass --tailwind npm to use npm)[/]");
         }
         else
         {

From 891412c02783dbb6b88cd48ec1eaca4fccd7311a Mon Sep 17 00:00:00 2001
From: Shewatipa Tseisi <shewatipa@chips.co.zw>
Date: Sat, 3 Oct 2026 17:09:02 +0200
Subject: [PATCH 4/7] fix: report updated, skipped and failed components
 separately in shellui update

The summary counted every requested component as updated, including skipped and failed ones. InstallComponent now reports success.
---
 .../Services/ComponentInstaller.cs            |  5 ++--
 src/ShellUI.CLI/Services/ComponentManager.cs  | 25 ++++++++++++++++---
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/ShellUI.CLI/Services/ComponentInstaller.cs b/src/ShellUI.CLI/Services/ComponentInstaller.cs
index 047bd06..b869844 100644
--- a/src/ShellUI.CLI/Services/ComponentInstaller.cs
+++ b/src/ShellUI.CLI/Services/ComponentInstaller.cs
@@ -143,13 +143,13 @@ public static Task<bool> InstallComponentForInitAsync(
         return Task.FromResult(result != InstallResult.Failed);
     }
 
-    public static void InstallComponent(string componentName, ComponentMetadata metadata, bool force, bool skipConfig = false)
+    public static bool InstallComponent(string componentName, ComponentMetadata metadata, bool force, bool skipConfig = false)
     {
         var configPath = Path.Combine(Directory.GetCurrentDirectory(), "shellui.json");
         var configJson = File.ReadAllText(configPath);
         var config = JsonSerializer.Deserialize<ShellUIConfig>(configJson);
 
-        if (config == null) return;
+        if (config == null) return false;
 
         var projectInfo = ProjectDetector.DetectProject();
         var result = InstallComponentInternal(componentName, config, projectInfo, force);
@@ -159,6 +159,7 @@ public static void InstallComponent(string componentName, ComponentMetadata meta
             var updatedJson = JsonSerializer.Serialize(config, new JsonSerializerOptions { WriteIndented = true });
             File.WriteAllText(configPath, updatedJson);
         }
+        return result != InstallResult.Failed;
     }
 
     public static bool EnsureShellUiJs()
diff --git a/src/ShellUI.CLI/Services/ComponentManager.cs b/src/ShellUI.CLI/Services/ComponentManager.cs
index 952a3f1..cd2ac69 100644
--- a/src/ShellUI.CLI/Services/ComponentManager.cs
+++ b/src/ShellUI.CLI/Services/ComponentManager.cs
@@ -187,6 +187,10 @@ public static void UpdateComponents(string[] componentNames, bool updateAll)
         AnsiConsole.Write(new Rule("[blue]Updating Components[/]").RuleStyle("blue dim"));
         AnsiConsole.WriteLine();
 
+        var updated = 0;
+        var skipped = 0;
+        var failed = new List<string>();
+
         Loaders.SnakeStatus().Start("Updating components...", ctx =>
         {
             foreach (var componentName in toUpdate)
@@ -197,12 +201,14 @@ public static void UpdateComponents(string[] componentNames, bool updateAll)
                 if (!ComponentRegistry.Components.TryGetValue(normalizedName, out var metadata))
                 {
                     AnsiConsole.MarkupLine($"[yellow]Warning:[/] Unknown component '{componentName}'");
+                    skipped++;
                     continue;
                 }
 
                 if (!installed.Contains(normalizedName))
                 {
                     AnsiConsole.MarkupLine($"[yellow]Skipped:[/] Component '{metadata.DisplayName}' is not installed");
+                    skipped++;
                     continue;
                 }
 
@@ -211,16 +217,29 @@ public static void UpdateComponents(string[] componentNames, bool updateAll)
                     !ComponentInstaller.EnsureShellUiJs())
                 {
                     AnsiConsole.MarkupLine($"[yellow]Skipped:[/] Component '{metadata.DisplayName}' requires a compatible wwwroot/shellui.js.");
+                    skipped++;
                     continue;
                 }
 
-                ComponentInstaller.InstallComponent(normalizedName, metadata, force: true, skipConfig: false);
-                AnsiConsole.MarkupLine($"[green]Updated:[/] {metadata.DisplayName} to v{metadata.Version}");
+                if (ComponentInstaller.InstallComponent(normalizedName, metadata, force: true, skipConfig: false))
+                {
+                    AnsiConsole.MarkupLine($"[green]Updated:[/] {metadata.DisplayName} to v{metadata.Version}");
+                    updated++;
+                }
+                else
+                {
+                    failed.Add(metadata.DisplayName);
+                }
             }
         });
 
         AnsiConsole.WriteLine();
-        AnsiConsole.MarkupLine($"[green]Successfully updated {toUpdate.Length} component(s)[/]");
+        if (updated > 0)
+            AnsiConsole.MarkupLine($"[green]Updated {updated} component(s)[/]");
+        if (skipped > 0)
+            AnsiConsole.MarkupLine($"[yellow]Skipped {skipped} component(s)[/]");
+        if (failed.Count > 0)
+            AnsiConsole.MarkupLine($"[red]Failed: {Markup.Escape(string.Join(", ", failed))}[/]");
     }
 
     private static void UpdateConfig(List<string> installedComponentNames)

From 5338cb350414bcaab348295494bff66537ab32e2 Mon Sep 17 00:00:00 2001
From: Shewatipa Tseisi <shewatipa@chips.co.zw>
Date: Sat, 3 Oct 2026 17:09:04 +0200
Subject: [PATCH 5/7] fix: download the Tailwind CLI during the build when it
 is missing

The standalone Build/ShellUI.targets silently skipped Tailwind when .shellui/bin had no binary, for example after a fresh clone, leaving a stale app.css. The build now downloads the pinned version with MSBuild's DownloadFile and warns if it can't.
---
 ShellUI.Tests/InitBootstrapTests.cs     | 17 +++++++++++++++++
 src/ShellUI.CLI/Services/InitService.cs | 19 +++++++++++++++++--
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/ShellUI.Tests/InitBootstrapTests.cs b/ShellUI.Tests/InitBootstrapTests.cs
index 7bf7f0e..edcc9aa 100644
--- a/ShellUI.Tests/InitBootstrapTests.cs
+++ b/ShellUI.Tests/InitBootstrapTests.cs
@@ -102,6 +102,23 @@ public void RewriteAppRazor_IsIdempotent()
         Assert.Equal(once, twice);
     }
 
+    [Theory]
+    [InlineData("standalone")]
+    [InlineData("npm")]
+    public void TargetsFile_IsValidMsBuildXml(string method)
+    {
+        var targets = InitService.GetTargetsFileContent(method);
+
+        var xml = System.Xml.Linq.XDocument.Parse(targets);
+        Assert.Equal("Project", xml.Root!.Name.LocalName);
+        if (method == "standalone")
+        {
+            Assert.Contains($"<TailwindTag>{ShellUI.Core.TailwindConstants.GitHubTag}</TailwindTag>", targets);
+            Assert.Contains("<DownloadFile ", targets);
+            Assert.Contains("WarnMissingTailwindCLI", targets);
+        }
+    }
+
     [Fact]
     public void RewriteAppRazor_KeepsIdentityPagesStatic()
     {
diff --git a/src/ShellUI.CLI/Services/InitService.cs b/src/ShellUI.CLI/Services/InitService.cs
index 3dd8ea8..c09095c 100644
--- a/src/ShellUI.CLI/Services/InitService.cs
+++ b/src/ShellUI.CLI/Services/InitService.cs
@@ -364,7 +364,7 @@ private static async Task RunTailwindBuildAsync(string tailwindPath, string inpu
         }
     }
 
-    private static string GetTargetsFileContent(string method)
+    internal static string GetTargetsFileContent(string method)
     {
         if (method == "npm")
         {
@@ -402,8 +402,23 @@ private static string GetTargetsFileContent(string method)
     <TailwindOutputCss Condition=""'$(TailwindOutputCss)' == ''"">$(MSBuildProjectDirectory)\wwwroot\app.css</TailwindOutputCss>
     <TailwindMinify Condition=""'$(Configuration)' == 'Release'"">--minify</TailwindMinify>
     <TailwindMinify Condition=""'$(Configuration)' != 'Release'""></TailwindMinify>
+    <TailwindTag>__TAILWIND_TAG__</TailwindTag>
+    <TailwindArch>$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString().ToLowerInvariant())</TailwindArch>
+    <TailwindPlatform Condition=""$([MSBuild]::IsOSPlatform('Windows'))"">windows-$(TailwindArch).exe</TailwindPlatform>
+    <TailwindPlatform Condition=""$([MSBuild]::IsOSPlatform('Linux'))"">linux-$(TailwindArch)</TailwindPlatform>
+    <TailwindPlatform Condition=""$([MSBuild]::IsOSPlatform('OSX'))"">macos-$(TailwindArch)</TailwindPlatform>
   </PropertyGroup>
 
+  <Target Name=""DownloadTailwindCLI"" BeforeTargets=""BeforeBuild"" Condition=""!Exists('$(TailwindExecutable)') AND Exists('$(TailwindInputCss)') AND '$(TailwindPlatform)' != ''"">
+    <Message Importance=""high"" Text=""Downloading the Tailwind CLI $(TailwindTag)..."" />
+    <DownloadFile SourceUrl=""https://github.com/tailwindlabs/tailwindcss/releases/download/$(TailwindTag)/tailwindcss-$(TailwindPlatform)"" DestinationFolder=""$(ShellUIBinPath)"" DestinationFileName=""$([System.IO.Path]::GetFileName('$(TailwindExecutable)'))"" ContinueOnError=""true"" />
+    <Exec Command=""chmod +x &quot;$(TailwindExecutable)&quot;"" Condition=""'$(OS)' != 'Windows_NT' AND Exists('$(TailwindExecutable)')"" />
+  </Target>
+
+  <Target Name=""WarnMissingTailwindCLI"" BeforeTargets=""BeforeBuild"" Condition=""!Exists('$(TailwindExecutable)') AND Exists('$(TailwindInputCss)')"">
+    <Warning Text=""ShellUI: the Tailwind CLI is missing from $(ShellUIBinPath) and could not be downloaded, so wwwroot/app.css was not rebuilt."" />
+  </Target>
+
   <Target Name=""BuildTailwindCSS"" BeforeTargets=""BeforeBuild"" Condition=""Exists('$(TailwindExecutable)') AND Exists('$(TailwindInputCss)')"">
     <Message Importance=""high"" Text=""Building Tailwind CSS..."" />
     <Exec Command=""&quot;$(TailwindExecutable)&quot; -i &quot;$(TailwindInputCss)&quot; -o &quot;$(TailwindOutputCss)&quot; $(TailwindMinify)"" />
@@ -414,7 +429,7 @@ private static string GetTargetsFileContent(string method)
     <Message Importance=""high"" Text=""Cleaning Tailwind CSS output..."" />
     <Delete Files=""$(TailwindOutputCss)"" />
   </Target>
-</Project>";
+</Project>".Replace("__TAILWIND_TAG__", TailwindConstants.GitHubTag);
         }
     }
 

From 89cc4ba05acf2d5ddedbe49a8b23c429419d1905 Mon Sep 17 00:00:00 2001
From: Shewatipa Tseisi <shewatipa@chips.co.zw>
Date: Sat, 3 Oct 2026 17:09:05 +0200
Subject: [PATCH 6/7] fix: close Dropdown and Popover on Escape

---
 src/ShellUI.Components/Components/Dropdown.razor    | 7 ++++++-
 src/ShellUI.Components/Components/Popover.razor     | 7 ++++++-
 src/ShellUI.Templates/Templates/DropdownTemplate.cs | 7 ++++++-
 src/ShellUI.Templates/Templates/PopoverTemplate.cs  | 7 ++++++-
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/ShellUI.Components/Components/Dropdown.razor b/src/ShellUI.Components/Components/Dropdown.razor
index 250b6ac..f015118 100644
--- a/src/ShellUI.Components/Components/Dropdown.razor
+++ b/src/ShellUI.Components/Components/Dropdown.razor
@@ -1,7 +1,7 @@
 @namespace ShellUI.Components
 
 <CascadingValue Value="this" IsFixed="true">
-    <div class="@Shell.Cn("relative inline-block text-left", ClassName, Class)" @attributes="AdditionalAttributes">
+    <div class="@Shell.Cn("relative inline-block text-left", ClassName, Class)" @attributes="AdditionalAttributes" @onkeydown="OnKeyDown">
         @if (UseCompositional)
         {
             @ChildContent
@@ -58,4 +58,9 @@
     {
         await ToggleAsync();
     }
+
+    private async Task OnKeyDown(KeyboardEventArgs e)
+    {
+        if (e.Key == "Escape" && IsOpen) await CloseAsync();
+    }
 }
diff --git a/src/ShellUI.Components/Components/Popover.razor b/src/ShellUI.Components/Components/Popover.razor
index e713e3f..bd5522a 100644
--- a/src/ShellUI.Components/Components/Popover.razor
+++ b/src/ShellUI.Components/Components/Popover.razor
@@ -1,7 +1,7 @@
 @namespace ShellUI.Components
 
 <CascadingValue Value="this" IsFixed="true">
-    <div class="@Shell.Cn("relative inline-block", ClassName, Class)" @attributes="AdditionalAttributes">
+    <div class="@Shell.Cn("relative inline-block", ClassName, Class)" @attributes="AdditionalAttributes" @onkeydown="OnKeyDown">
         @if (Trigger is null)
         {
             @ChildContent
@@ -45,4 +45,9 @@
     public async Task CloseAsync() { IsOpen = false; await IsOpenChanged.InvokeAsync(IsOpen); StateHasChanged(); }
     private async Task Toggle() => await ToggleAsync();
     private async Task Close() => await CloseAsync();
+
+    private async Task OnKeyDown(KeyboardEventArgs e)
+    {
+        if (e.Key == "Escape" && IsOpen) await CloseAsync();
+    }
 }
diff --git a/src/ShellUI.Templates/Templates/DropdownTemplate.cs b/src/ShellUI.Templates/Templates/DropdownTemplate.cs
index bb5b644..117d9aa 100644
--- a/src/ShellUI.Templates/Templates/DropdownTemplate.cs
+++ b/src/ShellUI.Templates/Templates/DropdownTemplate.cs
@@ -18,7 +18,7 @@ public static class DropdownTemplate
     public static string Content => @"@namespace YourProjectNamespace.Components.UI
 
 <CascadingValue Value=""this"" IsFixed=""true"">
-    <div class=""@Shell.Cn(""relative inline-block text-left"", ClassName, Class)"" @attributes=""AdditionalAttributes"">
+    <div class=""@Shell.Cn(""relative inline-block text-left"", ClassName, Class)"" @attributes=""AdditionalAttributes"" @onkeydown=""OnKeyDown"">
         @if (UseCompositional)
         {
             @ChildContent
@@ -75,6 +75,11 @@ private async Task ToggleOpen()
     {
         await ToggleAsync();
     }
+
+    private async Task OnKeyDown(KeyboardEventArgs e)
+    {
+        if (e.Key == ""Escape"" && IsOpen) await CloseAsync();
+    }
 }
 ";
 }
diff --git a/src/ShellUI.Templates/Templates/PopoverTemplate.cs b/src/ShellUI.Templates/Templates/PopoverTemplate.cs
index a0cdaf5..403d0b8 100644
--- a/src/ShellUI.Templates/Templates/PopoverTemplate.cs
+++ b/src/ShellUI.Templates/Templates/PopoverTemplate.cs
@@ -19,7 +19,7 @@ public class PopoverTemplate
     public static string Content => @"@namespace YourProjectNamespace.Components.UI
 
 <CascadingValue Value=""this"" IsFixed=""true"">
-    <div class=""@Shell.Cn(""relative inline-block"", ClassName, Class)"" @attributes=""AdditionalAttributes"">
+    <div class=""@Shell.Cn(""relative inline-block"", ClassName, Class)"" @attributes=""AdditionalAttributes"" @onkeydown=""OnKeyDown"">
         @if (Trigger is null)
         {
             @ChildContent
@@ -63,6 +63,11 @@ public class PopoverTemplate
     public async Task CloseAsync() { IsOpen = false; await IsOpenChanged.InvokeAsync(IsOpen); StateHasChanged(); }
     private async Task Toggle() => await ToggleAsync();
     private async Task Close() => await CloseAsync();
+
+    private async Task OnKeyDown(KeyboardEventArgs e)
+    {
+        if (e.Key == ""Escape"" && IsOpen) await CloseAsync();
+    }
 }
 ";
 }

From 7e4a218bc6b04ead4e30075d13848bc70c06d6b7 Mon Sep 17 00:00:00 2001
From: Shewatipa Tseisi <shewatipa@chips.co.zw>
Date: Sat, 3 Oct 2026 17:09:06 +0200
Subject: [PATCH 7/7] test: cover Command actions and Escape on Dropdown and
 Popover

---
 ShellUI.Tests/PackageBehaviorTests.cs | 65 +++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 ShellUI.Tests/PackageBehaviorTests.cs

diff --git a/ShellUI.Tests/PackageBehaviorTests.cs b/ShellUI.Tests/PackageBehaviorTests.cs
new file mode 100644
index 0000000..f1931dc
--- /dev/null
+++ b/ShellUI.Tests/PackageBehaviorTests.cs
@@ -0,0 +1,65 @@
+using Bunit;
+using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.Web;
+using ShellUI.Components;
+using ShellUI.Components.Models;
+
+namespace ShellUI.Tests;
+
+public class PackageBehaviorTests
+{
+    [Fact]
+    public void Command_RunsTheItemActionThenRaisesCommandSelected()
+    {
+        using var ctx = new BunitContext();
+        ctx.JSInterop.Mode = JSRuntimeMode.Loose;
+        var calls = new List<string>();
+        var item = new CommandItem { Title = "Go home", Action = () => { calls.Add("action"); return Task.CompletedTask; } };
+
+        var command = ctx.Render<Command>(p => p
+            .Add(c => c.IsOpen, true)
+            .Add(c => c.Commands, new List<CommandItem> { item })
+            .Add(c => c.CommandSelected, EventCallback.Factory.Create<CommandItem>(this, _ => calls.Add("selected"))));
+
+        command.Find("[role=option]").Click();
+
+        Assert.Equal(new[] { "action", "selected" }, calls);
+    }
+
+    [Fact]
+    public void Popover_ClosesOnEscape()
+    {
+        using var ctx = new BunitContext();
+        bool? open = null;
+
+        var popover = ctx.Render<Popover>(p => p
+            .Add(c => c.IsOpen, true)
+            .Add(c => c.IsOpenChanged, EventCallback.Factory.Create<bool>(this, v => open = v))
+            .Add(c => c.Trigger, "Open")
+            .Add(c => c.ChildContent, "Body"));
+
+        popover.Find("div.relative").KeyDown(new KeyboardEventArgs { Key = "Escape" });
+
+        Assert.False(open);
+        Assert.DoesNotContain("Body", popover.Markup);
+    }
+
+    [Fact]
+    public void Dropdown_ClosesOnEscapeButNotOnOtherKeys()
+    {
+        using var ctx = new BunitContext();
+        var changes = new List<bool>();
+
+        var dropdown = ctx.Render<Dropdown>(p => p
+            .Add(c => c.IsOpen, true)
+            .Add(c => c.IsOpenChanged, EventCallback.Factory.Create<bool>(this, v => changes.Add(v)))
+            .Add(c => c.Trigger, "Menu")
+            .Add(c => c.ChildContent, "Item"));
+
+        dropdown.Find("div.relative").KeyDown(new KeyboardEventArgs { Key = "a" });
+        Assert.Empty(changes);
+
+        dropdown.Find("div.relative").KeyDown(new KeyboardEventArgs { Key = "Escape" });
+        Assert.Equal(new[] { false }, changes);
+    }
+}