feat(navbar_options): Use in page_navbar() too

Author: gadenbuie

shiny/ui/_page.py

@@ -31,12 +31,18 @@
 
 from .._docstring import add_example, no_example
 from .._namespaces import resolve_id_or_none
-from ..types import MISSING, MISSING_TYPE, NavSetArg
+from ..types import DEPRECATED, MISSING, MISSING_TYPE, MaybeMissing, NavSetArg
 from ._bootstrap import panel_title
 from ._html_deps_external import Theme, ThemeProvider, shiny_page_theme_deps
 from ._html_deps_py_shiny import page_output_dependency
 from ._html_deps_shinyverse import components_dependencies
-from ._navs import NavMenu, NavPanel, navset_bar
+from ._navs import (
+    NavbarOptions,
+    NavMenu,
+    NavPanel,
+    navbar_options_resolve_deprecated,
+    navset_bar,
+)
 from ._sidebar import Sidebar, SidebarOpen, layout_sidebar
 from ._tag import consolidate_attrs
 from ._utils import get_window_title
@@ -161,17 +167,21 @@ def page_navbar(
     fillable_mobile: bool = False,
     gap: Optional[CssUnit] = None,
     padding: Optional[CssUnit | list[CssUnit]] = None,
-    position: Literal["static-top", "fixed-top", "fixed-bottom"] = "static-top",
     header: Optional[TagChild] = None,
     footer: Optional[TagChild] = None,
-    bg: Optional[str] = None,
-    inverse: bool = False,
-    underline: bool = True,
-    collapsible: bool = True,
+    navbar_options: Optional[NavbarOptions] = None,
     fluid: bool = True,
     window_title: str | MISSING_TYPE = MISSING,
     lang: Optional[str] = None,
     theme: Optional[str | Path | Theme | ThemeProvider] = None,
+    # Deprecated ----
+    position: MaybeMissing[
+        Literal["static-top", "fixed-top", "fixed-bottom"]
+    ] = DEPRECATED,
+    bg: MaybeMissing[str | None] = DEPRECATED,
+    inverse: MaybeMissing[bool] = DEPRECATED,
+    underline: MaybeMissing[bool] = DEPRECATED,
+    collapsible: MaybeMissing[bool] = DEPRECATED,
 ) -> Tag:
     """
     Create a page with a navbar and a title.
@@ -276,6 +286,16 @@ def page_navbar(
 
     tagAttrs: TagAttrs = {"class": pageClass}
 
+    navbar_options = navbar_options_resolve_deprecated(
+        fn_caller="page_navbar",
+        options_user=navbar_options,
+        position=position,
+        bg=bg,
+        inverse=inverse,
+        underline=underline,
+        collapsible=collapsible,
+    )
+
     navbar = navset_bar(
         *args,
         title=title,
@@ -285,13 +305,9 @@ def page_navbar(
         fillable=fillable,
         gap=gap,
         padding=padding,
-        position=position,
+        navbar_options=navbar_options,
         header=header,
         footer=footer,
-        bg=bg,
-        inverse=inverse,
-        underline=underline,
-        collapsible=collapsible,
         fluid=fluid,
     )
     # This is a page-level navbar, so opt into page-level layouts (in particular for