rstudio · cpsievert · Jan 2, 2017 · Jan 24, 2017 · Feb 27, 2017 · Feb 28, 2017
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -64,5 +64,5 @@ Suggests:
     RJSONIO,
     purrr,
     testthat
-RoxygenNote: 5.0.1
+RoxygenNote: 6.0.1
 LazyData: true
diff --git a/NAMESPACE b/NAMESPACE
@@ -2,14 +2,14 @@
 
 S3method("[",leaflet_awesome_icon_set)
 S3method("[",leaflet_icon_set)
+S3method(metaData,SharedData)
 S3method(metaData,SpatialLinesDataFrame)
 S3method(metaData,SpatialPointsDataFrame)
 S3method(metaData,SpatialPolygonsDataFrame)
 S3method(metaData,data.frame)
 S3method(metaData,list)
 S3method(metaData,map)
 S3method(metaData,sf)
-S3method(metaData,sharedData)
 S3method(pointData,POINT)
 S3method(pointData,SharedData)
 S3method(pointData,SpatialPoints)

diff --git a/R/layers.R b/R/layers.R
@@ -1121,8 +1121,11 @@ addPolygons <- function(
     dashArray = dashArray, smoothFactor = smoothFactor, noClip = noClip
   ))
   pgons = derivePolygons(data, lng, lat, missing(lng), missing(lat), "addPolygons")
-  invokeMethod(map, data, 'addPolygons', pgons, layerId, group, options, popup, popupOptions, safeLabel(label, data), labelOptions, highlightOptions) %>%
-    expandLimitsBbox(pgons)
+  invokeMethod(
+    map, data, 'addPolygons', pgons, layerId, group, options, popup,
+    popupOptions, safeLabel(label, data), labelOptions, highlightOptions,
+    getCrosstalkOptions(data)
+  ) %>% expandLimitsBbox(pgons)
 }
 
 #' @rdname remove

diff --git a/R/normalize-SharedData.R b/R/normalize-SharedData.R
@@ -1,5 +1,5 @@
 #' @export
-metaData.sharedData <- function(obj) {
+metaData.SharedData <- function(obj) {
   obj$data(withSelection = TRUE, withFilter = FALSE, withKey = TRUE)
 }
 

diff --git a/inst/examples/plotly.R b/inst/examples/plotly.R
@@ -0,0 +1,19 @@
+library(crosstalk)
+library(plotly)
+library(leaflet)
+
+sd <- SharedData$new(quakes)
+
+p <- plot_ly(sd, x = ~depth, y = ~mag) %>%
+  add_markers(alpha = 0.5) %>%
+  layout(dragmode = "select") %>%
+  highlight(dynamic = TRUE, persistent = TRUE)
+
+map <- leaflet(sd) %>%
+  addTiles() %>%
+  addCircles()
+
+# let leaflet know this is persistent selection
+options(persistent = TRUE)
+
+htmltools::browsable(htmltools::tagList(p, map))
diff --git a/inst/htmlwidgets/leaflet.js b/inst/htmlwidgets/leaflet.js
@@ -818,6 +818,8 @@ var LayerManager = function () {
             // Need to save this info so we know what to set opacity to later
             layer.options.origOpacity = typeof layer.options.opacity !== "undefined" ? layer.options.opacity : 0.5;
             layer.options.origFillOpacity = typeof layer.options.fillOpacity !== "undefined" ? layer.options.fillOpacity : 0.2;
+            layer.options.origColor = typeof layer.options.color !== "undefined" ? layer.options.color : "#03F";
+            layer.options.origFillColor = typeof layer.options.fillColor !== "undefined" ? layer.options.fillColor : layer.options.origColor;
           }
 
           var ctg = _this._byCrosstalkGroup[ctGroup];
@@ -856,18 +858,38 @@ var LayerManager = function () {
                   for (var i = 0; i < groupKeys.length; i++) {
                     var key = groupKeys[i];
                     var _layerInfo3 = _this._byStamp[ctg[key]];
-                    _this._setOpacity(_layerInfo3, 1.0);
+                    // reset the crosstalk style params
+                    _layerInfo3.layer.options.ctOpacity = undefined;
+                    _layerInfo3.layer.options.ctFillOpacity = undefined;
+                    _layerInfo3.layer.options.ctColor = undefined;
+                    _layerInfo3.layer.options.ctFillColor = undefined;
+                    _this._setStyle(_layerInfo3);
                   }
                 } else {
                   var selectedKeys = {};
                   for (var _i3 = 0; _i3 < e.value.length; _i3++) {
                     selectedKeys[e.value[_i3]] = true;
                   }
                   var _groupKeys2 = Object.keys(ctg);
+                  // for compatability with plotly's ability to colour selections
+                  // https://github.com/jcheng5/plotly/blob/71cf8a/R/crosstalk.R#L96-L100
+                  var selectionColour = crosstalk.group(ctGroup).var("plotlySelectionColour").get();
+                  var ctOpts = crosstalk.var("plotlyCrosstalkOpts").get() || { opacityDim: 0.2 };
+                  var persist = ctOpts.persistent === true;
                   for (var _i4 = 0; _i4 < _groupKeys2.length; _i4++) {
                     var _key2 = _groupKeys2[_i4];
                     var _layerInfo4 = _this._byStamp[ctg[_key2]];
-                    _this._setOpacity(_layerInfo4, selectedKeys[_groupKeys2[_i4]] ? 1.0 : 0.2);
+                    var selected = selectedKeys[_groupKeys2[_i4]];
+                    var opts = _layerInfo4.layer.options;
+
+                    // remember "old" selection colors if this is persistent selection
+                    _layerInfo4.layer.options.ctColor = selected ? selectionColour : persist ? opts.ctColor : opts.origColor;
+                    _layerInfo4.layer.options.ctFillColor = selected ? selectionColour : persist ? opts.ctFillColor : opts.origFillColor;
+
+                    _layerInfo4.layer.options.ctOpacity = selected ? opts.origOpacity : persist && opts.origOpacity == opts.ctOpacity ? opts.origOpacity : ctOpts.opacityDim * opts.origOpacity;
+                    _layerInfo4.layer.options.ctFillOpacity = selected ? opts.origFillOpacity : persist && opts.origFillOpacity == opts.ctFillOpacity ? opts.origFillOpacity : ctOpts.opacityDim * opts.origFillOpacity;
+
+                    _this._setStyle(_layerInfo4);
                   }
                 }
               };
