merge master

Merge branch 'master' into dev

# Conflicts:
#	R/useful-items.R
#	inst/bs4Dash-2.1.0/bs4Dash.min.js
#	inst/bs4Dash-2.1.0/bs4Dash.min.js.map

Author: DivadNojnarg

R/aliases.R

@@ -737,4 +737,4 @@ ribbon <- bs4Ribbon
 #' @rdname boxLayout
 #'
 #' @export
-boxLayout <- bs4CardLayout
+boxLayout <- bs4CardLayout

R/auto-color.R

@@ -60,4 +60,4 @@ useAutoColor <- function(input, output, session = shiny::getDefaultReactiveDomai
     # the initial one
     session$setCurrentTheme(theme)
   })
-}
+}

R/bs4DashGallery.R

@@ -24,4 +24,4 @@ bs4DashGallery <- function() { # nocov start
       mustWork = TRUE
     )
   )
-}
+}

R/cards.R

@@ -108,7 +108,7 @@
 #'             boxDropdownItem("Link to google", href = "https://www.google.com"),
 #'             boxDropdownItem("item 2", href = "#"),
 #'             dropdownDivider(),
-#'             boxDropdownItem("item 3", href = "#", icon = icon("th"))
+#'             boxDropdownItem("item 3", href = "#", icon = icon("table-cells"))
 #'           ),
 #'           sidebar = boxSidebar(
 #'             startOpen = TRUE,
