diff --git a/NEWS.md b/NEWS.md index be80bd95..4278ddd8 100644 --- a/NEWS.md +++ b/NEWS.md @@ -7,6 +7,7 @@ * Fix a bug with auto layout on undirected trees (#247) * Fix a bug in `get_con()` that would lead to wrong matching of additional data (#249) +* Allow `na.rm` in geoms (#301) # ggraph 2.1.0 diff --git a/R/geom_axis_hive.R b/R/geom_axis_hive.R index 16b07309..fa50645e 100644 --- a/R/geom_axis_hive.R +++ b/R/geom_axis_hive.R @@ -160,6 +160,6 @@ geom_axis_hive <- function(mapping = NULL, data = NULL, data = data, mapping = mapping, stat = StatAxisHive, geom = GeomAxisHive, position = position, show.legend = show.legend, inherit.aes = FALSE, - params = list(na.rm = FALSE, label = label, axis = axis, ...) + params = list2(label = label, axis = axis, ...) ) } diff --git a/R/geom_conn_bundle.R b/R/geom_conn_bundle.R index 1866d9ce..9cba5c28 100644 --- a/R/geom_conn_bundle.R +++ b/R/geom_conn_bundle.R @@ -123,9 +123,9 @@ geom_conn_bundle <- function(mapping = NULL, data = get_con(), geom = GeomEdgePath, position = position, show.legend = show.legend, inherit.aes = FALSE, params = expand_edge_aes( - list( - arrow = arrow, lineend = lineend, na.rm = FALSE, n = n, - interpolate = FALSE, tension = tension, type = 'clamped', ... + list2( + arrow = arrow, lineend = lineend, n = n, interpolate = FALSE, + tension = tension, type = 'clamped', ... ) ) ) @@ -162,8 +162,8 @@ geom_conn_bundle2 <- function(mapping = NULL, data = get_con(), inherit.aes = FALSE, params = expand_edge_aes( list( - arrow = arrow, lineend = lineend, na.rm = FALSE, n = n, - interpolate = TRUE, tension = tension, type = 'clamped', ... + arrow = arrow, lineend = lineend, n = n, interpolate = TRUE, + tension = tension, type = 'clamped', ... ) ) ) @@ -198,9 +198,9 @@ geom_conn_bundle0 <- function(mapping = NULL, data = get_con(), geom = GeomEdgeBspline, position = position, show.legend = show.legend, inherit.aes = FALSE, params = expand_edge_aes( - list( - arrow = arrow, lineend = lineend, na.rm = FALSE, - tension = tension, type = 'clamped', ... + list2( + arrow = arrow, lineend = lineend, tension = tension, type = 'clamped', + ... ) ) ) diff --git a/R/geom_edge_arc.R b/R/geom_edge_arc.R index 9b50226f..f11d6349 100644 --- a/R/geom_edge_arc.R +++ b/R/geom_edge_arc.R @@ -150,9 +150,9 @@ geom_edge_arc <- function(mapping = NULL, data = get_edges(), geom = GeomEdgePath, position = position, show.legend = show.legend, inherit.aes = FALSE, params = expand_edge_aes( - list( + list2( arrow = arrow, lineend = lineend, linejoin = linejoin, - linemitre = linemitre, na.rm = FALSE, n = n, + linemitre = linemitre, n = n, interpolate = FALSE, strength = strength, fold = fold, label_colour = label_colour, label_alpha = label_alpha, label_parse = label_parse, check_overlap = check_overlap, @@ -207,9 +207,9 @@ geom_edge_arc2 <- function(mapping = NULL, data = get_edges('long'), geom = GeomEdgePath, position = position, show.legend = show.legend, inherit.aes = FALSE, params = expand_edge_aes( - list( + list2( arrow = arrow, lineend = lineend, linejoin = linejoin, - linemitre = linemitre, na.rm = FALSE, n = n, + linemitre = linemitre, n = n, interpolate = TRUE, strength = strength, fold = fold, label_colour = label_colour, label_alpha = label_alpha, label_parse = label_parse, check_overlap = check_overlap, @@ -252,9 +252,8 @@ geom_edge_arc0 <- function(mapping = NULL, data = get_edges(), geom = GeomEdgeBezier, position = position, show.legend = show.legend, inherit.aes = FALSE, params = expand_edge_aes( - list( - arrow = arrow, lineend = lineend, na.rm = FALSE, - strength = strength, fold = FALSE, ... + list2( + arrow = arrow, lineend = lineend, strength = strength, fold = FALSE, ... ) ) ) diff --git a/R/geom_edge_bend.R b/R/geom_edge_bend.R index 75897a70..92579d4b 100644 --- a/R/geom_edge_bend.R +++ b/R/geom_edge_bend.R @@ -128,9 +128,9 @@ geom_edge_bend <- function(mapping = NULL, data = get_edges(), geom = GeomEdgePath, position = position, show.legend = show.legend, inherit.aes = FALSE, params = expand_edge_aes( - list( + list2( arrow = arrow, lineend = lineend, linejoin = linejoin, - linemitre = linemitre, na.rm = FALSE, n = n, + linemitre = linemitre, n = n, interpolate = FALSE, flipped = flipped, strength = strength, label_colour = label_colour, label_alpha = label_alpha, label_parse = label_parse, check_overlap = check_overlap, @@ -181,9 +181,9 @@ geom_edge_bend2 <- function(mapping = NULL, data = get_edges('long'), geom = GeomEdgePath, position = position, show.legend = show.legend, inherit.aes = FALSE, params = expand_edge_aes( - list( + list2( arrow = arrow, lineend = lineend, linejoin = linejoin, - linemitre = linemitre, na.rm = FALSE, n = n, + linemitre = linemitre, n = n, interpolate = TRUE, flipped = flipped, strength = strength, label_colour = label_colour, label_alpha = label_alpha, label_parse = label_parse, check_overlap = check_overlap, @@ -223,8 +223,8 @@ geom_edge_bend0 <- function(mapping = NULL, data = get_edges(), geom = GeomEdgeBezier, position = position, show.legend = show.legend, inherit.aes = FALSE, params = expand_edge_aes( - list( - arrow = arrow, lineend = lineend, na.rm = FALSE, strength = strength, + list2( + arrow = arrow, lineend = lineend, strength = strength, flipped = flipped, ... ) ) diff --git a/R/geom_edge_density.R b/R/geom_edge_density.R index d854dff0..c718be24 100644 --- a/R/geom_edge_density.R +++ b/R/geom_edge_density.R @@ -169,7 +169,7 @@ geom_edge_density <- function(mapping = NULL, data = get_edges('short'), geom = GeomEdgeDensity, position = position, show.legend = show.legend, inherit.aes = FALSE, params = expand_edge_aes( - list(na.rm = FALSE, n = n, ...) + list2(n = n, ...) ) ) } diff --git a/R/geom_edge_diagonal.R b/R/geom_edge_diagonal.R index 064f9197..d5454c9a 100644 --- a/R/geom_edge_diagonal.R +++ b/R/geom_edge_diagonal.R @@ -136,9 +136,9 @@ geom_edge_diagonal <- function(mapping = NULL, data = get_edges(), geom = GeomEdgePath, position = position, show.legend = show.legend, inherit.aes = FALSE, params = expand_edge_aes( - list( + list2( arrow = arrow, lineend = lineend, linejoin = linejoin, - linemitre = linemitre, na.rm = FALSE, n = n, + linemitre = linemitre, n = n, interpolate = FALSE, flipped = flipped, strength = strength, label_colour = label_colour, label_alpha = label_alpha, label_parse = label_parse, check_overlap = check_overlap, @@ -189,9 +189,9 @@ geom_edge_diagonal2 <- function(mapping = NULL, data = get_edges('long'), geom = GeomEdgePath, position = position, show.legend = show.legend, inherit.aes = FALSE, params = expand_edge_aes( - list( + list2( arrow = arrow, lineend = lineend, linejoin = linejoin, - linemitre = linemitre, na.rm = FALSE, n = n, + linemitre = linemitre, n = n, interpolate = TRUE, flipped = flipped, strength = strength, label_colour = label_colour, label_alpha = label_alpha, label_parse = label_parse, check_overlap = check_overlap, @@ -231,8 +231,8 @@ geom_edge_diagonal0 <- function(mapping = NULL, data = get_edges(), geom = GeomEdgeBezier, position = position, show.legend = show.legend, inherit.aes = FALSE, params = expand_edge_aes( - list( - arrow = arrow, lineend = lineend, na.rm = FALSE, strength = strength, + list2( + arrow = arrow, lineend = lineend, strength = strength, flipped = flipped, ... ) ) diff --git a/R/geom_edge_elbow.R b/R/geom_edge_elbow.R index dd1b659c..4884639b 100644 --- a/R/geom_edge_elbow.R +++ b/R/geom_edge_elbow.R @@ -229,9 +229,9 @@ geom_edge_elbow <- function(mapping = NULL, data = get_edges(), geom = GeomEdgePath, position = position, show.legend = show.legend, inherit.aes = FALSE, params = expand_edge_aes( - list( + list2( arrow = arrow, lineend = lineend, linejoin = linejoin, - linemitre = linemitre, na.rm = FALSE, n = n, + linemitre = linemitre, n = n, interpolate = FALSE, flipped = flipped, strength = strength, label_colour = label_colour, label_alpha = label_alpha, label_parse = label_parse, check_overlap = check_overlap, @@ -300,9 +300,9 @@ geom_edge_elbow2 <- function(mapping = NULL, data = get_edges('long'), geom = GeomEdgePath, position = position, show.legend = show.legend, inherit.aes = FALSE, params = expand_edge_aes( - list( + list2( arrow = arrow, lineend = lineend, linejoin = linejoin, - linemitre = linemitre, na.rm = FALSE, n = n, + linemitre = linemitre, n = n, interpolate = TRUE, flipped = flipped, strength = strength, label_colour = label_colour, label_alpha = label_alpha, label_parse = label_parse, check_overlap = check_overlap, @@ -404,9 +404,9 @@ geom_edge_elbow0 <- function(mapping = NULL, data = get_edges(), geom = GeomEdgePath, position = position, show.legend = show.legend, inherit.aes = FALSE, params = expand_edge_aes( - list( - arrow = arrow, lineend = lineend, na.rm = FALSE, - interpolate = FALSE, flipped = flipped, ... + list2( + arrow = arrow, lineend = lineend, interpolate = FALSE, flipped = flipped, + ... ) ) ) diff --git a/R/geom_edge_fan.R b/R/geom_edge_fan.R index 8dc92cf3..c0532619 100644 --- a/R/geom_edge_fan.R +++ b/R/geom_edge_fan.R @@ -142,9 +142,9 @@ geom_edge_fan <- function(mapping = NULL, data = get_edges(), geom = GeomEdgePath, position = position, show.legend = show.legend, inherit.aes = FALSE, params = expand_edge_aes( - list( + list2( arrow = arrow, lineend = lineend, linejoin = linejoin, - linemitre = linemitre, na.rm = FALSE, n = n, + linemitre = linemitre, n = n, interpolate = FALSE, strength = strength, label_colour = label_colour, label_alpha = label_alpha, label_parse = label_parse, check_overlap = check_overlap, @@ -199,9 +199,9 @@ geom_edge_fan2 <- function(mapping = NULL, data = get_edges('long'), geom = GeomEdgePath, position = position, show.legend = show.legend, inherit.aes = FALSE, params = expand_edge_aes( - list( + list2( arrow = arrow, lineend = lineend, linejoin = linejoin, - linemitre = linemitre, na.rm = FALSE, n = n, + linemitre = linemitre, n = n, interpolate = TRUE, strength = strength, label_colour = label_colour, label_alpha = label_alpha, label_parse = label_parse, check_overlap = check_overlap, @@ -244,9 +244,8 @@ geom_edge_fan0 <- function(mapping = NULL, data = get_edges(), geom = GeomEdgeBezier, position = position, show.legend = show.legend, inherit.aes = FALSE, params = expand_edge_aes( - list( - arrow = arrow, lineend = lineend, na.rm = FALSE, - strength = strength, ... + list2( + arrow = arrow, lineend = lineend, strength = strength, ... ) ) ) diff --git a/R/geom_edge_hive.R b/R/geom_edge_hive.R index c085218e..dc83574a 100644 --- a/R/geom_edge_hive.R +++ b/R/geom_edge_hive.R @@ -144,9 +144,9 @@ geom_edge_hive <- function(mapping = NULL, data = get_edges(), geom = GeomEdgePath, position = position, show.legend = show.legend, inherit.aes = FALSE, params = expand_edge_aes( - list( + list2( arrow = arrow, lineend = lineend, linejoin = linejoin, - linemitre = linemitre, na.rm = FALSE, n = n, + linemitre = linemitre, n = n, interpolate = FALSE, strength = strength, label_colour = label_colour, label_alpha = label_alpha, label_parse = label_parse, check_overlap = check_overlap, @@ -200,9 +200,9 @@ geom_edge_hive2 <- function(mapping = NULL, data = get_edges('long'), geom = GeomEdgePath, position = position, show.legend = show.legend, inherit.aes = FALSE, params = expand_edge_aes( - list( + list2( arrow = arrow, lineend = lineend, linejoin = linejoin, - linemitre = linemitre, na.rm = FALSE, n = n, + linemitre = linemitre, n = n, interpolate = TRUE, strength = strength, label_colour = label_colour, label_alpha = label_alpha, label_parse = label_parse, check_overlap = check_overlap, @@ -243,9 +243,8 @@ geom_edge_hive0 <- function(mapping = NULL, data = get_edges(), geom = GeomEdgeBezier, position = position, show.legend = show.legend, inherit.aes = FALSE, params = expand_edge_aes( - list( - arrow = arrow, lineend = lineend, na.rm = FALSE, - strength = strength, ... + list2( + arrow = arrow, lineend = lineend, strength = strength, ... ) ) ) diff --git a/R/geom_edge_link.R b/R/geom_edge_link.R index ce428a55..fc37dc2a 100644 --- a/R/geom_edge_link.R +++ b/R/geom_edge_link.R @@ -201,10 +201,9 @@ geom_edge_link <- function(mapping = NULL, data = get_edges('short'), geom = GeomEdgePath, position = position, show.legend = show.legend, inherit.aes = FALSE, params = expand_edge_aes( - list( + list2( arrow = arrow, lineend = lineend, linejoin = linejoin, - linemitre = linemitre, na.rm = FALSE, n = n, - interpolate = FALSE, + linemitre = linemitre, n = n, interpolate = FALSE, label_colour = label_colour, label_alpha = label_alpha, label_parse = label_parse, check_overlap = check_overlap, angle_calc = angle_calc, force_flip = force_flip, @@ -233,10 +232,9 @@ geom_edge_link2 <- function(mapping = NULL, data = get_edges('long'), geom = GeomEdgePath, position = position, show.legend = show.legend, inherit.aes = FALSE, params = expand_edge_aes( - list( + list2( arrow = arrow, lineend = lineend, linejoin = linejoin, - linemitre = linemitre, na.rm = FALSE, n = n, - interpolate = TRUE, + linemitre = linemitre, n = n, interpolate = TRUE, label_colour = label_colour, label_alpha = label_alpha, label_parse = label_parse, check_overlap = check_overlap, angle_calc = angle_calc, force_flip = force_flip, @@ -260,7 +258,7 @@ geom_edge_link0 <- function(mapping = NULL, data = get_edges(), geom = GeomEdgeSegment, position = position, show.legend = show.legend, inherit.aes = FALSE, params = expand_edge_aes( - list(arrow = arrow, lineend = lineend, na.rm = FALSE, ...) + list2(arrow = arrow, lineend = lineend, ...) ) ) } diff --git a/R/geom_edge_loop.R b/R/geom_edge_loop.R index db09b770..1c75c445 100644 --- a/R/geom_edge_loop.R +++ b/R/geom_edge_loop.R @@ -116,10 +116,9 @@ geom_edge_loop <- function(mapping = NULL, data = get_edges(), geom = GeomEdgePath, position = position, show.legend = show.legend, inherit.aes = FALSE, params = expand_edge_aes( - list( + list2( arrow = arrow, lineend = lineend, linejoin = linejoin, - linemitre = linemitre, na.rm = FALSE, n = n, - interpolate = FALSE, + linemitre = linemitre, n = n, interpolate = FALSE, label_colour = label_colour, label_alpha = label_alpha, label_parse = label_parse, check_overlap = check_overlap, angle_calc = angle_calc, force_flip = force_flip, @@ -157,7 +156,7 @@ geom_edge_loop0 <- function(mapping = NULL, data = get_edges(), geom = GeomEdgeBezier, position = position, show.legend = show.legend, inherit.aes = FALSE, params = expand_edge_aes( - list(arrow = arrow, lineend = lineend, na.rm = FALSE, ...) + list2(arrow = arrow, lineend = lineend, ...) ) ) } diff --git a/R/geom_edge_parallel.R b/R/geom_edge_parallel.R index 9a69076d..a8ef7400 100644 --- a/R/geom_edge_parallel.R +++ b/R/geom_edge_parallel.R @@ -135,9 +135,8 @@ geom_edge_parallel <- function(mapping = NULL, data = get_edges(), geom = GeomEdgeParallelPath, position = position, show.legend = show.legend, inherit.aes = FALSE, params = expand_edge_aes( - list(arrow = arrow, lineend = lineend, linejoin = linejoin, - linemitre = linemitre, na.rm = FALSE, sep = sep, n = n, - interpolate = FALSE, + list2(arrow = arrow, lineend = lineend, linejoin = linejoin, + linemitre = linemitre, sep = sep, n = n, interpolate = FALSE, label_colour = label_colour, label_alpha = label_alpha, label_parse = label_parse, check_overlap = check_overlap, angle_calc = angle_calc, force_flip = force_flip, @@ -187,9 +186,8 @@ geom_edge_parallel2 <- function(mapping = NULL, data = get_edges('long'), geom = GeomEdgeParallelPath, position = position, show.legend = show.legend, inherit.aes = FALSE, params = expand_edge_aes( - list(arrow = arrow, lineend = lineend, linejoin = linejoin, - linemitre = linemitre, na.rm = FALSE, sep = sep, n = n, - interpolate = TRUE, + list2(arrow = arrow, lineend = lineend, linejoin = linejoin, + linemitre = linemitre, sep = sep, n = n, interpolate = TRUE, label_colour = label_colour, label_alpha = label_alpha, label_parse = label_parse, check_overlap = check_overlap, angle_calc = angle_calc, force_flip = force_flip, @@ -226,9 +224,8 @@ geom_edge_parallel0 <- function(mapping = NULL, data = get_edges(), geom = GeomEdgeParallelSegment, position = position, show.legend = show.legend, inherit.aes = FALSE, params = expand_edge_aes( - list( - arrow = arrow, lineend = lineend, na.rm = FALSE, - sep = sep, ... + list2( + arrow = arrow, lineend = lineend, sep = sep, ... ) ) ) diff --git a/R/geom_edge_point.R b/R/geom_edge_point.R index 5cc63056..d8ff37db 100644 --- a/R/geom_edge_point.R +++ b/R/geom_edge_point.R @@ -68,6 +68,6 @@ geom_edge_point <- function(mapping = NULL, data = get_edges(), layer( data = data, mapping = mapping, stat = StatFilter, geom = GeomEdgePoint, position = position, show.legend = show.legend, inherit.aes = FALSE, - params = list(na.rm = FALSE, mirror = mirror, ...) + params = list2(mirror = mirror, ...) ) } diff --git a/R/geom_edge_span.R b/R/geom_edge_span.R index a1070686..7e6e4df1 100644 --- a/R/geom_edge_span.R +++ b/R/geom_edge_span.R @@ -113,9 +113,9 @@ geom_edge_span <- function(mapping = NULL, data = get_edges('short'), geom = GeomEdgeSpanPath, position = position, show.legend = show.legend, inherit.aes = FALSE, params = expand_edge_aes( - list( + list2( arrow = arrow, lineend = lineend, linejoin = linejoin, - linemitre = linemitre, na.rm = FALSE, n = n, + linemitre = linemitre, n = n, interpolate = FALSE, end_shape = end_shape, label_colour = label_colour, label_alpha = label_alpha, label_parse = label_parse, check_overlap = check_overlap, @@ -145,9 +145,9 @@ geom_edge_span2 <- function(mapping = NULL, data = get_edges('long'), geom = GeomEdgeSpanPath, position = position, show.legend = show.legend, inherit.aes = FALSE, params = expand_edge_aes( - list( + list2( arrow = arrow, lineend = lineend, linejoin = linejoin, - linemitre = linemitre, na.rm = FALSE, n = n, + linemitre = linemitre, n = n, interpolate = TRUE, end_shape = end_shape, label_colour = label_colour, label_alpha = label_alpha, label_parse = label_parse, check_overlap = check_overlap, @@ -172,7 +172,7 @@ geom_edge_span0 <- function(mapping = NULL, data = get_edges(), geom = GeomEdgeSpanSegment, position = position, show.legend = show.legend, inherit.aes = FALSE, params = expand_edge_aes( - list(end_shape = end_shape, arrow = arrow, lineend = lineend, na.rm = FALSE, ...) + list2(end_shape = end_shape, arrow = arrow, lineend = lineend, ...) ) ) } diff --git a/R/geom_edge_tile.R b/R/geom_edge_tile.R index a8a60837..7ae0626f 100644 --- a/R/geom_edge_tile.R +++ b/R/geom_edge_tile.R @@ -68,6 +68,6 @@ geom_edge_tile <- function(mapping = NULL, data = get_edges(), layer( data = data, mapping = mapping, stat = StatFilter, geom = GeomEdgeTile, position = position, show.legend = show.legend, inherit.aes = FALSE, - params = list(na.rm = FALSE, mirror = mirror, ...) + params = list2(mirror = mirror, ...) ) } diff --git a/R/geom_node_arc_bar.R b/R/geom_node_arc_bar.R index 740a4d08..c3b722f1 100644 --- a/R/geom_node_arc_bar.R +++ b/R/geom_node_arc_bar.R @@ -49,7 +49,7 @@ geom_node_arc_bar <- function(mapping = NULL, data = NULL, position = 'identity' layer( data = data, mapping = mapping, stat = StatNodeArcBar, geom = GeomArcBar, position = position, show.legend = show.legend, inherit.aes = FALSE, - params = list(na.rm = FALSE, ...) + params = list2(...) ) } diff --git a/R/geom_node_circle.R b/R/geom_node_circle.R index ce71326d..b21e32d5 100644 --- a/R/geom_node_circle.R +++ b/R/geom_node_circle.R @@ -46,7 +46,7 @@ geom_node_circle <- function(mapping = NULL, data = NULL, position = 'identity', layer( data = data, mapping = mapping, stat = StatNodeCircle, geom = GeomCircle, position = position, show.legend = show.legend, inherit.aes = FALSE, - params = list(na.rm = FALSE, ...) + params = list2(...) ) } diff --git a/R/geom_node_point.R b/R/geom_node_point.R index 55c4966c..a78cb5f9 100644 --- a/R/geom_node_point.R +++ b/R/geom_node_point.R @@ -41,6 +41,6 @@ geom_node_point <- function(mapping = NULL, data = NULL, position = 'identity', layer( data = data, mapping = mapping, stat = StatFilter, geom = GeomPoint, position = position, show.legend = show.legend, inherit.aes = FALSE, - params = list(na.rm = FALSE, ...) + params = list2(...) ) } diff --git a/R/geom_node_range.R b/R/geom_node_range.R index ed482fd5..610cbaa0 100644 --- a/R/geom_node_range.R +++ b/R/geom_node_range.R @@ -41,6 +41,6 @@ geom_node_range <- function(mapping = NULL, data = NULL, position = 'identity', layer( data = data, mapping = mapping, stat = StatFilter, geom = GeomSegment, position = position, show.legend = show.legend, inherit.aes = FALSE, - params = list(na.rm = FALSE, ...) + params = list2(...) ) } diff --git a/R/geom_node_text.R b/R/geom_node_text.R index 2428cc54..25870fcb 100644 --- a/R/geom_node_text.R +++ b/R/geom_node_text.R @@ -64,7 +64,7 @@ geom_node_text <- function(mapping = NULL, data = NULL, position = 'identity', } position <- position_nudge(nudge_x, nudge_y) } - params <- list(parse = parse, na.rm = FALSE, ...) + params <- list2(parse = parse, ...) if (repel) { geom <- GeomTextRepel } else { @@ -101,9 +101,9 @@ geom_node_label <- function(mapping = NULL, data = NULL, position = 'identity', } position <- position_nudge(nudge_x, nudge_y) } - params <- list( + params <- list2( parse = parse, label.padding = label.padding, - label.r = label.r, label.size = label.size, na.rm = FALSE, ... + label.r = label.r, label.size = label.size, ... ) if (repel) { geom <- GeomLabelRepel diff --git a/R/geom_node_tile.R b/R/geom_node_tile.R index ba200a0f..632efa8e 100644 --- a/R/geom_node_tile.R +++ b/R/geom_node_tile.R @@ -59,7 +59,7 @@ geom_node_tile <- function(mapping = NULL, data = NULL, position = 'identity', layer( data = data, mapping = mapping, stat = StatFilter, geom = GeomNodeTile, position = position, show.legend = show.legend, inherit.aes = FALSE, - params = list(na.rm = FALSE, ...) + params = list2(...) ) } diff --git a/R/geom_node_voronoi.R b/R/geom_node_voronoi.R index 8ec4327c..8fa0779d 100644 --- a/R/geom_node_voronoi.R +++ b/R/geom_node_voronoi.R @@ -56,7 +56,7 @@ geom_node_voronoi <- function(mapping = NULL, data = NULL, position = 'identity' layer( data = data, mapping = mapping, stat = StatNodeVoronoi, geom = GeomShape, position = position, show.legend = show.legend, inherit.aes = FALSE, - params = list(na.rm = FALSE, bound = bound, eps = eps, max.radius = max.radius, + params = list2(bound = bound, eps = eps, max.radius = max.radius, normalize = normalize, asp.ratio = asp.ratio, expand = expand, radius = radius, ...) )