Merge pull request #367 from RinteRface/dev

v2.3.3

CRAN-SUBMISSION

@@ -1,3 +1,3 @@
-Version: 2.2.1
-Date: 2022-12-19 15:51:44 UTC
-SHA: 1119ebead95ee388e684a36791707ad63b6e2785
+Version: 2.3.0
+Date: 2023-06-15 20:15:12 UTC
+SHA: f0452c4292e86a20aeabe440ec587c263e1811b4

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: bs4Dash
 Type: Package
 Title: A 'Bootstrap 4' Version of 'shinydashboard'
-Version: 2.3.0
+Version: 2.3.3
 Authors@R: c(
   person("David", "Granjon", email = "[email protected]", role = c("aut", "cre")),
   person(family = "RinteRface", role = "cph"),

NEWS.md

@@ -1,3 +1,16 @@
+# bs4Dash 2.3.3
+
+## Breaking change (potential)
+
+- Fix #302: both `dashboardSidebar()` and `dashboardControlbar()` default __skin__ value is NULL.
+This allows them to inherit from the parent `dashboardPage()` __dark__ parameter and have either
+a full light or full dark skin. If not NULL, the corresponding skin is applied, regardless of the
+parent `dashboardPage()`.
+
+## Bug fixes
+- Remove unused `headTitles` parameter from `bs4Table()`.
+- Fix #315: alert title is not added to alert body and if Alert is not closable the header contains "undefined" key word. Thanks @MohammedFCIS.
+
 # bs4Dash 2.3.0
 
 ## New feature

R/dashboardControlbar.R

@@ -10,7 +10,8 @@
 #' in pixels, or a string that specifies the width in CSS units. 250 px by default.
 #' @param collapsed Whether the control bar on the right side is collapsed or not at start. TRUE by default.
 #' @param overlay Whether the sidebar covers the content when expanded. Default to TRUE.
-#' @param skin Controlbar skin. "dark" or "light".
+#' @param skin Controlbar skin. "dark" or "light". Matches the \link{dashboardPage} dark parameter
+#' value.
 #' @param pinned Whether to block the controlbar state (TRUE or FALSE). Default to NULL.
 #'
 #' @author David Granjon, \email{dgranjon@@ymail.com}
@@ -19,9 +20,11 @@
 #'
 #' @export
 bs4DashControlbar <- function(..., id = NULL, disable = FALSE, width = 250,
-                              collapsed = TRUE, overlay = TRUE, skin = "dark",
+                              collapsed = TRUE, overlay = TRUE, skin = NULL,
                               pinned = NULL) {
   if (is.null(id)) id <- "controlbarId"
+
+  skin <- set_sidebar_skin(skin)
 
   controlbarTag <- shiny::tags$aside(
     class = paste0("control-sidebar control-sidebar-", skin),

R/dashboardSidebar.R

@@ -8,7 +8,8 @@
 #' @param width The width of the sidebar. This must either be a number which
 #'   specifies the width in pixels, or a string that specifies the width in CSS
 #'   units.
-#' @param skin Sidebar skin. "dark" or "light".
+#' @param skin Sidebar skin. "dark" or "light". Matches the \link{dashboardPage} dark parameter
+#' value.
 #' @param status Sidebar status. Valid statuses are defined as follows:
 #' \itemize{
 #'   \item \code{primary}: \Sexpr[results=rd, stage=render]{bs4Dash:::rd_color_tag("#007bff")}.
@@ -47,10 +48,14 @@
 #'
 #' @export
 bs4DashSidebar <- function(..., disable = FALSE, width = NULL,
-                           skin = "dark", status = "primary",
+                           skin = NULL, status = "primary",
                            elevation = 4, collapsed = FALSE,
                            minified = TRUE, expandOnHover = TRUE,
                            fixed = TRUE, id = NULL, customArea = NULL) {
+  # When no skin is specified, sidebar color must match the dashboard skin color 
+  # by default which is set in the dashboardPage function. 
+  skin <- set_sidebar_skin(skin)
+
   if (is.null(id)) id <- "sidebarId"
   # If we're restoring a bookmarked app, this holds the value of whether or not the
   # sidebar was collapsed. If this is not the case, the default is whatever the user
@@ -151,6 +156,14 @@ bs4DashSidebar <- function(..., disable = FALSE, width = NULL,
 }
 
 
+#' @keywords internal
+set_sidebar_skin <- function(skin) {
+  is_dark_skin <- get_parent_args()$dark
+  if (is.null(skin)) {
+    skin <- if (!is_dark_skin)  "light" else "dark"
+  }
+  skin
+}
 
 
 #' Toggle sidebar state

R/useful-items.R

@@ -2667,8 +2667,6 @@ bs4Sortable <- function(..., width = 12) {
 #'
 #' @param data Expect dataframe, tibble or list of shiny tags... See examples. 
 #' @param cardWrap Whether to wrap the table in a card. FALSE by default.
-#' @param headTitles Table header names. Must have the same length as the number of 
-#' \link{bs4TableItem} in \link{bs4TableItems}. Set "" to have an empty title field.
 #' @param bordered Whether to display border between elements. FALSE by default.
 #' @param striped Whether to displayed striped in elements. FALSE by default.
 #' @param width Table width. 12 by default.

R/utils.R

@@ -742,3 +742,11 @@ app_container <- function(url, deps = FALSE) {
     }
   } 
 }
+
+# Get parent function arguments
+get_parent_args <- function() {
+  cl <- sys.call(-3)
+  f <- get(as.character(cl[[1]]), mode = "function", sys.frame(-2))
+  cl <- match.call(definition = f, call = cl)
+  as.list(cl)[-1]
+}

_pkgdown.yml

@@ -252,7 +252,7 @@ articles:
 
 news:
  releases:
- - text: "bs4Dash 2.3.0"
+ - text: "bs4Dash 2.4.0.9000"
  - text: "bs4Dash 2.2.1"
  - text: "bs4Dash 2.1.0"
  - text: "bs4Dash 2.0.3"

cran-comments.md

@@ -1,5 +1,5 @@
 ## Test environments
-* local OS X install, R 4.1.3.
+* local OS X install, R 4.3.1.
 * RStudio Server on linux Ubuntu 20.04.3 LTS R 4.2.1.
 * `rhub::check_for_cran`.
 * Github actions.
@@ -9,5 +9,4 @@
 There were no ERRORs or WARNINGs or NOTEs.
 
 ## Note
-I remove the svg file from /man and replaced it by a smaller png, which fixes the NOTES
-on https://cran.r-project.org/web/checks/check_results_bs4Dash.html.
+This release will fixe the NOTES on https://cran.r-project.org/web/checks/check_results_bs4Dash.html.

inst/bs4Dash-2.3.0/bs4Dash.js → inst/bs4Dash-2.3.3/bs4Dash.js

@@ -932,12 +932,14 @@ $(function () {
         break;
       default: console.warn(`${config.status} does not belong to allowed statuses!`)
     }
+
+    closeButton = '';
 
     if (config.closable) {
       closeButton = '<button type="button" class="close" data-dismiss="alert" aria-hidden="true">x</button>'
     }
 
-    titleTag = `<h5><i class="icon fa fa-${iconType}"></i></h5>`
+    titleTag = `<h5><i class="icon fa fa-${iconType}"></i>${config.title}</h5>`
     contentTag = config.content;
 
     alertTag = `<div 

srcjs/bs4Dash-2.3.0/feedbacks.js → srcjs/bs4Dash-2.4.0.9000/feedbacks.js

@@ -100,11 +100,13 @@ $(function () {
       default: console.warn(`${config.status} does not belong to allowed statuses!`)
     }
 
+    closeButton = '';
+
     if (config.closable) {
       closeButton = '<button type="button" class="close" data-dismiss="alert" aria-hidden="true">x</button>'
     }
 
-    titleTag = `<h5><i class="icon fa fa-${iconType}"></i></h5>`
+    titleTag = `<h5><i class="icon fa fa-${iconType}"></i>${config.title}</h5>`
     contentTag = config.content;
 
     alertTag = `<div