Reduce code change within navs

Author: schloerke

shiny/ui/_navs.py

@@ -395,7 +395,8 @@ def __init__(
         footer: TagChild = None,
     ) -> None:
         id_resolved = resolve_id_or_none(id)
-        selected = restore_input(id_resolved, selected) if id_resolved else selected
+        selected = restore_input(id_resolved, selected)
+
         self.args = args
         self.ul_class = ul_class
         self.id = id_resolved
@@ -467,12 +468,10 @@ def navset_tab(
     -------
     See :func:`~shiny.ui.nav_panel`
     """
-    id_resolved = resolve_id_or_none(id)
-    selected = restore_input(id_resolved, selected) if id_resolved else selected
     return NavSet(
         *args,
         ul_class="nav nav-tabs",
-        id=id_resolved,
+        id=id,
         selected=selected,
         header=header,
         footer=footer,
@@ -524,12 +523,10 @@ def navset_pill(
     -------
     See :func:`~shiny.ui.nav_panel`
     """
-    id_resolved = resolve_id_or_none(id)
-    selected = restore_input(id_resolved, selected) if id_resolved else selected
     return NavSet(
         *args,
         ul_class="nav nav-pills",
-        id=id_resolved,
+        id=id,
         selected=selected,
         header=header,
         footer=footer,
@@ -581,12 +578,10 @@ def navset_underline(
     -------
     See :func:`~shiny.ui.nav_panel`
     """
-    id_resolved = resolve_id_or_none(id)
-    selected = restore_input(id_resolved, selected) if id_resolved else selected
     return NavSet(
         *args,
         ul_class="nav nav-underline",
-        id=id_resolved,
+        id=id,
         selected=selected,
         header=header,
         footer=footer,
@@ -634,12 +629,10 @@ def navset_hidden(
     * :func:`~shiny.ui.navset_card_underline`
     * :func:`~shiny.ui.navset_pill_list`
     """
-    id_resolved = resolve_id_or_none(id)
-    selected = restore_input(id_resolved, selected) if id_resolved else selected
     return NavSet(
         *args,
         ul_class="nav nav-hidden",
-        id=id_resolved,
+        id=id,
         selected=selected,
         header=header,
         footer=footer,
@@ -663,12 +656,10 @@ def __init__(
         footer: TagChild = None,
         placement: Literal["above", "below"] = "above",
     ) -> None:
-        id_resolved = resolve_id_or_none(id)
-        selected = restore_input(id_resolved, selected) if id_resolved else selected
         super().__init__(
             *args,
             ul_class=ul_class,
-            id=id_resolved,
+            id=id,
             selected=selected,
             header=header,
             footer=footer,
@@ -757,12 +748,10 @@ def navset_card_tab(
     -------
     See :func:`~shiny.ui.nav_panel`
     """
-    id_resolved = resolve_id_or_none(id)
-    selected = restore_input(id_resolved, selected) if id_resolved else selected
     return NavSetCard(
         *args,
         ul_class="nav nav-tabs card-header-tabs",
-        id=id_resolved,
+        id=id,
         selected=selected,
         title=title,
         sidebar=sidebar,
@@ -824,12 +813,10 @@ def navset_card_pill(
     -------
     See :func:`~shiny.ui.nav_panel`
     """
-    id_resolved = resolve_id_or_none(id)
-    selected = restore_input(id_resolved, selected) if id_resolved else selected
     return NavSetCard(
         *args,
         ul_class="nav nav-pills card-header-pills",
-        id=id_resolved,
+        id=id,
         selected=selected,
         title=title,
         sidebar=sidebar,
@@ -891,12 +878,10 @@ def navset_card_underline(
     -------
     See :func:`~shiny.ui.nav_panel`
     """
-    id_resolved = resolve_id_or_none(id)
-    selected = restore_input(id_resolved, selected) if id_resolved else selected
     return NavSetCard(
         *args,
         ul_class="nav nav-underline",
-        id=id_resolved,
+        id=id,
         selected=selected,
         title=title,
         sidebar=sidebar,
@@ -921,12 +906,10 @@ def __init__(
         well: bool = True,
         widths: tuple[int, int] = (4, 8),
     ) -> None:
-        id_resolved = resolve_id_or_none(id)
-        selected = restore_input(id_resolved, selected) if id_resolved else selected
         super().__init__(
             *args,
             ul_class=ul_class,
-            id=id_resolved,
+            id=id,
             selected=selected,
             header=header,
             footer=footer,
@@ -993,12 +976,10 @@ def navset_pill_list(
     -------
     See :func:`~shiny.ui.nav_panel`
     """
-    id_resolved = resolve_id_or_none(id)
-    selected = restore_input(id_resolved, selected) if id_resolved else selected
     return NavSetPillList(
         *args,
         ul_class="nav nav-pills nav-stacked",
-        id=id_resolved,
+        id=id,
         selected=selected,
         header=header,
         footer=footer,
@@ -1588,12 +1569,10 @@ def navset_bar(
     ul_class = "nav navbar-nav"
     if navbar_opts.underline:
         ul_class += " nav-underline"
-    id_resolved = resolve_id_or_none(id)
-    selected = restore_input(id_resolved, selected) if id_resolved else selected
     return NavSetBar(
         *new_args,
         ul_class=ul_class,
-        id=id_resolved,
+        id=id,
         selected=selected,
         sidebar=sidebar,
         fillable=fillable,