Compare ⋅ juliasilge/tidytext

#' variables.
#' @param fun Function to perform within each subset to determine the resulting
#' ordering. By default, mean.
#' @param sep Separator to distinguish the two. You may want to set this
#' @param labels Function to transform the labels of
#' [ggplot2::scale_x_discrete()], by default `reorder_func`.
#' @param sep Separator to distinguish `by` and `within`. You may want to set this
#' manually if ___ can exist within one of your labels.
#' @param ... In \code{reorder_within} arguments passed on to
#' \code{\link{reorder}}. In the scale functions, extra arguments passed on to

@@ -49,6 +51,7 @@

Loading

#'   scale_x_reordered() +
#'   facet_wrap(vs ~ am, scales = "free_x")
#'
#' @importFrom lifecycle deprecated
#' @export
reorder_within <- function(x, by, within, fun = mean, sep = "___", ...) {
  if (!is.list(within)) {

@@ -62,15 +65,39 @@

Loading


#' @rdname reorder_within
#' @export
scale_x_reordered <- function(..., sep = "___") {
  reg <- paste0(sep, ".+$")
  ggplot2::scale_x_discrete(labels = function(x) gsub(reg, "", x), ...)
scale_x_reordered <- function(..., labels = reorder_func, sep = deprecated()) {

  if (lifecycle::is_present(sep)) {
    lifecycle::deprecate_soft(
      "0.3.3",
      "scale_x_reordered(sep = )",
      "reorder_func(sep = )"
    )
  }

  ggplot2::scale_x_discrete(labels = labels, ...)
}


#' @rdname reorder_within
#' @export
scale_y_reordered <- function(..., sep = "___") {
scale_y_reordered <- function(..., labels = reorder_func, sep = deprecated()) {

  if (lifecycle::is_present(sep)) {
    lifecycle::deprecate_soft(
      "0.3.3",
      "scale_y_reordered(sep = )",
      "reorder_func(sep = )"
    )
  }

  ggplot2::scale_y_discrete(labels = labels, ...)
}

#' @rdname reorder_within
#' @export
reorder_func <- function(x, sep = "___") {
  reg <- paste0(sep, ".+$")
  ggplot2::scale_y_discrete(labels = function(x) gsub(reg, "", x), ...)
  gsub(reg, "", x)
}


Everything is accounted for!

No changes detected that need to be reviewed.

What changes does Codecov check for?

Lines, not adjusted in diff, that have changed coverage data.

Files that introduced coverage data that had none before.

Files that have missing coverage data that once were tracked.

81.70% 23.08% -1.34%

Use `labels` function for reorder_within scaling. Closes #200.

juliasilge

a208573

CI Passed

+10

+2

+8

83.04% ø ø

Update JSS link to DOI, update pkg docs

juliasilge

72610d9

CI Passed

Files		•	•	•	Coverage
Project Totals (19 files)	470	384	0	86	81.70%

Navigation	Overlay
`t` Navigate files	`h` Toggle hits
`y` Change url to tip of branch	`m` Toggle misses
`b / v` Jump to prev/next hit line	`p` Toggle partial
`z / x` Jump to prev/next missed or partial line	`1..9` Toggle flags
`shift + o` Open current page in GitHub	`a` Toggle all on
`/ or ?` Show keyboard shortcuts dialog	`c` Toggle context lines or commits

Compare `72610d9 ... +0 ... a208573`

No flags found

Everything is accounted for!

What changes does Codecov check for?

2 Commits

14	14		#' variables.
15	15		#' @param fun Function to perform within each subset to determine the resulting
16	16		#' ordering. By default, mean.
17		-	#' @param sep Separator to distinguish the two. You may want to set this
	17	+	#' @param labels Function to transform the labels of
	18	+	#' [ggplot2::scale_x_discrete()], by default `reorder_func`.
	19	+	#' @param sep Separator to distinguish `by` and `within`. You may want to set this
18	20		#' manually if ___ can exist within one of your labels.
19	21		#' @param ... In \code{reorder_within} arguments passed on to
20	22		#' \code{\link{reorder}}. In the scale functions, extra arguments passed on to

49	51		#' scale_x_reordered() +
50	52		#' facet_wrap(vs ~ am, scales = "free_x")
51	53		#'
	54	+	#' @importFrom lifecycle deprecated
52	55		#' @export
53	56		reorder_within <- function(x, by, within, fun = mean, sep = "___", ...) {
54	57		if (!is.list(within)) {

62	65
63	66		#' @rdname reorder_within
64	67		#' @export
65		-	scale_x_reordered <- function(..., sep = "___") {
66		-	reg <- paste0(sep, ".+$")
67		-	ggplot2::scale_x_discrete(labels = function(x) gsub(reg, "", x), ...)
	68	+	scale_x_reordered <- function(..., labels = reorder_func, sep = deprecated()) {
	69	+
	70	+	if (lifecycle::is_present(sep)) {
	71	+	lifecycle::deprecate_soft(
	72	+	"0.3.3",
	73	+	"scale_x_reordered(sep = )",
	74	+	"reorder_func(sep = )"
	75	+	)
	76	+	}
	77	+
	78	+	ggplot2::scale_x_discrete(labels = labels, ...)
68	79		}
69	80
70	81
71	82		#' @rdname reorder_within
72	83		#' @export
73		-	scale_y_reordered <- function(..., sep = "___") {
	84	+	scale_y_reordered <- function(..., labels = reorder_func, sep = deprecated()) {
	85	+
	86	+	if (lifecycle::is_present(sep)) {
	87	+	lifecycle::deprecate_soft(
	88	+	"0.3.3",
	89	+	"scale_y_reordered(sep = )",
	90	+	"reorder_func(sep = )"
	91	+	)
	92	+	}
	93	+
	94	+	ggplot2::scale_y_discrete(labels = labels, ...)
	95	+	}
	96	+
	97	+	#' @rdname reorder_within
	98	+	#' @export
	99	+	reorder_func <- function(x, sep = "___") {
74	100		reg <- paste0(sep, ".+$")
75		-	ggplot2::scale_y_discrete(labels = function(x) gsub(reg, "", x), ...)
	101	+	gsub(reg, "", x)
76	102		}
	103	+

Compare 72610d9 ... +0 ... a208573

No flags found

Everything is accounted for!

What changes does Codecov check for?

2 Commits

Compare `72610d9 ... +0 ... a208573`