Follow up to #588: use named argument when supplying sidebar()

Author: cpsievert

R/navs-legacy.R

@@ -257,10 +257,11 @@ navbarPage_ <- function(title,
       # the .container-fluid class adds padding that we don't want)
       class = if (!fluid) "container",
       layout_sidebar(
+        sidebar = sidebar,
         fillable = !isFALSE(fillable),
         border_radius = FALSE,
         border = !fluid,
-        sidebar, contents
+        contents
       )
     )
 

R/navs.R

@@ -95,7 +95,12 @@ collect_nav_items <- function(..., wrapper) {
 navs_card_body <- function(content, sidebar) {
   content <- makeTabsFillable(content, fillable = TRUE)
   if (!is.null(sidebar)) {
-    content <- layout_sidebar(sidebar, content, fillable = TRUE, border = FALSE)
+    content <- layout_sidebar(
+      sidebar = sidebar,
+      fillable = TRUE,
+      border = FALSE,
+      content
+    )
   }
   as.card_item(content)
 }

inst/themer-demo/R/tips.R

@@ -6,16 +6,16 @@ data(tips, package = "reshape2")
 
 tipsUI <- function(id) {
   ns <- NS(id)
-  
+
   layout_sidebar(
     fillable = TRUE,
     sidebar = sidebar(
-      title = "Restaurant tipping", 
+      title = "Restaurant tipping",
       sliderInput(
-        ns("total_bill"), 
-        "Bill amount", 
-        min(tips$total_bill), 
-        max(tips$total_bill), 
+        ns("total_bill"),
+        "Bill amount",
+        min(tips$total_bill),
+        max(tips$total_bill),
         value = range(tips$total_bill),
         pre = "$"
       ),
@@ -51,8 +51,8 @@ tipsUI <- function(id) {
         card_header("Total bill vs tip"),
         layout_sidebar(
           fillable = TRUE,
-          sidebar(
-            position = "right", 
+          sidebar = sidebar(
+            position = "right",
             open = FALSE,
             width = 150,
             selectInput(ns("scatter_color"), "Color by:", c("none", "sex", "smoker", "day", "time")),
@@ -72,7 +72,7 @@ tipsUI <- function(id) {
       card_header("Tip percentages"),
       layout_sidebar(
         fillable = TRUE,
-        sidebar(
+        sidebar = sidebar(
           position = "right",
           selectInput(ns("tip_perc_y"), "Split by:", c("sex", "smoker", "day", "time"), "day"),
           selectInput(ns("tip_perc_facet"), "Facet by:", c("none", "sex", "smoker", "day", "time"), "none"),
@@ -154,4 +154,4 @@ tipsServer <- function(id) {
       updateCheckboxGroupInput(session, "time", selected = c("Lunch", "Dinner"))
     })
   })
-}
+}

vignettes/sidebars.Rmd

@@ -401,7 +401,7 @@ quakes_view <- card(
   full_screen = TRUE,
   card_header("Earthquake locations"),
   layout_sidebar(
-    sidebar(map_filter),
+    sidebar = sidebar(map_filter),
     map_quakes
   )
 )
@@ -620,7 +620,7 @@ card(
   card_header("Groups of diamond filters"),
   layout_sidebar(
     fillable = TRUE,
-    sidebar(accordion_filters),
+    sidebar = sidebar(accordion_filters),
     plots[[1]]
   )
 )
@@ -635,9 +635,9 @@ It's possible to nest sidebar layouts, which means you can effectively have any
 page_fillable(
   h1("Left and right sidebar", class = "px-3 my-3"),
   layout_sidebar(
-    sidebar("Left sidebar"),
+    sidebar = sidebar("Left sidebar"),
     layout_sidebar(
-        sidebar("Right sidebar", position = "right", open = FALSE),
+        sidebar = sidebar("Right sidebar", position = "right", open = FALSE),
         "Main contents",
         border = FALSE
     ),
@@ -673,7 +673,7 @@ squake <- SharedData$new(quakes)
 
 container <- layout_sidebar(
   class = "p-0",
-  sidebar(
+  sidebar = sidebar(
     title = "Earthquakes off Fiji",
     bg = "#1E1E1E",
     width = "35%",