From 7e45649c06284d8c3ed37a582727b6e8861e5fc8 Mon Sep 17 00:00:00 2001
From: Garrick Aden-Buie <garrick@adenbuie.com>
Date: Tue, 19 Nov 2024 10:03:30 -0500
Subject: [PATCH 01/20] fix: apply `data-bs-theme="dark"` to `<nav>` when
 `inverse = TRUE`

---
 R/navs-legacy.R | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/R/navs-legacy.R b/R/navs-legacy.R
index 2ed977f69..d0cb10fcd 100644
--- a/R/navs-legacy.R
+++ b/R/navs-legacy.R
@@ -368,12 +368,12 @@ navs_bar_ <- function(..., title = NULL, id = NULL, selected = NULL,
     theme = theme
   )
 
-  if (!is.null(bg)) {
-    # navbarPage_() returns a tagList() of the nav and content
-    navbar[[1]] <- tagAppendAttributes(
-      navbar[[1]], style = css(background_color = paste(bg, "!important"))
-    )
-  }
+  # navbarPage_() returns a tagList() of the nav and content
+  navbar[[1]] <- tagAppendAttributes(
+    navbar[[1]], 
+    style = if (!is.null(bg)) css(background_color = paste(bg, "!important")),
+    "data-bs-theme" = if (inverse) "dark"
+  )
 
   as_fragment(navbar, page = page)
 }

From 86b4f7744b266ffeecf0864599146fb11e8dfbcc Mon Sep 17 00:00:00 2001
From: Garrick Aden-Buie <garrick@adenbuie.com>
Date: Tue, 19 Nov 2024 10:31:23 -0500
Subject: [PATCH 02/20] feat(navbar): Set `data-bs-theme` from `inverse`

Lets `inverse` be a character value that is used directly for `data-bs-theme`.
Turns out this is a backwards compatible change that opens the door
to the future addition of another argument.
---
 R/navs-legacy.R | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/R/navs-legacy.R b/R/navs-legacy.R
