make rotate_just() resilient for mixed S3/S7 classes

Author: teunbrand

R/guide-axis.R

@@ -454,13 +454,13 @@ GuideAxis <- ggproto(
     # rather than dimensions of this axis alone.
     if (has_labels && params$position %in% c("left", "right")) {
       where <- layout$l[-c(1, length(layout$l))]
-      just <- with(S7::props(elements$text), rotate_just(angle, hjust, vjust))$hjust %||% 0.5
+      just <- rotate_just(element = elements$text)$hjust %||% 0.5
       gt <- gtable_add_cols(gt, unit(just, "null"), pos = min(where) - 1)
       gt <- gtable_add_cols(gt, unit(1 - just, "null"), pos = max(where) + 1)
     }
     if (has_labels && params$position %in% c("top", "bottom")) {
       where <- layout$t[-c(1, length(layout$t))]
-      just <- with(S7::props(elements$text), rotate_just(angle, hjust, vjust))$vjust %||% 0.5
+      just <- rotate_just(element = elements$text)$vjust %||% 0.5
       gt <- gtable_add_rows(gt, unit(1 - just, "null"), pos = min(where) - 1)
       gt <- gtable_add_rows(gt, unit(just, "null"), pos = max(where) + 1)
     }

R/guide-custom.R

@@ -113,7 +113,7 @@ GuideCustom <- ggproto(
 
     gt <- self$add_title(
       gt, title, title_position,
-      with(S7::props(elems$title), rotate_just(angle, hjust, vjust))
+      rotate_just(element = elems$title)
     )
 
     # Add padding and background

R/guide-legend.R

@@ -574,7 +574,7 @@ GuideLegend <- ggproto(
 
     gt <- self$add_title(
       gt, grobs$title, elements$title_position,
-      with(S7::props(elements$title), rotate_just(angle, hjust, vjust))
+      rotate_just(element = elements$title)
     )
 
     gt <- gtable_add_padding(gt, unit(elements$padding, "cm"))

R/margins.R

@@ -198,7 +198,7 @@ heightDetails.titleGrob <- function(x) {
 #' @return A list with two components, `hjust` and `vjust`, containing the rotated hjust and vjust values
 #'
 #' @noRd
-rotate_just <- function(angle, hjust, vjust) {
+rotate_just <- function(angle = NULL, hjust = NULL, vjust = NULL, element = NULL) {
   ## Ideally we would like to do something like the following commented-out lines,
   ## but it currently yields unexpected results for angles other than 0, 90, 180, 270.
   ## Problems arise in particular in cases where the horizontal and the vertical
@@ -213,6 +213,14 @@ rotate_just <- function(angle, hjust, vjust) {
   #
   #hnew <- cos(rad) * hjust - sin(rad) * vjust + (1 - cos(rad) + sin(rad)) / 2
   #vnew <- sin(rad) * hjust + cos(rad) * vjust + (1 - cos(rad) - sin(rad)) / 2
+  if (S7::S7_inherits(element)) {
+    element <- S7::props(element)
+  }
+  if (!is.null(element)) {
+    angle <- element$angle
+    hjust <- element$hjust
+    vjust <- element$vjust
+  }
 
   angle <- (angle %||% 0) %% 360