bs4InfoBox: Make the icon optional

DESCRIPTION

@@ -19,11 +19,13 @@ Imports:
     htmltools (>= 0.5.1.1),
     jsonlite (>= 0.9.16),
     fresh,
+    grDevices,
     waiter (>= 0.2.3),
     httpuv (>= 1.5.2),
     lifecycle,
     bslib (>= 0.2.4),
-    httr
+    httr,
+    UU (>= 1.5.1)
 Suggests: 
     knitr,
     rmarkdown,
@@ -35,6 +37,7 @@ Encoding: UTF-8
 RoxygenNote: 7.2.1
 VignetteBuilder: knitr
 Collate: 
+    'aaa_reimports.R'
     'feedbacks.R'
     'useful-items.R'
     'tabs.R'
@@ -56,3 +59,5 @@ Collate:
     'skinSelector.R'
     'utils.R'
 RdMacros: lifecycle
+Remotes: 
+    yogat3ch/UU

NAMESPACE

@@ -1,5 +1,12 @@
 # Generated by roxygen2: do not edit by hand
 
+export("%nin%")
+export("%|%")
+export("%|0|%")
+export("%|legit|%")
+export("%|try|%")
+export("%|zchar|%")
+export("%||%")
 export(accordion)
 export(accordionItem)
 export(actionButton)
@@ -20,6 +27,7 @@ export(boxProfileItem)
 export(boxSidebar)
 export(bs4Accordion)
 export(bs4AccordionItem)
+export(bs4Alert)
 export(bs4Badge)
 export(bs4Callout)
 export(bs4Card)
@@ -82,6 +90,7 @@ export(cardSidebar)
 export(carousel)
 export(carouselItem)
 export(closeAlert)
+export(col2css)
 export(column)
 export(controlbarItem)
 export(controlbarMenu)
@@ -179,7 +188,15 @@ export(userPost)
 export(userPostMedia)
 export(userPostTagItem)
 export(userPostTagItems)
+export(validateColors)
 export(valueBox)
 export(valueBoxOutput)
+importFrom(UU,`%nin%`)
+importFrom(UU,`%|0|%`)
+importFrom(UU,`%|legit|%`)
+importFrom(UU,`%|try|%`)
+importFrom(UU,`%|zchar|%`)
 importFrom(jsonlite,toJSON)
 importFrom(lifecycle,deprecated)
+importFrom(rlang,`%|%`)
+importFrom(rlang,`%||%`)

R/aaa_reimports.R

@@ -0,0 +1,28 @@
+#' @title Re-imports
+#' @name Re-imports
+#' @description Useful functions from other packages
+#' @importFrom rlang `%||%` `%|%`
+#' @importFrom UU `%|0|%` `%|try|%` `%|zchar|%` `%|legit|%` `%nin%`
+NULL
+
+
+#' @export
+rlang::`%||%`
+
+#' @export
+rlang::`%|%`
+
+#' @export
+UU::`%|try|%`
+
+#' @export
+UU::`%|0|%`
+
+#' @export
+UU::`%|zchar|%`
+
+#' @export
+UU::`%|legit|%`
+
+#' @export
+UU::`%nin%`

R/cards.R

@@ -69,6 +69,7 @@
 #' @param closable If TRUE, display a button in the upper right that allows the user to close the box.
 #' @param maximizable If TRUE, the card can be displayed in full screen mode.
 #' @param icon Header icon. Displayed before title. Expect \code{\link[shiny]{icon}}.
+#' @param tip_icon Tip icon. Tooltip Icon displayed after title. Expect \code{\link[tippy]{tippy}}.
 #' @param gradient Whether to allow gradient effect for the background color. Default to FALSE.
 #' @param boxToolSize Size of the toolbox: choose among "xs", "sm", "md", "lg".
 #' @param elevation Card elevation.
@@ -135,11 +136,29 @@
 #' @author David Granjon, \email{dgranjon@@ymail.com}
 #'
 #' @export
