First revisions

Author: elnelson575

shiny/examples/nav_insert/app.py

@@ -1,53 +1,49 @@
-from shiny import *
+from shiny import App, Inputs, Outputs, Session, reactive, ui
 
-app_ui = ui.page_fluid(
-    ui.layout_sidebar(
-        ui.panel_sidebar(
-            ui.input_action_button("add", "Add 'Dynamic' tab"),
-            ui.input_action_button("removeFoo", "Remove 'Foo' tabs"),
-            ui.input_action_button("addFoo", "Add New 'Foo' tab"),
+app_ui = ui.page_sidebar(
+    ui.sidebar(
+        ui.input_action_button("add", "Add 'Dynamic' tab"),
+        ui.input_action_button("removeFoo", "Remove 'Foo' tabs"),
+        ui.input_action_button("addFoo", "Add New 'Foo' tab"),
+    ),
+    ui.navset_tab(
+        ui.nav_panel("Hello", "This is the hello tab"),
+        ui.nav_panel("Foo", "This is the Foo tab", value="Foo"),
+        ui.nav_menu(
+            "Static",
+            ui.nav_panel("Static 1", "Static 1", value="s1"),
+            ui.nav_panel("Static 2", "Static 2", value="s2"),
+            value="Menu",
         ),
-        ui.panel_main(
-            ui.navset_tab(
-                ui.nav("Hello", "This is the hello tab"),
-                ui.nav("Foo", "This is the Foo tab", value="Foo"),
-                ui.nav_menu(
-                    "Static",
-                    ui.nav("Static 1", "Static 1", value="s1"),
-                    ui.nav("Static 2", "Static 2", value="s2"),
-                    value="Menu",
-                ),
-                id="tabs",
-            ),
-        ),
-    )
+        id="tabs",
+    ),
 )
 
 
 def server(input: Inputs, output: Outputs, session: Session):
-    @reactive.Effect()
-    @event(input.add)
+    @reactive.effect()
+    @reactive.event(input.add)
     def _():
         id = "Dynamic-" + str(input.add())
         ui.nav_insert(
             "tabs",
-            ui.nav(id, id),
+            ui.nav_panel(id, id),
             target="s2",
             position="before",
         )
 
-    @reactive.Effect()
-    @event(input.removeFoo)
+    @reactive.effect()
+    @reactive.event(input.removeFoo)
     def _():
         ui.nav_remove("tabs", target="Foo")
 
-    @reactive.Effect()
-    @event(input.addFoo)
+    @reactive.effect()
+    @reactive.event(input.addFoo)
     def _():
         n = str(input.addFoo())
         ui.nav_insert(
             "tabs",
-            ui.nav("Foo-" + n, "This is the new Foo-" + n + " tab", value="Foo"),
+            ui.nav_panel("Foo-" + n, "This is the new Foo-" + n + " tab", value="Foo"),
             target="Menu",
             position="before",
             select=True,

shiny/ui/_navs_dynamic.py

@@ -24,7 +24,7 @@
 @add_example()
 def nav_insert(
     id: str,
-    nav: Union[NavSetArg, str],
+    nav_panel: Union[NavSetArg, str],
     target: Optional[str] = None,
     position: Literal["after", "before"] = "after",
     select: bool = False,
@@ -37,8 +37,8 @@ def nav_insert(
     ----------
     id
         The ``id`` of the relevant navigation container (i.e., ``navset_*()`` object).
-    nav
-        The navigation item to insert (typically a :func:`~shiny.ui.nav` or
+    nav_panel
+        The navigation item to insert (typically a :func:`~shiny.ui.nav_panel` or
         :func:`~shiny.ui.nav_menu`). A :func:`~shiny.ui.nav_menu` isn't allowed when the
         ``target`` references an :func:`~shiny.ui.nav_menu` (or an item within it). A
         string is only allowed when the ``target`` references a
@@ -69,9 +69,11 @@ def nav_insert(
     # N.B. this is only sensible if the target is a menu, but we don't know that,
     # which could cause confusion of we decide to support top-level strings at some
     # in the future.
-    if isinstance(nav, str):
-        nav = menu_string_as_nav(nav)
-
+    # print("IS INSTANCE: ", isinstance(nav_panel, str))
+    # if isinstance(nav_panel, str):
+    # print("isnav")
+    nav = menu_string_as_nav(nav_panel)
+    print(nav)
     # N.B. shiny.js' is smart enough to know how to add active classes and href/id attrs
     li_tag, div_tag = nav.resolve(
         selected=None, context=dict(tabsetid="tsid", index="id")