remove gather generic for now

Author: cpsievert

DESCRIPTION

@@ -60,6 +60,5 @@ Suggests:
     dendextend
 LazyData: true
 Remotes:
-    rstudio/crosstalk,
-    hadley/tidyr#229
+    rstudio/crosstalk
 RoxygenNote: 5.0.1

NAMESPACE

@@ -5,7 +5,6 @@ S3method(distinct_,plotly)
 S3method(do_,plotly)
 S3method(filter_,plotly)
 S3method(fortify,SharedData)
-S3method(gather_,plotly)
 S3method(geom2trace,GeomBar)
 S3method(geom2trace,GeomBlank)
 S3method(geom2trace,GeomBoxplot)
@@ -106,9 +105,6 @@ export(event_data)
 export(export)
 export(filter)
 export(filter_)
-export(gather)
-export(gather_)
-export(gather_vars.plotly)
 export(geom2trace)
 export(get_figure)
 export(gg2list)
@@ -178,7 +174,6 @@ importFrom(dplyr,rename)
 importFrom(dplyr,rename_)
 importFrom(dplyr,select)
 importFrom(dplyr,select_)
-importFrom(dplyr,select_vars)
 importFrom(dplyr,slice)
 importFrom(dplyr,slice_)
 importFrom(dplyr,summarise)
@@ -218,8 +213,6 @@ importFrom(stats,is.leaf)
 importFrom(stats,quantile)
 importFrom(stats,setNames)
 importFrom(tibble,as_tibble)
-importFrom(tidyr,gather)
-importFrom(tidyr,gather_)
 importFrom(tidyr,unnest)
 importFrom(utils,browseURL)
 importFrom(utils,data)

R/imports.R

@@ -160,14 +160,16 @@ dplyr::filter
 #' @export
 dplyr::filter_
 
-#' @importFrom tidyr gather
-#' @name gather
-#' @rdname reexports
-#' @export
-tidyr::gather
-
-#' @importFrom tidyr gather_
-#' @name gather_
-#' @rdname reexports
-#' @export
-tidyr::gather_
+# waiting on https://github.com/tidyverse/tidyr/pull/229
+#
+# #' @importFrom tidyr gather
+# #' @name gather
+# #' @rdname reexports
+# #' @export
+# tidyr::gather
+# 
+# #' @importFrom tidyr gather_
+# #' @name gather_
+# #' @rdname reexports
+# #' @export
+# tidyr::gather_

R/plotly_data.R

@@ -197,34 +197,35 @@ transmute_.plotly <- function(.data, ..., .dots) {
 
 # ---------------------------------------------------------------------------
 # tidyr methods
+# waiting on https://github.com/tidyverse/tidyr/pull/229
 # ---------------------------------------------------------------------------
 
-#' @rdname plotly_data
-#' @export
-gather_.plotly <- function(data, key_col, value_col, gather_cols, na.rm = FALSE,
-                           convert = FALSE, factor_key = FALSE) {
-  d <- plotly_data(data)
-  set <- attr(d, "set")
-  d <- tidyr::gather_(
-    d, key_col = key_col, value_col = value_col, gather_cols = gather_cols, 
-    na.rm = na.rm, convert = convert, factor_key = factor_key
-  )
-  add_data(data, structure(d, set = set))
-}
-
-#' @importFrom dplyr select_vars
-#' @rdname plotly_data
-#' @export
-gather_vars.plotly <- function(data, key_col, value_col, ...) {
-  d <- plotly_data(data)
-  if (n_dots(...) == 0) {
-    setdiff(colnames(d), c(key_col, value_col))
-  } else {
-    unname(dplyr::select_vars(colnames(d), ...))
-  }
-}
-
-n_dots <- function(...) nargs()
+# #' @rdname plotly_data
+# #' @export
+# gather_.plotly <- function(data, key_col, value_col, gather_cols, na.rm = FALSE,
+#                            convert = FALSE, factor_key = FALSE) {
+#   d <- plotly_data(data)
+#   set <- attr(d, "set")
+#   d <- tidyr::gather_(
+#     d, key_col = key_col, value_col = value_col, gather_cols = gather_cols, 
+#     na.rm = na.rm, convert = convert, factor_key = factor_key
+#   )
+#   add_data(data, structure(d, set = set))
+# }
+# 
+# #' @importFrom dplyr select_vars
+# #' @rdname plotly_data
+# #' @export
+# gather_vars.plotly <- function(data, key_col, value_col, ...) {
+#   d <- plotly_data(data)
+#   if (n_dots(...) == 0) {
+#     setdiff(colnames(d), c(key_col, value_col))
+#   } else {
+#     unname(dplyr::select_vars(colnames(d), ...))
+#   }
+# }
+# 
+# n_dots <- function(...) nargs()
 
 
 # ---------------------------------------------------------------------------