Improve sidebar initialization

R/sidebar.R

@@ -119,6 +119,7 @@ sidebar <- function(
       id = id,
       role = "complementary",
       class = c("sidebar", class),
+      hidden = if (open == "closed") NA,
       style = css(background_color = bg, color = fg),
       tags$div(
         class = "sidebar-content",
@@ -201,23 +202,18 @@ layout_sidebar <- function(
   max_height_mobile <- sidebar$max_height_mobile %||%
     if (is.null(height)) "250px" else "50%"
 
-  if (identical(sidebar$open, "always")) {
-    # sidebar initialization is only needed if collapsible
-    sidebar_id <- NULL
-    sidebar_init_js <- NULL
-  } else {
-    sidebar_id <- tagGetAttribute(sidebar$tag, "id")
-    sidebar_init_js <- sidebar_js_init(sidebar_id)
-  }
+  sidebar_init <- if (!identical(sidebar$open, "always")) TRUE
+  sidebar_border <- if (!is.null(border)) tolower(border)
+  sidebar_border_radius <- if (!is.null(border_radius)) tolower(border_radius)
 
   res <- div(
     class = "bslib-sidebar-layout",
     class = if (right) "sidebar-right",
     class = if (identical(sidebar$open, "closed")) "sidebar-collapsed",
-    `data-bslib-sidebar-init` = sidebar_id,
+    `data-bslib-sidebar-init` = sidebar_init,
     `data-bslib-sidebar-open` = sidebar$open,
-    `data-bslib-sidebar-border` = if (!is.null(border)) tolower(border),
-    `data-bslib-sidebar-border-radius` = if (!is.null(border_radius)) tolower(border_radius),
+    `data-bslib-sidebar-border` = sidebar_border,
+    `data-bslib-sidebar-border-radius` = sidebar_border_radius,
     style = css(
       "--bslib-sidebar-width" = sidebar$width,
       "--bs-card-border-color" = border_color,
@@ -226,7 +222,7 @@ layout_sidebar <- function(
     ),
     !!!contents,
     sidebar_dependency(),
-    sidebar_init_js
+    sidebar_init_js()
   )
 
   res <- bindFillRole(res, item = fill)
@@ -238,17 +234,6 @@ layout_sidebar <- function(
   )
 }
 
-sidebar_js_init <- function(id) {
-  # Requires Shiny >= 1.7.2 and works thanks to rstudio/shiny#3630 (2022-05-09)
-  tags$script(
-    "document.currentScript.parentElement.removeChild(document.currentScript);\n",
-    sprintf(
-      "window.bslib.Sidebar.initCollapsible(document.querySelector('[data-bslib-sidebar-init=\"%s\"]'));",
-      id
-    )
-  )
-}
-
 #' @describeIn sidebar Toggle a `sidebar()` state during an active Shiny user
 #'   session.
 #' @param session A Shiny session object (the default should almost always be
@@ -270,6 +255,7 @@ sidebar_toggle <- function(id, open = NULL, session = get_current_session()) {
       abort('`open` must be `NULL`, `TRUE` (or "open"), or `FALSE` (or "closed").')
     }
 
+  force(id)
   callback <- function() {
     session$sendInputMessage(id, list(method = method))
   }
@@ -293,3 +279,10 @@ sidebar_dependency <- function() {
     script = "sidebar.min.js"
   )
 }
+
+sidebar_init_js <- function() {
+  tags$script(
+    `data-bslib-sidebar-init` = NA,
+    HTML("bslib.Sidebar.initCollapsibleAll()")
+  )
+}