fix: bugs found during QA testing (#573)

Author: schloerke

examples/penguins/app.py

@@ -6,8 +6,7 @@
 
 import pandas as pd
 import seaborn as sns
-
-# import shinyswatch
+import shinyswatch
 from colors import bg_palette, palette
 
 import shiny.experimental as x
@@ -22,38 +21,32 @@
 species: List[str] = df["Species"].unique().tolist()
 species.sort()
 
-app_ui = ui.page_fluid(
-    # shinyswatch.theme.pulse(), # Uncomment when shinyswatch it updated
-    ui.layout_sidebar(
-        ui.panel_sidebar(
-            # Artwork by @allison_horst
-            ui.tags.img(
-                src="palmerpenguins.png", width="80%", class_="mt-0 mb-2 mx-auto"
-            ),
-            ui.input_selectize(
-                "xvar",
-                "X variable",
-                numeric_cols,
-                selected="Bill Length (mm)",
-            ),
-            ui.input_selectize(
-                "yvar",
-                "Y variable",
-                numeric_cols,
-                selected="Bill Depth (mm)",
-            ),
-            ui.input_checkbox_group(
-                "species", "Filter by species", species, selected=species
-            ),
-            ui.hr(),
-            ui.input_switch("by_species", "Show species", value=True),
-            ui.input_switch("show_margins", "Show marginal plots", value=True),
+app_ui = x.ui.page_sidebar(
+    x.ui.sidebar(
+        # Artwork by @allison_horst
+        ui.tags.img(src="palmerpenguins.png", width="80%", class_="mt-0 mb-2 mx-auto"),
+        ui.input_selectize(
+            "xvar",
+            "X variable",
+            numeric_cols,
+            selected="Bill Length (mm)",
+        ),
+        ui.input_selectize(
+            "yvar",
+            "Y variable",
+            numeric_cols,
+            selected="Bill Depth (mm)",
         ),
-        ui.panel_main(
-            ui.output_ui("value_boxes"),
-            x.ui.output_plot("scatter", fill=True),
+        ui.input_checkbox_group(
+            "species", "Filter by species", species, selected=species
         ),
+        ui.hr(),
+        ui.input_switch("by_species", "Show species", value=True),
+        ui.input_switch("show_margins", "Show marginal plots", value=True),
     ),
+    shinyswatch.theme.pulse(),
+    ui.output_ui("value_boxes"),
+    x.ui.output_plot("scatter", fill=True),
 )
 
 
@@ -104,7 +97,6 @@ def penguin_value_box(title: str, count: int, bgcol: str, showcase_img: str):
                 ),
                 theme_color=None,
                 style=f"background-color: {bgcol};",
-                height="90px",
                 full_screen=True,
             )
 

shiny/experimental/e2e/accordion/app.py

@@ -59,12 +59,18 @@ def _():
 
     has_efg = False
     has_alternate = True
+    has_updates = False
 
     @reactive.Effect
     def _():
         req(input.alternate())
 
-        sections = ["Section A", "Section B", "Section C", "Section D"]
+        sections = [
+            "updated_section_a" if has_updates else "Section A",
+            "Section B",
+            "Section C",
+            "Section D",
+        ]
         if has_efg:
             sections.extend(["Section E", "Section F", "Section G"])
 
@@ -87,8 +93,6 @@ def _():
             x.ui.accordion_panel_insert("acc", make_panel("G"), "Section F")
         has_efg = not has_efg
 
-    has_updates = False
-
     @reactive.Effect
     def _():
         req(input.toggle_updates())

shiny/experimental/examples/accordion_panel_remove/app.py

@@ -28,19 +28,22 @@ def make_panel(letter: str) -> x.ui.AccordionPanel:
 
 
 def server(input: Inputs, output: Outputs, session: Session):
+    # Copy the list for user
+    user_choices = [choice for choice in choices]
+
     @reactive.Effect
     @reactive.event(input.remove_panel)
     def _():
-        if len(choices) == 0:
+        if len(user_choices) == 0:
             ui.notification_show("No more panels to remove!")
             return
 
         # Remove panel
-        x.ui.accordion_panel_remove("acc", f"Section { choices.pop() }")
+        x.ui.accordion_panel_remove("acc", f"Section { user_choices.pop() }")
 
         label = "No more panels to remove!"
-        if len(choices) > 0:
-            label = f"Remove Section {choices[-1]}"
+        if len(user_choices) > 0:
+            label = f"Remove Section {user_choices[-1]}"
         ui.update_action_button("remove_panel", label=label)
 
 

shiny/experimental/ui/_navs.py

@@ -114,7 +114,7 @@ def tagify(self) -> TagList | Tag:
         nav, content = _render_navset(
             *self.args, ul_class=ul_class, id=id, selected=self.selected, context={}
         )
-        return self.layout(nav, content)
+        return self.layout(nav, content).tagify()
 
     # Types must match output of `_render_navset() -> Tuple[Tag, Tag]`
     def layout(self, nav: Tag, content: Tag) -> TagList | Tag:

shiny/experimental/ui/_sidebar.py

@@ -40,10 +40,12 @@ def __init__(
         self.color_fg = color_fg
         self.color_bg = color_bg
 
-    # # This does not contain the `collapse_tag`
-    # # The `Sidebar` class should use it's fields, not this method
-    # def tagify(self) -> Tag:
-    #     return self.tag.tagify()
+    # The `Sidebar` class should use it's fields, not this method
+    def tagify(self) -> Tag:
+        # Similar to `NavMenu.tagify()`
+        raise NotImplementedError(
+            "`Sidebar` objects must be handled by `layout_sidebar(sidebar)`."
+        )
 
 
 # TODO-maindocs; @add_example()

shiny/ui/_navs.py

@@ -367,7 +367,7 @@ def tagify(self) -> TagList | Tag:
         nav, content = render_navset(
             *self.args, ul_class=ul_class, id=id, selected=self.selected, context={}
         )
-        return self.layout(nav, content)
+        return self.layout(nav, content).tagify()
 
     def layout(self, nav: TagChild, content: TagChild) -> TagList | Tag:
         return TagList(nav, self.header, content, self.footer)