fix: icons missing on empty navitems

#8652
dotnet · Apr 20, 2023 · 7831dfa · 7831dfa
1 parent 463a4ef
commit 7831dfa
Showing 1 changed file with 14 additions and 13 deletions.
diff --git a/templates/modern/src/nav.ts b/templates/modern/src/nav.ts
@@ -15,24 +15,14 @@ export type NavItem = {
  * @returns active navbar items
  */
 export async function renderNavbar(): Promise<NavItem[]> {
-  const navrel = meta('docfx:navrel')
-  if (!navrel) {
-    return []
-  }
-
-  const navUrl = new URL(navrel.replace(/.html$/gi, '.json'), window.location.href)
-  const { items } = await fetch(navUrl).then(res => res.json())
-  const navItems = items.map(a => ({ name: a.name, href: new URL(a.href, navUrl) }))
-  if (navItems.length <= 0) {
-    return []
-  }
-
-  const activeItem = findActiveItem(navItems)
   const navbar = document.getElementById('navbar')
   if (!navbar) {
     return
   }
 
+  const navItems = await loadNavItems()
+  const activeItem = findActiveItem(navItems)
+
   const menu = html`
     <ul class='navbar-nav'>${
       navItems.map(item => {
@@ -53,6 +43,17 @@ export async function renderNavbar(): Promise<NavItem[]> {
 
   return activeItem ? [activeItem] : []
 
+  async function loadNavItems(): Promise<NavItem[]> {
+    const navrel = meta('docfx:navrel')
+    if (!navrel) {
+      return []
+    }
+
+    const navUrl = new URL(navrel.replace(/.html$/gi, '.json'), window.location.href)
+    const { items } = await fetch(navUrl).then(res => res.json())
+    return items.map(a => ({ name: a.name, href: new URL(a.href, navUrl) }))
+  }
+
   function githubLink() {
     const docurl = meta('docfx:docurl')
     const github = parseGitHubRepo(docurl)