Fix tab input value updating for BS4 dropdowns (#3412)

* Fix tab input value updating for BS4 dropdowns * Add comments * yarn build (GitHub Actions) * Better comment * yarn lint (GitHub Actions) * yarn build (GitHub Actions) Co-authored-by: Barret Schloerke <[email protected]> Co-authored-by: schloerke <[email protected]> Co-authored-by: cpsievert <[email protected]>
rstudio · Jun 2, 2021 · dcca77c · dcca77c
1 parent 871b1ba
commit dcca77c
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 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
@@ -5958,10 +5958,11 @@ function main(): void {
     },
     getValue: function (el) {
       // prettier-ignore
+      // The BS4+ selectors may not work as is for dropdowns within dropdowns, but BS3+ dropped support for those anyway
       let anchor = isBS3()
         ? $(el).find("li:not(.dropdown).active > a")
         : $(el).find(
-          ".nav-link:not(.dropdown-toggle).active, .dropdown-menu > .dropdown-item.active"
+          ".nav-link:not(.dropdown-toggle).active, .dropdown-menu .dropdown-item.active"
         );
 
       if (anchor.length === 1) return this._getTabName(anchor);
@@ -5974,10 +5975,11 @@ function main(): void {
 
       if (value) {
         // prettier-ignore
+        // The BS4+ selectors may not work as is for dropdowns within dropdowns, but BS3+ dropped support for those anyway
         let anchors = isBS3()
           ? $(el).find("li:not(.dropdown) > a")
           : $(el).find(
-            ".nav-link:not(.dropdown-toggle), .dropdown-menu > .dropdown-item"
+            ".nav-link:not(.dropdown-toggle), .dropdown-menu .dropdown-item"
           );
 
         anchors.each(function () {