if minWidth not provided via ... append to dotlist to ensure proper p…

…opup container width. #15
r-spatial · May 1, 2021 · 89e74d3 · 89e74d3
1 parent 1c68195
commit 89e74d3
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/R/addPopupImages.R b/R/addPopupImages.R
@@ -115,7 +115,14 @@ addPopupImages = function(map,
       height = height
     }
 
-    return(list(nm = nm, width = width, height = height, src = src))
+    return(
+      list(
+        nm = nm
+        , width = width
+        , height = height
+        , src = src
+      )
+    )
 
   })
 
@@ -160,7 +167,12 @@ addPopupImages = function(map,
   }
   map$dependencies = map$dependencies[!duplicated(map$dependencies)]
 
-  dotlist = utils::modifyList(list("maxWidth" = 2000), list(...))
+  dotlist = utils::modifyList(
+    list(
+      "maxWidth" = 2000
+    )
+    , list(...)
+  )
 
   leaflet::invokeMethod(
     map,

diff --git a/inst/htmlwidgets/popup.js b/inst/htmlwidgets/popup.js
@@ -40,6 +40,9 @@ LeafletWidget.methods.imagePopup = function(image, group, width, height, src, na
   lay.eachLayer(function (layer) {
     wdth = width[imgid];
     hght = height[imgid];
+    if (dotlist.minWidth === undefined) {
+      dotlist.minWidth = wdth;
+    }
     if (imgid <= image.length) {
       popimg = "<image src='" + img[imgid] + "'" + " height=" + hght + " width=" + wdth + ">";
       poporig = layer.getPopup();