Will fix #306

RinteRface · Oct 1, 2022 · aa3fc85 · aa3fc85
1 parent d5c7c5f
commit aa3fc85
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 14 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -33,7 +33,7 @@ Suggests:
     DT, 
     thematic (>= 0.1.2)
 Encoding: UTF-8
-RoxygenNote: 7.1.2
+RoxygenNote: 7.2.1
 VignetteBuilder: knitr
 Collate: 
     'feedbacks.R'

diff --git a/NEWS.md b/NEWS.md
@@ -5,6 +5,8 @@
 [pagination](https://getbootstrap.com/docs/4.0/components/pagination/).
 
 ## Bug fixes
+- Fix #306: Dynamic menuSubItems with apply() adds some extra text. Added __.list__
+param to `menuItem()` to programatically pass `menuSubItem()` as list. 
 - Fix #297: `tabsetPanel()` renders below the list of `tabPanels` when vertical = TRUE. 
 Changed layout to `fluidRow`. Thanks @lucas-alcantara for reporting. 
 - Fix #296: Documentation issue for `valueBox()` and `infoBox()` in the render function section.

diff --git a/R/dashboardSidebar.R b/R/dashboardSidebar.R
@@ -311,6 +311,9 @@ findSidebarItem <- function(items, regex) {
 #' @param startExpanded Whether to expand the \link{menuItem} at start.
 #' @param condition When using \link{menuItem} with \link[shiny]{conditionalPanel},
 #' write the condition here (see \url{https://github.com/RinteRface/bs4Dash/issues/35}).
+#' @param .list An optional list containing items to put in the menu Same as the
+#' \code{...} arguments, but in list format. This can be useful when working
+#' with programmatically generated items.
 #'
 #' @rdname dashboardSidebar
 #'
@@ -360,8 +363,8 @@ bs4SidebarMenuItem <- function(text, ..., icon = NULL, badgeLabel = NULL, badgeC
                                tabName = NULL, href = NULL,
                                newTab = TRUE, selected = NULL,
                                expandedName = as.character(gsub("[[:space:]]", "", text)),
-                               startExpanded = FALSE, condition = NULL) {
-  subItems <- list(...)
+                               startExpanded = FALSE, condition = NULL, .list = NULL) {
+  subItems <- c(list(...), .list)
 
   if (!is.null(icon)) {
     tagAssert(icon, type = "i")

diff --git a/man/appButton.Rd b/man/appButton.Rd
diff --git a/man/box.Rd b/man/box.Rd
diff --git a/man/dashboardSidebar.Rd b/man/dashboardSidebar.Rd
diff --git a/man/dashboardUser.Rd b/man/dashboardUser.Rd
diff --git a/man/infoBox.Rd b/man/infoBox.Rd
diff --git a/man/renderMenu.Rd b/man/renderMenu.Rd
diff --git a/man/valueBox.Rd b/man/valueBox.Rd