feat: Keep attrs on .main of page_sidebar() (#1058)

* page_sidebar: Keep attributes on `.main` container * Update test to show where `page_sidebar()` attrs end up
rstudio · May 29, 2024 · 7dbfb72 · 7dbfb72
1 parent 245fef4
commit 7dbfb72
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/R/page.R b/R/page.R
@@ -275,6 +275,8 @@ page_sidebar <- function(
 
   sidebar <- maybe_page_sidebar(sidebar)
 
+  dots <- separate_arguments(...)
+
   page_fillable(
     padding = 0,
     gap = 0,
@@ -289,15 +291,16 @@ page_sidebar <- function(
       fillable = fillable,
       border = FALSE,
       border_radius = FALSE,
-      page_sidebar_main(...)
+      !!!dots$attribs,
+      page_sidebar_main(dots$children)
     )
   )
 }
 
 page_sidebar_main <- function(...) {
   as_fill_carrier(
     div(
-      class = "bslib-page-sidebar-main bslib-gap-spacing", 
+      class = "bslib-page-sidebar-main bslib-gap-spacing",
       ...
     )
   )

diff --git a/tests/testthat/_snaps/page.md b/tests/testthat/_snaps/page.md
@@ -33,8 +33,8 @@
 ---
 
     Code
-      renderTags(page_sidebar("main", title = "Title", sidebar = sidebar(open = "always")))$
-        html
+      renderTags(page_sidebar("main", title = "Title", sidebar = sidebar(open = "always"),
+      `data-attr` = "here"))$html
     Output
       <body class="bslib-page-fill bslib-gap-spacing bslib-flow-mobile bslib-page-sidebar html-fill-container" style="padding:0px;gap:0px;">
         <div class="navbar navbar-static-top">
@@ -43,7 +43,7 @@
           </div>
         </div>
         <div class="bslib-sidebar-layout bslib-mb-spacing html-fill-item" data-bslib-sidebar-border="false" data-bslib-sidebar-border-radius="false" data-bslib-sidebar-init="TRUE" data-collapsible-desktop="false" data-collapsible-mobile="false" data-open-desktop="always" data-open-mobile="always" data-require-bs-caller="layout_sidebar()" data-require-bs-version="5" style="--_sidebar-width:250px;">
-          <div class="main bslib-gap-spacing html-fill-container">
+          <div class="main bslib-gap-spacing html-fill-container" data-attr="here">
             <div class="bslib-page-sidebar-main bslib-gap-spacing html-fill-item html-fill-container">main</div>
           </div>
           <aside class="sidebar">

diff --git a/tests/testthat/test-page.R b/tests/testthat/test-page.R
@@ -55,7 +55,8 @@ test_that("page_sidebar()", {
         "main",
         title = "Title",
         # Removes the {bsicons} icon
-        sidebar = sidebar(open = "always")
+        sidebar = sidebar(open = "always"),
+        "data-attr" = "here"
       )
     )$html,
     cran = TRUE