Tidy and repair for v1

docs/components_page/__init__.py

@@ -109,6 +109,7 @@ def register_apps():
         "input_group": {"markdown_path": COMPONENTS / "input_group.md"},
         "layout": {"markdown_path": COMPONENTS / "layout.md"},
         "list_group": {"markdown_path": COMPONENTS / "list_group.md"},
+        "main": {"markdown_path": COMPONENTS / "main.md"},
         "modal": {
             "markdown_path": COMPONENTS / "modal.md",
             "extra_env_vars": {"LOREM": LOREM},
@@ -149,7 +150,6 @@ def register_apps():
         },
         {"name": "themes", "href": "/docs/themes", "label": "Themes"},
         {"name": "faq", "href": "/docs/faq", "label": "FAQ"},
-        {"name": "dashr", "href": "/docs/dashr", "label": "Dash for R"},
         {
             "name": "components",
             "href": "/docs/components",
@@ -161,6 +161,7 @@ def register_apps():
                     "label": _get_label(slug),
                 }
                 for slug in component_bodies
+                if _get_label(slug) != "Main"
             ],
         },
     ]

docs/components_page/components/__tests__/helpers.py

@@ -9,7 +9,12 @@ def py_source_to_app(py_source, env):
     """
     env = env or {}
     # TODO: remove class_name modifiers
-    exec(py_source.replace("class_name", "className"), env)
+    exec(
+        py_source.replace("class_name", "className").replace(
+            "_className", "_class_name"
+        ),
+        env,
+    )
     return env["app"]
 
 
@@ -52,21 +57,31 @@ def rename_variable(snippet_path, suffix, variable, assign_op="="):
     return "\n".join(new_lines)
 
 
-def load_r_app(path, component_name):
-    return R_WRAPPER.format(
-        snippet=path.read_text(),
-        components=component_name,
-        port=8050,
-    ).replace(
-        "class_name", "className"
+def load_r_app(path, component_name, extra_args=""):
+    snippet = path.read_text()
+    if extra_args:
+        snippet = f"{extra_args}\n{snippet}"
+    return (
+        R_WRAPPER.format(
+            snippet=snippet,
+            components=component_name,
+            port=8050,
+        )
+        .replace("class_name", "className")
+        .replace("_className", "_class_name")
     )  # TODO: remove this in future
 
 
-def load_jl_app(path, component_name):
-    return JL_WRAPPER.format(
-        snippet=path.read_text(),
-        components=component_name,
-        port=8050,
-    ).replace(
-        "class_name", "className"
+def load_jl_app(path, component_name, extra_args=""):
+    snippet = path.read_text()
+    if extra_args:
+        snippet = f"{extra_args}\n{snippet}"
+    return (
+        JL_WRAPPER.format(
+            snippet=snippet,
+            components=component_name,
+            port=8050,
+        )
+        .replace("class_name", "className")
+        .replace("_className", "_class_name")
     )  # TODO: remove this in future

docs/components_page/components/__tests__/test_accordion.py

@@ -10,23 +10,21 @@
 HERE = Path(__file__).parent
 
 
-def test_r_simple(dashr):
-    r_app = load_r_app((HERE.parent / "accordion" / "simple.R"), "accordion")
+def test_r_callback(dashr):
+    r_app = load_r_app((HERE.parent / "accordion" / "callback.R"), "accordion")
     dashr.start_server(r_app)
-    check_simple_callbacks(dashr)
+    check_callback_callbacks(dashr)
 
 
-def test_jl_simple(dashjl):
+def test_jl_callback(dashjl):
     jl_app = load_jl_app(
-        (HERE.parent / "accordion" / "simple.jl"), "accordion"
+        (HERE.parent / "accordion" / "callback.jl"), "accordion"
     )
-    with open("app.jl", "w") as f:
-        f.write(jl_app)
     dashjl.start_server(jl_app)
-    check_simple_callbacks(dashjl)
+    check_callback_callbacks(dashjl)
 
 
-def check_simple_callbacks(runner):
+def check_callback_callbacks(runner):
     # Find the accordion object
     accordion_comp = runner.find_element("#accordion")
     accordion_text = runner.find_element("#accordion-contents")

docs/components_page/components/__tests__/test_carousel.py

@@ -27,14 +27,19 @@ def test_jl_carousel(dashjl):
 
 def check_carousel_callbacks(runner):
 
-    runner.find_element(
-        "label[for='_dbcprivate_radioitems_slide-number_input_1']"
-    ).click()
+    item = "label[for='_dbcprivate_radioitems_slide-number_input_1']"
+
+    runner.find_element(item).click()
 
     wait.until(
-        lambda: runner.find_elements("div.carousel-item")[1].get_attribute(
-            "class"
+        lambda: len(
+            {"carousel-item", "active"}
+            - set(
+                runner.find_elements("div.carousel-item")[1].get_attribute(
+                    "class"
+                )
+            )
         )
-        == "carousel-item active",
+        == 0,
         timeout=4,
     )

docs/components_page/components/__tests__/test_collapse.py

@@ -71,45 +71,3 @@ def check_collapse_multiple_callbacks(runner):
         == "collapse show",
         timeout=4,
     )
-
-
-# --------------------------------------------
-# accordion
-
-
-def test_r_collapse_accordion(dashr):
-    r_app = load_r_app((HERE.parent / "collapse" / "accordion.R"), "accordion")
-    dashr.start_server(r_app)
-    check_collapse_accordion_callbacks(dashr)
-
-
-def test_jl_collapse_accordion(dashjl):
-    jl_app = load_jl_app(
-        (HERE.parent / "collapse" / "accordion.jl"), "accordion"
-    )
-    dashjl.start_server(jl_app)
-    check_collapse_accordion_callbacks(dashjl)
-
-
-def check_collapse_accordion_callbacks(runner):
-
-    runner.find_element("#group-1-toggle").click()
-    wait.until(
-        lambda: runner.find_element("#collapse-1").get_attribute("class")
-        == "collapse show",
-        timeout=4,
-    )
-
-    runner.find_element("#group-2-toggle").click()
-    wait.until(
-        lambda: runner.find_element("#collapse-2").get_attribute("class")
-        == "collapse show",
-        timeout=4,
-    )
-
-    runner.find_element("#group-3-toggle").click()
-    wait.until(
-        lambda: runner.find_element("#collapse-3").get_attribute("class")
-        == "collapse show",
-        timeout=4,
-    )

docs/components_page/components/__tests__/test_navbar.py

@@ -27,14 +27,28 @@ def check_navbar_callbacks(runner):
     runner.driver.set_window_size(375, 667)
 
     wait.until(
-        lambda: runner.find_element("#navbar-collapse").get_attribute("class")
-        == "collapse navbar-collapse",
+        lambda: len(
+            {"navbar-collapse", "collapse"}
+            - set(
+                runner.find_element("#navbar-collapse")
+                .get_attribute("class")
+                .split()
+            )
+        )
+        == 0,
         timeout=4,
     )
 
     runner.find_element("#navbar-toggler").click()
     wait.until(
-        lambda: runner.find_element("#navbar-collapse").get_attribute("class")
-        == "collapse show navbar-collapse",
+        lambda: len(
+            {"navbar-collapse", "collapse", "show"}
+            - set(
+                runner.find_element("#navbar-collapse")
+                .get_attribute("class")
+                .split()
+            )
+        )
+        == 0,
         timeout=4,
     )

docs/components_page/components/__tests__/test_pagination.py

@@ -10,33 +10,38 @@
 HERE = Path(__file__).parent
 
 
-def test_r_pagination_simple(dashr):
-    r_app = load_r_app((HERE.parent / "pagination" / "simple.R"), "pagination")
+def test_r_pagination_callback(dashr):
+    r_app = load_r_app(
+        (HERE.parent / "pagination" / "callback.R"), "pagination"
+    )
     dashr.start_server(r_app)
-    check_pagination_simple_callbacks(dashr)
+    check_pagination_callback_callbacks(dashr)
 
 
-def test_jl_pagination_simple(dashjl):
+def test_jl_pagination_callback(dashjl):
     jl_app = load_jl_app(
-        (HERE.parent / "pagination" / "simple.jl"), "pagination"
+        (HERE.parent / "pagination" / "callback.jl"), "pagination"
     )
     dashjl.start_server(jl_app)
-    check_pagination_simple_callbacks(dashjl)
-
+    check_pagination_callback_callbacks(dashjl)
 
-def check_pagination_simple_callbacks(runner):
 
-    # Find the pagination object
-    pagination_comp = runner.find_element("#pagination")
-    pagination_text = runner.find_element("#pagination-contents")
+def check_pagination_callback_callbacks(runner):
 
     # Check it has 10 page-items objects in it
-    pages = pagination_comp.find_elements(".page-item")
+    pages = runner.find_elements("#pagination .page-item")
     wait.until(
         lambda: len(pages) == 10,
         timeout=4,
     )
 
+    # Ensure that all the items have loaded
+    wait.until(
+        lambda: runner.find_element("#pagination-contents").text
+        == "Page selected: 1",
+        timeout=4,
+    )
+
     # Click the link with text 7
     wait.until(
         lambda: pages[6].text == "7",
@@ -46,22 +51,26 @@ def check_pagination_simple_callbacks(runner):
 
     # Check the text in contents changes to "Page selected: 7"
     wait.until(
-        lambda: pagination_text.text == "Page selected: 7",
+        lambda: runner.find_element("#pagination-contents").text
+        == "Page selected: 7",
         timeout=4,
     )
 
     # Change the slider to value 5
-    runner.click_at_coord_fractions(
-        runner.find_element("#page-change"), 0.5, 0.25
-    )
+    page_changer = runner.find_element("#page-change")
+    runner.click_at_coord_fractions(page_changer, 0.5, 0.25)
 
     # Check the text in contents changes to "Page selected: 5"
     wait.until(
-        lambda: pagination_text.text == "Page selected: 5",
+        lambda: runner.find_element("#pagination-contents").text
+        == "Page selected: 5",
         timeout=4,
     )
 
     # Check that the <li> object inside pagination with number = 5
     # has active as a class
-    pages = pagination_comp.find_element(".active")
-    wait.until(lambda: pages[4].text == "5")
+    active_page = runner.find_element("#pagination .active")
+    wait.until(
+        lambda: active_page.text.split("\n") == ["5", "(current)"],
+        timeout=4,
+    )

docs/components_page/components/__tests__/test_popover.py

@@ -27,6 +27,7 @@ def test_jl_popover(dashjl):
 
 
 def check_popover_callbacks(runner):
+
     assert len(runner.find_elements("#popover")) == 0
     runner.find_element("#toggle").click()
     wait.until(

docs/components_page/components/__tests__/test_snippets.py

@@ -23,7 +23,11 @@
     for path in HERE.parent.glob("*.md")
 ]
 
-SKIP = ["components/table/kwargs.py", "components/tabs/active_tab.py"]
+SKIP = [
+    "components/table/kwargs.py",
+    "components/table/color.py",
+    "components/tabs/active_tab.py",
+]
 ENVS = {
     "modal.md": {
         "LOREM": (HERE.parent / "modal" / "lorem.txt").read_text().strip()
@@ -135,9 +139,9 @@ def assert_layouts_equal(
             snippet="\n".join(x[1] for x in compare),
             components=", ".join(x[2] for x in compare),
             port=port,
-        ).replace(
-            "class_name", "className"
-        )  # TODO: remove
+        )
+        .replace("class_name", "className")
+        .replace("_className", "_class_name")  # TODO: remove
     )
     layout = requests.get(f"{runner.url}/_dash-layout").json()