Merge branch 'master' into testing_name_sort_order

* master: Update NEWS Use esbuild option preserveSymlinks Fix regression in repeated appendTab()s when navbarMenu() is present (#3518)
rstudio · Oct 1, 2021 · eaebded · eaebded
2 parents 5ebd6e4 + c6ae4c0
commit eaebded
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 10 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -19,7 +19,9 @@ shiny 1.7.0.9000
 
 ## Bug Fixes
 
-* Re-arrange conditions for testthat 1.0.0 compatibility (#3512)
+* Closed #3516: Fix regression in repeated calls to `appendTab()` when `navbarMenu()` is already present within a `tabsetPanel()`/`navbarPage()`. (#3518)
+
+* Re-arranged conditions for testthat 1.0.0 compatibility. (#3512)
 
 
 shiny 1.7.0

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/build/_build.ts b/srcts/build/_build.ts
@@ -70,6 +70,7 @@ async function build(
     incremental: incremental,
     watch: watch,
     target: "es5",
+    preserveSymlinks: true,
     ...opts,
   }).then((x) => {
     onRebuild();

diff --git a/srcts/src/shiny/shinyapp.ts b/srcts/src/shiny/shinyapp.ts
@@ -1112,8 +1112,8 @@ 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);
+          $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)