Merge branch 'main' into 479_lockfile_extendtask@main

DESCRIPTION

@@ -1,8 +1,8 @@
 Type: Package
 Package: teal
 Title: Exploratory Web Apps for Analyzing Clinical Trials Data
-Version: 0.15.2.9042
-Date: 2024-06-18
+Version: 0.15.2.9044
+Date: 2024-06-19
 Authors@R: c(
     person("Dawid", "Kaledkowski", , "dawid.kaledkowski@roche.com", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0001-9533-457X")),

NEWS.md

@@ -1,4 +1,4 @@
-# teal 0.15.2.9042
+# teal 0.15.2.9044
 
 ### Enhancement
 * Provided progress bar for modules loading and data filtering during teal app startup.

R/module_teal.R

@@ -23,8 +23,6 @@
 #' updates the displayed datasets to filter for according to the active `datanames`
 #' of the tab.
 #'
-#' It is written as a `shiny` module so it can be added into other apps as well.
-#'
 #' @name module_teal
 #'
 #' @inheritParams module_teal_with_splash

inst/js/sidebar.js

@@ -1,12 +1,26 @@
 // used to collapse and expand the filter panel in teal apps
+/*
+resize is placed at end of functions
+b/c in embedded apps it will throw errors that cause the function to exit early
+*/
 var filter_open = true;
 const hideSidebar = () => {
-  $(".teal_secondary_col").fadeOut(1);
-  $(".teal_primary_col").attr("class", "teal_primary_col col-sm-12").resize();
+  $(".teal_secondary_col").css("display", "none");
+  $(".teal_primary_col")
+    .removeClass("col-sm-9")
+    .addClass("col-sm-12");
+  $(".teal_primary_col").trigger("resize");
 };
 const showSidebar = () => {
-  $(".teal_primary_col").attr("class", "teal_primary_col col-sm-9").resize();
-  $(".teal_secondary_col").delay(600).fadeIn(50);
+  $(".teal_primary_col")
+    .removeClass("col-sm-12")
+    .addClass("col-sm-9");
+  setTimeout(
+    () => {
+      $(".teal_secondary_col").css("display", "block");
+    },
+    600);
+  $(".teal_primary_col").trigger("resize");
 };
 const toggleFilterPanel = () => {
   if (filter_open && !$(".teal_secondary_col").is(':visible')) {

tests/testthat/test-shinytest2-utils.R

@@ -18,7 +18,7 @@ testthat::test_that("e2e: show/hide hamburger works as expected", {
   secondary_attrs <- get_class_attributes(app, ".teal_secondary_col")
 
   testthat::expect_true(grepl("col-sm-9", primary_attrs$class))
-  testthat::expect_false(isTruthy(secondary_attrs$style))
+  testthat::expect_true(grepl("display: block;", secondary_attrs$style))
 
   app$click(selector = ".btn.action-button.filter_hamburger")
   primary_attrs <- get_class_attributes(app, ".teal_primary_col")