Merge branch 'ropensci-master7'

Author: chschan

DESCRIPTION

@@ -40,6 +40,7 @@ Imports:
     hexbin,
     RColorBrewer,
     dplyr,
+    vctrs,
     tibble,
     lazyeval (>= 0.2.0),
     rlang,
@@ -75,7 +76,9 @@ Suggests:
     forcats,
     thematic
 LazyData: true
-RoxygenNote: 7.1.0
+RoxygenNote: 7.1.1
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)
-Remotes: rstudio/thematic
+Remotes: 
+  rstudio/thematic,
+  Displayr/htmlwidgets

NAMESPACE

@@ -3,11 +3,7 @@
 S3method(api_create,data.frame)
 S3method(api_create,ggplot)
 S3method(api_create,plotly)
-S3method(arrange_,plotly)
-S3method(distinct_,plotly)
-S3method(do_,plotly)
 S3method(embed_notebook,plotly)
-S3method(filter_,plotly)
 S3method(fortify,SharedData)
 S3method(geom2trace,GeomBar)
 S3method(geom2trace,GeomBlank)
@@ -25,12 +21,11 @@ S3method(ggplotly,"NULL")
 S3method(ggplotly,ggmatrix)
 S3method(ggplotly,ggplot)
 S3method(ggplotly,plotly)
-S3method(group_by_,plotly)
-S3method(groups,plotly)
+S3method(highlight_key,default)
+S3method(highlight_key,plotly)
 S3method(layout,matrix)
 S3method(layout,plotly)
 S3method(layout,shiny.tag.list)
-S3method(mutate_,plotly)
 S3method(plotly_build,"NULL")
 S3method(plotly_build,gg)
 S3method(plotly_build,list)
@@ -40,10 +35,6 @@ S3method(print,api_grid)
 S3method(print,api_grid_local)
 S3method(print,api_plot)
 S3method(print,plotly_data)
-S3method(rename_,plotly)
-S3method(select_,plotly)
-S3method(slice_,plotly)
-S3method(summarise_,plotly)
 S3method(to_basic,GeomAbline)
 S3method(to_basic,GeomAnnotationMap)
 S3method(to_basic,GeomArea)
@@ -78,8 +69,6 @@ S3method(to_basic,GeomTile)
 S3method(to_basic,GeomViolin)
 S3method(to_basic,GeomVline)
 S3method(to_basic,default)
-S3method(transmute_,plotly)
-S3method(ungroup,plotly)
 export("%>%")
 export(TeX)
 export(add_annotations)
@@ -259,6 +248,8 @@ importFrom(lazyeval,is_formula)
 importFrom(lazyeval,is_lang)
 importFrom(magrittr,"%>%")
 importFrom(purrr,transpose)
+importFrom(rlang,"!!!")
+importFrom(rlang,"!!")
 importFrom(rlang,eval_tidy)
 importFrom(stats,complete.cases)
 importFrom(stats,is.leaf)

NEWS.md

@@ -44,7 +44,7 @@ This is minor patch release with a few minor bug fixes and updates test expectat
 
 ## NEW FEATURES
 
-* `ggplotly()` now works well with the [**thematic** package](https://rstudio.github.io/thematic). That is, it can now correctly translate **ggplot2** styling that derives from **thematic** (#1801).
+* `ggplotly()` now works well with the [**thematic** package](https://rstudio.github.io/thematic). That is, it can now correctly translate **ggplot2** styling that derives from **thematic**. Note that, in order to use **thematic**'s auto theming in Shiny with `ggplotly()`, you need **shiny** v1.5.0 (or higher) and **htmlwidgets** v1.5.1.9001 (or higher). Relatedly, if these versions are available, one may now also call `getCurrentOutputInfo()` inside `renderPlotly()` to get CSS styles of the output container (#1801 and #1802).
 
 ## IMPROVEMENTS
 

R/add.R

@@ -334,7 +334,7 @@ add_sf <- function(p, ..., x = ~x, y = ~y, data = NULL, inherit = TRUE) {
       y = y,
       `_bbox` = bbox,
       set = set,
-      data = if ("group" %in% names(d[[i]])) group_by_(d[[i]], "group", add = TRUE) else d[[i]], 
+      data = if ("group" %in% names(d[[i]])) group_by_add(d[[i]], !!rlang::sym("group")) else d[[i]], 
       inherit = inherit
     )
     args <- modify_list(args, attrs)

R/ggplotly.R

@@ -517,7 +517,7 @@ gg2list <- function(p, width = NULL, height = NULL,
       )
     }
     # anchor X axis to the lowest plot in its column
-    layout$layout <- dplyr::group_by_(layout$layout, "xaxis")
+    layout$layout <- dplyr::group_by(layout$layout, !!rlang::sym("xaxis"))
     layout$layout <-  dplyr::mutate(layout$layout, xanchor = max(as.integer(yaxis)))
   }
   layout$layout <- as.data.frame(layout$layout)
