Added dismissalert to remove arbitrary number of messages

.gitignore

@@ -3,3 +3,4 @@
 .RData
 .Ruserdata
 inst/doc
+.DS_Store

DESCRIPTION

@@ -5,7 +5,9 @@ Authors@R: c(
     person("Dean", "Attali", email = "daattali@gmail.com",
       role = c("aut", "cre"), comment = "R interface"),
     person("Tristan", "Edwards", role = c("aut"),
-       comment = "sweetalert library")
+      comment = "sweetalert library"),
+    person("Zhengjia", "Wang", email = "dipterix.wang@gmail.com",
+      role = c("ctb"))
     )
 Description: Easily create pretty popup messages (modals) in 'Shiny'. A modal can
     contain text, images, OK/Cancel buttons, an input to get a response from the

NAMESPACE

@@ -1,5 +1,6 @@
 # Generated by roxygen2: do not edit by hand
 
+export(closeAlert)
 export(runExample)
 export(shinyalert)
 export(useShinyalert)

R/shinyalert.R

@@ -45,6 +45,8 @@
 #' close automatically. Use \code{0} to not close the modal automatically
 #' (default). If the modal closes automatically, no value is returned from the
 #' modal. See the 'Modal return value' section below.
+#' @param immediate Whether to close previously opened alerts and display
+#' current message immediately; default is \code{FALSE}.
 #' @param animation If \code{FALSE}, the modal's animation will be disabled.
 #' Possible values: \code{FALSE}, \code{TRUE}, \code{"slide-from-top"},
 #' \code{"slide-from-bottom"}, \code{"pop"} (the default animation when
@@ -197,6 +199,7 @@ shinyalert <- function(
   confirmButtonCol = "#AEDEF4",
   cancelButtonText = "Cancel",
   timer = 0,
+  immediate = FALSE,
   animation = TRUE,
   imageUrl = NULL,
   imageWidth = 100,
@@ -238,6 +241,11 @@ shinyalert <- function(
 
   session <- getSession()
 
+  if( immediate ){
+    # Close all previously opened alerts and display this one at once
+    closeAlert()
+  }
+
   # If an R callback function is provided, create an observer for it
   if (!is.null(callbackR)) {
     cbid <- paste0("__shinyalert-", gsub("-", "", uuid::UUIDgenerate()))
@@ -250,6 +258,15 @@ shinyalert <- function(
       }
     }, once = TRUE)
     params[['callbackR']] <- NULL
+  } else {
+    # Still create `cbid` used by closeAlert to explicitly close this alert
+    paramsSerialize <- params
+    paramsSerialize[['callbackR']] <- NULL
+
+    cbid <- sprintf("shinyalert-%s-%s",
+                    digest::digest(paramsSerialize),
+                    as.integer(stats::runif(1, 0, 1e9)))
+    params[['cbid']] <- session$ns(cbid)
   }
 
 
@@ -273,5 +290,20 @@ shinyalert <- function(
   params[["inputId"]] <- session$ns(params[["inputId"]])
   session$sendCustomMessage(type = "shinyalert.show", message = params)
 
-  invisible(NULL)
+  invisible(params[["cbid"]])
 }
+
+
+#' Dismiss one or more popup messages
+#' @param n Number of popup messages to dismiss. If set to \code{NULL}, then
+#' all modals will be dismissed; default is \code{NULL}.
+#' @param cbid ID created by \code{\link{shinyalert}}. Usually \code{cbid} is
+#' used to close a specific alert. Note that if \code{cbid} is specified,
+#' then \code{n} will be ignored.
+#' @export
+closeAlert <- function(n = NULL, cbid = NULL){
+
+  session <- getSession()
+  session$sendCustomMessage(type = "shinyalert.close",
+                            message = list(count = n, cbid = cbid))
+}

inst/www/shared/swalservice/swalservice.js

@@ -20,7 +20,7 @@ SwalService.prototype = {
     var pending = {
       args: arguments,
       id: this.nextId++
-    }
+    };
     return this._swalWithId(pending);
   },
 

inst/www/srcjs/shinyalert.js

@@ -1,9 +1,8 @@
 var swalService = new SwalService({showPendingMessage: false});
 shinyalert = {};
-shinyalert.num = 0;  // Used to make the timer work
+shinyalert.instances = [];  // Used to make the timer work
 
 Shiny.addCustomMessageHandler('shinyalert.show', function(params) {
-  shinyalert.num++;
 
   var callbackJS = function(value) {};
   if (params['callbackJS'] != null) {
@@ -13,15 +12,27 @@ Shiny.addCustomMessageHandler('shinyalert.show', function(params) {
   }
 
   var callbackR = function(value) {};
-  if (params['cbid'] != null) {
-    var cbid = params['cbid'];
-    delete params['cbid'];
+  // Always create cbid
+  var cbid = params['cbid'];
+  delete params['cbid'];
+  if(typeof cbid === 'string'){
     callbackR = function(value) {
       Shiny.onInputChange(cbid, value);
     }
   }
 
   var callback = function(value) {
+    // Remove instance immediately
+    var ii = 0;
+    for(ii in shinyalert.instances){
+      swalService.close( shinyalert.instances[ii].swal_id );
+      if( shinyalert.instances[ii].cbid === cbid ){
+        shinyalert.instances.splice( ii, 1 );
+      }
+      break;
+    }
+
+
     if ('compareVersion' in Shiny &&
         Shiny.compareVersion(Shiny.version, ">=", "1.1.0") ) {
       Shiny.setInputValue(params['inputId'], value, {priority: "event"});
@@ -33,15 +44,54 @@ Shiny.addCustomMessageHandler('shinyalert.show', function(params) {
     delete params['inputId'];
   }
 
-  if (params['timer'] != 0) {
+  var timer = params['timer'];
+  delete params['timer'];
+
+  var swal_id = swalService.swal(params, callback);
+  shinyalert.instances.push({
+    swal_id : swal_id,
+    cbid    : cbid
+  });
+
+  // Changed timer != 0 to timer > 0
+  if (timer > 0) {
     setTimeout(function(x) {
-      if (x == shinyalert.num) {
-        swalService.close();
+      var ii = 0;
+      for(ii in shinyalert.instances){
+        swalService.close( x );
+        if( shinyalert.instances[ii].swal_id === x ){
+          shinyalert.instances.splice( ii, 1 );
+        }
+        break;
       }
-    }, params['timer'], shinyalert.num);
+    }, timer, swal_id);
   }
-  delete params['timer'];
 
   Shiny.unbindAll($(".sweet-alert"));
   swalService.swal(params, callback);
 });
+
+Shiny.addCustomMessageHandler('shinyalert.close', function(params) {
+  var n = (params && params.count) || shinyalert.instances.length,
+      cbid = params.cbid;
+
+  var i, item;
+  if( typeof cbid === 'string' ){
+    // close specific alert
+    for( i = 0; i < shinyalert.instances.length; i++ ){
+      item = shinyalert.instances[i];
+      if( item.cbid === cbid ){
+        swalService.close( item.swal_id );
+        shinyalert.instances.splice( i, 1 );
+        break;
+      }
+    }
+  } else {
+    // dismiss n alerts
+    item = shinyalert.instances.splice(0, n);
+    for( i = 0; i < item.length; i++ ){
+      swalService.close( item[i].swal_id );
+    }
+  }
+
+});

vignettes/.gitignore

@@ -0,0 +1,2 @@
+shinyalert.R
+shinyalert.html