fix popupOptions + add example + update version

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: leaflet.minicharts
 Type: Package
 Title: Mini Charts for Interactive Maps
-Version: 0.6.1
+Version: 0.6.2
 Authors@R: c(
     person(given = "Veronique",
            family = "Bachelier",
@@ -21,7 +21,7 @@ Imports: leaflet (>= 1.1.0),
     htmltools
 Encoding: UTF-8
 LazyData: true
-RoxygenNote: 7.0.1
+RoxygenNote: 7.1.1
 Suggests: knitr,
     rmarkdown,
     dplyr,

NEWS

@@ -1,3 +1,8 @@
+Changes in version 0.6.2 (2021-04-07)
+
+NEW FEATURES:
+* add popupOptions
+
 Changes in version 0.6.1 (2019-12-16)
 
 BUGFIXES:

R/add_flows.R

@@ -43,6 +43,16 @@
 #'     time = bal$month
 #'   )
 #'
+#' # popupOptions
+#' data("eco2mixBalance")
+#' bal <- eco2mixBalance
+#' leaflet() %>% addTiles() %>%
+#'   addFlows(
+#'     bal$lng0, bal$lat0, bal$lng1, bal$lat1,
+#'     flow = bal$balance,
+#'     time = bal$month,
+#'     popupOptions = list(closeOnClick = FALSE, autoClose = FALSE)
+#'   )
 #'
 #' @export
 addFlows <- function(map, lng0, lat0, lng1, lat1, color = "blue", flow = 1,

R/add_minicharts.R

@@ -61,8 +61,8 @@
 #' @param onChange (For power users who know javascript) A character string
 #'   containing javascript code that is executed each time a chart is updated.
 #'   See the details section to understand why and how to use this parameter.
-#' @param popupOptions Change popupOptions (ex : autoClose, maxHeight, closeButton ...)
-#' see leaflet::popupOptions for more informations.
+#' @param popupOptions Change default popupOptions (ex : autoClose, maxHeight, closeButton ...)
+#' See \code{\link[leaflet]{popupOptions}} for more informations.
 #'
 #' @details
 #' Since version 0.5, the parameter \code{onChange} can be used to execute
@@ -124,6 +124,13 @@
 #' mymap %>% updateMinicharts("c1", maxValues = 6)
 #' mymap %>% updateMinicharts("c1", type="pie")
 #'
+#' # popupOptions
+#' mymap <- leaflet() %>% addTiles() %>%
+#'   addMinicharts(0, 0, chartdata = 1:3, layerId = "c1", popupOptions = list(closeButton = FALSE))
+#'
+#' mymap
+#' mymap %>% updateMinicharts("c1", maxValues = 6, popupOptions = list(closeButton = TRUE))
+#'
 #' @export
 #'
 addMinicharts <- function(map, lng, lat, chartdata = 1, time = NULL, maxValues = NULL, type = "auto",
@@ -201,7 +208,7 @@ updateMinicharts <- function(map, layerId, chartdata = NULL, time = NULL, maxVal
                              transitionTime = NULL, popup = NULL,
                              legend = TRUE, legendPosition = NULL,
                              timeFormat = NULL, initialTime = NULL, onChange = NULL,
-                             popupOptions= NULL) {
+                             popupOptions = NULL) {
 
   if (!is.null(type)) {
     type <- match.arg(type, c("auto", "bar", "pie", "polar-area", "polar-radius"))

javascript/utils.js

@@ -119,12 +119,12 @@
     if (l.popupArgs.noPopup) return;
 
     if (l.opts[timeId].popupHTML) {
-            if(l.isPopupOpen() === false){
+      if(l.isPopupOpen() === false){
         l.bindPopup(l.opts[timeId].popupHTML, l.popupOptions);
       } else {
         l.setPopupContent(l.opts[timeId].popupHTML);
       }
-      /* l.bindPopup(l.opts[timeId].popupHTML, l.popupOptions); */
+      /* l.bindPopup(l.opts[timeId].popupHTML); */
       return;
     }
 
@@ -164,12 +164,12 @@
     }
 
     popup =  '<div class="popup">'+ title + content + '</div>';
-    /* l.bindPopup(popup.popupHTML, l.popupOptions); */
-          if(l.isPopupOpen() === false){
-        l.bindPopup(l.opts[timeId].popupHTML, l.popupOptions);
-      } else {
-        l.setPopupContent(l.opts[timeId].popupHTML);
-      }
+    /* l.bindPopup(popup); */
+    if(l.isPopupOpen() === false){
+      l.bindPopup(popup, l.popupOptions);
+    } else {
+      l.setPopupContent(popup);
+    }
     return popup;
   }