@@ -1112,7 +1112,7 @@ gg2list <- function(p, width = NULL, height = NULL,
   # translate group aesthetics to data attributes
   return_dat <- Map(function(x, y) {
     if (is.null(y[["group"]])) return(x)
-    dplyr::group_by_(x, y[["group"]])
+    dplyr::group_by(x, !!rlang::as_quosure(y[["group"]]))
   }, return_dat, mappingFormulas)
 
   # don't need to add group as an attribute anymore
@@ -1258,12 +1258,31 @@ bbox <- function(txt = "foo", angle = 0, size = 12) {
 text2font <- function(x = ggplot2::element_text(), type = "height") {
   list(
     color = toRGB(x$colour),
-    family = x$family,
+    family = font_family(x$family),
     # TODO: what about the size of vertical text?
     size = unitConvert(grid::unit(x$size %||% 0, "points"), "pixels", type)
   )
 }
 
+# Replace a default font family, "", with thematic's font option (if set)
+font_family <- function(family = "") {
+  if (!identical(family, "")) {
+    return(family)
+  }
+  if (!isNamespaceLoaded("thematic")) {
+    return("")
+  }
+  font <- thematic::thematic_get_option("font")
+  if (!length(font)) {
+    return("")
+  }
+  # font$families is a vector of families, but font.family wants to be a 
+  # string (like CSS font-family), so make sure the names are unquoted, 
+  # then quote them
+  families <- sub("'$", "", sub("^'", "", font$families))
+  sprintf("'%s'", paste(families, collapse = "', '"))
+}
+
 # wrap text in bold/italics according to the text "face"
 faced <- function(txt, face = "plain") {
   if (is.null(face)) face <- "plain"

R/imports.R

@@ -14,7 +14,7 @@
 #' @importFrom purrr transpose
 #' @importFrom tools file_ext file_path_sans_ext
 #' @importFrom data.table as.data.table setorderv
-#' @importFrom rlang eval_tidy
+#' @importFrom rlang eval_tidy !! !!!
 NULL
 
 

R/onLoad.R

@@ -0,0 +1,15 @@
+.onLoad <- function(...) {
+  # These generics are defined in R/plotly_data.R
+  dplyr_generics <- c(
+    "groups", "ungroup", "group_by", "summarise", "mutate", "do", "arrange",
+    "select", "filter", "distinct", "slice", "rename", "transmute"
+  )
+  dplyr_generics <- paste0("dplyr::", dplyr_generics)
+  for (generic in dplyr_generics) {
+    vctrs::s3_register(generic, "plotly")
+    if (generic %in% c("dplyr::groups", "dplyr::ungroup")) {
+      next
+    }
+    vctrs::s3_register(paste0(generic, "_"), "plotly")
+  }
+}

R/plotly_build.R

@@ -561,7 +561,7 @@ train_data <- function(data, trace) {
     idx2 <- seq.int(2, NROW(dat), by = 2)
     dat[idx2, "x"] <- data[["xend"]]
     dat[idx2, "y"] <- data[["yend"]]
-    data <- dplyr::group_by_(dat, ".plotlyGroupIndex", add = TRUE)
+    data <- group_by_add(dat, !!rlang::sym(".plotlyGroupIndex"))
   }
 
   # TODO: a lot more geoms!!!