Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@
@inject NavigationManager NavigationManager

##endif*@
@*#if (UseWebAssembly && InteractiveAtRoot) -->
<script type="module" src="@Assets["Layout/NavMenu.razor.js"]"></script>
##else
<script type="module" src="@Assets["Components/Layout/NavMenu.razor.js"]"></script>
##endif*@

<div class="top-row ps-3 navbar navbar-dark">
<div class="container-fluid">
<a class="navbar-brand" href="">BlazorWebCSharp.1</a>
Expand All @@ -12,7 +18,7 @@

<input type="checkbox" title="Navigation menu" class="navbar-toggler" />

<div class="nav-scrollable" onclick="document.querySelector('.navbar-toggler').click()">
<div id="nav-scrollable" class="nav-scrollable">
<nav class="nav flex-column">
<div class="nav-item px-3">
<NavLink class="nav-link" href="" Match="NavLinkMatch.All">
Expand Down
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you check the different template configurations to make sure we are only adding this when needed? I imagine it'll be something in .templates.json.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@copilot confirm this with me.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've verified the template configurations. The JS file is already correctly handled by the existing template.json:

  1. Exclusion when needed: The wildcard pattern NavMenu.* (line 120) automatically excludes the JS file when !SampleContent (empty template)
  2. Client project handling: The rename configuration (line 67) moves all NavMenu.* files to the Client project when UseWebAssembly && InteractiveAtRoot
  3. Conditional paths: Added conditional script references matching the ReconnectModal pattern to use the correct asset path based on project structure

Tested across all configurations: ✅ Server default, ✅ WebAssembly + global, ✅ None interactivity, ✅ Empty template.

Fixed in commit 3749489.

Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// Handle navigation menu toggle
const navScrollable = document.getElementById("nav-scrollable");
const navToggler = document.querySelector(".navbar-toggler");

