Skip to content

Commit afbfe16

Browse files
authored
Date break doc improvement (#5080)
* Document valid specifications of date_breaks * date_breaks() to `breaks_width()` * Don't use `date_breaks()` in tests
1 parent b118168 commit afbfe16

File tree

5 files changed

+20
-14
lines changed

5 files changed

+20
-14
lines changed

R/scale-date.r

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,13 @@
1515
#' - A function that takes the limits as input and returns breaks as output
1616
#' @param date_breaks A string giving the distance between breaks like "2
1717
#' weeks", or "10 years". If both `breaks` and `date_breaks` are
18-
#' specified, `date_breaks` wins.
18+
#' specified, `date_breaks` wins. Valid specifications are 'sec', 'min',
19+
#' 'hour', 'day', 'week', 'month' or 'year', optionally followed by 's'.
1920
#' @param date_minor_breaks A string giving the distance between minor breaks
2021
#' like "2 weeks", or "10 years". If both `minor_breaks` and
21-
#' `date_minor_breaks` are specified, `date_minor_breaks` wins.
22+
#' `date_minor_breaks` are specified, `date_minor_breaks` wins. Valid
23+
#' specifications are 'sec', 'min', 'hour', 'day', 'week', 'month' or 'year',
24+
#' optionally followed by 's'.
2225
#' @param minor_breaks One of:
2326
#' - `NULL` for no breaks
2427
#' - `waiver()` for the breaks specified by `date_minor_breaks`
@@ -282,14 +285,14 @@ datetime_scale <- function(aesthetics, trans, palette,
282285

283286

284287
# Backward compatibility
285-
if (is.character(breaks)) breaks <- date_breaks(breaks)
286-
if (is.character(minor_breaks)) minor_breaks <- date_breaks(minor_breaks)
288+
if (is.character(breaks)) breaks <- breaks_width(breaks)
289+
if (is.character(minor_breaks)) minor_breaks <- breaks_width(minor_breaks)
287290

288291
if (!is.waive(date_breaks)) {
289-
breaks <- date_breaks(date_breaks)
292+
breaks <- breaks_width(date_breaks)
290293
}
291294
if (!is.waive(date_minor_breaks)) {
292-
minor_breaks <- date_breaks(date_minor_breaks)
295+
minor_breaks <- breaks_width(date_minor_breaks)
293296
}
294297
if (!is.waive(date_labels)) {
295298
labels <- function(self, x) {

man/scale_date.Rd

Lines changed: 5 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/testthat/_snaps/scale_date/scale-x-date-breaks-date-breaks-2-weeks.svg renamed to tests/testthat/_snaps/scale_date/scale-x-date-breaks-breaks-width-2-weeks.svg

Lines changed: 1 addition & 1 deletion
Loading

tests/testthat/_snaps/scale_date/scale-y-date-breaks-date-breaks-2-weeks.svg renamed to tests/testthat/_snaps/scale_date/scale-y-date-breaks-breaks-width-2-weeks.svg

Lines changed: 1 addition & 1 deletion
Loading

tests/testthat/test-scale_date.R

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ test_that("date scale draws correctly", {
1616
expect_doppelganger("dates along x, default breaks",
1717
dt
1818
)
19-
expect_doppelganger("scale_x_date(breaks = date_breaks(\"2 weeks\"))",
20-
dt + scale_x_date(breaks = date_breaks("2 weeks"))
19+
expect_doppelganger("scale_x_date(breaks = breaks_width(\"2 weeks\"))",
20+
dt + scale_x_date(breaks = breaks_width("2 weeks"))
2121
)
2222
expect_doppelganger("scale_x_date(breaks = \"3 weeks\")",
2323
dt + scale_x_date(date_breaks = "3 weeks")
@@ -31,8 +31,8 @@ test_that("date scale draws correctly", {
3131

3232
dt <- ggplot(df, aes(price, dx)) + geom_line()
3333
expect_doppelganger("dates along y, default breaks", dt)
34-
expect_doppelganger("scale_y_date(breaks = date_breaks(\"2 weeks\"))",
35-
dt + scale_y_date(breaks = date_breaks("2 weeks"))
34+
expect_doppelganger("scale_y_date(breaks = breaks_width(\"2 weeks\"))",
35+
dt + scale_y_date(breaks = breaks_width("2 weeks"))
3636
)
3737
expect_doppelganger("scale_y_date(breaks = \"3 weeks\")",
3838
dt + scale_y_date(date_breaks = "3 weeks")

0 commit comments

Comments
 (0)