Tweak autoreload behavior

I had to update scripts/htmlDependencies.R to pull from the rstudio/shiny@autoreload-tweaks branch, because we're not ready to pull all of the changes from rstudio/shiny@main right at this moment
posit-dev · Oct 19, 2023 · f9db1ab · f9db1ab
1 parent 4d1e6db
commit f9db1ab
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 22 deletions.
diff --git a/shiny/www/shared/_version.json b/shiny/www/shared/_version.json
@@ -1,5 +1,5 @@
 {
   "note!": "This file is auto-generated by scripts/htmlDependencies.R",
   "package": "shiny",
-  "version": "Github (rstudio/shiny@68546c319e465a9cb113ea4499912823e264e75f)"
+  "version": "Github (rstudio/shiny@ab69d7292c51d8983174e0828496a7096f513673)"
 }
diff --git a/shiny/www/shared/bootstrap/_version.json b/shiny/www/shared/bootstrap/_version.json
@@ -1,6 +1,6 @@
 {
   "note!": "This file is auto-generated by scripts/htmlDependencies.R",
-  "shiny_version": "Github (rstudio/shiny@68546c319e465a9cb113ea4499912823e264e75f)",
+  "shiny_version": "Github (rstudio/shiny@ab69d7292c51d8983174e0828496a7096f513673)",
   "bslib_version": "Github (rstudio/bslib@a076e72e78562d7f006889da4118cd781c66c84c)",
   "htmltools_version": "Github (rstudio/htmltools@9338b7f3e2ed7b3fef8fd813904b9b05281344aa)",
   "bootstrap_version": "5.2.2"

diff --git a/shiny/www/shared/shiny-autoreload.js b/shiny/www/shared/shiny-autoreload.js
diff --git a/shiny/www/shared/shiny-autoreload.js.map b/shiny/www/shared/shiny-autoreload.js.map
diff --git a/shiny/www/shared/shiny.js b/shiny/www/shared/shiny.js
@@ -17894,15 +17894,16 @@
             }, _callee2);
           })));
         };
-        socket.onclose = function() {
+        socket.onclose = function(e) {
+          var restarting = e.code === 1012;
           if (hasOpened) {
             (0, import_jquery38.default)(document).trigger({
               type: "shiny:disconnected",
               socket: socket
             });
             _this.$notifyDisconnected();
           }
-          _this.onDisconnected();
+          _this.onDisconnected(restarting);
           _this.$removeSocket();
         };
         return socket;
@@ -17982,10 +17983,11 @@
     }, {
       key: "onDisconnected",
       value: function onDisconnected() {
-        var $overlay = (0, import_jquery38.default)("#shiny-disconnected-overlay");
-        if ($overlay.length === 0) {
+        var reloading = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : false;
+        if ((0, import_jquery38.default)("#shiny-disconnected-overlay").length === 0) {
           (0, import_jquery38.default)(document.body).append('<div id="shiny-disconnected-overlay"></div>');
         }
+        (0, import_jquery38.default)("#shiny-disconnected-overlay").toggleClass("reloading", reloading);
         if (this.$allowReconnect === true && this.$socket.allowReconnect === true || this.$allowReconnect === "force") {
           var delay = this.reconnectDelay.next();
           showReconnectDialog(delay);

diff --git a/shiny/www/shared/shiny.js.map b/shiny/www/shared/shiny.js.map
diff --git a/shiny/www/shared/shiny.min.css b/shiny/www/shared/shiny.min.css
diff --git a/shiny/www/shared/shiny.min.js b/shiny/www/shared/shiny.min.js
diff --git a/shiny/www/shared/shiny.min.js.map b/shiny/www/shared/shiny.min.js.map
diff --git a/shiny/www/shared/shiny_scss/shiny.scss b/shiny/www/shared/shiny_scss/shiny.scss
@@ -88,17 +88,25 @@ pre.shiny-text-output {
 
 #shiny-disconnected-overlay {
   position: fixed;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  right: 0;
+  inset: 0;
   background-color: $shiny-disconnected-bg;
   opacity: 0.5;
   overflow: hidden;
   z-index: 99998;
   pointer-events: none;
 }
 
+html.autoreload-enabled #shiny-disconnected-overlay.reloading {
+  opacity: 0;
+  animation: fadeIn 250ms forwards;
+  animation-delay: 1s;
+}
+@keyframes fadeIn {
+  to {
+    opacity: 0.1;
+  }
+}
+
 .table.shiny-table {
   @include table-padding($left: 12px, $right: 12px);
 }