Skip to content

#4173 lambda functions in discrete scales & facets #4188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thomasp85 merged 7 commits into from
May 7, 2021
Merged

#4173 lambda functions in discrete scales & facets #4188

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f16a15b
#4173 lambda functions in discrete scales & facets
netique Sep 3, 2020
5331072
#4173 lambda functions in discrete scales & facets
netique Sep 3, 2020
ce15ec1
more concise as_labeller
netique Mar 26, 2021
05167de
Merge branch 'master' into pr/4188
netique May 6, 2021
019c43d
incorporate changes from master
netique May 6, 2021
6d488b6
revert added blank lines
netique May 6, 2021
7cf02ae
NEWS updated
netique May 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions R/labeller.r
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,8 @@ as_labeller <- function(x, default = label_value, multi_line = TRUE) {
x(labels)
} else if (is.function(x)) {
default(lapply(labels, x))
} else if (is.formula(x)) {
default(lapply(labels, as_function(x)))
} else if (is.character(x)) {
default(lapply(labels, function(label) x[label]))
} else {
Expand Down Expand Up @@ -433,7 +435,10 @@ labeller <- function(..., .rows = NULL, .cols = NULL,
if (!is.null(keep.as.numeric)) {
.Deprecated(old = "keep.as.numeric")
}

dots <- list(...)


Copy link
Member

@thomasp85 thomasp85 May 6, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can I get you to revert these superfluous changed

Copy link
Contributor Author

@netique netique May 6, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My apologies. Fixed in 6d488b6.

Copy link
Member

@thomasp85 thomasp85 May 6, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No apology needed - thanks for your work on this

.default <- as_labeller(.default)

function(labels) {
Expand Down
1 change: 1 addition & 0 deletions R/scale-.r
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ discrete_scale <- function(aesthetics, scale_name, palette, name = waiver(),

check_breaks_labels(breaks, labels)

if (is.formula(labels)) labels <- as_function(labels)
Copy link
Collaborator

@teunbrand teunbrand May 6, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry this is mostly my fault for getting in your way with #4427, but the allow_lambda() statements below already capture formulas as functions, so this line has become unnecessary. Apologies!

Copy link
Contributor Author

@netique netique May 6, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's OK, thank you for your contribution. In the up-to-date commit, the line is removed. I accidentally retained both solutions during the merge conflict resolution.

# Convert formula input to function if appropriate
limits <- allow_lambda(limits)
breaks <- allow_lambda(breaks)
Expand Down