From cf719ba763fdaaf9b285cb2871dad8c746e9e6b7 Mon Sep 17 00:00:00 2001
From: Hadley Wickham <h.wickham@gmail.com>
Date: Tue, 14 May 2024 15:06:00 -0500
Subject: [PATCH] Improve HTML5 compliance (#2523)

Fixes #2369
---
 NEWS.md                                       |   4 +
 R/navbar.R                                    |  36 ++---
 R/render.R                                    |   7 +-
 inst/BS5/templates/content-article-index.html |   2 +-
 inst/BS5/templates/content-article.html       |   2 +-
 inst/BS5/templates/content-authors.html       |   2 +-
 .../templates/content-citation-authors.html   |   2 +-
 inst/BS5/templates/content-news-index.html    |   2 +-
 inst/BS5/templates/content-news.html          |   2 +-
 .../templates/content-reference-index.html    |   4 +-
 .../templates/content-reference-topic.html    |   2 +-
 inst/BS5/templates/content-title-body.html    |   2 +-
 .../BS5/templates/content-tutorial-index.html |   2 +-
 inst/BS5/templates/content-tutorial.html      |   2 +-
 inst/BS5/templates/head.html                  |   5 -
 inst/BS5/templates/navbar.html                |   2 +-
 po/R-pkgdown.pot                              | 148 +++++++++---------
 tests/testthat/_snaps/navbar.md               |   6 +-
 tests/testthat/_snaps/render.md               |   2 +
 tests/testthat/test-navbar.R                  |  13 +-
 20 files changed, 136 insertions(+), 111 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index e986b09ca..9bc0c8a1d 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,9 @@
 # pkgdown (development version)
 
+* Improve HTML5 compliance (#2369):
+  * No longer support IE9 or earlier
+  * Strip trailing whitespace
+  * Label `<nav>`s and improve navbar html.
 * `build_home_index()` now renders math if you use it in your home page (#2263).
 * `build_home()` now correctly escapes special HTML characters in the bibtex citation (#2022).
 * BS5 templates no longer include empty link to logo when none exists (#2536).
diff --git a/R/navbar.R b/R/navbar.R
index 23be2fef4..e1f112108 100644
--- a/R/navbar.R
+++ b/R/navbar.R
@@ -274,13 +274,16 @@ bs4_navbar_links_tags <- function(links, depth = 0L, side = "left") {
       return(
         htmltools::tags$li(
           class = menu_class,
-          htmltools::tags$a(
-            href = "#", class = "nav-link dropdown-toggle",
-            `data-bs-toggle` = "dropdown", role = "button",
-            `aria-expanded` = "false", `aria-haspopup` = "true",
+          htmltools::tags$button(
+            href = "#",
+            class = "nav-link dropdown-toggle",
+            `data-bs-toggle` = "dropdown",
+            type = "button",
+            `aria-expanded` = "false",
+            `aria-haspopup` = "true",
             link_text,
             id = paste0("dropdown-", make_slug(link_text)),
-          "aria-label" = x$`aria-label` %||% NULL
+            "aria-label" = x$`aria-label` %||% NULL
           ),
           htmltools::tags$div(
             class = dropdown_class,
@@ -336,24 +339,21 @@ bs4_navbar_links_tags <- function(links, depth = 0L, side = "left") {
 
   tags <- purrr::map2(links, seq_along(links), tackle_link, is_submenu = is_submenu, depth = depth)
   htmltools::tagList(tags)
-
 }
 
 bs4_navbar_link_text <- function(x, ...) {
-
   if (!is.null(x$icon)) {
-    # find the iconset
-    split <- strsplit(x$icon, "-")
-    if (length(split[[1]]) > 1) {
-      iconset <- split[[1]][[1]]
-    }
-    else {
-      iconset <- ""
-    }
-    htmltools::tagList(htmltools::tags$span(class = paste(iconset, x$icon)), " ", x$text, ...)
-  }
-  else
+    # Find the icon set
+    classes <- strsplit(x$icon, " ")[[1]]
+    icon_classes <- classes[grepl("-", classes)]
+    iconset <- purrr::map_chr(strsplit(icon_classes, "-"), 1)
+    class <- paste0(unique(c(iconset, classes)), collapse = " ")
+
+    text <- paste0(if (!is.null(x$text)) " ", x$text)
+    htmltools::tagList(htmltools::tags$span(class = class), text, ...)
+  } else {
     htmltools::tagList(x$text, ...)
+  }
 }
 
 # Testing helpers ---------------------------------------------------------
diff --git a/R/render.R b/R/render.R
index 141a8cb92..3799a730b 100644
--- a/R/render.R
+++ b/R/render.R
@@ -63,6 +63,9 @@ render_page_html <- function(pkg, name, data = list(), depth = 0L) {
   template <- find_template("layout", name, pkg = pkg)
   rendered <- render_template(template, components)
 
+  # Strip trailing whitespace
+  rendered <- gsub("\\s+\n", "\n", rendered, perl = TRUE)
+  
   xml2::read_html(rendered, encoding = "UTF-8")
 }
 
@@ -98,7 +101,9 @@ data_template <- function(pkg = ".", depth = 0L) {
     version = tr_("Version"),
     examples = tr_("Examples"),
     citation = tr_("Citation"),
-    author_details = tr_("Additional details")
+    author_details = tr_("Additional details"),
+    toc = tr_("Table of contents"),
+    site_nav = tr_("Site navigation")
   )
 
   # Components that mostly end up in the <head>
diff --git a/inst/BS5/templates/content-article-index.html b/inst/BS5/templates/content-article-index.html
index 7b3df019e..0ff27681d 100644
--- a/inst/BS5/templates/content-article-index.html
+++ b/inst/BS5/templates/content-article-index.html
@@ -21,7 +21,7 @@ <h3>{{{title}}}</h3>
   </main>
 
   <aside class="col-md-3">
-    <nav id="toc">
+    <nav id="toc" aria-label="{{#translate}}{{toc}}{{/translate}}">
       <h2>{{#translate}}{{on_this_page}}{{/translate}}</h2>
     </nav>
   </aside>
diff --git a/inst/BS5/templates/content-article.html b/inst/BS5/templates/content-article.html
index 8a5c79b61..b2be7817c 100644
--- a/inst/BS5/templates/content-article.html
+++ b/inst/BS5/templates/content-article.html
@@ -48,7 +48,7 @@ <h4 data-toc-skip class="date">$date$</h4>
   </main>
  {{#toc}}
   <aside class="col-md-3">
-    <nav id="toc">
+    <nav id="toc" aria-label="{{#translate}}{{toc}}{{/translate}}">
       <h2>{{#translate}}{{on_this_page}}{{/translate}}</h2>
     </nav>
   </aside>
diff --git a/inst/BS5/templates/content-authors.html b/inst/BS5/templates/content-authors.html
index f4bfabf82..b337f6e44 100644
--- a/inst/BS5/templates/content-authors.html
+++ b/inst/BS5/templates/content-authors.html
@@ -20,7 +20,7 @@ <h1>{{{pagetitle}}}</h1>
   </main>
 
   <aside class="col-md-3">
-    <nav id="toc">
+    <nav id="toc" aria-label="{{#translate}}{{toc}}{{/translate}}">
       <h2>{{#translate}}{{on_this_page}}{{/translate}}</h2>
     </nav>
   </aside>
diff --git a/inst/BS5/templates/content-citation-authors.html b/inst/BS5/templates/content-citation-authors.html
index 06a92899e..2cafe4779 100644
--- a/inst/BS5/templates/content-citation-authors.html
+++ b/inst/BS5/templates/content-citation-authors.html
@@ -38,7 +38,7 @@ <h2>{{#translate}}{{author_details}}{{/translate}}</h2>
   </main>
 
   <aside class="col-md-3">
-    <nav id="toc">
+    <nav id="toc" aria-label="{{#translate}}{{toc}}{{/translate}}">
       <h2>{{#translate}}{{on_this_page}}{{/translate}}</h2>
     </nav>
   </aside>
diff --git a/inst/BS5/templates/content-news-index.html b/inst/BS5/templates/content-news-index.html
index 1cc580fde..82d483eb9 100644
--- a/inst/BS5/templates/content-news-index.html
+++ b/inst/BS5/templates/content-news-index.html
@@ -12,7 +12,7 @@ <h1>{{{pagetitle}}}</h1>
   </main>
 
   <aside class="col-md-3">
-    <nav id="toc">
+    <nav id="toc" aria-label="{{#translate}}{{toc}}{{/translate}}">
       <h2>{{#translate}}{{on_this_page}}{{/translate}}</h2>
     </nav>
   </aside>
diff --git a/inst/BS5/templates/content-news.html b/inst/BS5/templates/content-news.html
index 5bd56acfa..3fb091c41 100644
--- a/inst/BS5/templates/content-news.html
+++ b/inst/BS5/templates/content-news.html
@@ -12,7 +12,7 @@ <h1>{{{pagetitle}}}</h1>
   </main>
 
   <aside class="col-md-3">
-    <nav id="toc">
+    <nav id="toc" aria-label="{{#translate}}{{toc}}{{/translate}}">
       <h2>{{#translate}}{{on_this_page}}{{/translate}}</h2>
     </nav>
   </aside>
diff --git a/inst/BS5/templates/content-reference-index.html b/inst/BS5/templates/content-reference-index.html
index b1d3d0c9d..3cacfc730 100644
--- a/inst/BS5/templates/content-reference-index.html
+++ b/inst/BS5/templates/content-reference-index.html
@@ -5,7 +5,7 @@
       <h1>{{{pagetitle}}}</h1>
     </div>
 
-    {{#rows}}<div id="{{slug}}" class="section level2">
+    {{#rows}}<div {{#slug}}id="{{.}}"{{/slug}} class="section level2">
       {{#title}}<h2>{{{.}}}</h2>{{/title}}
       {{#subtitle}}<h3>{{{.}}}</h3>{{/subtitle}}
       {{#desc}}<div class="section-desc">{{{desc}}}</div>{{/desc}}
@@ -21,7 +21,7 @@ <h1>{{{pagetitle}}}</h1>
   </main>
 
   <aside class="col-md-3">
-    <nav id="toc">
+    <nav id="toc" aria-label="{{#translate}}{{toc}}{{/translate}}">
       <h2>{{#translate}}{{on_this_page}}{{/translate}}</h2>
     </nav>
   </aside>
diff --git a/inst/BS5/templates/content-reference-topic.html b/inst/BS5/templates/content-reference-topic.html
index 7974ae50c..0d7475d86 100644
--- a/inst/BS5/templates/content-reference-topic.html
+++ b/inst/BS5/templates/content-reference-topic.html
@@ -41,7 +41,7 @@ <h2>{{#translate}}{{examples}}{{/translate}}</h2>
     {{/examples}}
   </main>
   <aside class="col-md-3">
-    <nav id="toc">
+    <nav id="toc" aria-label="{{#translate}}{{toc}}{{/translate}}">
       <h2>{{#translate}}{{on_this_page}}{{/translate}}</h2>
     </nav>
   </aside>
diff --git a/inst/BS5/templates/content-title-body.html b/inst/BS5/templates/content-title-body.html
index d5bb0adac..920670404 100644
--- a/inst/BS5/templates/content-title-body.html
+++ b/inst/BS5/templates/content-title-body.html
@@ -11,7 +11,7 @@ <h1>{{pagetitle}}</h1>
   </main>
 
   <aside class="col-md-3">
-    <nav id="toc">
+    <nav id="toc" aria-label="{{#translate}}{{toc}}{{/translate}}">
       <h2>{{#translate}}{{on_this_page}}{{/translate}}</h2>
     </nav>
   </aside>
diff --git a/inst/BS5/templates/content-tutorial-index.html b/inst/BS5/templates/content-tutorial-index.html
index 97336070d..4be63cb37 100644
--- a/inst/BS5/templates/content-tutorial-index.html
+++ b/inst/BS5/templates/content-tutorial-index.html
@@ -13,7 +13,7 @@ <h1>{{{pagetitle}}}</h1>
   </main>
 
   <aside class="col-md-3">
-    <nav id="toc">
+    <nav id="toc" aria-label="{{#translate}}{{toc}}{{/translate}}">
       <h2>{{#translate}}{{on_this_page}}{{/translate}}</h2>
     </nav>
   </aside>
diff --git a/inst/BS5/templates/content-tutorial.html b/inst/BS5/templates/content-tutorial.html
index 9a2d91131..ec839b772 100644
--- a/inst/BS5/templates/content-tutorial.html
+++ b/inst/BS5/templates/content-tutorial.html
@@ -5,7 +5,7 @@ <h1>{{pagetitle}}</h1>
     </div>
   </main>
   <aside class="col-md-3">
-    <nav id="toc">
+    <nav id="toc" aria-label="{{#translate}}{{toc}}{{/translate}}">
       <h2>{{#translate}}{{on_this_page}}{{/translate}}</h2>
     </nav>
   </aside>
diff --git a/inst/BS5/templates/head.html b/inst/BS5/templates/head.html
index e663b6f93..183609b52 100644
--- a/inst/BS5/templates/head.html
+++ b/inst/BS5/templates/head.html
@@ -84,11 +84,6 @@
 <script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js" integrity="sha256-nvJJv9wWKEm88qvoQl9ekL2J+k/RWIsaSScxxlsrv8k=" crossorigin="anonymous"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/config/TeX-AMS-MML_HTMLorMML.js" integrity="sha256-84DKXVJXs0/F8OTMzX4UR909+jtl4G7SPypPavF+GfA=" crossorigin="anonymous"></script>
 
-<!--[if lt IE 9]>
-<script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
-<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-<![endif]-->
-
 {{#yaml}}{{#ganalytics}}
 <!-- Global site tag (gtag.js) - Google Analytics -->
 <script async src="https://www.googletagmanager.com/gtag/js?id={{.}}"></script>
diff --git a/inst/BS5/templates/navbar.html b/inst/BS5/templates/navbar.html
index b8a50fd61..c13e8b08a 100644
--- a/inst/BS5/templates/navbar.html
+++ b/inst/BS5/templates/navbar.html
@@ -1,5 +1,5 @@
 {{#navbar}}
-<nav class="navbar fixed-top navbar-{{{type}}} navbar-expand-lg bg-{{{bg}}}" data-bs-theme="{{{type}}}">
+<nav class="navbar fixed-top navbar-{{{type}}} navbar-expand-lg bg-{{{bg}}}" data-bs-theme="{{{type}}}" aria-label="{{#translate}}{{site_nav}}{{/translate}}">
   <div class="container">
     {{#includes}}{{{before_title}}}{{/includes}}
     <a class="navbar-brand me-2" href="{{#site}}{{root}}{{/site}}index.html">{{#site}}{{title}}{{/site}}</a>
diff --git a/po/R-pkgdown.pot b/po/R-pkgdown.pot
index cb87847b2..533a48959 100644
--- a/po/R-pkgdown.pot
+++ b/po/R-pkgdown.pot
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: pkgdown 2.0.9.9000\n"
-"POT-Creation-Date: 2024-04-19 08:40-0500\n"
+"POT-Creation-Date: 2024-05-10 10:43-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,11 +18,11 @@ msgstr ""
 msgid "Content not found. Please use links in the navbar."
 msgstr ""
 
-#: build-articles.R:395 navbar.R:147 navbar.R:154 navbar.R:169
+#: build-articles.R:411 navbar.R:163 navbar.R:170 navbar.R:185
 msgid "Articles"
 msgstr ""
 
-#: build-articles.R:446
+#: build-articles.R:462
 msgid "All vignettes"
 msgstr ""
 
@@ -34,74 +34,70 @@ msgstr ""
 msgid "Site built with <a href=\"%s\">pkgdown</a> %s."
 msgstr ""
 
-#: build-home-authors.R:69
-msgid "More about authors..."
+#: build-home-authors.R:12
+msgid "Authors and Citation"
 msgstr ""
 
-#: build-home-authors.R:72
-msgid "Developers"
+#: build-home-authors.R:96
+msgid "More about authors..."
 msgstr ""
 
-#: build-home-authors.R:77 render.R:95
-msgid "Authors"
+#: build-home-authors.R:99
+msgid "Developers"
 msgstr ""
 
-#: build-home-authors.R:169
+#: build-home-authors.R:185
 msgid "author"
 msgstr ""
 
-#: build-home-authors.R:170
+#: build-home-authors.R:186
 msgid "compiler"
 msgstr ""
 
-#: build-home-authors.R:171
+#: build-home-authors.R:187
 msgid "contractor"
 msgstr ""
 
-#: build-home-authors.R:172
+#: build-home-authors.R:188
 msgid "contributor"
 msgstr ""
 
-#: build-home-authors.R:173
+#: build-home-authors.R:189
 msgid "copyright holder"
 msgstr ""
 
-#: build-home-authors.R:174
+#: build-home-authors.R:190
 msgid "maintainer"
 msgstr ""
 
-#: build-home-authors.R:175
+#: build-home-authors.R:191
 msgid "data contributor"
 msgstr ""
 
-#: build-home-authors.R:176
+#: build-home-authors.R:192
 msgid "funder"
 msgstr ""
 
-#: build-home-authors.R:177
+#: build-home-authors.R:193
 msgid "reviewer"
 msgstr ""
 
-#: build-home-authors.R:178
+#: build-home-authors.R:194
 msgid "thesis advisor"
 msgstr ""
 
-#: build-home-authors.R:179
+#: build-home-authors.R:195
 msgid "translator"
 msgstr ""
 
-#: build-home-citation.R:37 build-home-citation.R:94 render.R:98
+#: build-home-authors.R:249 render.R:101
 msgid "Citation"
 msgstr ""
 
-#: build-home-citation.R:38
+#: build-home-authors.R:250
 msgid "Citing %s"
 msgstr ""
 
-#: build-home-citation.R:93
-msgid "Authors and Citation"
-msgstr ""
-
 #: build-home-community.R:23
 msgid "Contributing guide"
 msgstr ""
@@ -118,27 +114,27 @@ msgstr ""
 msgid "Community"
 msgstr ""
 
-#: build-home-index.R:96
+#: build-home-index.R:88
 msgid "Dev Status"
 msgstr ""
 
-#: build-home-index.R:165
+#: build-home-index.R:161
 msgid "View on %s"
 msgstr ""
 
-#: build-home-index.R:166
+#: build-home-index.R:162
 msgid "Browse source code"
 msgstr ""
 
-#: build-home-index.R:167
+#: build-home-index.R:163
 msgid "Report a bug"
 msgstr ""
 
-#: build-home-index.R:171
+#: build-home-index.R:167
 msgid "Links"
 msgstr ""
 
-#: build-home-index.R:176
+#: build-home-index.R:172 render.R:103
 msgid "Table of contents"
 msgstr ""
 
@@ -150,23 +146,23 @@ msgstr ""
 msgid "Full license"
 msgstr ""
 
-#: build-news.R:101 build-news.R:257 build-news.R:262
+#: build-news.R:101 build-news.R:259 build-news.R:264
 msgid "Changelog"
 msgstr ""
 
-#: build-news.R:126
+#: build-news.R:128
 msgid "Version %s"
 msgstr ""
 
-#: build-news.R:138 build-news.R:251
+#: build-news.R:140 build-news.R:253
 msgid "News"
 msgstr ""
 
-#: build-news.R:253
+#: build-news.R:255
 msgid "Releases"
 msgstr ""
 
-#: build-news.R:309
+#: build-news.R:311
 msgid "CRAN release: %s"
 msgstr ""
 
@@ -174,15 +170,15 @@ msgstr ""
 msgid "Package index"
 msgstr ""
 
-#: build-reference-index.R:132
+#: build-reference-index.R:127
 msgid "All functions"
 msgstr ""
 
-#: build-reference.R:361
+#: build-reference.R:369
 msgid "Usage"
 msgstr ""
 
-#: build-tutorials.R:46 navbar.R:113
+#: build-tutorials.R:47 navbar.R:129
 msgid "Tutorials"
 msgstr ""
 
@@ -198,102 +194,114 @@ msgstr ""
 msgid "Unreleased version"
 msgstr ""
 
-#: navbar.R:105
+#: navbar.R:121
 msgid "Reference"
 msgstr ""
 
-#: navbar.R:141
+#: navbar.R:157
 msgid "Get started"
 msgstr ""
 
-#: navbar.R:167
+#: navbar.R:183
 msgid "More articles..."
 msgstr ""
 
-#: navbar.R:208
+#: navbar.R:224
 msgid "Search site"
 msgstr ""
 
-#: navbar.R:209
+#: navbar.R:225
 msgid "Search for"
 msgstr ""
 
-#: rd-data.R:33
+#: rd-data.R:23
 msgid "Details"
 msgstr ""
 
-#: rd-data.R:37
+#: rd-data.R:27
 msgid "Description"
 msgstr ""
 
-#: rd-data.R:41
+#: rd-data.R:31
 msgid "References"
 msgstr ""
 
-#: rd-data.R:45 render.R:93
+#: rd-data.R:35 render.R:96
 msgid "Source"
 msgstr ""
 
-#: rd-data.R:49
+#: rd-data.R:39
 msgid "Format"
 msgstr ""
 
-#: rd-data.R:53
+#: rd-data.R:43
 msgid "Note"
 msgstr ""
 
-#: rd-data.R:57
+#: rd-data.R:47
 msgid "Author"
 msgstr ""
 
-#: rd-data.R:61
+#: rd-data.R:51
 msgid "See also"
 msgstr ""
 
-#: rd-data.R:77
+#: rd-data.R:67
 msgid "Arguments"
 msgstr ""
 
-#: rd-data.R:85
+#: rd-data.R:75
 msgid "Value"
 msgstr ""
 
-#: rd-html.R:209
-msgid "# Default %s method"
-msgstr ""
-
-#: rd-html.R:211
-msgid "# %s method for class '%s'"
-msgstr ""
-
-#: render.R:90
+#: render.R:93
 msgid "Skip to contents"
 msgstr ""
 
-#: render.R:91
+#: render.R:94
 msgid "Toggle navigation"
 msgstr ""
 
-#: render.R:92
+#: render.R:95
 msgid "On this page"
 msgstr ""
 
-#: render.R:94
+#: render.R:97
 msgid "Abstract"
 msgstr ""
 
-#: render.R:96
+#: render.R:98
+msgid "Authors"
+msgstr ""
+
+#: render.R:99
 msgid "Version"
 msgstr ""
 
-#: render.R:97
+#: render.R:100
 msgid "Examples"
 msgstr ""
 
-#: repo.R:33
+#: render.R:102
+msgid "Additional details"
+msgstr ""
+
+#: render.R:104
+msgid "Site navigation"
+msgstr ""
+
+#: repo.R:35
 msgid "Source:"
 msgstr ""
 
 #: tweak-homepage.R:61
 msgid "Dev status"
 msgstr ""
+
+#: usage.R:23
+msgid "# Default %s method"
+msgstr ""
+
+#: usage.R:25
+msgid "# %s method for class '%s'"
+msgstr ""
diff --git a/tests/testthat/_snaps/navbar.md b/tests/testthat/_snaps/navbar.md
index 807c21867..5e15ae36f 100644
--- a/tests/testthat/_snaps/navbar.md
+++ b/tests/testthat/_snaps/navbar.md
@@ -138,7 +138,7 @@
       data_navbar(pkg)[c("left", "right")]
     Output
       $left
-      [1] "<li class=\"nav-item\">\n  <a class=\"nav-link\" href=\"https://github.com/r-lib/pkgdown/\" aria-label=\"github\">\n    <span class=\"fab fa fab fa-github fa-lg\"></span>\n     \n  </a>\n</li>\n<li><form class=\"form-inline\" role=\"search\">\n<input type=\"search\" class=\"form-control\" name=\"search-input\" id=\"search-input\" autocomplete=\"off\" aria-label=\"Search site\" placeholder=\"Search for\" data-search-index=\"search.json\">\n</form></li>"
+      [1] "<li class=\"nav-item\">\n  <a class=\"nav-link\" href=\"https://github.com/r-lib/pkgdown/\" aria-label=\"github\">\n    <span class=\"fa fab fa-github fa-lg\"></span>\n  </a>\n</li>\n<li><form class=\"form-inline\" role=\"search\">\n<input type=\"search\" class=\"form-control\" name=\"search-input\" id=\"search-input\" autocomplete=\"off\" aria-label=\"Search site\" placeholder=\"Search for\" data-search-index=\"search.json\">\n</form></li>"
       
       $right
       [1] "<li class=\"nav-item\">\n  <a class=\"nav-link\" href=\"news/index.html\">Changelog</a>\n</li>"
@@ -230,7 +230,7 @@
         <a class="nav-link" href="reference/index.html">Reference</a>
       </li>
       <li class="nav-item dropdown">
-        <a href="#" class="nav-link dropdown-toggle" data-bs-toggle="dropdown" role="button" aria-expanded="false" aria-haspopup="true" id="dropdown-articles">Articles</a>
+        <button href="#" class="nav-link dropdown-toggle" data-bs-toggle="dropdown" type="button" aria-expanded="false" aria-haspopup="true" id="dropdown-articles">Articles</button>
         <div class="dropdown-menu" aria-labelledby="dropdown-articles">
           <a class="dropdown-item" href="articles/linking.html">Auto-linking</a>
           <a class="dropdown-item" href="articles/search.html">Search</a>
@@ -250,7 +250,7 @@
       cat(render_navbar_links(x, pkg = list(bs_version = 4)))
     Output
       <li class="nav-item dropdown">
-        <a href="#" class="nav-link dropdown-toggle" data-bs-toggle="dropdown" role="button" aria-expanded="false" aria-haspopup="true" id="dropdown-articles">Articles</a>
+        <button href="#" class="nav-link dropdown-toggle" data-bs-toggle="dropdown" type="button" aria-expanded="false" aria-haspopup="true" id="dropdown-articles">Articles</button>
         <div class="dropdown-menu" aria-labelledby="dropdown-articles">
           <h6 class="dropdown-header" data-toc-skip>First section</h6>
           <a class="dropdown-item" href="articles/search.html">Search</a>
diff --git a/tests/testthat/_snaps/render.md b/tests/testthat/_snaps/render.md
index 38125932f..11d04eb82 100644
--- a/tests/testthat/_snaps/render.md
+++ b/tests/testthat/_snaps/render.md
@@ -36,6 +36,8 @@
       examples: Examples
       citation: Citation
       author_details: Additional details
+      toc: Table of contents
+      site_nav: Site navigation
     has_favicons: no
     opengraph: []
     extra:
diff --git a/tests/testthat/test-navbar.R b/tests/testthat/test-navbar.R
index 567b01bf0..65a570fcd 100644
--- a/tests/testthat/test-navbar.R
+++ b/tests/testthat/test-navbar.R
@@ -235,4 +235,15 @@ test_that("can render search helper", {
   expect_snapshot({
     bs4_navbar_links_tags(list(menu = list(search = TRUE)))
   })
-})
\ No newline at end of file
+})
+
+test_that("icons extract icon set", {
+  expect_equal(
+    as.character(bs4_navbar_link_text(menu_icon("github", ""))),
+    '<span class="fa fas fa-github fa-lg"></span>'
+  )
+  expect_equal(
+    as.character(bs4_navbar_link_text(menu_icon("github", "", style = "fab"))),
+    '<span class="fa fab fa-github fa-lg"></span>'
+  )
+})