fix: Schedule .modal("hide") for transitioning modals (#4173)

* fix: Schedule modal removal for transitioning modals

* refactor: Simplify and both call and schedule modal hiding at same time

* Increment version number to 1.10.0.9000

* docs: Add NEWS entry

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: shiny
 Type: Package
 Title: Web Application Framework for R
-Version: 1.10.0
+Version: 1.10.0.9000
 Authors@R: c(
     person("Winston", "Chang", role = c("aut", "cre"), email = "winston@posit.co", comment = c(ORCID = "0000-0002-1576-2126")),
     person("Joe", "Cheng", role = "aut", email = "joe@posit.co"),

NEWS.md

@@ -1,3 +1,9 @@
+# shiny (development version)
+
+## Bug fixes
+
+* Fixed a bug with modals where calling `removeModal()` too quickly after `showModal()` would fail to remove the modal if the remove modal message was received while the modal was in the process of being revealed. (#4173)
+
 # shiny 1.10.0
 
 ## New features and improvements

inst/www/shared/shiny.js

@@ -1,4 +1,4 @@
-/*! shiny 1.10.0 | (c) 2012-2024 RStudio, PBC. | License: GPL-3 | file LICENSE */
+/*! shiny 1.10.0.9000 | (c) 2012-2024 RStudio, PBC. | License: GPL-3 | file LICENSE */
 "use strict";
 (function() {
   var __create = Object.create;
@@ -21315,8 +21315,12 @@
   function remove() {
     var $modal = (0, import_jquery35.default)("#shiny-modal-wrapper");
     $modal.off("keydown.shinymodal");
-    if ($modal.find(".modal").length > 0) {
-      $modal.find(".modal").modal("hide");
+    var $bsModal = $modal.find(".modal");
+    if ($bsModal.length > 0) {
+      $bsModal.on("shown.bs.modal", function() {
+        return $bsModal.modal("hide");
+      });
+      $bsModal.modal("hide");
     } else {
       shinyUnbindAll($modal);
       $modal.remove();
@@ -25165,7 +25169,7 @@
       _defineProperty23(this, "initializeInputs", void 0);
       _defineProperty23(this, "initializedPromise", void 0);
       _defineProperty23(this, "oncustommessage", void 0);
-      this.version = "1.10.0";
+      this.version = "1.10.0.9000";
       var _initInputBindings = initInputBindings(), inputBindings = _initInputBindings.inputBindings, fileInputBinding2 = _initInputBindings.fileInputBinding;
       var _initOutputBindings = initOutputBindings(), outputBindings = _initOutputBindings.outputBindings;
       setFileInputBinding(fileInputBinding2);

package.json

@@ -3,7 +3,7 @@
   "homepage": "https://shiny.rstudio.com",
   "repository": "github:rstudio/shiny",
   "name": "@types/rstudio-shiny",
-  "version": "1.10.0",
+  "version": "1.10.0-alpha.9000",
   "license": "GPL-3.0-only",
   "main": "",
   "browser": "",

srcts/src/shiny/modal.ts

@@ -71,8 +71,12 @@ function remove(): void {
   // Look for a Bootstrap modal and if present, trigger hide event. This will
   // trigger the hidden.bs.modal callback that we set in show(), which unbinds
   // and removes the element.
-  if ($modal.find(".modal").length > 0) {
-    $modal.find(".modal").modal("hide");
+  const $bsModal = $modal.find(".modal");
+  if ($bsModal.length > 0) {
+    // We both hide the modal when its shown and also immediately; the immediate
+    // version is a no-op in Bootstrap if called before the modal is fully shown
+    $bsModal.on("shown.bs.modal", () => $bsModal.modal("hide"));
+    $bsModal.modal("hide");
   } else {
     // If not a Bootstrap modal dialog, simply unbind and remove it.
     shinyUnbindAll($modal);