better style for tabBox. Will hopefully fix #342.

RinteRface · Jun 5, 2023 · bb309b6 · bb309b6
1 parent 82b7f3d
commit bb309b6
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 12 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,9 @@
 # bs4Dash 2.2.2.9000
 
+## Minor change
+- Fix #342: better title alignment in `tabBox()`. Increase padding for card with pills. Thanks @HugoGit39
+for reporting. 
+
 ## Bug fixes
 - Fix #349: allow to pass list of `accordionItem()` with `.list` parameter in `accordion()`. Thanks @vladimirstroganov for reporting.
 - Fix #330: allow to use input elements (or any not `menuItem` element) in the sidebar.

diff --git a/R/cards.R b/R/cards.R
@@ -1180,7 +1180,7 @@ bs4TabCard <- function(..., id = NULL, selected = NULL, title = NULL, width = 6,
   # add card-tabs class
   boxTag$children[[1]]$attribs$class <- paste0(
     boxTag$children[[1]]$attribs$class,
-    if (solidHeader) {
+    if (solidHeader || type == "pills") {
       " card-tabs"
     } else {
       " card-outline-tabs"
@@ -1190,19 +1190,27 @@ bs4TabCard <- function(..., id = NULL, selected = NULL, title = NULL, width = 6,
   # change header class
   boxTag$children[[1]]$children[[1]]$attribs$class <- paste0(
     boxTag$children[[1]]$children[[1]]$attribs$class,
-    if (solidHeader) {
-      " p-0 pt-1"
-    } else {
-      " p-0 border-bottom-0"
+    if (type != "pills") {
+      if (solidHeader) {
+        " p-0 pt-1"
+      } else {
+        " p-0 border-bottom-0"
+      } 
     }
   )
 
 
   # Remove title and add it to tab list
   titleTag <- boxTag$children[[1]]$children[[1]]$children[[1]]
+  if (type == "tabs") {
+    titleTag$attribs$class <- paste(
+      titleTag$attribs$class,
+      "pt-1"
+    )
+  }
   boxTag$children[[1]]$children[[1]]$children[[1]] <- NULL
   titleNavTag <- shiny::tags$li(
-    class = "pt-2 px-3",
+    class = if (side == "left") "pt-2 px-3 ml-auto" else "pt-2 px-3",
     titleTag
   )
 
@@ -1224,11 +1232,16 @@ bs4TabCard <- function(..., id = NULL, selected = NULL, title = NULL, width = 6,
   }
 
   # Insert box tools at the end of the list
-  content$children[[1]] <- tagInsertChild(
-    content$children[[1]],
-    shiny::tags$li(class = "ml-auto", boxToolTag),
-    length(content$children[[1]])
-  )
+  if (
+      length(boxToolTag$children[[1]]) > 0 || 
+      length(boxToolTag$children[[2]]) > 0
+  ) {
+    content$children[[1]] <- tagInsertChild(
+      content$children[[1]],
+      shiny::tags$li(class = if (side == "left") "ml-0" else "ml-auto", boxToolTag),
+      length(content$children[[1]])
+    ) 
+  }
 
   # Insert tabs at different position in the header tag
   if (side == "right") {

diff --git a/inst/examples/showcase/app.R b/inst/examples/showcase/app.R
@@ -966,7 +966,7 @@ shinyApp(
   ui = dashboardPage(
     preloader = list(html = tagList(spin_1(), "Loading ..."), color = "#343a40"),
     dark = TRUE,
-    help = TRUE,
+    help = FALSE,
     fullscreen = TRUE,
     scrollToTop = TRUE,
     header = dashboardHeader(