@@ -943,16 +965,18 @@ var LayerManager = function () {
       }
     }
   }, {
-    key: "_setOpacity",
-    value: function _setOpacity(layerInfo, opacity) {
-      if (layerInfo.layer.setOpacity) {
-        layerInfo.layer.setOpacity(opacity);
-      } else if (layerInfo.layer.setStyle) {
-        layerInfo.layer.setStyle({
-          opacity: opacity * layerInfo.layer.options.origOpacity,
-          fillOpacity: opacity * layerInfo.layer.options.origFillOpacity
-        });
+    key: "_setStyle",
+    value: function _setStyle(layerInfo) {
+      var opts = layerInfo.layer.options;
+      if (!layerInfo.layer.setStyle) {
+        return;
       }
+      layerInfo.layer.setStyle({
+        opacity: opts.ctOpacity || opts.origOpacity,
+        fillOpacity: opts.ctFillOpacity || opts.origFillOpacity,
+        color: opts.ctColor || opts.origColor,
+        fillColor: opts.ctFillColor || opts.origFillColor
+      });
     }
   }, {
     key: "getLayer",
@@ -1097,7 +1121,7 @@ var LayerManager = function () {
       if (layerInfo.ctGroup) {
         var ctGroup = this._byCrosstalkGroup[layerInfo.ctGroup];
         var layersForKey = ctGroup[layerInfo.ctKey];
-        var idx = layersForKey ? layersForKey.indexOf(stamp) : -1;
+        var idx = layersForKey ? layersForKey.indexOf(+stamp) : -1;
         if (idx >= 0) {
           if (layersForKey.length === 1) {
             delete ctGroup[layerInfo.ctKey];
@@ -1605,9 +1629,9 @@ methods.addRectangles = function (lat1, lng1, lat2, lng2, layerId, group, option
  * @param lat Array of arrays of latitude coordinates for polygons
  * @param lng Array of arrays of longitude coordinates for polygons
  */
-methods.addPolygons = function (polygons, layerId, group, options, popup, popupOptions, label, labelOptions, highlightOptions) {
+methods.addPolygons = function (polygons, layerId, group, options, popup, popupOptions, label, labelOptions, highlightOptions, crosstalkOptions) {
   if (polygons.length > 0) {
-    var df = new _dataframe2.default().col("shapes", polygons).col("layerId", layerId).col("group", group).col("popup", popup).col("popupOptions", popupOptions).col("label", label).col("labelOptions", labelOptions).col("highlightOptions", highlightOptions).cbind(options);
+    var df = new _dataframe2.default().col("shapes", polygons).col("layerId", layerId).col("group", group).col("popup", popup).col("popupOptions", popupOptions).col("label", label).col("labelOptions", labelOptions).col("highlightOptions", highlightOptions).cbind(options).cbind(crosstalkOptions || {});
 
     addLayers(this, "shape", df, function (df, i) {
       // This code used to use L.multiPolygon, but that caused
@@ -2348,7 +2372,6 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 // pixel of the original image has some contribution to the downscaled image)
 // as opposed to a single-step downscaling which will discard a lot of data
 // (and with sparse images at small scales can give very surprising results).
-
 var Mipmapper = function () {
   function Mipmapper(img) {
     _classCallCheck(this, Mipmapper);

diff --git a/javascript/src/layer-manager.js b/javascript/src/layer-manager.js
@@ -95,6 +95,9 @@ export default class LayerManager {
         // Need to save this info so we know what to set opacity to later
         layer.options.origOpacity = typeof(layer.options.opacity) !== "undefined" ? layer.options.opacity : 0.5;
         layer.options.origFillOpacity = typeof(layer.options.fillOpacity) !== "undefined" ? layer.options.fillOpacity : 0.2;
+        layer.options.origColor = typeof(layer.options.color) !== "undefined" ? layer.options.color : "#03F";
+        layer.options.origFillColor = typeof(layer.options.fillColor) !== "undefined" ? layer.options.fillColor : layer.options.origColor;
+
       }
 
       let ctg = this._byCrosstalkGroup[ctGroup];
@@ -132,18 +135,48 @@ export default class LayerManager {
             for (let i = 0; i < groupKeys.length; i++) {
               let key = groupKeys[i];
               let layerInfo = this._byStamp[ctg[key]];
-              this._setOpacity(layerInfo, 1.0);
+              // reset the crosstalk style params
+              layerInfo.layer.options.ctOpacity = undefined;
+              layerInfo.layer.options.ctFillOpacity = undefined;
+              layerInfo.layer.options.ctColor = undefined;
+              layerInfo.layer.options.ctFillColor = undefined;
+              this._setStyle(layerInfo);
             }
           } else {
             let selectedKeys = {};
             for (let i = 0; i < e.value.length; i++) {
               selectedKeys[e.value[i]] = true;
             }
             let groupKeys = Object.keys(ctg);
+            // for compatability with plotly's ability to colour selections
+            // https://github.com/jcheng5/plotly/blob/71cf8a/R/crosstalk.R#L96-L100
+            let selectionColour = crosstalk.group(ctGroup).var("plotlySelectionColour").get();
+            let ctOpts = crosstalk.var("plotlyCrosstalkOpts").get() || {opacityDim: 0.2};
+            let persist = ctOpts.persistent === true;
             for (let i = 0; i < groupKeys.length; i++) {
               let key = groupKeys[i];
               let layerInfo = this._byStamp[ctg[key]];
-              this._setOpacity(layerInfo, selectedKeys[groupKeys[i]] ? 1.0 : 0.2);
+              let selected = selectedKeys[groupKeys[i]];
+              let opts = layerInfo.layer.options;
+
+              // remember "old" selection colors if this is persistent selection
+              layerInfo.layer.options.ctColor =
+                selected ? selectionColour :
+                  persist ? opts.ctColor : opts.origColor;
+              layerInfo.layer.options.ctFillColor =
+                selected ? selectionColour :
+                  persist ? opts.ctFillColor : opts.origFillColor;
+
+              layerInfo.layer.options.ctOpacity =
+                  selected ? opts.origOpacity :
+                    (persist && opts.origOpacity == opts.ctOpacity) ? opts.origOpacity :
+                      ctOpts.opacityDim * opts.origOpacity;
+              layerInfo.layer.options.ctFillOpacity =
+                  selected ? opts.origFillOpacity :
+                    (persist && opts.origFillOpacity == opts.ctFillOpacity) ? opts.origFillOpacity :
+                      ctOpts.opacityDim * opts.origFillOpacity;
+
+              this._setStyle(layerInfo);
             }
           }
         };
@@ -214,15 +247,17 @@ export default class LayerManager {
     }
   }
 
-  _setOpacity(layerInfo, opacity) {
-    if (layerInfo.layer.setOpacity) {
-      layerInfo.layer.setOpacity(opacity);
-    } else if (layerInfo.layer.setStyle) {
-      layerInfo.layer.setStyle({
-        opacity: opacity * layerInfo.layer.options.origOpacity,
-        fillOpacity: opacity * layerInfo.layer.options.origFillOpacity
-      });
+  _setStyle(layerInfo) {
+    let opts = layerInfo.layer.options;
+    if (!layerInfo.layer.setStyle) {
+      return;
     }
+    layerInfo.layer.setStyle({
+      opacity: opts.ctOpacity || opts.origOpacity,
+      fillOpacity: opts.ctFillOpacity || opts.origFillOpacity,
+      color: opts.ctColor || opts.origColor,
+      fillColor: opts.ctFillColor || opts.origFillColor
+    });
   }
 
   getLayer(category, layerId) {
@@ -349,7 +384,7 @@ export default class LayerManager {
     if (layerInfo.ctGroup) {
       let ctGroup = this._byCrosstalkGroup[layerInfo.ctGroup];
       let layersForKey = ctGroup[layerInfo.ctKey];
-      let idx = layersForKey ? layersForKey.indexOf(stamp) : -1;
+      let idx = layersForKey ? layersForKey.indexOf(+stamp) : -1;
       if (idx >= 0) {
         if (layersForKey.length === 1) {
           delete ctGroup[layerInfo.ctKey];

diff --git a/javascript/src/methods.js b/javascript/src/methods.js
@@ -521,7 +521,7 @@ methods.addRectangles = function(lat1, lng1, lat2, lng2, layerId, group, options
  * @param lat Array of arrays of latitude coordinates for polygons
  * @param lng Array of arrays of longitude coordinates for polygons
  */
-methods.addPolygons = function(polygons, layerId, group, options, popup, popupOptions, label, labelOptions, highlightOptions) {
+methods.addPolygons = function(polygons, layerId, group, options, popup, popupOptions, label, labelOptions, highlightOptions, crosstalkOptions) {
   if(polygons.length>0) {
     let df = new DataFrame()
       .col("shapes", polygons)
@@ -532,7 +532,8 @@ methods.addPolygons = function(polygons, layerId, group, options, popup, popupOp
       .col("label", label)
       .col("labelOptions", labelOptions)
       .col("highlightOptions", highlightOptions)
-      .cbind(options);
+      .cbind(options)
+      .cbind(crosstalkOptions || {});
 
     addLayers(this, "shape", df, function(df, i) {
       // This code used to use L.multiPolygon, but that caused

diff --git a/man/addAwesomeMarkers.Rd b/man/addAwesomeMarkers.Rd
diff --git a/man/addGraticule.Rd b/man/addGraticule.Rd
diff --git a/man/addLayersControl.Rd b/man/addLayersControl.Rd
diff --git a/man/addLegend.Rd b/man/addLegend.Rd
diff --git a/man/addMeasure.Rd b/man/addMeasure.Rd
diff --git a/man/addMiniMap.Rd b/man/addMiniMap.Rd
diff --git a/man/addProviderTiles.Rd b/man/addProviderTiles.Rd
diff --git a/man/addRasterImage.Rd b/man/addRasterImage.Rd
diff --git a/man/addScaleBar.Rd b/man/addScaleBar.Rd
diff --git a/man/addSimpleGraticule.Rd b/man/addSimpleGraticule.Rd
diff --git a/man/addTerminator.Rd b/man/addTerminator.Rd
diff --git a/man/atlStorms2005.Rd b/man/atlStorms2005.Rd
diff --git a/man/awesomeIconList.Rd b/man/awesomeIconList.Rd
diff --git a/man/awesomeIcons.Rd b/man/awesomeIcons.Rd
diff --git a/man/breweries91.Rd b/man/breweries91.Rd
diff --git a/man/colorNumeric.Rd b/man/colorNumeric.Rd
diff --git a/man/deprecated.Rd b/man/deprecated.Rd
diff --git a/man/derivePoints.Rd b/man/derivePoints.Rd