Skip to content

Reimplement classes in S7 #6364

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

Jump to bottom
Open
wants to merge 80 commits into
base: main
Choose a base branch
from
Open

Reimplement classes in S7 #6364

wants to merge 80 commits into from

Conversation

teunbrand
Copy link
Collaborator

@teunbrand teunbrand commented Mar 17, 2025 •
edited
Loading

This PR aims to fix a large part of #6352.

Briefly it implements the following S7 classes:

  • class_ggplot
  • class_ggplot_built
  • class_mapping
  • class_labels
  • class_theme

I've put in the usual extractors and replacers ([, [[, $ and their <- methods) for the ggplot/ggplot_built classes for backwards compatibility. The code internally now uses @ though, so that we can deprecate the usual extractors/replacers later.

teunbrand added 30 commits March 4, 2025 15:19
@teunbrand
add S7 as import
8bd9f31
@teunbrand
custom properties for theme elements
d54e464
@teunbrand
convert theme elements to S7 classes
91302e0
@teunbrand
adapt element definitions
8c199a1
@teunbrand
convert element_grob to S7 generic
202b80d
@teunbrand
replace merge_element by S7
df02b37
@teunbrand
implement $.element for backward compatibility
b038e8f
@teunbrand
Use S7 properties
09eef8d
@teunbrand
fix inherits() issues
62d8db4
@teunbrand
fix misc issues
27cdb73
@teunbrand
Revert "implement $.element for backward compatibility"
3bc0d63 
This reverts commit b038e8f.
@teunbrand
don't rely on element$prop
360c975
@teunbrand
move element properties
68fe80b
@teunbrand
convert margin to S7
8c3471e
@teunbrand
I liked index properties as an idea but apparently they print badly
9f69323
@teunbrand
adapt failing example
e4b870b
@teunbrand
import S7
0154671
@teunbrand
convert theme to S7
b4163e0
@teunbrand
Reimplement S3 <uneval> into S7 <mapping>
7fce100
@teunbrand
convert labels to S7
32ccdb2
@teunbrand
make S7 class_ggplot
032ca6a
@teunbrand
Use @ as accessor
c37317b
@teunbrand
double dispatch for ggplot_add()
90d644f
@teunbrand
Write methods for external generics as S7
0310be8
@teunbrand
backward compatibility for ggplot class
2607597
@teunbrand
Implement <ggplot_built> as S7
30b1118
@teunbrand
implement as.gtable methods
ef5db54
@teunbrand
rename mapping to class_mapping
206c394
@teunbrand
refine class_ggplot_built and related functions
53504c3
@teunbrand
also access ggplot_built slots with normal extractors
bbdc7a5
thomasp85
thomasp85 requested changes May 14, 2025
View reviewed changes
R/aes.R

#' @export
print.uneval <- function(x, ...) {
`print.ggplot2::mapping` <- function(x, ...) {
Copy link
Member

Choose a reason for hiding this comment

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

Do you know the timeline for resolving this?

teunbrand and others added 4 commits May 14, 2025 11:00
@teunbrand
redocument
5797664
@teunbrand
resolve merge conflict
18b9273 
Merge branch 'S7_objects' into S7_elements

# Conflicts:
#	NAMESPACE
#	R/plot-construction.R
#	R/theme.R
#	R/zzz.R
#	man/ggplot_add.Rd
#	tests/testthat/test-theme.R
@teunbrand
fix doc links
4b7a189
@teunbrand
Merge pull request #16 from teunbrand/S7_elements
8b285a5 
S7 elements
@teunbrand teunbrand changed the title Adopt S7 in most places Reimplement classes in S7 May 14, 2025
@teunbrand
Copy link
Collaborator Author

#6355 is now merged in via teunbrand#16

@teunbrand teunbrand mentioned this pull request May 14, 2025
Closed
teunbrand
teunbrand commented May 14, 2025
View reviewed changes
@teunbrand
Copy link
Collaborator Author

I'm slightly annoyed that we have a class_-prefix for most classes now, e.g. class_ggplot, but not for the theme elements which are still element_line etc.

@thomasp85
Copy link
Member

I'm open to suggestions, but can also live a long and happy life with the discrepancy

@teunbrand
Copy link
Collaborator Author

Alright let's not worry about it too much then :)

thomasp85
thomasp85 approved these changes May 19, 2025
View reviewed changes
Copy link
Member

@thomasp85 thomasp85 left a comment

Choose a reason for hiding this comment

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

LGTM - do you want a revdepcheck before merging?

@teunbrand
Copy link
Collaborator Author

do you want a revdepcheck

Yes please! ☺️

@teunbrand teunbrand mentioned this pull request May 20, 2025
Open
teunbrand added 8 commits May 20, 2025 17:42
@teunbrand
resolve merge conflict
b91bb9c 
Merge branch 'main' into S7_objects

# Conflicts:
#	DESCRIPTION
#	NAMESPACE
#	R/guide-.R
#	R/guide-axis-theta.R
#	R/labels.R
#	R/theme-elements.R
#	R/theme.R
#	man/is_tests.Rd
@teunbrand
fix typo
0ef6d29
@teunbrand
prevent NSE shenannigans
95cc8e5
@teunbrand
avoid %+% in test code
a7dab26
@teunbrand
add 'meta' property to track arbitrary fields
a03d41b
@teunbrand
document new property
6ecf39e
@teunbrand
resolve merge conflict
471a7e8 
Merge branch 'main' into S7_objects

# Conflicts:
#	tests/testthat/test-layer.R
@teunbrand
fix stretchy guide bug
a315d8f
@teunbrand
Copy link
Collaborator Author

I'm having a hard time getting this to go over smoothly with some widely used packages, or even my own extensions for that matter. Perhaps we need some aggressive backward compatibility for ggplot_build(), ggplot_gtable(), ggplot_add() and element_grob().

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thomasp85 thomasp85 thomasp85 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
ggplot2 4.0.0
Development

Successfully merging this pull request may close these issues.
2 participants
@teunbrand @thomasp85