add reorder argument to address #126

NEWS.md

@@ -14,6 +14,7 @@ Every function that adds a serie to chart (e.g.: `e_bar`) have been turned into
 - Added `e_resize` to dynamically resize the chart.
 - Added `e_map_register_p` works like a proxy but does not require a chart.
 - Fixed a few issues with `e_mark*` family, labels and multiple marks correctly work.
+- Initialisation function now take `reorder` argument to specify whether to reorder numeric values.
 
 # echarts4r 0.2.3
 

R/echarts4r.R

@@ -30,6 +30,7 @@ echarts_build <- function(e) {
 #' @param renderer Renderer, takes \code{canvas} (default) or \code{svg}.
 #' @param timeline Set to \code{TRUE} to build a timeline, see timeline section.
 #' @param ... Any other argument.
+#' @param reorder Set the \code{FALSE} to not reorder numeric x axis values.
 #' 
 #' @section Timeline:
 #' The timeline feature currently supports the following chart types.
@@ -76,7 +77,7 @@ echarts_build <- function(e) {
 #' @name init
 #' @export
 e_charts <- function(data, x, width = NULL, height = NULL, elementId = NULL, dispose = TRUE, 
-                     draw = TRUE, renderer = "canvas", timeline = FALSE, ...) {
+                     draw = TRUE, renderer = "canvas", timeline = FALSE, ..., reorder = TRUE) {
 
   xmap <- NULL
 
@@ -105,7 +106,7 @@ e_charts <- function(data, x, width = NULL, height = NULL, elementId = NULL, dis
     row.names(data) <- NULL
 
     if(!is.null(xmap) && !isTRUE(timeline))
-      data <- .arrange_data_x(data, xmap)
+      data <- .arrange_data_x(data, xmap, reorder = reorder)
 
     x$data <- map_grps_(data, timeline)
   }
@@ -125,7 +126,7 @@ e_charts <- function(data, x, width = NULL, height = NULL, elementId = NULL, dis
       stop("must pass grouped data when timeline = TRUE", call. = FALSE)
 
     if(!is.null(xmap))
-      x$data <- .arrange_data_by_group(x$data, xmap)
+      x$data <- .arrange_data_by_group(x$data, xmap, reorder = reorder)
 
     tl <- list(
       baseOption = list(
@@ -195,7 +196,7 @@ e_charts <- function(data, x, width = NULL, height = NULL, elementId = NULL, dis
 #' @rdname init
 #' @export
 e_charts_ <- function(data, x = NULL, width = NULL, height = NULL, elementId = NULL, dispose = TRUE, 
-                      draw = TRUE, renderer = "canvas", timeline = FALSE, ...) {
+                      draw = TRUE, renderer = "canvas", timeline = FALSE, ..., reorder = TRUE) {
 
   xmap <- x
 
@@ -356,7 +357,7 @@ renderEcharts4r <- function(expr, env = parent.frame(), quoted = FALSE) {
 
 #' @rdname echarts4r-shiny
 #' @export
-echarts4rProxy <- function(id, data, x, timeline = FALSE, session = shiny::getDefaultReactiveDomain()){
+echarts4rProxy <- function(id, data, x, timeline = FALSE, session = shiny::getDefaultReactiveDomain(), reorder = TRUE){
 
   if(missing(data)){
     proxy <- list(id = id, session = session)
@@ -390,7 +391,7 @@ echarts4rProxy <- function(id, data, x, timeline = FALSE, session = shiny::getDe
     row.names(data) <- NULL
 
     if(!is.null(xmap))
-      data <- .arrange_data_x(data, xmap)
+      data <- .arrange_data_x(data, xmap, reorder = reorder)
 
     x$data <- map_grps_(data, timeline)
   }
@@ -410,7 +411,7 @@ echarts4rProxy <- function(id, data, x, timeline = FALSE, session = shiny::getDe
       stop("must pass grouped data when timeline = TRUE", call. = FALSE)
 
     if(!is.null(xmap))
-      x$data <- .arrange_data_by_group(x$data, xmap)
+      x$data <- .arrange_data_by_group(x$data, xmap, reorder = reorder)
 
     tl <- list(
       baseOption = list(

R/utils.R

@@ -4,22 +4,24 @@ globalVariables(c("x", "e", ".", "acc", "epoch", "loss", "size", "val_acc", "val
   if (!is.null(x)) x else y
 }
 
-.arrange_data_x <- function(data, x){
+.arrange_data_x <- function(data, x, reorder = TRUE){
   vect <- data[[x]]
 
-  if(inherits(vect, "numeric") || inherits(vect, "integer"))
-    data <- data %>% dplyr::arrange_(x)
+  if(reorder)
+    if(inherits(vect, "numeric") || inherits(vect, "integer"))
+      data <- data %>% dplyr::arrange_(x)
 
   return(data)
 }
 
-.arrange_data_by_group <- function(data, x){
+.arrange_data_by_group <- function(data, x, reorder = TRUE){
 
   vect <- data[[1]][[x]]
 
   for(i in 1:length(data)){
-    if(inherits(vect, "numeric") || inherits(vect, "integer"))
-      data[[i]] <- data[[i]] %>% dplyr::arrange_(x)
+    if(reorder)
+      if(inherits(vect, "numeric") || inherits(vect, "integer"))
+        data[[i]] <- data[[i]] %>% dplyr::arrange_(x)
   }
 
   return(data)