@@ -224,11 +224,11 @@ ggplot_add.tiplab <- function(object, plot, object_name) {

         ly <- do.call(geom_tiplab_rectangular, object)

         plot <- ggplot_add(ly, plot, object_name)

         object$size <- fontsize

-        object$mapping <- NULL

+        #object$mapping <- NULL

         object$align <- NULL

         object$linetype <- NULL

         object$linesize <- NULL

-        object$geom <- NULL

+        #object$geom <- NULL

         object$offset <- NULL

         object$nodelab <- NULL

         res <- ggplot_add.tiplab_ylab(object, plot, object_name)

@@ -259,11 +259,30 @@ ggplot_add.tiplab_ylab <- function(object, plot, object_name) {

     }

     df <- plot$data

-    df <- df[df$isTip, ]

+    if ('label' %in% names(object$mapping)){

+        if (object$geom == 'text'){

+            xx <- do.call('geom_text', list(mapping=object$mapping))

+            xx$computed_mapping <- c(xx$mapping, plot$mapping[setdiff(names(plot$mapping), names(xx$mapping))])

+            class(xx$computed_mapping) <- "uneval"

+            if (!is.null(object$data)){

+                df <- object$data

+            }else{

+                df <- df[df$isTip,]

+            }

+            df <- suppressWarnings(xx$compute_aesthetics(data=df, plot=plot))

+        }else{

+            message('The geom is not text, as_ylab will use original tip labels of tree')

+            df <- df[df$isTip, ]

+        }

+    }else{

+        df <- df[df$isTip, ]

+    }

     yscale <- scale_y_continuous(breaks = df$y, labels = df$label,

                                  position = object$position, expand = expansion(0, 0.6))

     object$position <- NULL

+    object$mapping <- NULL

+    object$geom <- NULL

     object$node <- NULL

     ytext <- do.call(element_text, object)