Close #3516: fix regression in repeated appendTab()s when navbarMenu(…

…) is present
rstudio · Sep 30, 2021 · d58a159 · d58a159
1 parent 0fc861a
commit d58a159
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/inst/www/shared/shiny.js b/inst/www/shared/shiny.js
diff --git a/inst/www/shared/shiny.js.map b/inst/www/shared/shiny.js.map
diff --git a/inst/www/shared/shiny.min.js b/inst/www/shared/shiny.min.js
diff --git a/inst/www/shared/shiny.min.js.map b/inst/www/shared/shiny.min.js.map
diff --git a/srcts/src/shiny/shinyapp.ts b/srcts/src/shiny/shinyapp.ts
@@ -1112,8 +1112,9 @@ class ShinyApp {
           // loop through all existing tabs, find the one with highest id
           // (since this is based on a numeric counter), and increment
 
-          $tabset.find("a[data-toggle='tab']").each(function () {
-            const $tab = $(this);
+          // TODO: make sure this works for BS4+ dropdown items
+          $tabset.find("> li").each(function () {
+            const $tab = $(this).find("> a[data-toggle='tab']");
 
             if ($tab.length > 0) {
               // remove leading url if it exists. (copy of bootstrap url stripper)