Make ensureTabsetHasVisibleTab() is aware of BS4+ markup (#3349)

* Close rstudio/shinycoreci-apps#126: Make ensureTabsetHasVisibleTab() aware of BS4+ markup * yarn build (GitHub Actions) * Update srcts/src/main.ts * yarn lint (GitHub Actions) * yarn build (GitHub Actions) Co-authored-by: cpsievert <[email protected]>
rstudio · Mar 26, 2021 · 5c919ae · 5c919ae
1 parent e29d92c
commit 5c919ae
Show file tree

Hide file tree

Showing 5 changed files with 12 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/main.ts b/srcts/src/main.ts
@@ -1480,13 +1480,16 @@ function main(): void {
 
     // If the given tabset has no active tabs, select the first one
     function ensureTabsetHasVisibleTab($tabset) {
-      if ($tabset.find("li.active").not(".dropdown").length === 0) {
+      const inputBinding = $tabset.data("shiny-input-binding");
+
+      // Use the getValue() method to avoid duplicating the CSS selector
+      // for querying the DOM for the currently active tab
+      if (!inputBinding.getValue($tabset)) {
         // Note: destTabValue may be null. We still want to proceed
         // through the below logic and setValue so that the input
         // value for the tabset gets updated (i.e. input$tabsetId
         // should be null if there are no tabs).
         const destTabValue = getFirstTab($tabset);
-        const inputBinding = $tabset.data("shiny-input-binding");
         const evt = jQuery.Event("shiny:updateinput");
 
         evt.binding = inputBinding;