tree

DESCRIPTION

@@ -11,5 +11,6 @@ Imports:
   htmlwidgets,
   magrittr,
   rlang,
-  dplyr
+  dplyr,
+  data.tree
 RoxygenNote: 6.0.1

NAMESPACE

@@ -12,8 +12,10 @@ export(e_graph_nodes)
 export(e_heatmap)
 export(e_line)
 export(e_parallel)
+export(e_pie)
 export(e_sankey)
 export(e_scatter)
+export(e_treemap)
 export(e_visual_map)
 export(echarts4Output)
 export(renderEcharts4)

R/add.R

@@ -9,16 +9,16 @@
 #' 
 #' @examples 
 #' USArrests %>% 
-#'   dplyr::mutate(
-#'     state = row.names(.)
-#'   ) %>% 
-#'   e_charts(state) %>% 
+#'   e_charts(Assault) %>% 
 #'   e_bar(Murder, name = "Euwww") %>% 
 #'   e_line(Rape)
 #' 
 #' @rdname barline
 #' @export
 e_bar <- function(e, serie, name = NULL, ...){
+
+  if(missing(e))
+    stop("must pass e", call. = FALSE)
 
   if(missing(serie))
     stop("must pass serie", call. = FALSE)
@@ -541,4 +541,93 @@ e_parallel <- function(e, ..., name = NULL){
   e$x$opts$series <- append(e$x$opts$series, serie)
   e$x$opts$parallelAxis <- para
   e
+}
+
+#' Pie
+#' 
+#' Draw pie and donut charts.
+#' 
+#' @inheritParams e_bar
+#' @param label Labels of slices.
+#' 
+#' @examples 
+#' mtcars %>% 
+#'   head() %>% 
+#'   dplyr::mutate(model = row.names(.)) %>% 
+#'   e_charts() %>% 
+#'   e_pie(carb, model)
+#' 
+#' @export
+e_pie <- function(e, serie, label, name = NULL, ...){
+  if(missing(e))
+    stop("must pass e", call. = FALSE)
+
+  if(missing(serie) || missing(label))
+    stop("must pass serie and label", call. = FALSE)
+
+  e$x$opts$xAxis <- NULL # remove
+  e$x$opts$yAxis <- NULL # remove
+
+  if(is.null(name)) # defaults to column name
+    name <- deparse(substitute(serie))
+
+  # build JSON data
+  data <- .build_pie(e$x$data, dplyr::enquo(serie), dplyr::enquo(label))
+
+  serie <- list(
+    name = name,
+    type = "pie",
+    data = data,
+    ...
+  )
+
+  e$x$opts$legend$data <- append(e$x$opts$legend$data, .graph_cat_legend(e$x$data, dplyr::enquo(label)))
+
+  e$x$opts$series <- append(e$x$opts$series, list(serie))
+  e
+}
+
+#' Tree
+#' 
+#' Build a treemap.
+#' 
+#' @inheritParams e_bar
+#' @param parent,child Edges.
+#' 
+#' @examples 
+#' df <- data.frame(
+#'   parent = c("earth","earth","forest","forest","ocean","ocean","ocean","ocean"), 
+#'   child = c("ocean","forest","tree","sasquatch","fish","seaweed","mantis shrimp","sea monster")
+#' )
+#' 
+#' df %>% 
+#'   e_charts() %>% 
+#'   e_treemap(parent, child)
+#' 
+#' @export
+e_treemap <- function(e, parent, child, ...){
+  if(missing(e))
+    stop("must pass e", call. = FALSE)
+
+  if(missing(parent) || missing(child))
+    stop("must pass parent and child", call. = FALSE)
+
+  e$x$opts$xAxis <- NULL # remove
+  e$x$opts$yAxis <- NULL # remove
+
+  # build JSON data
+  data <- .build_tree(
+    e$x$data, 
+    dplyr::enquo(parent), 
+    dplyr::enquo(child)
+  )
+
+  serie <- list(
+    type = "tree",
+    data = list(data),
+    ...
+  )
+
+  e$x$opts$series <- append(e$x$opts$series, list(serie))
+  e
 }

R/echarts4.R

@@ -45,11 +45,11 @@ e_charts <- function(data, x = NULL, width = NULL, height = NULL, elementId = NU
 
   # create widget
   htmlwidgets::createWidget(
-    name = 'echarts4',
+    name = 'echarts4r',
     x,
     width = width,
     height = height,
-    package = 'echarts4',
+    package = 'echarts4r',
     elementId = elementId
   )
 }

R/utils.R

@@ -192,3 +192,26 @@
 
   apply(data, 1, as.list)
 }
+
+.build_pie <- function(data, serie, label){
+  data %>%
+    dplyr::select(
+      !!serie,
+      !!label
+    ) -> data
+
+  names(data) <- c("value", "name")
+
+  apply(data, 1, as.list)
+}
+
+.build_tree <- function(data, parent, child){
+  data %>%
+    dplyr::select(
+      !!parent,
+      !!child
+    ) -> df
+
+  tree <- data.tree::FromDataFrameNetwork(df)
+  data.tree::ToListExplicit(tree, unname = TRUE)
+}

echarts4r.Rproj

@@ -0,0 +1,17 @@
+Version: 1.0
+
+RestoreWorkspace: Default
+SaveWorkspace: Default
+AlwaysSaveHistory: Default
+
+EnableCodeIndexing: Yes
+UseSpacesForTab: Yes
+NumSpacesForTab: 2
+Encoding: UTF-8
+
+RnwWeave: Sweave
+LaTeX: pdfLaTeX
+
+BuildType: Package
+PackageUseDevtools: Yes
+PackageInstallArgs: --no-multiarch --with-keep.source

inst/htmlwidgets/echarts4.js → inst/htmlwidgets/echarts4r.js

@@ -1,6 +1,6 @@
 HTMLWidgets.widget({
 
-  name: 'echarts4',
+  name: 'echarts4r',
 
   type: 'output',