-bs4Card <- function(..., title = NULL, footer = NULL, status = NULL,
-                    solidHeader = FALSE, background = NULL, width = 6, height = NULL,
-                    collapsible = TRUE, collapsed = FALSE, closable = FALSE, maximizable = FALSE, icon = NULL,
-                    gradient = FALSE, boxToolSize = "sm", elevation = NULL, headerBorder = TRUE, label = NULL, dropdownMenu = NULL,
-                    sidebar = NULL, id = NULL) {
+bs4Card <- function(...,
+                    title = NULL,
+                    footer = NULL,
+                    status = NULL,
+                    solidHeader = FALSE,
+                    background = NULL,
+                    width = 6,
+                    height = NULL,
+                    collapsible = TRUE,
+                    collapsed = FALSE,
+                    closable = FALSE,
+                    maximizable = FALSE,
+                    icon = NULL,
+                    tip_icon = NULL,
+                    gradient = FALSE,
+                    boxToolSize = "sm",
+                    elevation = NULL,
+                    headerBorder = TRUE,
+                    label = NULL,
+                    dropdownMenu = NULL,
+                    sidebar = NULL,
+                    id = NULL) {
+
 
   if (is.null(status)) solidHeader <- TRUE
 
@@ -242,15 +261,14 @@ bs4Card <- function(..., title = NULL, footer = NULL, status = NULL,
 
   headerTag <- shiny::tags$div(
     class = if (headerBorder) "card-header" else "card-header border-0",
-    shiny::tags$h3(class = "card-title", icon, title)
+    shiny::tags$h3(class = "card-title", tip_icon, icon, title)
   )
   headerTag <- shiny::tagAppendChild(headerTag, cardToolTag)
 
 
   # body
   bodyTag <- shiny::tags$div(
     class = "card-body",
-    style = style,
     ...,
     sidebar[[2]]
   )
@@ -263,7 +281,7 @@ bs4Card <- function(..., title = NULL, footer = NULL, status = NULL,
     )
   }
 
-  cardTag <- shiny::tags$div(class = cardCl, id = id)
+  cardTag <- shiny::tags$div(class = cardCl, id = id, style = style)
   cardTag <- shiny::tagAppendChildren(cardTag, headerTag, bodyTag, footerTag)
 
   # wrapper
@@ -280,6 +298,54 @@ bs4Card <- function(..., title = NULL, footer = NULL, status = NULL,
         json_verbatim = TRUE
       )
     )
+    # , if (maximizable)
+      # shiny::tags$script(
+      #   type = "text/javascript",
+      #   paste0("
+      #   $(document).ready(function() {
+      #   var ids = $('div",ifelse(is.null(id), "", paste0("#",id))," div.card-body div').map(function(){
+      # return $(this).attr('id');
+      # }).get();
+      # function resizeBoxContent(trigger, target) {
+      #         var target = '#' + target
+      #         $(trigger).on('click', function() {
+      #           setTimeout(function() {
+      #             var isMaximized = $('html').hasClass('maximized-card');
+      #               if (isMaximized) {
+      #                 $(target).css('height', '100%');
+      #                 $(target).css('width', 'auto');
+      #               } else {
+      #                 $(target).css('height', '400px');
+      #                 $(target).css('width', 'auto');
+      #               }
+      #             console.log('resizing '+ target)
+      #           }, 300);
+      #           $(target).trigger('resize');
+      #         });
+      #       };
+      # setTimeout(function() {
+      #         ids.map(function(x){
+      #           resizeBoxContent('div.card button[data-card-widget=\"maximize\"]', x);
+      #         })
+      # 
+      #       }, 500);
+      # console.log(ids);
+      # });"),
+        # paste0("
+        #        $(document).ready(function() {
+        #        $('[data-card-widget=\"maximize\"]').on('click', function() {
+        #         setTimeout(function() {
+        #           var isMaximized = $('html').hasClass('maximized-card');
+        #           if (isMaximized) {
+        #            window.location.reload()
+        #           }
+        #         }, 300);
+        #         $('",ifelse(is.null(id), "", paste0(id)),"').resize();
+        #       });
+        #        }
+        #        ")
+      # )
+
   )
 }
 