if (navScrollable && navToggler) {
navScrollable.addEventListener("click", function() {
navToggler.click();
});
}
Original file line number Diff line number Diff line change
Expand Up @@ -533,6 +533,7 @@
"Components/Layout/MainLayout.razor.css",
"Components/Layout/NavMenu.razor",
"Components/Layout/NavMenu.razor.css",
"Components/Layout/NavMenu.razor.js",
"Components/Pages/Error.razor",
"Components/Pages/Home.razor",
"Components/Pages/NotFound.razor",
Expand Down Expand Up @@ -648,6 +649,7 @@
"Components/Layout/MainLayout.razor.css",
"Components/Layout/NavMenu.razor",
"Components/Layout/NavMenu.razor.css",
"Components/Layout/NavMenu.razor.js",
"Components/Pages/Auth.razor",
"Components/Pages/Error.razor",
"Components/Pages/Home.razor",
Expand Down Expand Up @@ -728,6 +730,7 @@
"Components/Layout/MainLayout.razor.css",
"Components/Layout/NavMenu.razor",
"Components/Layout/NavMenu.razor.css",
"Components/Layout/NavMenu.razor.js",
"Components/Layout/ReconnectModal.razor",
"Components/Layout/ReconnectModal.razor.css",
"Components/Layout/ReconnectModal.razor.js",
Expand Down Expand Up @@ -844,6 +847,7 @@
"Components/Layout/MainLayout.razor.css",
"Components/Layout/NavMenu.razor",
"Components/Layout/NavMenu.razor.css",
"Components/Layout/NavMenu.razor.js",
"Components/Layout/ReconnectModal.razor",
"Components/Layout/ReconnectModal.razor.css",
"Components/Layout/ReconnectModal.razor.js",
Expand Down Expand Up @@ -971,6 +975,7 @@
"Components/Layout/MainLayout.razor.css",
"Components/Layout/NavMenu.razor",
"Components/Layout/NavMenu.razor.css",
"Components/Layout/NavMenu.razor.js",
"Components/Layout/ReconnectModal.razor",
"Components/Layout/ReconnectModal.razor.css",
"Components/Layout/ReconnectModal.razor.js",
Expand Down Expand Up @@ -1055,6 +1060,7 @@
"{ProjectName}/Components/Layout/MainLayout.razor.css",
"{ProjectName}/Components/Layout/NavMenu.razor",
"{ProjectName}/Components/Layout/NavMenu.razor.css",
"{ProjectName}/Components/Layout/NavMenu.razor.js",
"{ProjectName}/Components/Pages/Error.razor",
"{ProjectName}/Components/Pages/Home.razor",
"{ProjectName}/Components/Pages/NotFound.razor",
Expand Down Expand Up @@ -1180,6 +1186,7 @@
"{ProjectName}/Components/Layout/MainLayout.razor.css",
"{ProjectName}/Components/Layout/NavMenu.razor",
"{ProjectName}/Components/Layout/NavMenu.razor.css",
"{ProjectName}/Components/Layout/NavMenu.razor.js",
"{ProjectName}/Components/Pages/Error.razor",
"{ProjectName}/Components/Pages/Home.razor",
"{ProjectName}/Components/Pages/NotFound.razor",
Expand Down Expand Up @@ -1260,6 +1267,7 @@
"{ProjectName}/Components/Layout/MainLayout.razor.css",
"{ProjectName}/Components/Layout/NavMenu.razor",
"{ProjectName}/Components/Layout/NavMenu.razor.css",
"{ProjectName}/Components/Layout/NavMenu.razor.js",
"{ProjectName}/Components/Layout/ReconnectModal.razor",
"{ProjectName}/Components/Layout/ReconnectModal.razor.css",
"{ProjectName}/Components/Layout/ReconnectModal.razor.js",
Expand Down Expand Up @@ -1389,6 +1397,7 @@
"{ProjectName}/Components/Layout/MainLayout.razor.css",
"{ProjectName}/Components/Layout/NavMenu.razor",
"{ProjectName}/Components/Layout/NavMenu.razor.css",
"{ProjectName}/Components/Layout/NavMenu.razor.js",
"{ProjectName}/Components/Layout/ReconnectModal.razor",
"{ProjectName}/Components/Layout/ReconnectModal.razor.css",
"{ProjectName}/Components/Layout/ReconnectModal.razor.js",
Expand Down Expand Up @@ -1467,6 +1476,7 @@
"Components/Layout/MainLayout.razor.css",
"Components/Layout/NavMenu.razor",
"Components/Layout/NavMenu.razor.css",
"Components/Layout/NavMenu.razor.js",
"Components/Layout/ReconnectModal.razor",
"Components/Layout/ReconnectModal.razor.css",
"Components/Layout/ReconnectModal.razor.js",
Expand Down Expand Up @@ -1537,6 +1547,7 @@
"{ProjectName}.Client/Layout/MainLayout.razor.css",
"{ProjectName}.Client/Layout/NavMenu.razor",
"{ProjectName}.Client/Layout/NavMenu.razor.css",
"{ProjectName}.Client/Layout/NavMenu.razor.js",
"{ProjectName}.Client/Pages/Counter.razor",
"{ProjectName}.Client/Pages/Home.razor",
"{ProjectName}.Client/Pages/NotFound.razor",
Expand Down Expand Up @@ -1613,6 +1624,7 @@
"{ProjectName}.Client/Layout/MainLayout.razor.css",
"{ProjectName}.Client/Layout/NavMenu.razor",
"{ProjectName}.Client/Layout/NavMenu.razor.css",
"{ProjectName}.Client/Layout/NavMenu.razor.js",
"{ProjectName}.Client/Layout/ReconnectModal.razor",
"{ProjectName}.Client/Layout/ReconnectModal.razor.css",
"{ProjectName}.Client/Layout/ReconnectModal.razor.js",
Expand Down Expand Up @@ -1921,6 +1933,7 @@
"Components/Layout/MainLayout.razor.css",
"Components/Layout/NavMenu.razor",
"Components/Layout/NavMenu.razor.css",
"Components/Layout/NavMenu.razor.js",
"Components/Layout/ReconnectModal.razor",
"Components/Layout/ReconnectModal.razor.css",
"Components/Layout/ReconnectModal.razor.js",
Expand Down Expand Up @@ -1998,6 +2011,7 @@
"{ProjectName}.Client/Layout/MainLayout.razor.css",
"{ProjectName}.Client/Layout/NavMenu.razor",
"{ProjectName}.Client/Layout/NavMenu.razor.css",
"{ProjectName}.Client/Layout/NavMenu.razor.js",
"{ProjectName}.Client/{ProjectName}.Client.csproj",
"{ProjectName}.Client/Pages/Auth.razor",
"{ProjectName}.Client/Pages/Counter.razor",
Expand Down Expand Up @@ -2128,6 +2142,7 @@
"{ProjectName}.Client/Layout/MainLayout.razor.css",
"{ProjectName}.Client/Layout/NavMenu.razor",
"{ProjectName}.Client/Layout/NavMenu.razor.css",
"{ProjectName}.Client/Layout/NavMenu.razor.js",
"{ProjectName}.Client/Layout/ReconnectModal.razor",
"{ProjectName}.Client/Layout/ReconnectModal.razor.css",
"{ProjectName}.Client/Layout/ReconnectModal.razor.js",
Expand Down Expand Up @@ -3721,4 +3736,4 @@
]
}
}
}
}
Loading