From 9c2b4dbb67f24699f334b9101a9ac96939dffbd5 Mon Sep 17 00:00:00 2001
From: Enis Necipoglu <iletisim@enisnecipoglu.com>
Date: Mon, 6 Feb 2023 16:07:40 +0300
Subject: [PATCH 1/2] Update Basic-Theme documentation

---
 docs/en/UI/Blazor/Basic-Theme.md | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/docs/en/UI/Blazor/Basic-Theme.md b/docs/en/UI/Blazor/Basic-Theme.md
index 4060f097ba..e4124d9a2c 100644
--- a/docs/en/UI/Blazor/Basic-Theme.md
+++ b/docs/en/UI/Blazor/Basic-Theme.md
@@ -85,6 +85,27 @@ You can simply override the styles in the Global Styles file of your application
 
 See the [Customization / Overriding Components](Customization-Overriding-Components.md) to learn how you can replace components, customize and extend the user interface.
 
+### Overriding the Menu Item
+Basic theme supports overriding a single menu item with a custom component. You can create a custom component and call `UseComponent` extension method of Basic Theme in the **MenuContributor**.
+
+```csharp
+using Volo.Abp.AspNetCore.Components.Web.BasicTheme.Navigation;
+
+//...
+
+context.Menu.Items.Add(
+  new ApplicationMenuItem("Custom.1", "My Custom Menu", "#")
+    .UseComponent(typeof(MyMenuItemComponent)));
+```
+
+```html
+<li class="nav-item">
+    <a href="#" class="nav-link">
+        My Custom Menu
+    </a>
+</li>
+```
+
 ### Copy & Customize
 
 You can run the following [ABP CLI](../../CLI.md) command in **Blazor{{if UI == "Blazor"}}WebAssembly{{else}} Server{{end}}** project directory to copy the source code to your solution:

From b4f007c59d99daa3bb148fe5ffa8f18de48bfd45 Mon Sep 17 00:00:00 2001
From: Enis Necipoglu <iletisim@enisnecipoglu.com>
Date: Tue, 7 Feb 2023 09:33:48 +0300
Subject: [PATCH 2/2] Fix mistaken check from #15611

---
 .../Themes/Basic/FirstLevelNavMenuItem.razor                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.BasicTheme/Themes/Basic/FirstLevelNavMenuItem.razor b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.BasicTheme/Themes/Basic/FirstLevelNavMenuItem.razor
index b3ecb41862..1f469a809a 100644
--- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.BasicTheme/Themes/Basic/FirstLevelNavMenuItem.razor
+++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.BasicTheme/Themes/Basic/FirstLevelNavMenuItem.razor
@@ -13,7 +13,7 @@
     {
         <DynamicComponent Type="@customComponentType" />
     }
-    else if (url != null)
+    else if (MenuItem.Url != null)
     {
         <li class="nav-item @cssClass @disabled" id="@elementId">
             <a class="nav-link" href="@url" target="@MenuItem.Target">