@@ -9,6 +9,7 @@ S3method(fortify,phylo4)

 S3method(fortify,phylo4d)

 S3method(fortify,phyloseq)

 S3method(fortify,treedata)

+S3method(ggplot_add,facet_xlim)

 S3method(groupClade,ggtree)

 S3method(groupOTU,ggtree)

 S3method(identify,gg)

@@ -164,6 +165,7 @@ importFrom(ggplot2,geom_text)

 importFrom(ggplot2,geom_tile)

 importFrom(ggplot2,ggplot)

 importFrom(ggplot2,ggplotGrob)

+importFrom(ggplot2,ggplot_add)

 importFrom(ggplot2,ggplot_build)

 importFrom(ggplot2,ggplot_gtable)

 importFrom(ggplot2,ggproto)

@@ -205,11 +207,13 @@ importFrom(grid,viewport)

 importFrom(magrittr,"%<>%")

 importFrom(magrittr,"%>%")

 importFrom(magrittr,equals)

+importFrom(magrittr,extract)

 importFrom(methods,is)

 importFrom(methods,missingArg)

 importFrom(methods,setGeneric)

 importFrom(methods,setOldClass)

 importFrom(rlang,.data)

+importFrom(rlang,quo_name)

 importFrom(rvcheck,get_aes_var)

 importFrom(rvcheck,get_fun_from_pkg)

 importFrom(tidyr,gather)

@@ -1,5 +1,7 @@

 # ggtree 1.17.1

++ extend `xlim_expand` to work with `ggplot2` (2019-05-20, Tue)

+  - <https://yulab-smu.github.io/treedata-book/chapter9.html#xlim_expand>

 + add `legend_title` variable in `gheatmap` (2019-05-16, Thu)

 # ggtree 1.16.0

@@ -23,7 +23,27 @@ xlim_tree <- function(xlim) {

 ##' @author guangchuang yu

 xlim_expand <- function(xlim, panel) {

     dummy <- data.frame(x=xlim, .panel=panel)

-    geom_blank(aes_(x=~x), dummy, inherit.aes = FALSE)

+    ly <- geom_blank(aes_(x=~x), dummy, inherit.aes = FALSE)

+    class(ly) <- c("facet_xlim", class(ly))

+    return(ly)

+}

+

+##' @importFrom rlang quo_name

+##' @importFrom magrittr extract

+##' @importFrom ggplot2 ggplot_add

+##' @method ggplot_add facet_xlim

+##' @export

+ggplot_add.facet_xlim <- function(object, plot, object_name) {

+    var <- quo_name(plot$facet$params$cols[[1]])

+    free_x <- plot$facet$params$free$x

+    if (!is.null(free_x) && !free_x) {

+        message('If you want to adjust xlim for specific panel, you need to set `scales = "free_x"`')

+    }

+    class(object) %<>% extract(., .!= "facet_xlim")

+    nm <- names(object$data)

+    nm[nm == '.panel']  <- var

+    names(object$data)  <- nm

+    ggplot_add(object, plot, object_name)

 }

 ##' reverse timescle x-axis