Hotfix 3.4.4 (#5449)

* is.atomic() --> is.atomic() || is.null()

* Polish news

* Put is.null() first

Author: teunbrand

NEWS.md

@@ -1,4 +1,7 @@
-# ggplot2 (development version)
+# ggplot2 3.4.4
+
+This hotfix release adapts to a change in r-devel's `base::is.atomic()` and 
+the upcoming retirement of maptools.
 
 * `fortify()` for sp objects (e.g., `SpatialPolygonsDataFrame`) is now deprecated
   and will be removed soon in support of [the upcoming retirement of rproj, rgeos,

R/aes-evaluation.R

@@ -226,7 +226,7 @@ is_calculated <- function(x, warn = FALSE) {
     return(TRUE)
   }
   # Support of old recursive behaviour
-  if (is.atomic(x)) {
+  if (is.null(x) || is.atomic(x)) {
     FALSE
   } else if (is.symbol(x)) {
     res <- is_dotted_var(as.character(x))
@@ -266,7 +266,7 @@ is_staged <- function(x) {
 
 # Strip dots from expressions
 strip_dots <- function(expr, env, strip_pronoun = FALSE) {
-  if (is.atomic(expr)) {
+  if (is.null(expr) || is.atomic(expr)) {
     expr
   } else if (is.name(expr)) {
     expr_ch <- as.character(expr)
@@ -323,7 +323,7 @@ strip_stage <- function(expr) {
 make_labels <- function(mapping) {
   default_label <- function(aesthetic, mapping) {
     # e.g., geom_smooth(aes(colour = "loess")) or aes(y = NULL)
-    if (is.atomic(mapping)) {
+    if (is.null(mapping) || is.atomic(mapping)) {
       return(aesthetic)
     }
     mapping <- strip_stage(mapping)

R/aes.R

@@ -280,7 +280,7 @@ aes_ <- function(x, y, ...) {
   as_quosure_aes <- function(x) {
     if (is.formula(x) && length(x) == 2) {
       as_quosure(x)
-    } else if (is.call(x) || is.name(x) || is.atomic(x)) {
+    } else if (is.null(x) || is.call(x) || is.name(x) || is.atomic(x)) {
       new_aesthetic(x, caller_env)
     } else {
       cli::cli_abort("Aesthetic must be a one-sided formula, call, name, or constant.")