Merge branch 'master' into relative-dependency-paths

Author: cpsievert

.travis.yml

@@ -16,6 +16,8 @@ env:
     - secure: "WsvmMHN4YVhnk0bLRE04APcLbs5s4vWKSHjEdU0bPXd0xdMTzZeP5D7pxyF1983C+P5LpSnGHv4dgwLMBkNzxJwBR7/Ta7lfO1akYILWwxib+1DVbCqUH5Z4Ba1FSCQptIrLNGR3P7+0Lem4hEhqKdPKltFnxhnXO0Y+MeG71IQ="
     # MAPBOX_TOKEN (for testing `plot_mapbox()`)
     - secure: "QPBEqtLRdwb4ablJORzD0JdCT9ESe3nNdIehM1oxfcNKfpSdf2OFxH3TkeYY1nMpv0mLxiMNTy6xcj9Yk5MaaBCIA0P7q6OdZv9ruzQD1j3g84gP45KwBilbPGjb+/EvOS0fM25vR/pAmA8IyoUfPC2J8HwiNnW8DYdt/hJOJ9A="
+    # GITHUB_PAT
+    - secure: "lZf7GBt1+ogux5WAXmIZ6/VBTmR1G7rv+8Aevogfan7GWb32K3IVatsrKr1pSvz0hysP0MDueQqTv0GcNOvrFnYvobyo6fFpx+n33WkXQCGybUOHyfJpPdw1L2wtAy88ugNJDl+n9fdXr4yL2cWvRqq4WBKeeSi6hpdiKOaoB3Y="
 
 before_install:
   - echo "Sys.setenv('plotly_username' = 'cpsievert')" > ~/.Rprofile

NEWS.md

@@ -15,6 +15,7 @@
 
 * `subplot()` now bumps annotation `xref`/`yref` anchors correctly (#1181).
 * `subplot()` now accumulates images, repositions paper coordinates, and reanchors axis references (#1332).
+* In some cases, a `ggplotly()` colorbar would cause issues with hover behavior, which is now fixed (#1381).  
 * Recursive attribute validation is now only performed on recursive objects (#1315).
 
 # 4.8.0

R/ggplotly.R

@@ -1300,7 +1300,7 @@ gdef2trace <- function(gdef, theme, gglayout) {
       type = "scatter",
       mode = "markers",
       opacity = 0,
-      hoverinfo = "none",
+      hoverinfo = "skip",
       showlegend = FALSE,
       # do everything on a 0-1 scale
       marker = list(

inst/htmlwidgets/plotly.js

@@ -305,39 +305,6 @@ HTMLWidgets.widget({
       });
     } 
 
-    
-    // send user input event data to dashR
-    // TODO: make this more consistent with Graph() props?
-    var dashRwidgets = window.dashRwidgets || {};
-    var dashRmode = typeof el.setProps === "function" &&
-                    typeof dashRwidgets.htmlwidget === "function";
-    if (dashRmode) {
-      graphDiv.on('plotly_relayout', function(d) {
-        el.setProps({"input_plotly_relayout": d});
-      });
-      graphDiv.on('plotly_hover', function(d) {
-        el.setProps({"input_plotly_hover": eventDataWithKey(d)});
-      });
-      graphDiv.on('plotly_click', function(d) {
-        el.setProps({"input_plotly_click": eventDataWithKey(d)});
-      });
-      graphDiv.on('plotly_selected', function(d) {
-        el.setProps({"input_plotly_selected": eventDataWithKey(d)});
-      });
-      graphDiv.on('plotly_unhover', function(eventData) {
-        el.setProps({"input_plotly_hover": null});
-      });
-      graphDiv.on('plotly_doubleclick', function(eventData) {
-        el.setProps({"input_plotly_click": null});
-      });
-      // 'plotly_deselect' is code for doubleclick when in select mode
-      graphDiv.on('plotly_deselect', function(eventData) {
-        el.setProps({"input_plotly_selected": null});
-        el.setProps({"input_plotly_click": null});
-      });
-    } 
-    
-    
     // Given an array of {curveNumber: x, pointNumber: y} objects,
     // return a hash of {
     //   set1: {value: [key1, key2, ...], _isSimpleKey: false}, 

tests/testthat/test-ggplot-sf.R

@@ -54,7 +54,7 @@ test_that("geom_sf() polygons with fill/text.", {
   # one trace for every fillcolor, one for graticule, one for colorbar
   expect_length(l$data, length(unique(nc$AREA)) + 2)
   expect_true(
-    all(unlist(lapply(l$data, "[[", "hoverinfo")) %in% c("none", "text"))
+    all(unlist(lapply(l$data, "[[", "hoverinfo")) %in% c("skip", "none", "text"))
   )
   # graticule styling should inherit from panel.grid.major
   expect_equivalent(