index d0cb10fcd..5b18c50f1 100644
--- a/R/navs-legacy.R
+++ b/R/navs-legacy.R
@@ -346,6 +346,13 @@ navs_bar_ <- function(..., title = NULL, id = NULL, selected = NULL,
                       collapsible = TRUE, fluid = TRUE,
                       theme = NULL) {
 
+  navbar_color_mode <- switch(
+    inverse,
+    "TRUE" = "dark",
+    "FALSE" = "light",
+    inverse
+  )
+
   if (identical(inverse, "auto")) {
     inverse <- TRUE
     if (identical(theme_preset_info(theme)$name, "shiny")) {
@@ -372,7 +379,7 @@ navs_bar_ <- function(..., title = NULL, id = NULL, selected = NULL,
   navbar[[1]] <- tagAppendAttributes(
     navbar[[1]], 
     style = if (!is.null(bg)) css(background_color = paste(bg, "!important")),
-    "data-bs-theme" = if (inverse) "dark"
+    "data-bs-theme" = navbar_color_mode
   )
 
   as_fragment(navbar, page = page)
@@ -408,7 +415,7 @@ navbarPage_ <- function(title,
   position <- match.arg(position)
   if (!is.null(position))
     navbarClass <- paste0(navbarClass, " navbar-", position)
-  if (inverse)
+  if (isTRUE(inverse))
     navbarClass <- paste(navbarClass, "navbar-inverse")
 
   if (!is.null(id))

From 4d789d4b3c9392fdd378e56c00e8e762cf62b1c9 Mon Sep 17 00:00:00 2001
From: Garrick Aden-Buie <garrick@adenbuie.com>
Date: Thu, 21 Nov 2024 16:37:44 -0500
Subject: [PATCH 03/20] chore: explicitly cast to character

Co-authored-by: Carson Sievert <cpsievert1@gmail.com>
---
 R/navs-legacy.R | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/R/navs-legacy.R b/R/navs-legacy.R
index 5b18c50f1..96dc8709a 100644
--- a/R/navs-legacy.R
+++ b/R/navs-legacy.R
@@ -347,7 +347,7 @@ navs_bar_ <- function(..., title = NULL, id = NULL, selected = NULL,
                       theme = NULL) {
 
   navbar_color_mode <- switch(
-    inverse,
+    as.character(inverse),
     "TRUE" = "dark",
     "FALSE" = "light",
     inverse

From a540bb1adc3b8507568626b2cf383499b02372b0 Mon Sep 17 00:00:00 2001
From: Garrick Aden-Buie <garrick@adenbuie.com>
Date: Tue, 3 Dec 2024 11:47:37 -0500
Subject: [PATCH 04/20] feat: introduce `type` and `attrs` (via `...`) in
 `navbar_options()`

---
 R/navs-legacy.R | 61 +++++++++++++++++++++++++++++++++++++------------
 R/page.R        |  2 +-
 2 files changed, 48 insertions(+), 15 deletions(-)

diff --git a/R/navs-legacy.R b/R/navs-legacy.R
index 96dc8709a..f3612ece4 100644
--- a/R/navs-legacy.R
+++ b/R/navs-legacy.R
@@ -161,7 +161,7 @@ navset_bar <- function(
     fluid = fluid,
     position = .navbar_options$position,
     bg = .navbar_options$bg,
-    inverse = .navbar_options$inverse,
+    inverse = .navbar_options$type,
     collapsible = .navbar_options$collapsible,
     underline = .navbar_options$underline,
     # theme is only used to determine whether legacy style markup should be used
@@ -189,12 +189,13 @@ navset_bar <- function(
 #' 
 #' @inheritParams shiny::navbarPage
 #' @param bg a CSS color to use for the navbar's background color.
-#' @param inverse Either `TRUE` for a light text color or `FALSE` for a dark
-#'   text color. If `"auto"` (the default), the best contrast to `bg` is chosen.
+#' @param type Either `"dark"` for a light text color (on a **dark** background)
+#'   or `"light"` for a dark text color (on a **light** background). If `"auto"`
+#'   (the default) and `bg` is provided, the best contrast to `bg` is chosen.
 #' @param underline Whether or not to add underline styling to page or navbar
 #'   links when active or focused.
-#' @param ... Additional arguments are ignored. `...` is included for future
-#'   expansion on `navbar_options()`.
+#' @param ... Additional attributes that will be passed directly to the navbar
+#'   container element.
 #' 
 #' @returns Returns a list of navbar options.
 #' 
@@ -203,7 +204,7 @@ navbar_options <- function(
   ...,
   position = c("static-top", "fixed-top", "fixed-bottom"),
   bg = NULL,
-  inverse = "auto",
+  type = c("auto", "light", "dark"),
   collapsible = TRUE,
   underline = TRUE
 ) {
@@ -211,21 +212,25 @@ navbar_options <- function(
   is_default <- list(
     position = missing(position),
     bg = missing(bg),
-    inverse = missing(inverse),
+    type = missing(type),
     collapsible = missing(collapsible),
     underline = missing(underline)
   )
 
-  rlang::check_dots_empty()
-
+  
   opts <- list(
     position = rlang::arg_match(position),
     bg = bg,
-    inverse = inverse,
+    type = rlang::arg_match(type),
     collapsible = collapsible,
     underline = underline
   )
   
+  attrs <- rlang::dots_list(...)
+  if (length(attrs)) {
+    opts[["attrs"]] <- attrs
+  }
+  
   structure(
     opts,
     class = c("bslib_navbar_options", "list"),
@@ -260,13 +265,35 @@ navbar_options_resolve_deprecated <- function(
     lifecycle::deprecate_warn(
       "0.9.0",
       I(sprintf(
-        "The %s argument%s of `%s()` have been consolidated into a single `navbar_options` argument and ",
+        "The %s argument%s of `%s()` %s been consolidated into a single `navbar_options` argument and ",
         paste(sprintf("`%s`", args_deprecated), collapse = ", "),
         if (length(args_deprecated) > 1) "s" else "",
-        .fn_caller
-      ))
+        .fn_caller,
+        if (length(args_deprecated) > 1) "have" else "has"
+      )),
+      details = c(
+        "i" = "See `navbar_options()` for more details.",
+        "!" = if ("inverse" %in% args_deprecated) "Use `type` instead of `inverse` in `navbar_options()`."
+      )
     )
   }
+
+  # Upgrade `inverse` to the new `type` argument of `navbar_options()`
+  if ("inverse" %in% names(options_old)) {
+    inverse <- options_old[["inverse"]]
+    options_old[["inverse"]] <- NULL
+    
+    options_old[["type"]] <- 
+      if (is.character(inverse)) {
+        inverse
+      } else if (isTRUE(as.logical(inverse))) {
+        options_old[["type"]] <- "dark"
+      } else if (isFALSE(as.logical(inverse))) {
+        options_old[["type"]] <- "light"
+      } else {
+        abort(paste("Invalid `inverse` value: ", inverse))
+      }
+  }
   
   # Consolidate `navbar_options` (options_user) with the deprecated direct
   # options. We take the direct option if the user option is a default value,
@@ -303,7 +330,10 @@ navbar_options_resolve_deprecated <- function(
     )
   }
 
-  rlang::exec(navbar_options, !!!options_user)
+  attrs <- options_user$attrs %||% list()
+  options_user$attrs <- NULL
+
+  rlang::exec(navbar_options, !!!options_user, !!!attrs)
 }
 
 #' @export
@@ -319,6 +349,9 @@ print.bslib_navbar_options <- function(x, ...) {
   is_default <- attr(x, "is_default") %||% list()
   for (opt in fields) {
     value <- x[[opt]] %||% "NULL"
+    if (inherits(value, "list")) {
+      value <- paste(names(value), collapse = ", ")
+    }
     if (isTRUE(is_default[[opt]])) {
       if (identical(value, "NULL")) { 
         # Skip printing default NULL values
diff --git a/R/page.R b/R/page.R
index 06f862b79..917cd9555 100644
--- a/R/page.R
+++ b/R/page.R
@@ -466,7 +466,7 @@ page_navbar <- function(
       footer = footer,
       position = .navbar_options$position,
       bg = .navbar_options$bg,
-      inverse = .navbar_options$inverse,
+      inverse = .navbar_options$type,
       underline = .navbar_options$underline,
       collapsible = .navbar_options$collapsible,
       fluid = fluid,

From 176c9b8365482b0a7fe08dc1e8b4736bd4d8897b Mon Sep 17 00:00:00 2001
From: Garrick Aden-Buie <garrick@adenbuie.com>
Date: Tue, 3 Dec 2024 11:49:22 -0500
Subject: [PATCH 05/20] refactor: Move `navbar_options()` to its own R file

---
 DESCRIPTION                                   |   1 +
 R/navbar_options.R                            | 194 ++++++++++++++++++
 R/navs-legacy.R                               | 194 ------------------
 ...st-navs-legacy.R => test-navbar_options.R} |   0
 4 files changed, 195 insertions(+), 194 deletions(-)
 create mode 100644 R/navbar_options.R
 rename tests/testthat/{test-navs-legacy.R => test-navbar_options.R} (100%)

diff --git a/DESCRIPTION b/DESCRIPTION
index e6c168b72..a8128ae37 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -137,6 +137,7 @@ Collate:
     'layout.R'
     'nav-items.R'
     'nav-update.R'
+    'navbar_options.R'
     'navs-legacy.R'
     'navs.R'
     'onLoad.R'
diff --git a/R/navbar_options.R b/R/navbar_options.R
new file mode 100644
index 000000000..455d12adb
--- /dev/null
+++ b/R/navbar_options.R
@@ -0,0 +1,194 @@
+#' Create a set of navbar options
+#' 
+#' A `navbar_options()` object captures options specific to the appearance and
+#' behavior of the navbar, independent from the content displayed on the page.
+#' This helper should be used to create the list of options expected by
+#' `navbar_options` in [page_navbar()] and [navset_bar()].
+#' 
+#' ## Changelog
+#' 
+#' This function was introduced in \pkg{bslib} v0.9.0, replacing the `position`,
+#' `bg`, `inverse`, `collapsible` and `underline` arguments of [page_navbar()]
+#' and [navset_bar()]. Those arguments are deprecated with a warning and will be
+#' removed in a future version of \pkg{bslib}.
+#' 
+#' @examples
+#' navbar_options(position = "static-top", bg = "#2e9f7d", underline = FALSE)
+#' 
+#' @inheritParams shiny::navbarPage
+#' @param bg a CSS color to use for the navbar's background color.
+#' @param type Either `"dark"` for a light text color (on a **dark** background)
+#'   or `"light"` for a dark text color (on a **light** background). If `"auto"`
+#'   (the default) and `bg` is provided, the best contrast to `bg` is chosen.
+#' @param underline Whether or not to add underline styling to page or navbar
+#'   links when active or focused.
+#' @param ... Additional attributes that will be passed directly to the navbar
+#'   container element.
+#' 
+#' @returns Returns a list of navbar options.
+#' 
+#' @export
+navbar_options <- function(
+  ...,
+  position = c("static-top", "fixed-top", "fixed-bottom"),
+  bg = NULL,
+  type = c("auto", "light", "dark"),
+  collapsible = TRUE,
+  underline = TRUE
+) {
+  # Track user-provided arguments for print method and deprecation warnings
+  is_default <- list(
+    position = missing(position),
+    bg = missing(bg),
+    type = missing(type),
+    collapsible = missing(collapsible),
+    underline = missing(underline)
+  )
+
+  
+  opts <- list(
+    position = rlang::arg_match(position),
+    bg = bg,
+    type = rlang::arg_match(type),
+    collapsible = collapsible,
+    underline = underline
+  )
+  
+  attrs <- rlang::dots_list(...)
+  if (length(attrs)) {
+    opts[["attrs"]] <- attrs
+  }
+  
+  structure(
+    opts,
+    class = c("bslib_navbar_options", "list"),
+    is_default = is_default,
+    waldo_opts = list(ignore_attr = TRUE)
+  )
+}
+
+navbar_options_resolve_deprecated <- function(
+  options_user = list(),
+  position = deprecated(),
+  bg = deprecated(),
+  inverse = deprecated(),
+  collapsible = deprecated(),
+  underline = deprecated(),
+  .fn_caller = "navset_bar",
+  .warn_deprecated = TRUE
+) {
+  options_old <- list(
+    position = if (lifecycle::is_present(position)) position,
+    bg = if (lifecycle::is_present(bg)) bg,
+    inverse = if (lifecycle::is_present(inverse)) inverse,
+    collapsible = if (lifecycle::is_present(collapsible)) collapsible,
+    underline = if (lifecycle::is_present(underline)) underline
+  )
+  options_old <- dropNulls(options_old)
+
+  args_deprecated <- names(options_old)
+
+  if (.warn_deprecated && length(args_deprecated)) {
+    # TODO-deprecated: (2024-12) Elevate deprecation to an error
+    lifecycle::deprecate_warn(
+      "0.9.0",
+      I(sprintf(
+        "The %s argument%s of `%s()` %s been consolidated into a single `navbar_options` argument and ",
+        paste(sprintf("`%s`", args_deprecated), collapse = ", "),
+        if (length(args_deprecated) > 1) "s" else "",
+        .fn_caller,
+        if (length(args_deprecated) > 1) "have" else "has"
+      )),
+      details = c(
+        "i" = "See `navbar_options()` for more details.",
+        "!" = if ("inverse" %in% args_deprecated) "Use `type` instead of `inverse` in `navbar_options()`."
+      )
+    )
+  }
+
+  # Upgrade `inverse` to the new `type` argument of `navbar_options()`
+  if ("inverse" %in% names(options_old)) {
+    inverse <- options_old[["inverse"]]
+    options_old[["inverse"]] <- NULL
+    
+    options_old[["type"]] <- 
+      if (is.character(inverse)) {
+        inverse
+      } else if (isTRUE(as.logical(inverse))) {
+        options_old[["type"]] <- "dark"
+      } else if (isFALSE(as.logical(inverse))) {
+        options_old[["type"]] <- "light"
+      } else {
+        abort(paste("Invalid `inverse` value: ", inverse))
+      }
+  }
+  
+  # Consolidate `navbar_options` (options_user) with the deprecated direct
+  # options. We take the direct option if the user option is a default value,
+  # warning if otherwise ignored.
+  # TODO-deprecated: Remove this and warning when direct options are hard-deprecated  
+  is_default <- attr(options_user, "is_default") %||% list()
+  keep_user_values <- vapply(
+    names(options_user),
+    function(x) !isTRUE(is_default[[x]]),
+    logical(1)
+  )
+  options_user <- options_user[keep_user_values]
+  
+  ignored <- c()
+  for (opt in names(options_old)) {
+    if (!opt %in% names(options_user)) {
+      options_user[[opt]] <- options_old[[opt]]
+    } else if (!identical(options_old[[opt]], options_user[[opt]])) {
+      ignored <- c(ignored, opt)      
+    }
+  }
+
+  if (length(ignored) > 0) {
+    rlang::warn(
+      c(
+        sprintf(
+          "`%s` %s provided twice: once directly and once in `navbar_options`.",
+          paste(ignored, collapse = "`, `"),
+          if (length(ignored) == 1) "was" else "were"
+        ),
+        "The deprecated direct option(s) will be ignored and the values from `navbar_options` will be used."
+      ),
+      call = rlang::caller_call()
+    )
+  }
+
+  attrs <- options_user$attrs %||% list()
+  options_user$attrs <- NULL
+
+  rlang::exec(navbar_options, !!!options_user, !!!attrs)
+}
+
+#' @export
+print.bslib_navbar_options <- function(x, ...) {
+  cat("<bslib_navbar_options>\n")
+  
+  if (length(x) == 0) {
+    return(invisible(x))
+  }
+
+  fields <- names(x)
+  opt_w <- max(nchar(fields))
+  is_default <- attr(x, "is_default") %||% list()
+  for (opt in fields) {
+    value <- x[[opt]] %||% "NULL"
+    if (inherits(value, "list")) {
+      value <- paste(names(value), collapse = ", ")
+    }
+    if (isTRUE(is_default[[opt]])) {
+      if (identical(value, "NULL")) { 
+        # Skip printing default NULL values
+        next
+      }
+      value <- sprintf("(%s)", value)
+    }
+    cat(sprintf("%*s", opt_w, opt), ": ", value, "\n", sep = "")
+  }
+
+  invisible(x)
+}
diff --git a/R/navs-legacy.R b/R/navs-legacy.R
index f3612ece4..27a498b09 100644
--- a/R/navs-legacy.R
+++ b/R/navs-legacy.R
@@ -170,200 +170,6 @@ navset_bar <- function(
   )
 }
 
-#' Create a set of navbar options
-#' 
-#' A `navbar_options()` object captures options specific to the appearance and
-#' behavior of the navbar, independent from the content displayed on the page.
-#' This helper should be used to create the list of options expected by
-#' `navbar_options` in [page_navbar()] and [navset_bar()].
-#' 
-#' ## Changelog
-#' 
-#' This function was introduced in \pkg{bslib} v0.9.0, replacing the `position`,
-#' `bg`, `inverse`, `collapsible` and `underline` arguments of [page_navbar()]
-#' and [navset_bar()]. Those arguments are deprecated with a warning and will be
-#' removed in a future version of \pkg{bslib}.
-#' 
-#' @examples
-#' navbar_options(position = "static-top", bg = "#2e9f7d", underline = FALSE)
-#' 
-#' @inheritParams shiny::navbarPage
-#' @param bg a CSS color to use for the navbar's background color.
-#' @param type Either `"dark"` for a light text color (on a **dark** background)
-#'   or `"light"` for a dark text color (on a **light** background). If `"auto"`
-#'   (the default) and `bg` is provided, the best contrast to `bg` is chosen.
-#' @param underline Whether or not to add underline styling to page or navbar
-#'   links when active or focused.
-#' @param ... Additional attributes that will be passed directly to the navbar
-#'   container element.
-#' 
-#' @returns Returns a list of navbar options.
-#' 
-#' @export
-navbar_options <- function(
-  ...,
-  position = c("static-top", "fixed-top", "fixed-bottom"),
-  bg = NULL,
-  type = c("auto", "light", "dark"),
-  collapsible = TRUE,
-  underline = TRUE
-) {
-  # Track user-provided arguments for print method and deprecation warnings
-  is_default <- list(
-    position = missing(position),
-    bg = missing(bg),
-    type = missing(type),
-    collapsible = missing(collapsible),
-    underline = missing(underline)
-  )
-
-  
-  opts <- list(
-    position = rlang::arg_match(position),
-    bg = bg,
-    type = rlang::arg_match(type),
-    collapsible = collapsible,
-    underline = underline
-  )
-  
-  attrs <- rlang::dots_list(...)
-  if (length(attrs)) {
-    opts[["attrs"]] <- attrs
-  }
-  
-  structure(
-    opts,
-    class = c("bslib_navbar_options", "list"),
-    is_default = is_default,
-    waldo_opts = list(ignore_attr = TRUE)
-  )
-}
-
-navbar_options_resolve_deprecated <- function(
-  options_user = list(),
-  position = deprecated(),
-  bg = deprecated(),
-  inverse = deprecated(),
-  collapsible = deprecated(),
-  underline = deprecated(),
-  .fn_caller = "navset_bar",
-  .warn_deprecated = TRUE
-) {
-  options_old <- list(
-    position = if (lifecycle::is_present(position)) position,
-    bg = if (lifecycle::is_present(bg)) bg,
-    inverse = if (lifecycle::is_present(inverse)) inverse,
-    collapsible = if (lifecycle::is_present(collapsible)) collapsible,
-    underline = if (lifecycle::is_present(underline)) underline
-  )
-  options_old <- dropNulls(options_old)
-
-  args_deprecated <- names(options_old)
-
-  if (.warn_deprecated && length(args_deprecated)) {
-    # TODO-deprecated: (2024-12) Elevate deprecation to an error
-    lifecycle::deprecate_warn(
-      "0.9.0",
-      I(sprintf(
-        "The %s argument%s of `%s()` %s been consolidated into a single `navbar_options` argument and ",
-        paste(sprintf("`%s`", args_deprecated), collapse = ", "),
-        if (length(args_deprecated) > 1) "s" else "",
-        .fn_caller,
-        if (length(args_deprecated) > 1) "have" else "has"
-      )),
-      details = c(
-        "i" = "See `navbar_options()` for more details.",
-        "!" = if ("inverse" %in% args_deprecated) "Use `type` instead of `inverse` in `navbar_options()`."
-      )
-    )
-  }
-
-  # Upgrade `inverse` to the new `type` argument of `navbar_options()`
-  if ("inverse" %in% names(options_old)) {
-    inverse <- options_old[["inverse"]]
-    options_old[["inverse"]] <- NULL
-    
-    options_old[["type"]] <- 
-      if (is.character(inverse)) {
-        inverse
-      } else if (isTRUE(as.logical(inverse))) {
-        options_old[["type"]] <- "dark"
-      } else if (isFALSE(as.logical(inverse))) {
-        options_old[["type"]] <- "light"
-      } else {
-        abort(paste("Invalid `inverse` value: ", inverse))
-      }
-  }
-  
-  # Consolidate `navbar_options` (options_user) with the deprecated direct
-  # options. We take the direct option if the user option is a default value,
-  # warning if otherwise ignored.
-  # TODO-deprecated: Remove this and warning when direct options are hard-deprecated  
-  is_default <- attr(options_user, "is_default") %||% list()
-  keep_user_values <- vapply(
-    names(options_user),
-    function(x) !isTRUE(is_default[[x]]),
-    logical(1)
-  )
-  options_user <- options_user[keep_user_values]
-  
-  ignored <- c()
-  for (opt in names(options_old)) {
-    if (!opt %in% names(options_user)) {
-      options_user[[opt]] <- options_old[[opt]]
-    } else if (!identical(options_old[[opt]], options_user[[opt]])) {
-      ignored <- c(ignored, opt)      
-    }
-  }
-
-  if (length(ignored) > 0) {
-    rlang::warn(
-      c(
-        sprintf(
-          "`%s` %s provided twice: once directly and once in `navbar_options`.",
-          paste(ignored, collapse = "`, `"),
-          if (length(ignored) == 1) "was" else "were"
-        ),
-        "The deprecated direct option(s) will be ignored and the values from `navbar_options` will be used."
-      ),
-      call = rlang::caller_call()
-    )
-  }
-
-  attrs <- options_user$attrs %||% list()
-  options_user$attrs <- NULL
-
-  rlang::exec(navbar_options, !!!options_user, !!!attrs)
-}
-
-#' @export
-print.bslib_navbar_options <- function(x, ...) {
-  cat("<bslib_navbar_options>\n")
-  
-  if (length(x) == 0) {
-    return(invisible(x))
-  }
-
-  fields <- names(x)
-  opt_w <- max(nchar(fields))
-  is_default <- attr(x, "is_default") %||% list()
-  for (opt in fields) {
-    value <- x[[opt]] %||% "NULL"
-    if (inherits(value, "list")) {
-      value <- paste(names(value), collapse = ", ")
-    }
-    if (isTRUE(is_default[[opt]])) {
-      if (identical(value, "NULL")) { 
-        # Skip printing default NULL values
-        next
-      }
-      value <- sprintf("(%s)", value)
-    }
-    cat(sprintf("%*s", opt_w, opt), ": ", value, "\n", sep = "")
-  }
-
-  invisible(x)
-}
 
 # This internal version of navs_bar() exists so both it and page_navbar()
 # (and thus shiny::navbarPage()) can use it. And in the page_navbar() case,
diff --git a/tests/testthat/test-navs-legacy.R b/tests/testthat/test-navbar_options.R
similarity index 100%
rename from tests/testthat/test-navs-legacy.R
rename to tests/testthat/test-navbar_options.R

From 92cd8fde515f4b3ccc13e57001c101bb71c69af4 Mon Sep 17 00:00:00 2001
From: Garrick Aden-Buie <garrick@adenbuie.com>
Date: Tue, 3 Dec 2024 12:06:41 -0500
Subject: [PATCH 06/20] tests: Update `navbar_options()` tests

---
 .../_snaps/{navs-legacy.md => navbar_options.md} | 10 +++++-----
 tests/testthat/test-navbar_options.R             | 16 ++++++++--------
 2 files changed, 13 insertions(+), 13 deletions(-)
 rename tests/testthat/_snaps/{navs-legacy.md => navbar_options.md} (70%)

diff --git a/tests/testthat/_snaps/navs-legacy.md b/tests/testthat/_snaps/navbar_options.md
similarity index 70%
rename from tests/testthat/_snaps/navs-legacy.md
rename to tests/testthat/_snaps/navbar_options.md
index bab54fe87..a10f90e95 100644
--- a/tests/testthat/_snaps/navs-legacy.md
+++ b/tests/testthat/_snaps/navbar_options.md
@@ -5,30 +5,30 @@
     Output
       <bslib_navbar_options>
          position: (static-top)
-          inverse: (auto)
+             type: (auto)
       collapsible: (TRUE)
         underline: (TRUE)
 
 ---
 
     Code
-      navbar_options(inverse = TRUE, bg = "red")
+      navbar_options(type = "dark", bg = "red")
     Output
       <bslib_navbar_options>
          position: (static-top)
                bg: red
-          inverse: TRUE
+             type: dark
       collapsible: (TRUE)
         underline: (TRUE)
 
 ---
 
     Code
-      navbar_options(position = "static-top", inverse = FALSE, collapsible = TRUE)
+      navbar_options(position = "static-top", type = "auto", collapsible = TRUE)
     Output
       <bslib_navbar_options>
          position: static-top
-          inverse: FALSE
+             type: auto
       collapsible: TRUE
         underline: (TRUE)
 
diff --git a/tests/testthat/test-navbar_options.R b/tests/testthat/test-navbar_options.R
index 4847aac21..12414e48e 100644
--- a/tests/testthat/test-navbar_options.R
+++ b/tests/testthat/test-navbar_options.R
@@ -9,9 +9,9 @@ test_that("navbar_options() validates position", {
 
 test_that("navbar_options() print method", {
   expect_snapshot(navbar_options())
-  expect_snapshot(navbar_options(inverse = TRUE, bg = "red"))
+  expect_snapshot(navbar_options(type = "dark", bg = "red"))
   expect_snapshot(
-    navbar_options(position = "static-top", inverse = FALSE, collapsible = TRUE)
+    navbar_options(position = "static-top", type = "auto", collapsible = TRUE)
   )
 
   expect_output(
@@ -20,8 +20,8 @@ test_that("navbar_options() print method", {
   )
 })
 
-test_that("navbar_options() errors if ... swallows unused options", {
-  expect_error(navbar_options(foo = "bar"))
+test_that("navbar_options() adds ... to `attrs`", {
+  expect_equal(navbar_options(foo = "bar")$attrs, list(foo = "bar"))
 })
 
 test_that("navbar_options_resolve_deprecated() consolidates correctly", {
@@ -107,7 +107,7 @@ test_that("navset_bar() warns if `navbar_options()` collide with direct deprecat
   expect_warning(
     navset_bar(
       inverse = TRUE,
-      navbar_options = navbar_options(inverse = FALSE)
+      navbar_options = navbar_options(type = "light")
     )
   )
 
@@ -146,9 +146,9 @@ test_that("navbar_options_resolve_deprecated() prefers user options over depreca
     expect_equal(
       navbar_options_resolve_deprecated(
         inverse = TRUE,
-        options_user = navbar_options(inverse = FALSE)
-      )$inverse,
-      FALSE
+        options_user = navbar_options(type = "light")
+      )$type,
+      "light"
     )
   )
 

From 1046eb7247f656a5a73ffec8f936ed876af08af0 Mon Sep 17 00:00:00 2001
From: Garrick Aden-Buie <garrick@adenbuie.com>
Date: Tue, 3 Dec 2024 12:12:17 -0500
Subject: [PATCH 07/20] fixup: small details in `navbar_options()`

---
 R/navbar_options.R    |  8 +++-----
 man/navbar_options.Rd | 13 +++++++------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/R/navbar_options.R b/R/navbar_options.R
index 455d12adb..2517cce70 100644
--- a/R/navbar_options.R
+++ b/R/navbar_options.R
@@ -93,11 +93,9 @@ navbar_options_resolve_deprecated <- function(
     lifecycle::deprecate_warn(
       "0.9.0",
       I(sprintf(
-        "The %s argument%s of `%s()` %s been consolidated into a single `navbar_options` argument and ",
-        paste(sprintf("`%s`", args_deprecated), collapse = ", "),
-        if (length(args_deprecated) > 1) "s" else "",
+        "The arguments of `%s()` for navbar options (including %s) have been consolidated into a single `navbar_options` argument and ",
         .fn_caller,
-        if (length(args_deprecated) > 1) "have" else "has"
+        paste(sprintf("`%s`", args_deprecated), collapse = ", ")
       )),
       details = c(
         "i" = "See `navbar_options()` for more details.",
@@ -140,7 +138,7 @@ navbar_options_resolve_deprecated <- function(
     if (!opt %in% names(options_user)) {
       options_user[[opt]] <- options_old[[opt]]
     } else if (!identical(options_old[[opt]], options_user[[opt]])) {
-      ignored <- c(ignored, opt)      
+      ignored <- c(ignored, if (opt == "type") "inverse" else opt)      
     }
   }
 
diff --git a/man/navbar_options.Rd b/man/navbar_options.Rd
index 6c4744312..6d2bb527b 100644
--- a/man/navbar_options.Rd
+++ b/man/navbar_options.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/navs-legacy.R
+% Please edit documentation in R/navbar_options.R
 \name{navbar_options}
 \alias{navbar_options}
 \title{Create a set of navbar options}
@@ -8,14 +8,14 @@ navbar_options(
   ...,
   position = c("static-top", "fixed-top", "fixed-bottom"),
   bg = NULL,
-  inverse = "auto",
+  type = c("auto", "light", "dark"),
   collapsible = TRUE,
   underline = TRUE
 )
 }
 \arguments{
-\item{...}{Additional arguments are ignored. \code{...} is included for future
-expansion on \code{navbar_options()}.}
+\item{...}{Additional attributes that will be passed directly to the navbar
+container element.}
 
 \item{position}{Determines whether the navbar should be displayed at the top
 of the page with normal scrolling behavior (\code{"static-top"}), pinned at
@@ -27,8 +27,9 @@ unless you add padding, e.g.: \code{tags$style(type="text/css", "body
 
 \item{bg}{a CSS color to use for the navbar's background color.}
 
-\item{inverse}{Either \code{TRUE} for a light text color or \code{FALSE} for a dark
-text color. If \code{"auto"} (the default), the best contrast to \code{bg} is chosen.}
+\item{type}{Either \code{"dark"} for a light text color (on a \strong{dark} background)
+or \code{"light"} for a dark text color (on a \strong{light} background). If \code{"auto"}
+(the default) and \code{bg} is provided, the best contrast to \code{bg} is chosen.}
 
 \item{collapsible}{\code{TRUE} to automatically collapse the navigation
 elements into an expandable menu on mobile devices or narrow window widths.}

From 31a9456ad8d6694a59978e9f2693fd9f7df40df1 Mon Sep 17 00:00:00 2001
From: Garrick Aden-Buie <garrick@adenbuie.com>
Date: Tue, 3 Dec 2024 12:22:16 -0500
Subject: [PATCH 08/20] tests: Add another inverse -> type test

---
 tests/testthat/test-navbar_options.R | 36 ++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/tests/testthat/test-navbar_options.R b/tests/testthat/test-navbar_options.R
index 12414e48e..869d78b50 100644
--- a/tests/testthat/test-navbar_options.R
+++ b/tests/testthat/test-navbar_options.R
@@ -72,6 +72,42 @@ test_that("navbar_options_resolve_deprecated() consolidates correctly", {
   )
 })
 
+test_that("navbar_options_resolve_deprecated() upgrades `inverse` to `type`", {
+  # TODO-deprecated: Remove when direction options are deprecated with an error
+
+  # deprecation messages are handled through other tests
+  rlang::local_options(lifecycle_verbosity = "quiet")
+
+  expect_equal(
+    navbar_options_resolve_deprecated(navbar_options(), inverse = TRUE)$type,
+    "dark"
+  )
+
+  expect_equal(
+    navbar_options_resolve_deprecated(navbar_options(), inverse = FALSE)$type,
+    "light"
+  )
+
+  expect_equal(
+    navbar_options_resolve_deprecated(navbar_options(), inverse = "auto")$type,
+    "auto"
+  )
+
+  expect_warning(
+    expect_equal(
+      navbar_options_resolve_deprecated(navbar_options(type = "light"), inverse = TRUE)$type,
+      "light"
+    )
+  )
+
+  expect_warning(
+    expect_equal(
+      navbar_options_resolve_deprecated(navbar_options(type = "dark"), inverse = FALSE)$type,
+      "dark"
+    )
+  )
+})
+
 test_that("navset_bar() warns if using deprecated args", {
   lifecycle::expect_deprecated(
     navset_bar(position = "fixed-top")

From 81390ebc1c5f6846cdddc32af0aca72cc4304242 Mon Sep 17 00:00:00 2001
From: Garrick Aden-Buie <garrick@adenbuie.com>
Date: Tue, 3 Dec 2024 13:26:43 -0500
Subject: [PATCH 09/20] refactor: Use faster color contrast getter

---
 R/navs-legacy.R | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/R/navs-legacy.R b/R/navs-legacy.R
index 27a498b09..863d391fd 100644
--- a/R/navs-legacy.R
+++ b/R/navs-legacy.R
@@ -185,25 +185,24 @@ navs_bar_ <- function(..., title = NULL, id = NULL, selected = NULL,
                       collapsible = TRUE, fluid = TRUE,
                       theme = NULL) {
 
-  navbar_color_mode <- switch(
-    as.character(inverse),
-    "TRUE" = "dark",
-    "FALSE" = "light",
-    inverse
-  )
-
   if (identical(inverse, "auto")) {
-    inverse <- TRUE
-    if (identical(theme_preset_info(theme)$name, "shiny")) {
-      inverse <- FALSE
+    if (is.null(theme) || theme_version(theme) < 5) {
+      inverse <- TRUE
     }
     if (!is.null(bg)) {
       bg <- htmltools::parseCssColors(bg)
-      bg_contrast <- bs_get_contrast(bs_theme("navbar-bg" = bg), "navbar-bg")
-      inverse <- col2rgb(bg_contrast)[1,] > 127.5
+      bg_contrast <- get_color_contrast(bg)
+      inverse <- bg_contrast == "#FFFFFF"
     }
   }
 
+  navbar_color_mode <- switch(
+    as.character(inverse),
+    "TRUE" = "dark",
+    "FALSE" = "light",
+    inverse
+  )
+
   navbar <- navbarPage_(
     title = title, ..., id = id, selected = selected,
     sidebar = sidebar, fillable = fillable,

From 6dd4c29c0cf2648b55f06d3d47cbb8e6c269e01f Mon Sep 17 00:00:00 2001
From: Garrick Aden-Buie <garrick@adenbuie.com>
Date: Tue, 3 Dec 2024 13:38:30 -0500
Subject: [PATCH 10/20] feat: Apply `...` from `navbar_options()` as attributes
 on the navbar container

Fixes #940
---
 R/navbar_options.R | 19 +++++++++++++++++++
 R/navs-legacy.R    |  4 +++-
 R/page.R           | 41 ++++++++++++++++++++++-------------------
 3 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/R/navbar_options.R b/R/navbar_options.R
index 2517cce70..52052f3b7 100644
--- a/R/navbar_options.R
+++ b/R/navbar_options.R
@@ -67,6 +67,25 @@ navbar_options <- function(
   )
 }
 
+navbar_options_apply_attrs <- function(navbar, navbar_options = NULL) {
+  if (is.null(navbar_options[["attrs"]])) {
+    return(navbar)
+  }
+
+  attrs <- navbar_options[["attrs"]]
+  navbar[[1]] <- rlang::exec(tagAppendAttributes, navbar[[1]], !!!attrs)
+
+  if ("data-bs-theme" %in% names(attrs)) {
+    # If you're setting this attribute directly, you know more about what you're
+    # doing than we do (we handle it for users via `type`). Also: the call to
+    # tagAppendAttributes ensures that `navbar[[1]]` is a tag object and has the
+    # attribs field.
+    navbar[[1]][["attribs"]][["data-bs-theme"]] <- attrs[["data-bs-theme"]]
+  }
+
+  navbar
+}
+
 navbar_options_resolve_deprecated <- function(
   options_user = list(),
   position = deprecated(),
diff --git a/R/navs-legacy.R b/R/navs-legacy.R
index 863d391fd..1c80967d9 100644
--- a/R/navs-legacy.R
+++ b/R/navs-legacy.R
@@ -147,7 +147,7 @@ navset_bar <- function(
     collapsible = collapsible
   )
 
-  navs_bar_(
+  navbar <- navs_bar_(
     ...,
     title = title,
     id = id,
@@ -168,6 +168,8 @@ navset_bar <- function(
     # (and, at least at the moment, we don't need legacy markup for this exported function)
     theme = bs_theme()
   )
+
+  navbar_options_apply_attrs(navbar, .navbar_options)
 }
 
 
diff --git a/R/page.R b/R/page.R
index 917cd9555..323450318 100644
--- a/R/page.R
+++ b/R/page.R
@@ -447,31 +447,34 @@ page_navbar <- function(
     function(...) page_fillable(..., fillable_mobile = fillable_mobile, padding = 0, gap = 0)
   }
 
+  navbar <- navs_bar_(
+    ...,
+    title = title,
+    id = id,
+    selected = selected,
+    sidebar = sidebar,
+    fillable = fillable,
+    gap = gap,
+    padding = padding,
+    header = header,
+    footer = footer,
+    position = .navbar_options$position,
+    bg = .navbar_options$bg,
+    inverse = .navbar_options$type,
+    underline = .navbar_options$underline,
+    collapsible = .navbar_options$collapsible,
+    fluid = fluid,
+    theme = theme
+  )
+  navbar <- navbar_options_apply_attrs(navbar, .navbar_options)
+
   page_func(
     title = infer_window_title(title, window_title),
     theme = theme,
     lang = lang,
     class = "bslib-page-navbar",
     class = if (!is.null(sidebar)) "has-page-sidebar",
-    navs_bar_(
-      ...,
-      title = title,
-      id = id,
-      selected = selected,
-      sidebar = sidebar,
-      fillable = fillable,
-      gap = gap,
-      padding = padding,
-      header = header,
-      footer = footer,
-      position = .navbar_options$position,
-      bg = .navbar_options$bg,
-      inverse = .navbar_options$type,
-      underline = .navbar_options$underline,
-      collapsible = .navbar_options$collapsible,
-      fluid = fluid,
-      theme = theme
-    )
+    navbar
   )
 }
 

From 50500ea34bb84dfa77c2eab596336d5caacdc1ed Mon Sep 17 00:00:00 2001
From: Garrick Aden-Buie <garrick@adenbuie.com>
Date: Tue, 3 Dec 2024 13:48:35 -0500
Subject: [PATCH 11/20] feat: Warn if users try `navbar_options(inverse=)`
 instead of using `type`

---
 R/navbar_options.R                   | 11 ++++++++++-
 tests/testthat/test-navbar_options.R |  6 ++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/R/navbar_options.R b/R/navbar_options.R
index 52052f3b7..b2aa494be 100644
--- a/R/navbar_options.R
+++ b/R/navbar_options.R
@@ -44,7 +44,6 @@ navbar_options <- function(
     collapsible = missing(collapsible),
     underline = missing(underline)
   )
-
   
   opts <- list(
     position = rlang::arg_match(position),
@@ -55,6 +54,16 @@ navbar_options <- function(
   )
   
   attrs <- rlang::dots_list(...)
+  if ("inverse" %in% names(attrs)) {
+    # Catch muscle-memory for using `inverse`. We didn't release 
+    # `navbar_options()` with an `inverse`, but it's reasonable people might try
+    # to use it and it did exist briefly in dev versions.
+    lifecycle::deprecate_soft(
+      when = "0.9.0",
+      what = "navbar_options(inverse=)",
+      with = "navbar_options(type=)"
+    )
+  }
   if (length(attrs)) {
     opts[["attrs"]] <- attrs
   }
diff --git a/tests/testthat/test-navbar_options.R b/tests/testthat/test-navbar_options.R
index 869d78b50..082854748 100644
--- a/tests/testthat/test-navbar_options.R
+++ b/tests/testthat/test-navbar_options.R
@@ -24,6 +24,12 @@ test_that("navbar_options() adds ... to `attrs`", {
   expect_equal(navbar_options(foo = "bar")$attrs, list(foo = "bar"))
 })
 
+test_that("navbar_options() warns `inverse` is used instead of `type`", {
+  lifecycle::expect_deprecated(
+    navbar_options(inverse = TRUE)
+  )
+})
+
 test_that("navbar_options_resolve_deprecated() consolidates correctly", {
   # TODO-deprecated: Remove when direction options are deprecated with an error
 

From 840604c53fd8576c68a484855a554360a3a374f6 Mon Sep 17 00:00:00 2001
From: Garrick Aden-Buie <garrick@adenbuie.com>
Date: Tue, 3 Dec 2024 14:05:22 -0500
Subject: [PATCH 12/20] chore: Add note about what to do if precompiled theme
 output fails

---
 tests/testthat/test-zzz-precompile.R | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/testthat/test-zzz-precompile.R b/tests/testthat/test-zzz-precompile.R
index 258bd3510..ad56a8bb8 100644
--- a/tests/testthat/test-zzz-precompile.R
+++ b/tests/testthat/test-zzz-precompile.R
@@ -16,6 +16,7 @@ test_that("Can find precompiled themes", {
 
 test_that("Precompiled theme output is identical to compiled themes", {
   skip_on_cran()
+  # If this fails run: Rscript tools/main.R
 
   get_bootstrap_path <- function(x) {
     bs_dep <- Filter(x, f = function(y) { identical(y$name, "bootstrap") })[[1]]

From f27fc0a2eaf77d221a0157f95bdce0135adbe508 Mon Sep 17 00:00:00 2001
From: Garrick Aden-Buie <garrick@adenbuie.com>
Date: Tue, 3 Dec 2024 14:54:14 -0500
Subject: [PATCH 13/20] fix(navbar_options): Require all named arguments in
 `...` and use `attribs` for consistency

---
 R/navbar_options.R                   | 30 ++++++++++++++++------------
 R/navs-legacy.R                      |  2 +-
 R/page.R                             |  2 +-
 tests/testthat/test-navbar_options.R |  8 ++++++--
 4 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/R/navbar_options.R b/R/navbar_options.R
index b2aa494be..2832ca75e 100644
--- a/R/navbar_options.R
+++ b/R/navbar_options.R
@@ -53,8 +53,12 @@ navbar_options <- function(
     underline = underline
   )
   
-  attrs <- rlang::dots_list(...)
-  if ("inverse" %in% names(attrs)) {
+  dots <- separate_arguments(...)
+  if (length(dots$children) > 0) {
+    abort("All arguments in `...` must be named attributes to be applied to the navbar container.")
+  }
+
+  if ("inverse" %in% names(dots$attribs)) {
     # Catch muscle-memory for using `inverse`. We didn't release 
     # `navbar_options()` with an `inverse`, but it's reasonable people might try
     # to use it and it did exist briefly in dev versions.
@@ -64,8 +68,8 @@ navbar_options <- function(
       with = "navbar_options(type=)"
     )
   }
-  if (length(attrs)) {
-    opts[["attrs"]] <- attrs
+  if (length(dots$attribs)) {
+    opts[["attribs"]] <- dots$attribs
   }
   
   structure(
@@ -76,20 +80,20 @@ navbar_options <- function(
   )
 }
 
-navbar_options_apply_attrs <- function(navbar, navbar_options = NULL) {
-  if (is.null(navbar_options[["attrs"]])) {
+navbar_options_apply_attribs <- function(navbar, navbar_options = NULL) {
+  if (is.null(navbar_options[["attribs"]])) {
     return(navbar)
   }
 
-  attrs <- navbar_options[["attrs"]]
-  navbar[[1]] <- rlang::exec(tagAppendAttributes, navbar[[1]], !!!attrs)
+  attribs <- navbar_options[["attribs"]]
+  navbar[[1]] <- rlang::exec(tagAppendAttributes, navbar[[1]], !!!attribs)
 
-  if ("data-bs-theme" %in% names(attrs)) {
+  if ("data-bs-theme" %in% names(attribs)) {
     # If you're setting this attribute directly, you know more about what you're
     # doing than we do (we handle it for users via `type`). Also: the call to
     # tagAppendAttributes ensures that `navbar[[1]]` is a tag object and has the
     # attribs field.
-    navbar[[1]][["attribs"]][["data-bs-theme"]] <- attrs[["data-bs-theme"]]
+    navbar[[1]][["attribs"]][["data-bs-theme"]] <- attribs[["data-bs-theme"]]
   }
 
   navbar
@@ -184,10 +188,10 @@ navbar_options_resolve_deprecated <- function(
     )
   }
 
-  attrs <- options_user$attrs %||% list()
-  options_user$attrs <- NULL
+  attribs <- options_user$attrs %||% list()
+  options_user$attribs <- NULL
 
-  rlang::exec(navbar_options, !!!options_user, !!!attrs)
+  rlang::exec(navbar_options, !!!options_user, !!!attribs)
 }
 
 #' @export
diff --git a/R/navs-legacy.R b/R/navs-legacy.R
index 1c80967d9..7dc892837 100644
--- a/R/navs-legacy.R
+++ b/R/navs-legacy.R
@@ -169,7 +169,7 @@ navset_bar <- function(
     theme = bs_theme()
   )
 
-  navbar_options_apply_attrs(navbar, .navbar_options)
+  navbar_options_apply_attribs(navbar, .navbar_options)
 }
 
 
diff --git a/R/page.R b/R/page.R
index 323450318..c398ee932 100644
--- a/R/page.R
+++ b/R/page.R
@@ -466,7 +466,7 @@ page_navbar <- function(
     fluid = fluid,
     theme = theme
   )
-  navbar <- navbar_options_apply_attrs(navbar, .navbar_options)
+  navbar <- navbar_options_apply_attribs(navbar, .navbar_options)
 
   page_func(
     title = infer_window_title(title, window_title),
diff --git a/tests/testthat/test-navbar_options.R b/tests/testthat/test-navbar_options.R
index 082854748..206e3e426 100644
--- a/tests/testthat/test-navbar_options.R
+++ b/tests/testthat/test-navbar_options.R
@@ -20,8 +20,12 @@ test_that("navbar_options() print method", {
   )
 })
 
-test_that("navbar_options() adds ... to `attrs`", {
-  expect_equal(navbar_options(foo = "bar")$attrs, list(foo = "bar"))
+test_that("navbar_options() adds named args from ... to `attribs`", {
+  expect_equal(navbar_options(foo = "bar")$attribs, list(foo = "bar"))
+})
+
+test_that("navbar_options() throws for unnamed args in ...", {
+  expect_error(navbar_options("foo", "bar"))
 })
 
 test_that("navbar_options() warns `inverse` is used instead of `type`", {

From 151093cb5211d68cc2aa1b2ab15643a91d61bca3 Mon Sep 17 00:00:00 2001
From: Garrick Aden-Buie <garrick@adenbuie.com>
Date: Wed, 4 Dec 2024 10:15:53 -0500
Subject: [PATCH 14/20] docs(navbar_options): Add note about `inverse` ->
 `type` to docs

---
 R/navbar_options.R    | 4 +++-
 man/navbar_options.Rd | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/R/navbar_options.R b/R/navbar_options.R
index 2832ca75e..cde5fc321 100644
--- a/R/navbar_options.R
+++ b/R/navbar_options.R
@@ -10,7 +10,9 @@
 #' This function was introduced in \pkg{bslib} v0.9.0, replacing the `position`,
 #' `bg`, `inverse`, `collapsible` and `underline` arguments of [page_navbar()]
 #' and [navset_bar()]. Those arguments are deprecated with a warning and will be
-#' removed in a future version of \pkg{bslib}.
+#' removed in a future version of \pkg{bslib}. Note that the deprecated
+#' `inverse` argument of [page_navbar()] and [navset_bar()] was replaced with
+#' the `type` argument of `navbar_options()`.
 #' 
 #' @examples
 #' navbar_options(position = "static-top", bg = "#2e9f7d", underline = FALSE)
diff --git a/man/navbar_options.Rd b/man/navbar_options.Rd
index 6d2bb527b..9f74743d5 100644
--- a/man/navbar_options.Rd
+++ b/man/navbar_options.Rd
@@ -52,7 +52,9 @@ This helper should be used to create the list of options expected by
 This function was introduced in \pkg{bslib} v0.9.0, replacing the \code{position},
 \code{bg}, \code{inverse}, \code{collapsible} and \code{underline} arguments of \code{\link[=page_navbar]{page_navbar()}}
 and \code{\link[=navset_bar]{navset_bar()}}. Those arguments are deprecated with a warning and will be
-removed in a future version of \pkg{bslib}.
+removed in a future version of \pkg{bslib}. Note that the deprecated
+\code{inverse} argument of \code{\link[=page_navbar]{page_navbar()}} and \code{\link[=navset_bar]{navset_bar()}} was replaced with
+the \code{type} argument of \code{navbar_options()}.
 }
 }
 \examples{

From 45f2fdf6e9d8d7c9f03b7aadce799ce59b39724e Mon Sep 17 00:00:00 2001
From: Garrick Aden-Buie <garrick@adenbuie.com>
Date: Wed, 4 Dec 2024 10:21:20 -0500
Subject: [PATCH 15/20] chore: revert moving `navbar_options()` for better diff

---
 DESCRIPTION                                   |   1 -
 R/navbar_options.R                            | 226 -----------------
 R/navs-legacy.R                               | 227 ++++++++++++++++++
 man/navbar_options.Rd                         |   2 +-
 .../{navbar_options.md => navs-legacy.md}     |   0
 ...st-navbar_options.R => test-navs-legacy.R} |   0
 6 files changed, 228 insertions(+), 228 deletions(-)
 delete mode 100644 R/navbar_options.R
 rename tests/testthat/_snaps/{navbar_options.md => navs-legacy.md} (100%)
 rename tests/testthat/{test-navbar_options.R => test-navs-legacy.R} (100%)

diff --git a/DESCRIPTION b/DESCRIPTION
index a8128ae37..e6c168b72 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -137,7 +137,6 @@ Collate:
     'layout.R'
     'nav-items.R'
     'nav-update.R'
-    'navbar_options.R'
     'navs-legacy.R'
     'navs.R'
     'onLoad.R'
diff --git a/R/navbar_options.R b/R/navbar_options.R
deleted file mode 100644
index cde5fc321..000000000
--- a/R/navbar_options.R
+++ /dev/null
@@ -1,226 +0,0 @@
-#' Create a set of navbar options
-#' 
-#' A `navbar_options()` object captures options specific to the appearance and
-#' behavior of the navbar, independent from the content displayed on the page.
-#' This helper should be used to create the list of options expected by
-#' `navbar_options` in [page_navbar()] and [navset_bar()].
-#' 
-#' ## Changelog
-#' 
-#' This function was introduced in \pkg{bslib} v0.9.0, replacing the `position`,
-#' `bg`, `inverse`, `collapsible` and `underline` arguments of [page_navbar()]
-#' and [navset_bar()]. Those arguments are deprecated with a warning and will be
-#' removed in a future version of \pkg{bslib}. Note that the deprecated
-#' `inverse` argument of [page_navbar()] and [navset_bar()] was replaced with
-#' the `type` argument of `navbar_options()`.
-#' 
-#' @examples
-#' navbar_options(position = "static-top", bg = "#2e9f7d", underline = FALSE)
-#' 
-#' @inheritParams shiny::navbarPage
-#' @param bg a CSS color to use for the navbar's background color.
-#' @param type Either `"dark"` for a light text color (on a **dark** background)
-#'   or `"light"` for a dark text color (on a **light** background). If `"auto"`
-#'   (the default) and `bg` is provided, the best contrast to `bg` is chosen.
-#' @param underline Whether or not to add underline styling to page or navbar
-#'   links when active or focused.
-#' @param ... Additional attributes that will be passed directly to the navbar
-#'   container element.
-#' 
-#' @returns Returns a list of navbar options.
-#' 
-#' @export
-navbar_options <- function(
-  ...,
-  position = c("static-top", "fixed-top", "fixed-bottom"),
-  bg = NULL,
-  type = c("auto", "light", "dark"),
-  collapsible = TRUE,
-  underline = TRUE
-) {
-  # Track user-provided arguments for print method and deprecation warnings
-  is_default <- list(
-    position = missing(position),
-    bg = missing(bg),
-    type = missing(type),
-    collapsible = missing(collapsible),
-    underline = missing(underline)
-  )
-  
-  opts <- list(
-    position = rlang::arg_match(position),
-    bg = bg,
-    type = rlang::arg_match(type),
-    collapsible = collapsible,
-    underline = underline
-  )
-  
-  dots <- separate_arguments(...)
-  if (length(dots$children) > 0) {
-    abort("All arguments in `...` must be named attributes to be applied to the navbar container.")
-  }
-
-  if ("inverse" %in% names(dots$attribs)) {
-    # Catch muscle-memory for using `inverse`. We didn't release 
-    # `navbar_options()` with an `inverse`, but it's reasonable people might try
-    # to use it and it did exist briefly in dev versions.
-    lifecycle::deprecate_soft(
-      when = "0.9.0",
-      what = "navbar_options(inverse=)",
-      with = "navbar_options(type=)"
-    )
-  }
-  if (length(dots$attribs)) {
-    opts[["attribs"]] <- dots$attribs
-  }
-  
-  structure(
-    opts,
-    class = c("bslib_navbar_options", "list"),
-    is_default = is_default,
-    waldo_opts = list(ignore_attr = TRUE)
-  )
-}
-
-navbar_options_apply_attribs <- function(navbar, navbar_options = NULL) {
-  if (is.null(navbar_options[["attribs"]])) {
-    return(navbar)
-  }
-
-  attribs <- navbar_options[["attribs"]]
-  navbar[[1]] <- rlang::exec(tagAppendAttributes, navbar[[1]], !!!attribs)
-
-  if ("data-bs-theme" %in% names(attribs)) {
-    # If you're setting this attribute directly, you know more about what you're
-    # doing than we do (we handle it for users via `type`). Also: the call to
-    # tagAppendAttributes ensures that `navbar[[1]]` is a tag object and has the
-    # attribs field.
-    navbar[[1]][["attribs"]][["data-bs-theme"]] <- attribs[["data-bs-theme"]]
-  }
-
-  navbar
-}
-
-navbar_options_resolve_deprecated <- function(
-  options_user = list(),
-  position = deprecated(),
-  bg = deprecated(),
-  inverse = deprecated(),
-  collapsible = deprecated(),
-  underline = deprecated(),
-  .fn_caller = "navset_bar",
-  .warn_deprecated = TRUE
-) {
-  options_old <- list(
-    position = if (lifecycle::is_present(position)) position,
-    bg = if (lifecycle::is_present(bg)) bg,
-    inverse = if (lifecycle::is_present(inverse)) inverse,
-    collapsible = if (lifecycle::is_present(collapsible)) collapsible,
-    underline = if (lifecycle::is_present(underline)) underline
-  )
-  options_old <- dropNulls(options_old)
-
-  args_deprecated <- names(options_old)
-
-  if (.warn_deprecated && length(args_deprecated)) {
-    # TODO-deprecated: (2024-12) Elevate deprecation to an error
-    lifecycle::deprecate_warn(
-      "0.9.0",
-      I(sprintf(
-        "The arguments of `%s()` for navbar options (including %s) have been consolidated into a single `navbar_options` argument and ",
-        .fn_caller,
-        paste(sprintf("`%s`", args_deprecated), collapse = ", ")
-      )),
-      details = c(
-        "i" = "See `navbar_options()` for more details.",
-        "!" = if ("inverse" %in% args_deprecated) "Use `type` instead of `inverse` in `navbar_options()`."
-      )
-    )
-  }
-
-  # Upgrade `inverse` to the new `type` argument of `navbar_options()`
-  if ("inverse" %in% names(options_old)) {
-    inverse <- options_old[["inverse"]]
-    options_old[["inverse"]] <- NULL
-    
-    options_old[["type"]] <- 
-      if (is.character(inverse)) {
-        inverse
-      } else if (isTRUE(as.logical(inverse))) {
-        options_old[["type"]] <- "dark"
-      } else if (isFALSE(as.logical(inverse))) {
-        options_old[["type"]] <- "light"
-      } else {
-        abort(paste("Invalid `inverse` value: ", inverse))
-      }
-  }
-  
-  # Consolidate `navbar_options` (options_user) with the deprecated direct
-  # options. We take the direct option if the user option is a default value,
-  # warning if otherwise ignored.
-  # TODO-deprecated: Remove this and warning when direct options are hard-deprecated  
-  is_default <- attr(options_user, "is_default") %||% list()
-  keep_user_values <- vapply(
-    names(options_user),
-    function(x) !isTRUE(is_default[[x]]),
-    logical(1)
-  )
-  options_user <- options_user[keep_user_values]
-  
-  ignored <- c()
-  for (opt in names(options_old)) {
-    if (!opt %in% names(options_user)) {
-      options_user[[opt]] <- options_old[[opt]]
-    } else if (!identical(options_old[[opt]], options_user[[opt]])) {
-      ignored <- c(ignored, if (opt == "type") "inverse" else opt)      
-    }
-  }
-
-  if (length(ignored) > 0) {
-    rlang::warn(
-      c(
-        sprintf(
-          "`%s` %s provided twice: once directly and once in `navbar_options`.",
-          paste(ignored, collapse = "`, `"),
-          if (length(ignored) == 1) "was" else "were"
-        ),
-        "The deprecated direct option(s) will be ignored and the values from `navbar_options` will be used."
-      ),
-      call = rlang::caller_call()
-    )
-  }
-
-  attribs <- options_user$attrs %||% list()
-  options_user$attribs <- NULL
-
-  rlang::exec(navbar_options, !!!options_user, !!!attribs)
-}
-
-#' @export
-print.bslib_navbar_options <- function(x, ...) {
-  cat("<bslib_navbar_options>\n")
-  
-  if (length(x) == 0) {
-    return(invisible(x))
-  }
-
-  fields <- names(x)
-  opt_w <- max(nchar(fields))
-  is_default <- attr(x, "is_default") %||% list()
-  for (opt in fields) {
-    value <- x[[opt]] %||% "NULL"
-    if (inherits(value, "list")) {
-      value <- paste(names(value), collapse = ", ")
-    }
-    if (isTRUE(is_default[[opt]])) {
-      if (identical(value, "NULL")) { 
-        # Skip printing default NULL values
-        next
-      }
-      value <- sprintf("(%s)", value)
-    }
-    cat(sprintf("%*s", opt_w, opt), ": ", value, "\n", sep = "")
-  }
-
-  invisible(x)
-}
diff --git a/R/navs-legacy.R b/R/navs-legacy.R
index 7dc892837..ca7f1a6fe 100644
--- a/R/navs-legacy.R
+++ b/R/navs-legacy.R
@@ -172,6 +172,233 @@ navset_bar <- function(
   navbar_options_apply_attribs(navbar, .navbar_options)
 }
 
+#' Create a set of navbar options
+#' 
+#' A `navbar_options()` object captures options specific to the appearance and
+#' behavior of the navbar, independent from the content displayed on the page.
+#' This helper should be used to create the list of options expected by
+#' `navbar_options` in [page_navbar()] and [navset_bar()].
+#' 
+#' ## Changelog
+#' 
+#' This function was introduced in \pkg{bslib} v0.9.0, replacing the `position`,
+#' `bg`, `inverse`, `collapsible` and `underline` arguments of [page_navbar()]
+#' and [navset_bar()]. Those arguments are deprecated with a warning and will be
+#' removed in a future version of \pkg{bslib}. Note that the deprecated
+#' `inverse` argument of [page_navbar()] and [navset_bar()] was replaced with
+#' the `type` argument of `navbar_options()`.
+#' 
+#' @examples
+#' navbar_options(position = "static-top", bg = "#2e9f7d", underline = FALSE)
+#' 
+#' @inheritParams shiny::navbarPage
+#' @param bg a CSS color to use for the navbar's background color.
+#' @param type Either `"dark"` for a light text color (on a **dark** background)
+#'   or `"light"` for a dark text color (on a **light** background). If `"auto"`
+#'   (the default) and `bg` is provided, the best contrast to `bg` is chosen.
+#' @param underline Whether or not to add underline styling to page or navbar
+#'   links when active or focused.
+#' @param ... Additional attributes that will be passed directly to the navbar
+#'   container element.
+#' 
+#' @returns Returns a list of navbar options.
+#' 
+#' @export
+navbar_options <- function(
+  ...,
+  position = c("static-top", "fixed-top", "fixed-bottom"),
+  bg = NULL,
+  type = c("auto", "light", "dark"),
+  collapsible = TRUE,
+  underline = TRUE
+) {
+  # Track user-provided arguments for print method and deprecation warnings
+  is_default <- list(
+    position = missing(position),
+    bg = missing(bg),
+    type = missing(type),
+    collapsible = missing(collapsible),
+    underline = missing(underline)
+  )
+  
+  opts <- list(
+    position = rlang::arg_match(position),
+    bg = bg,
+    type = rlang::arg_match(type),
+    collapsible = collapsible,
+    underline = underline
+  )
+  
+  dots <- separate_arguments(...)
+  if (length(dots$children) > 0) {
+    abort("All arguments in `...` must be named attributes to be applied to the navbar container.")
+  }
+
+  if ("inverse" %in% names(dots$attribs)) {
+    # Catch muscle-memory for using `inverse`. We didn't officially release
+    # `navbar_options()` with an `inverse` argument, but it's reasonable people
+    # might try to use it and it did exist briefly in dev versions.
+    lifecycle::deprecate_soft(
+      when = "0.9.0",
+      what = "navbar_options(inverse=)",
+      with = "navbar_options(type=)"
+    )
+  }
+  if (length(dots$attribs)) {
+    opts[["attribs"]] <- dots$attribs
+  }
+  
+  structure(
+    opts,
+    class = c("bslib_navbar_options", "list"),
+    is_default = is_default,
+    waldo_opts = list(ignore_attr = TRUE)
+  )
+}
+
+navbar_options_apply_attribs <- function(navbar, navbar_options = NULL) {
+  if (is.null(navbar_options[["attribs"]])) {
+    return(navbar)
+  }
+
+  attribs <- navbar_options[["attribs"]]
+  navbar[[1]] <- rlang::exec(tagAppendAttributes, navbar[[1]], !!!attribs)
+
+  if ("data-bs-theme" %in% names(attribs)) {
+    # If you're setting this attribute directly, you know more about what you're
+    # doing than we do (we handle it for users via `type`). Also: the call to
+    # tagAppendAttributes ensures that `navbar[[1]]` is a tag object and has the
+    # attribs field.
+    navbar[[1]][["attribs"]][["data-bs-theme"]] <- attribs[["data-bs-theme"]]
+  }
+
+  navbar
+}
+
+navbar_options_resolve_deprecated <- function(
+  options_user = list(),
+  position = deprecated(),
+  bg = deprecated(),
+  inverse = deprecated(),
+  collapsible = deprecated(),
+  underline = deprecated(),
+  .fn_caller = "navset_bar",
+  .warn_deprecated = TRUE
+) {
+  options_old <- list(
+    position = if (lifecycle::is_present(position)) position,
+    bg = if (lifecycle::is_present(bg)) bg,
+    inverse = if (lifecycle::is_present(inverse)) inverse,
+    collapsible = if (lifecycle::is_present(collapsible)) collapsible,
+    underline = if (lifecycle::is_present(underline)) underline
+  )
+  options_old <- dropNulls(options_old)
+
+  args_deprecated <- names(options_old)
+
+  if (.warn_deprecated && length(args_deprecated)) {
+    # TODO-deprecated: (2024-12) Elevate deprecation to an error
+    lifecycle::deprecate_warn(
+      "0.9.0",
+      I(sprintf(
+        "The arguments of `%s()` for navbar options (including %s) have been consolidated into a single `navbar_options` argument and ",
+        .fn_caller,
+        paste(sprintf("`%s`", args_deprecated), collapse = ", ")
+      )),
+      details = c(
+        "i" = "See `navbar_options()` for more details.",
+        "!" = if ("inverse" %in% args_deprecated) "Use `type` instead of `inverse` in `navbar_options()`."
+      )
+    )
+  }
+
+  # Upgrade `inverse` to the new `type` argument of `navbar_options()`
+  if ("inverse" %in% names(options_old)) {
+    inverse <- options_old[["inverse"]]
+    options_old[["inverse"]] <- NULL
+    
+    options_old[["type"]] <- 
+      if (is.character(inverse)) {
+        inverse
+      } else if (isTRUE(as.logical(inverse))) {
+        options_old[["type"]] <- "dark"
+      } else if (isFALSE(as.logical(inverse))) {
+        options_old[["type"]] <- "light"
+      } else {
+        abort(paste("Invalid `inverse` value: ", inverse))
+      }
+  }
+  
+  # Consolidate `navbar_options` (options_user) with the deprecated direct
+  # options. We take the direct option if the user option is a default value,
+  # warning if otherwise ignored.
+  # TODO-deprecated: Remove this and warning when direct options are hard-deprecated  
+  is_default <- attr(options_user, "is_default") %||% list()
+  keep_user_values <- vapply(
+    names(options_user),
+    function(x) !isTRUE(is_default[[x]]),
+    logical(1)
+  )
+  options_user <- options_user[keep_user_values]
+  
+  ignored <- c()
+  for (opt in names(options_old)) {
+    if (!opt %in% names(options_user)) {
+      options_user[[opt]] <- options_old[[opt]]
+    } else if (!identical(options_old[[opt]], options_user[[opt]])) {
+      ignored <- c(ignored, if (opt == "type") "inverse" else opt)      
+    }
+  }
+
+  if (length(ignored) > 0) {
+    rlang::warn(
+      c(
+        sprintf(
+          "`%s` %s provided twice: once directly and once in `navbar_options`.",
+          paste(ignored, collapse = "`, `"),
+          if (length(ignored) == 1) "was" else "were"
+        ),
+        "The deprecated direct option(s) will be ignored and the values from `navbar_options` will be used."
+      ),
+      call = rlang::caller_call()
+    )
+  }
+
+  attribs <- options_user$attrs %||% list()
+  options_user$attribs <- NULL
+
+  rlang::exec(navbar_options, !!!options_user, !!!attribs)
+}
+
+#' @export
+print.bslib_navbar_options <- function(x, ...) {
+  cat("<bslib_navbar_options>\n")
+  
+  if (length(x) == 0) {
+    return(invisible(x))
+  }
+
+  fields <- names(x)
+  opt_w <- max(nchar(fields))
+  is_default <- attr(x, "is_default") %||% list()
+  for (opt in fields) {
+    value <- x[[opt]] %||% "NULL"
+    if (inherits(value, "list")) {
+      value <- paste(names(value), collapse = ", ")
+    }
+    if (isTRUE(is_default[[opt]])) {
+      if (identical(value, "NULL")) { 
+        # Skip printing default NULL values
+        next
+      }
+      value <- sprintf("(%s)", value)
+    }
+    cat(sprintf("%*s", opt_w, opt), ": ", value, "\n", sep = "")
+  }
+
+  invisible(x)
+}
+
 
 # This internal version of navs_bar() exists so both it and page_navbar()
 # (and thus shiny::navbarPage()) can use it. And in the page_navbar() case,
diff --git a/man/navbar_options.Rd b/man/navbar_options.Rd
index 9f74743d5..af03ed2c4 100644
--- a/man/navbar_options.Rd
+++ b/man/navbar_options.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/navbar_options.R
+% Please edit documentation in R/navs-legacy.R
 \name{navbar_options}
 \alias{navbar_options}
 \title{Create a set of navbar options}
diff --git a/tests/testthat/_snaps/navbar_options.md b/tests/testthat/_snaps/navs-legacy.md
similarity index 100%
rename from tests/testthat/_snaps/navbar_options.md
rename to tests/testthat/_snaps/navs-legacy.md
diff --git a/tests/testthat/test-navbar_options.R b/tests/testthat/test-navs-legacy.R
similarity index 100%
rename from tests/testthat/test-navbar_options.R
rename to tests/testthat/test-navs-legacy.R

From 2a51b70996c4ebcedd4b5951b0399101cd1d89b1 Mon Sep 17 00:00:00 2001
From: Garrick Aden-Buie <garrick@adenbuie.com>
Date: Wed, 4 Dec 2024 13:05:12 -0500
Subject: [PATCH 16/20] chore: Apply suggestions from code review

---
 R/navs-legacy.R | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/R/navs-legacy.R b/R/navs-legacy.R
index ca7f1a6fe..ae9e4cdb3 100644
--- a/R/navs-legacy.R
+++ b/R/navs-legacy.R
@@ -245,7 +245,7 @@ navbar_options <- function(
     )
   }
   if (length(dots$attribs)) {
-    opts[["attribs"]] <- dots$attribs
+    opts$attribs <- dots$attribs
   }
   
   structure(
@@ -364,7 +364,7 @@ navbar_options_resolve_deprecated <- function(
     )
   }
 
-  attribs <- options_user$attrs %||% list()
+  attribs <- options_user[["attribs"]] %||% list()
   options_user$attribs <- NULL
 
   rlang::exec(navbar_options, !!!options_user, !!!attribs)

From f18214b3787c823c2637740917456fad1b9d172c Mon Sep 17 00:00:00 2001
From: gadenbuie <gadenbuie@users.noreply.github.com>
Date: Wed, 4 Dec 2024 18:11:33 +0000
Subject: [PATCH 17/20] `devtools::document()` (GitHub Actions)

---
 man/figures/page-navbar.png | Bin 10070 -> 10017 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/man/figures/page-navbar.png b/man/figures/page-navbar.png
index 622c83d912ac4b482ff872dcab4f92db0c144eff..2c30bec45377185de25e0899be879f5b59f87b10 100644
GIT binary patch
literal 10017
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
S7617<pz%oOVVR2EtN#Iw!9qg-

literal 10070
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


From 0395d7b02844199e9415cd7f5afc859798adbda1 Mon Sep 17 00:00:00 2001
From: Garrick Aden-Buie <garrick@adenbuie.com>
Date: Wed, 4 Dec 2024 13:42:22 -0500
Subject: [PATCH 18/20] chore: code style

---
 R/navs-legacy.R | 50 +++++++++++++++++++++++++++++++++----------------
 1 file changed, 34 insertions(+), 16 deletions(-)

diff --git a/R/navs-legacy.R b/R/navs-legacy.R
index ae9e4cdb3..444702930 100644
--- a/R/navs-legacy.R
+++ b/R/navs-legacy.R
@@ -404,16 +404,25 @@ print.bslib_navbar_options <- function(x, ...) {
 # (and thus shiny::navbarPage()) can use it. And in the page_navbar() case,
 # we can use addition theme information as an indication of whether we need
 # to handle backwards compatibility
-navs_bar_ <- function(..., title = NULL, id = NULL, selected = NULL,
-                      sidebar = NULL, fillable = TRUE,
-                      gap = NULL, padding = NULL,
-                      position = c("static-top", "fixed-top", "fixed-bottom"),
-                      header = NULL, footer = NULL,
-                      bg = NULL, inverse = "auto",
-                      underline = TRUE,
-                      collapsible = TRUE, fluid = TRUE,
-                      theme = NULL) {
-
+navs_bar_ <- function(
+  ...,
+  title = NULL,
+  id = NULL,
+  selected = NULL,
+  sidebar = NULL,
+  fillable = TRUE,
+  gap = NULL,
+  padding = NULL,
+  position = c("static-top", "fixed-top", "fixed-bottom"),
+  header = NULL,
+  footer = NULL,
+  bg = NULL,
+  inverse = "auto",
+  underline = TRUE,
+  collapsible = TRUE,
+  fluid = TRUE,
+  theme = NULL
+) {
   if (identical(inverse, "auto")) {
     if (is.null(theme) || theme_version(theme) < 5) {
       inverse <- TRUE
@@ -433,18 +442,27 @@ navs_bar_ <- function(..., title = NULL, id = NULL, selected = NULL,
   )
 
   navbar <- navbarPage_(
-    title = title, ..., id = id, selected = selected,
-    sidebar = sidebar, fillable = fillable,
-    gap = gap, padding = padding,
+    title = title,
+    ...,
+    id = id,
+    selected = selected,
+    sidebar = sidebar,
+    fillable = fillable,
+    gap = gap,
+    padding = padding,
     position = match.arg(position),
-    header = header, footer = footer, collapsible = collapsible,
-    inverse = inverse, underline = underline, fluid = fluid,
+    header = header,
+    footer = footer,
+    collapsible = collapsible,
+    inverse = inverse,
+    underline = underline,
+    fluid = fluid,
     theme = theme
   )
 
   # navbarPage_() returns a tagList() of the nav and content
   navbar[[1]] <- tagAppendAttributes(
-    navbar[[1]], 
+    navbar[[1]],
     style = if (!is.null(bg)) css(background_color = paste(bg, "!important")),
     "data-bs-theme" = navbar_color_mode
   )

From 5190d24e2bc7ab6b662e7bc19809e0e1e315dd3a Mon Sep 17 00:00:00 2001
From: Garrick Aden-Buie <garrick@adenbuie.com>
Date: Wed, 4 Dec 2024 13:55:44 -0500
Subject: [PATCH 19/20] refactor: Use `navbar_options` inside `navs_bar_()`

Allows us to avoid needing to do surgery on the navbar later
---
 R/navs-legacy.R | 71 ++++++++++++++++---------------------------------
 R/page.R        |  7 +----
 2 files changed, 24 insertions(+), 54 deletions(-)

diff --git a/R/navs-legacy.R b/R/navs-legacy.R
index 444702930..15fa37bd6 100644
--- a/R/navs-legacy.R
+++ b/R/navs-legacy.R
@@ -147,7 +147,7 @@ navset_bar <- function(
     collapsible = collapsible
   )
 
-  navbar <- navs_bar_(
+  navs_bar_(
     ...,
     title = title,
     id = id,
@@ -159,17 +159,11 @@ navset_bar <- function(
     header = header,
     footer = footer,
     fluid = fluid,
-    position = .navbar_options$position,
-    bg = .navbar_options$bg,
-    inverse = .navbar_options$type,
-    collapsible = .navbar_options$collapsible,
-    underline = .navbar_options$underline,
+    navbar_options = .navbar_options,
     # theme is only used to determine whether legacy style markup should be used
     # (and, at least at the moment, we don't need legacy markup for this exported function)
     theme = bs_theme()
   )
-
-  navbar_options_apply_attribs(navbar, .navbar_options)
 }
 
 #' Create a set of navbar options
@@ -256,25 +250,6 @@ navbar_options <- function(
   )
 }
 
-navbar_options_apply_attribs <- function(navbar, navbar_options = NULL) {
-  if (is.null(navbar_options[["attribs"]])) {
-    return(navbar)
-  }
-
-  attribs <- navbar_options[["attribs"]]
-  navbar[[1]] <- rlang::exec(tagAppendAttributes, navbar[[1]], !!!attribs)
-
-  if ("data-bs-theme" %in% names(attribs)) {
-    # If you're setting this attribute directly, you know more about what you're
-    # doing than we do (we handle it for users via `type`). Also: the call to
-    # tagAppendAttributes ensures that `navbar[[1]]` is a tag object and has the
-    # attribs field.
-    navbar[[1]][["attribs"]][["data-bs-theme"]] <- attribs[["data-bs-theme"]]
-  }
-
-  navbar
-}
-
 navbar_options_resolve_deprecated <- function(
   options_user = list(),
   position = deprecated(),
@@ -413,34 +388,28 @@ navs_bar_ <- function(
   fillable = TRUE,
   gap = NULL,
   padding = NULL,
-  position = c("static-top", "fixed-top", "fixed-bottom"),
+  navbar_options = NULL,
   header = NULL,
   footer = NULL,
-  bg = NULL,
-  inverse = "auto",
-  underline = TRUE,
-  collapsible = TRUE,
   fluid = TRUE,
   theme = NULL
 ) {
-  if (identical(inverse, "auto")) {
+  navbar_options <- navbar_options %||% navbar_options()
+  
+  type <- navbar_options[["type"]]
+  bg <- navbar_options[["bg"]]
+
+  if (identical(type, "auto")) {
     if (is.null(theme) || theme_version(theme) < 5) {
-      inverse <- TRUE
-    }
+      type <- "dark"
+    }    
     if (!is.null(bg)) {
       bg <- htmltools::parseCssColors(bg)
       bg_contrast <- get_color_contrast(bg)
-      inverse <- bg_contrast == "#FFFFFF"
+      type <- if (bg_contrast == "#FFFFFF") "dark" else "light"
     }
   }
 
-  navbar_color_mode <- switch(
-    as.character(inverse),
-    "TRUE" = "dark",
-    "FALSE" = "light",
-    inverse
-  )
-
   navbar <- navbarPage_(
     title = title,
     ...,
@@ -450,21 +419,27 @@ navs_bar_ <- function(
     fillable = fillable,
     gap = gap,
     padding = padding,
-    position = match.arg(position),
+    position = navbar_options[["position"]],
     header = header,
     footer = footer,
-    collapsible = collapsible,
-    inverse = inverse,
-    underline = underline,
+    collapsible = navbar_options[["collapsible"]],
+    inverse = identical(type, "dark"),
+    underline = navbar_options[["underline"]],
     fluid = fluid,
     theme = theme
   )
 
+  attribs <- navbar_options[["attribs"]] %||% list()
+
+  # Use user-provided `data-bs-theme` or our internally selected `type`. If the
+  # user includes both, the attribute wins for being most technically-correct.
+  attribs[["data-bs-theme"]] <- attribs[["data-bs-theme"]] %||% type
+
   # navbarPage_() returns a tagList() of the nav and content
   navbar[[1]] <- tagAppendAttributes(
     navbar[[1]],
     style = if (!is.null(bg)) css(background_color = paste(bg, "!important")),
-    "data-bs-theme" = navbar_color_mode
+    !!!attribs
   )
 
   as_fragment(navbar, page = page)
diff --git a/R/page.R b/R/page.R
index c398ee932..b69106ab2 100644
--- a/R/page.R
+++ b/R/page.R
@@ -458,15 +458,10 @@ page_navbar <- function(
     padding = padding,
     header = header,
     footer = footer,
-    position = .navbar_options$position,
-    bg = .navbar_options$bg,
-    inverse = .navbar_options$type,
-    underline = .navbar_options$underline,
-    collapsible = .navbar_options$collapsible,
+    navbar_options = .navbar_options,
     fluid = fluid,
     theme = theme
   )
-  navbar <- navbar_options_apply_attribs(navbar, .navbar_options)
 
   page_func(
     title = infer_window_title(title, window_title),

From 3a95d0ad86e4a74748c3eae6ee10f3dd14966496 Mon Sep 17 00:00:00 2001
From: Garrick Aden-Buie <garrick@adenbuie.com>
Date: Wed, 4 Dec 2024 14:06:03 -0500
Subject: [PATCH 20/20] tests(navs_bar_): Add snapshots to track navbar markup

---
 tests/testthat/_snaps/navs-legacy.md | 85 ++++++++++++++++++++++++++++
 tests/testthat/test-navs-legacy.R    | 68 ++++++++++++++++++++++
 2 files changed, 153 insertions(+)

diff --git a/tests/testthat/_snaps/navs-legacy.md b/tests/testthat/_snaps/navs-legacy.md
index a10f90e95..dab92fe26 100644
--- a/tests/testthat/_snaps/navs-legacy.md
+++ b/tests/testthat/_snaps/navs-legacy.md
@@ -32,3 +32,88 @@
       collapsible: TRUE
         underline: (TRUE)
 
+# navbar markup snapshots
+
+    Code
+      show_navbar_markup(navs_bar_(theme = bs_theme(version = 3)))
+    Output
+      <nav class="navbar navbar-default navbar-static-top navbar-inverse" role="navigation" data-bs-theme="dark"></nav>
+
+---
+
+    Code
+      show_navbar_markup(navs_bar_(theme = bs_theme(version = 4)))
+    Output
+      <nav class="navbar navbar-default navbar-static-top navbar-inverse" role="navigation" data-bs-theme="dark"></nav>
+
+---
+
+    Code
+      show_navbar_markup(navs_bar_(theme = bs_theme(version = 5)))
+    Output
+      <nav class="navbar navbar-default navbar-static-top" role="navigation" data-bs-theme="auto"></nav>
+
+---
+
+    Code
+      show_navbar_markup(navs_bar_(theme = bs_theme(version = 4), navbar_options = navbar_options(
+        type = "dark")))
+    Output
+      <nav class="navbar navbar-default navbar-static-top navbar-inverse" role="navigation" data-bs-theme="dark"></nav>
+
+---
+
+    Code
+      show_navbar_markup(navs_bar_(theme = bs_theme(version = 4), navbar_options = navbar_options(
+        type = "light")))
+    Output
+      <nav class="navbar navbar-default navbar-static-top" role="navigation" data-bs-theme="light"></nav>
+
+---
+
+    Code
+      show_navbar_markup(navs_bar_(theme = bs_theme(version = 4), navbar_options = navbar_options(
+        bg = "#000")))
+    Output
+      <nav class="navbar navbar-default navbar-static-top navbar-inverse" role="navigation" style="background-color:#000000 !important;" data-bs-theme="dark"></nav>
+
+---
+
+    Code
+      show_navbar_markup(navs_bar_(theme = bs_theme(version = 5), navbar_options = navbar_options(
+        type = "dark")))
+    Output
+      <nav class="navbar navbar-default navbar-static-top navbar-inverse" role="navigation" data-bs-theme="dark"></nav>
+
+---
+
+    Code
+      show_navbar_markup(navs_bar_(theme = bs_theme(version = 5), navbar_options = navbar_options(
+        type = "light")))
+    Output
+      <nav class="navbar navbar-default navbar-static-top" role="navigation" data-bs-theme="light"></nav>
+
+---
+
+    Code
+      show_navbar_markup(navs_bar_(theme = bs_theme(version = 5), navbar_options = navbar_options(
+        bg = "#000")))
+    Output
+      <nav class="navbar navbar-default navbar-static-top navbar-inverse" role="navigation" style="background-color:#000000 !important;" data-bs-theme="dark"></nav>
+
+---
+
+    Code
+      show_navbar_markup(navs_bar_(theme = bs_theme(version = 5), navbar_options = navbar_options(
+        type = "light", `data-bs-theme` = "dark")))
+    Output
+      <nav class="navbar navbar-default navbar-static-top" role="navigation" data-bs-theme="dark"></nav>
+
+---
+
+    Code
+      show_navbar_markup(navs_bar_(theme = bs_theme(version = 5), navbar_options = navbar_options(
+        class = "bg-primary", type = "dark")))
+    Output
+      <nav class="navbar navbar-default navbar-static-top navbar-inverse bg-primary" data-bs-theme="dark" role="navigation"></nav>
+
diff --git a/tests/testthat/test-navs-legacy.R b/tests/testthat/test-navs-legacy.R
index 206e3e426..6242eeceb 100644
--- a/tests/testthat/test-navs-legacy.R
+++ b/tests/testthat/test-navs-legacy.R
@@ -226,3 +226,71 @@ test_that("shiny:navbarPage() is unaffected", {
     )
   )
 })
+
+show_navbar_markup <- function(navbar) {
+  nb <- navbar[[1]]
+  nb$children <- NULL
+  cat(format(nb))
+}
+
+test_that("navbar markup snapshots", {
+  expect_snapshot(
+    show_navbar_markup(navs_bar_(theme = bs_theme(version = 3)))
+  )
+
+  expect_snapshot(
+    show_navbar_markup(navs_bar_(theme = bs_theme(version = 4)))
+  )
+  
+  expect_snapshot(
+    show_navbar_markup(navs_bar_(theme = bs_theme(version = 5)))
+  )
+
+  expect_snapshot(
+    show_navbar_markup(
+      navs_bar_(theme = bs_theme(version = 4), navbar_options = navbar_options(type = "dark"))
+    )
+  )
+
+  expect_snapshot(
+    show_navbar_markup(
+      navs_bar_(theme = bs_theme(version = 4), navbar_options = navbar_options(type = "light"))
+    )
+  )
+
+  expect_snapshot(
+    show_navbar_markup(
+      navs_bar_(theme = bs_theme(version = 4), navbar_options = navbar_options(bg = "#000"))
+    )
+  )
+
+  expect_snapshot(
+    show_navbar_markup(
+      navs_bar_(theme = bs_theme(version = 5), navbar_options = navbar_options(type = "dark"))
+    )
+  )
+
+  expect_snapshot(
+    show_navbar_markup(
+      navs_bar_(theme = bs_theme(version = 5), navbar_options = navbar_options(type = "light"))
+    )
+  )
+
+  expect_snapshot(
+    show_navbar_markup(
+      navs_bar_(theme = bs_theme(version = 5), navbar_options = navbar_options(bg = "#000"))
+    )
+  )
+  
+  expect_snapshot(
+    show_navbar_markup(
+      navs_bar_(theme = bs_theme(version = 5), navbar_options = navbar_options(type = "light", `data-bs-theme` = "dark"))
+    )
+  )
+
+  expect_snapshot(
+    show_navbar_markup(
+      navs_bar_(theme = bs_theme(version = 5), navbar_options = navbar_options(class = "bg-primary", type = "dark"))
+    )
+  )
+})