chore(express.ui.navbar_options): Reflect changes from core

Author: gadenbuie

shiny/express/ui/_cm_components.py

@@ -8,11 +8,19 @@
 
 from ... import ui
 from ..._docstring import add_example, no_example
-from ...types import MISSING, MISSING_TYPE
+from ...types import DEPRECATED, MISSING, MISSING_TYPE, MaybeMissing
 from ...ui._accordion import AccordionPanel
 from ...ui._card import CardItem
 from ...ui._layout_columns import BreakpointsUser
-from ...ui._navs import NavMenu, NavPanel, NavSet, NavSetBar, NavSetCard
+from ...ui._navs import (
+    NavbarOptions,
+    NavbarOptionsPositionT,
+    NavMenu,
+    NavPanel,
+    NavSet,
+    NavSetBar,
+    NavSetCard,
+)
 from ...ui._sidebar import SidebarOpenSpec, SidebarOpenValue
 from ...ui.css import CssUnit
 from .._recall_context import RecallContextManager
@@ -1067,17 +1075,16 @@ def navset_bar(
     fillable: bool | list[str] = True,
     gap: Optional[CssUnit] = None,
     padding: Optional[CssUnit | list[CssUnit]] = None,
-    position: Literal[
-        "static-top", "fixed-top", "fixed-bottom", "sticky-top"
-    ] = "static-top",
     header: TagChild = None,
     footer: TagChild = None,
-    bg: Optional[str] = None,
-    # TODO: default to 'auto', like we have in R (parse color via webcolors?)
-    inverse: bool = False,
-    underline: bool = True,
-    collapsible: bool = True,
+    navbar_options: Optional[NavbarOptions] = None,
     fluid: bool = True,
+    # Deprecated ----
+    position: MaybeMissing[NavbarOptionsPositionT] = DEPRECATED,
+    bg: MaybeMissing[str | None] = DEPRECATED,
+    inverse: MaybeMissing[bool] = DEPRECATED,
+    underline: MaybeMissing[bool] = DEPRECATED,
+    collapsible: MaybeMissing[bool] = DEPRECATED,
 ) -> RecallContextManager[NavSetBar]:
     """
     Context manager for a set of nav items as a tabset inside a card container.
@@ -1095,16 +1102,15 @@ def navset_bar(
         Choose a particular nav item to select by default value (should match it's
         ``value``).
     sidebar
-        A :class:`~shiny.ui.Sidebar` component to display on every
-        :func:`~shiny.ui.nav_panel` page.
+        A :class:`~shiny.ui.Sidebar` component to display on every :func:`~shiny.ui.nav_panel` page.
     fillable
         Whether or not to allow fill items to grow/shrink to fit the browser window. If
         `True`, all `nav()` pages are fillable. A character vector, matching the value
         of `nav()`s to be filled, may also be provided. Note that, if a `sidebar` is
         provided, `fillable` makes the main content portion fillable.
     gap
         A CSS length unit defining the gap (i.e., spacing) between elements provided to
-        `*args`.
+        `*args`. This value is only used when the navbar is `fillable`.
     padding
         Padding to use for the body. This can be a numeric vector (which will be
         interpreted as pixels) or a character vector with valid CSS lengths. The length
@@ -1113,26 +1119,45 @@ def navset_bar(
         the second value will be used for left and right. If three, then the first will
         be used for top, the second will be left and right, and the third will be
         bottom. If four, then the values will be interpreted as top, right, bottom, and
-        left respectively.
+        left respectively. This value is only used when the navbar is `fillable`.
+    header
+        UI to display above the selected content.
+    footer
+        UI to display below the selected content.
+    fluid
+        ``True`` to use fluid layout; ``False`` to use fixed layout.
+    navbar_options
+        Configure the appearance and behavior of the navbar using
+        :func:`~shiny.ui.navbar_options` to set properties like position, background
+        color, and more.
+
+        `navbar_options` was added in v1.3.0 and replaces deprecated arguments
+        `position`, `bg`, `inverse`, `collapsible`, and `underline`.
     position
+        Deprecated in v1.3.0. Please use `navbar_options` instead; see
+        :func:`~shiny.ui.navbar_options` for details.
+
         Determines whether the navbar should be displayed at the top of the page with
         normal scrolling behavior ("static-top"), pinned at the top ("fixed-top"), or
         pinned at the bottom ("fixed-bottom"). Note that using "fixed-top" or
         "fixed-bottom" will cause the navbar to overlay your body content, unless you
         add padding (e.g., ``tags.style("body {padding-top: 70px;}")``).
-    header
-        UI to display above the selected content.
-    footer
-        UI to display below the selected content.
     bg
+        Deprecated in v1.3.0. Please use `navbar_options` instead; see
+        :func:`~shiny.ui.navbar_options` for details.
+
         Background color of the navbar (a CSS color).
     inverse
+        Deprecated in v1.3.0. Please use `navbar_options` instead; see
+        :func:`~shiny.ui.navbar_options` for details.
+
         Either ``True`` for a light text color or ``False`` for a dark text color.
     collapsible
-        ``True`` to automatically collapse the navigation elements into an expandable
-        menu on mobile devices or narrow window widths.
-    fluid
-        ``True`` to use fluid layout; ``False`` to use fixed layout.
+        Deprecated in v1.3.0. Please use `navbar_options` instead; see
+        :func:`~shiny.ui.navbar_options` for details.
+
+        ``True`` to automatically collapse the elements into an expandable menu on
+        mobile devices or narrow window widths.
     """
     return RecallContextManager(
         ui.navset_bar,
@@ -1144,14 +1169,16 @@ def navset_bar(
             fillable=fillable,
             gap=gap,
             padding=padding,
-            position=position,
             header=header,
             footer=footer,
+            fluid=fluid,
+            navbar_options=navbar_options,
+            # Deprecated -- v1.3.0 2025-01 ----
+            position=position,
             bg=bg,
             inverse=inverse,
             underline=underline,
             collapsible=collapsible,
-            fluid=fluid,
         ),
     )