fix other partial matching

Author: Yunuuuu

R/facet-.R

@@ -879,7 +879,7 @@ map_facet_data <- function(data, layout, params) {
     return(vec_cbind(data %|W|% NULL, PANEL = integer(0)))
   }
 
-  vars <- params$facet %||% c(params$rows, params$cols)
+  vars <- params$facets %||% c(params$rows, params$cols)
 
   if (length(vars) == 0) {
     data$PANEL <- layout$PANEL
@@ -898,7 +898,7 @@ map_facet_data <- function(data, layout, params) {
   # Compute faceting values
   facet_vals <- eval_facets(vars, data, params$.possible_columns)
 
-  include_margins <- !isFALSE(params$margin %||% FALSE) &&
+  include_margins <- !isFALSE(params$margins %||% FALSE) &&
     nrow(facet_vals) == nrow(data) && grid_layout
   if (include_margins) {
     # Margins are computed on evaluated faceting values (#1864).

R/labels.R

@@ -351,7 +351,7 @@ get_alt_text.gtable <- function(p, ...) {
 #'
 generate_alt_text <- function(p) {
   # Combine titles
-  if (!is.null(p$label$title %||% p$labels$subtitle)) {
+  if (!is.null(p$labels$title %||% p$labels$subtitle)) {
     title <- sub("\\.?$", "", c(p$labels$title, p$labels$subtitle))
     if (length(title) == 2) {
       title <- paste0(title[1], ": ", title[2])

tests/testthat/test-legend-draw.R

@@ -36,7 +36,7 @@ test_that("all keys can be drawn without 'params'", {
   expect_in(nse, names(keys))
 
   # Add title to every key
-  template <- gtable(width = unit(size, "mm"), heights = unit(c(1, size), c("lines", "mm")))
+  template <- gtable(widths = unit(size, "mm"), heights = unit(c(1, size), c("lines", "mm")))
   keys <- Map(
     function(key, name) {
       text <- textGrob(name, gp = gpar(fontsize = 8))