fix(listGroupInput): shift dots arg to front

nteetor · Mar 14, 2020 · ce0fbbe · ce0fbbe
1 parent e1ed698
commit ce0fbbe
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 20 deletions.
diff --git a/R/list-group.R b/R/list-group.R
@@ -107,15 +107,15 @@
 #'   layout = "horizontal"
 #' )
 #'
-listGroupInput <- function(id, choices = NULL, values = choices,
-                           selected = NULL, ..., layout = "vertical",
+listGroupInput <- function(..., id, choices = NULL, values = choices,
+                           selected = NULL, layout = "vertical",
                            flush = FALSE) {
   assert_id()
   assert_choices()
   assert_possible(layout, c("vertical", "horizontal"))
   assert_possible(flush, c(TRUE, FALSE))
 
-  tag <- dep_attach({
+  with_deps({
     layout <- resp_construct(layout, c("vertical", "horizontal"))
     classes <- resp_classes(layout, "list-group")
 
@@ -124,7 +124,7 @@ listGroupInput <- function(id, choices = NULL, values = choices,
 
     items <- map_listitems(choices, values, selected)
 
-    tags$div(
+    tag <- div(
       class = str_collate(
         "yonder-list-group",
         "list-group",
@@ -135,9 +135,9 @@ listGroupInput <- function(id, choices = NULL, values = choices,
       items,
       ...
     )
-  })
 
-  s3_class_add(tag, c("yonder_list_group", "yonder_input"))
+    s3_class_add(tag, c("yonder_list_group", "yonder_input"))
+  })
 }
 
 #' @rdname listGroupInput

diff --git a/man/listGroupInput.Rd b/man/listGroupInput.Rd
diff --git a/tests/testthat/test-list-group.R b/tests/testthat/test-list-group.R
@@ -1,21 +1,27 @@
 context("list group input")
 
 test_that("id is character or null", {
-  expect_silent(listGroupInput("ID"))
-  expect_silent(listGroupInput(NULL))
+  expect_silent(listGroupInput(id = "ID"))
+  expect_silent(listGroupInput(id = NULL))
 
-  expect_error(listGroupInput(NA_character_))
-  expect_error(listGroupInput(3030))
+  expect_error(listGroupInput(id = NA_character_))
+  expect_error(listGroupInput(id = 3030))
 })
 
 test_that("choices and values same length", {
-  expect_silent(listGroupInput("ID", c("one")))
-  expect_silent(listGroupInput("ID", c("two"), c("two")))
+  expect_silent(listGroupInput(id = "ID", choices = c("one")))
+  expect_silent(listGroupInput(
+    id = "ID", choices = c("two"), values = c("two")
+  ))
 
-  expect_error(listGroupInput("ID", c("three"), c("three", "four")))
-  expect_error(listGroupInput("ID", c("four", "five"), "four"))
+  expect_error(listGroupInput(
+    id = "ID", choices = c("three"), values = c("three", "four")
+  ))
+  expect_error(listGroupInput(
+    id = "ID", choices = c("four", "five"), values = "four"
+  ))
 })
 
 test_that("has dependencies", {
-  expect_dependencies(listGroupInput("ID"))
+  expect_dependencies(listGroupInput(id = "ID"))
 })