insertTab() now handles position correctly when target is NULL (#3404)

* Close #3403: insertTab() now handles position correctly when target is NULL

* Have insertTab()'s target default to NULL

* yarn tsc (GitHub Actions)

* yarn build (GitHub Actions)

Co-authored-by: cpsievert <[email protected]>

Author: cpsievert

DESCRIPTION

@@ -91,7 +91,7 @@ Imports:
     withr,
     commonmark (>= 1.7),
     glue (>= 1.3.2),
-    bslib (>= 0.2.5.9001),
+    bslib (>= 0.2.5.9002),
     cachem,
     ellipsis,
     lifecycle (>= 0.2.0)

R/insert-tab.R

@@ -112,7 +112,7 @@
 #'
 #' }
 #' @export
-insertTab <- function(inputId, tab, target,
+insertTab <- function(inputId, tab, target = NULL,
                       position = c("before", "after"), select = FALSE,
                       session = getDefaultReactiveDomain()) {
   bslib::nav_insert(
@@ -137,48 +137,14 @@ insertTab <- function(inputId, tab, target,
 #' @export
 prependTab <- function(inputId, tab, select = FALSE, menuName = NULL,
                        session = getDefaultReactiveDomain()) {
-  force(select)
-  force(menuName)
-  inputId <- session$ns(inputId)
-
-  item <- buildTabItem("id", "tsid", TRUE, divTag = tab,
-    textFilter = if (is.character(tab)) navbarMenuTextFilter else NULL)
-
-  callback <- function() {
-    session$sendInsertTab(
-      inputId = inputId,
-      liTag = processDeps(item$liTag, session),
-      divTag = processDeps(item$divTag, session),
-      menuName = menuName,
-      target = NULL,
-      position = "after",
-      select = select)
-  }
-  session$onFlush(callback, once = TRUE)
+  bslib::tab_prepend(inputId, tab, menu_title = menuName, select = select, session = session)
 }
 
 #' @rdname insertTab
 #' @export
 appendTab <- function(inputId, tab, select = FALSE, menuName = NULL,
                       session = getDefaultReactiveDomain()) {
-  force(select)
-  force(menuName)
-  inputId <- session$ns(inputId)
-
-  item <- buildTabItem("id", "tsid", TRUE, divTag = tab,
-    textFilter = if (is.character(tab)) navbarMenuTextFilter else NULL)
-
-  callback <- function() {
-    session$sendInsertTab(
-      inputId = inputId,
-      liTag = processDeps(item$liTag, session),
-      divTag = processDeps(item$divTag, session),
-      menuName = menuName,
-      target = NULL,
-      position = "before",
-      select = select)
-  }
-  session$onFlush(callback, once = TRUE)
+  bslib::tab_append(inputId, tab, menu_title = menuName, select = select, session = session)
 }
 
 #' @rdname insertTab

inst/www/shared/shiny.js

@@ -1037,13 +1037,13 @@ class ShinyApp {
           if ($targetLiTag) {
             $targetLiTag.before($liTag);
           } else {
-            $tabset.append($liTag);
+            $tabset.prepend($liTag);
           }
         } else if (message.position === "after") {
           if ($targetLiTag) {
             $targetLiTag.after($liTag);
           } else {
-            $tabset.prepend($liTag);
+            $tabset.append($liTag);
           }
         }