@@ -936,7 +1002,6 @@ bs4InfoBox <- function(title, value = NULL, subtitle = NULL, icon = shiny::icon(
                        elevation = NULL, iconElevation = NULL, tabName = NULL) {
 
   # check conditions
-  tagAssert(icon, "i")
   if (!is.null(color)) validateStatusPlus(color)
 
   if (is.null(color) && (fill || gradient)) {
@@ -987,12 +1052,16 @@ bs4InfoBox <- function(title, value = NULL, subtitle = NULL, icon = shiny::icon(
   }
   if (!is.null(iconElevation)) infoBoxIconCl <- paste0(infoBoxIconCl, " elevation-", iconElevation)
 
-  iconTag <- shiny::tags$span(
-    class = infoBoxIconCl,
-    id = if (!is.null(tabName)) paste0("icon-", tabName),
-    # icon
-    icon
-  )
+  if (!is.null(icon)) {
+    tagAssert(icon, "i")
+    iconTag <- shiny::tags$span(
+      class = infoBoxIconCl,
+      id = if (!is.null(tabName)) paste0("icon-", tabName),
+      # icon
+      icon
+    )
+  } else
+    iconTag <- icon
 
 
   contentTag <- shiny::tags$div(

R/dashboardHeader.R

@@ -59,23 +59,24 @@ bs4DashNavbar <- function(..., title = NULL, titleWidth = NULL, disable = FALSE,
   # by the end user.
   if (skin == "dark" && is.null(status)) status <- "gray-dark"
 
+  .types <- c("li", "a", "button", "div", "shiny.tag", "shiny.tag.list")
   if (!is.null(leftUi)) {
     if (inherits(leftUi, "shiny.tag.list")) {
       lapply(leftUi, function(item) {
-        tagAssert(item, type = "li", class = "dropdown")
+        tagAssert(item, type = .types)
       })
     } else {
-      tagAssert(leftUi, type = "li", class = "dropdown")
+      tagAssert(leftUi, type = .types)
     }
   }
 
   if (!is.null(rightUi)) {
     if (inherits(rightUi, "shiny.tag.list")) {
       lapply(rightUi, function(item) {
-        tagAssert(item, type = "li", class = "dropdown")
+        tagAssert(item, type = .types)
       })
     } else {
-      tagAssert(rightUi, type = "li", class = "dropdown")
+      tagAssert(rightUi, type = .types)
     }
   }
 

R/dashboardSidebar.R

@@ -367,7 +367,7 @@ bs4SidebarMenuItem <- function(text, ..., icon = NULL, badgeLabel = NULL, badgeC
   subItems <- c(list(...), .list)
 
   if (!is.null(icon)) {
-    tagAssert(icon, type = "i")
+    tagAssert(icon, type = c("i", "img"))
     icon$attribs$class <- paste0(icon$attribs$class, " nav-icon")
   }
 
@@ -412,7 +412,7 @@ bs4SidebarMenuItem <- function(text, ..., icon = NULL, badgeLabel = NULL, badgeC
           # needed by leftSidebar.js
           `data-start-selected` = if (isTRUE(selected)) 1 else NULL,
           icon,
-          shiny::tags$p(text, badgeTag)
+          shiny::tags$span(text, badgeTag)
         )
       )
     )
@@ -454,7 +454,7 @@ bs4SidebarMenuItem <- function(text, ..., icon = NULL, badgeLabel = NULL, badgeC
         class = "nav-link",
         `data-start-selected` = if (isTRUE(selected)) 1 else NULL,
         icon,
-        shiny::tags$p(
+        shiny::tags$span(
           text,
           shiny::tags$i(class = "right fas fa-angle-left")
         )
@@ -517,7 +517,7 @@ bs4SidebarMenuSubItem <- function(text, tabName = NULL, href = NULL,
       # below this is needed by leftSidebar.js
       `data-start-selected` = if (isTRUE(selected)) 1 else NULL,
       icon,
-      shiny::tags$p(text)
+      shiny::tags$span(text)
     )
   )
 }