@@ -327,7 +327,7 @@ bs4CardLabel <- function(text, status, tooltip = NULL) {
 #' @family boxWidgets
 #' @export
 bs4CardSidebar <- function(..., id = NULL, width = 50, background = "#333a40",
-                           startOpen = FALSE, icon = shiny::icon("cogs"), 
+                           startOpen = FALSE, icon = shiny::icon("gears"), 
                            easyClose = TRUE) {
 
   stopifnot(width >= 25 && width <= 100)
@@ -709,13 +709,13 @@ dropdownDivider <- function() {
 #'             value = 150,
 #'             subtitle = "New orders",
 #'             color = "primary",
-#'             icon = icon("shopping-cart")
+#'             icon = icon("cart-shopping")
 #'           ),
 #'           valueBox(
 #'             value = "53%",
 #'             subtitle = "New orders",
 #'             color = "indigo",
-#'             icon = icon("cogs"),
+#'             icon = icon("gears"),
 #'             footer = div("Hello World")
 #'           ),
 #'           valueBox(
@@ -799,7 +799,7 @@ bs4ValueBox <- function(value, subtitle, icon = NULL, color = NULL, width = 3,
         target = "_blank",
         class = "small-box-footer",
         "More info",
-        shiny::icon("arrow-circle-right")
+        shiny::icon("circle-arrow-right")
       )
     } else {
       shiny::tags$div(class = "small-box-footer", style = "height: 30px;")
@@ -931,7 +931,7 @@ bs4ValueBox <- function(value, subtitle, icon = NULL, color = NULL, width = 3,
 #'   )
 #' }
 #' @export
-bs4InfoBox <- function(title, value = NULL, subtitle = NULL, icon = shiny::icon("bar-chart"),
+bs4InfoBox <- function(title, value = NULL, subtitle = NULL, icon = shiny::icon("chart-bar"),
                        color = NULL, width = 4, href = NULL, fill = FALSE, gradient = FALSE,
                        elevation = NULL, iconElevation = NULL, tabName = NULL) {
 

R/dashboardBody.R

@@ -63,4 +63,4 @@ bs4TabItem <- function(tabName = NULL, ...) {
     id = paste0("shiny-tab-", tabName),
     ...
   )
-}
+}

R/dashboardControlbar.R

@@ -166,4 +166,4 @@ updateControlbarMenu <- function (session = shiny::getDefaultReactiveDomain(), i
 #' }
 updateControlbar <- function(id, session = shiny::getDefaultReactiveDomain()) {
   session$sendInputMessage(id, NULL)
-}
+}

R/dashboardHeader.R

@@ -52,7 +52,7 @@
 bs4DashNavbar <- function(..., title = NULL, titleWidth = NULL, disable = FALSE,
                           .list = NULL, leftUi = NULL, rightUi = NULL, skin = "light", status = "white",
                           border = TRUE, compact = FALSE, sidebarIcon = shiny::icon("bars"),
-                          controlbarIcon = shiny::icon("th"), fixed = FALSE) {
+                          controlbarIcon = shiny::icon("table-cells"), fixed = FALSE) {
   items <- c(list(...), .list)
 
   # make sure default status for dark skin is gray-dark if status is not specified
@@ -302,7 +302,7 @@ bs4DropdownMenu <- function(..., type = c("messages", "notifications", "tasks"),
       type,
       messages = shiny::icon("comments"),
       notifications = shiny::icon("bell"),
-      tasks = shiny::icon("tasks")
+      tasks = shiny::icon("list-check")
     )
   }
 
@@ -486,7 +486,7 @@ messageItem <- function(from, message, icon = shiny::icon("user"), time = NULL,
 #' @rdname dropdownMenu
 #'
 #' @export
-notificationItem <- function(text, icon = shiny::icon("exclamation-triangle"),
+notificationItem <- function(text, icon = shiny::icon("triangle-exclamation"),
                              status = "success", href = NULL, inputId = NULL) {
   tagAssert(icon, type = "i")
   if (is.null(href)) href <- "#"
@@ -787,4 +787,4 @@ renderUser <- function(expr, env = parent.frame(), quoted = FALSE, outputArgs =
   shiny::renderUI(expr, env = env, quoted = quoted, outputArgs = outputArgs)
 }
 
-globalVariables("func")
+globalVariables("func")

R/dashboardPage.R

@@ -217,4 +217,4 @@ bs4DashPage <- function(header, sidebar, body, controlbar = NULL, footer = NULL,
       options = options
     )
   )
-}
+}

R/dashboardSidebar.R

@@ -490,7 +490,7 @@ bs4SidebarMenuItem <- function(text, ..., icon = NULL, badgeLabel = NULL, badgeC
 #'
 #' @export
 bs4SidebarMenuSubItem <- function(text, tabName = NULL, href = NULL,
-                                  newTab = NULL, icon = shiny::icon("angle-double-right"), selected = NULL) {
+                                  newTab = NULL, icon = shiny::icon("angles-right"), selected = NULL) {
   if (!is.null(icon)) {
     tagAssert(icon, type = "i")
     icon$attribs$cl <- paste0(icon$attribs$cl, " nav-icon")
@@ -639,12 +639,12 @@ bs4SidebarUserPanel <- function(name, image = NULL) {
 #'           menuItem(
 #'             text = "Tab 1",
 #'             tabName = "tab1",
-#'             icon = icon("shuttle-van")
+#'             icon = icon("van-shuttle")
 #'           ),
 #'           menuItem(
 #'             text = "Tab 2",
 #'             tabName = "tab2",
-#'             icon = icon("space-shuttle"),
+#'             icon = icon("shuttle-space"),
 #'             selected = TRUE
 #'           ),
 #'           menuItem(
@@ -654,12 +654,12 @@ bs4SidebarUserPanel <- function(name, image = NULL) {
 #'             menuSubItem(
 #'               text = "Item 3",
 #'               tabName = "tab3",
-#'               icon = icon("circle-thin")
+#'               icon = icon("circle")
 #'             ),
 #'             menuSubItem(
 #'               text = "Item 4",
 #'               tabName = "tab4",
-#'               icon = icon("circle-thin")
+#'               icon = icon("circle")
 #'             )
 #'           ),
 #'           menuItem(
@@ -669,18 +669,18 @@ bs4SidebarUserPanel <- function(name, image = NULL) {
 #'             menuSubItem(
 #'               text = "Item 5",
 #'               tabName = "tab5",
-#'               icon = icon("circle-thin")
+#'               icon = icon("circle")
 #'             ),
 #'             menuSubItem(
 #'               text = "Item 6",
 #'               tabName = "tab6",
-#'               icon = icon("circle-thin")
+#'               icon = icon("circle")
 #'             )
 #'           ),
 #'           menuItem(
 #'             text = "Tab 7",
 #'             tabName = "tab7",
-#'             icon = icon("home")
+#'             icon = icon("house")
 #'           )
 #'         )
 #'       ),

R/deps.R

@@ -109,4 +109,4 @@ add_bs4Dash_deps <- function(tag, options) {
   )
 
   shiny::tagList(tag, bs4Dash_deps)
-}
+}