Don't remove margins for ggmark and cross_mark

Author: Yunuuuu

R/cross-link.R

@@ -150,7 +150,8 @@ CrossLink <- ggproto("CrossLink", Cross,
         plot$ggalign_link_data <- NULL
 
         # insert the grob
-        plot + inset(grob, on_top = self$on_top) + theme_recycle()
+        plot <- plot + inset(grob, on_top = self$on_top)
+        ggremove_margin(plot, direction) + theme_recycle()
     },
     summary = function(self, plot) {
         header <- ggproto_parent(Cross, self)$summary(plot)

R/ggalign.R

@@ -288,7 +288,8 @@ AlignGg <- ggproto("AlignGg", AlignProto,
                 panel.spacing.x = calc_element("panel.spacing.x", theme)
             )
         }
-        plot + theme + theme_recycle()
+        plot <- plot + theme
+        ggremove_margin(plot, direction) + theme_recycle()
     },
     summary = function(self, plot) {
         header <- ggproto_parent(AlignProto, self)$summary(plot)

R/ggcross.R

@@ -169,7 +169,8 @@ CrossGg <- ggproto("CrossGg", AlignProto,
                 panel.spacing.x = calc_element("panel.spacing.x", theme)
             )
         }
-        plot + theme + theme_recycle()
+        plot <- plot + theme
+        ggremove_margin(plot, direction) + theme_recycle()
     },
     summary = function(self, plot) {
         header <- ggproto_parent(AlignProto, self)$summary(plot)

R/ggplot-utils.R

@@ -50,6 +50,17 @@ gguse_data <- function(plot, data) {
     plot
 }
 
+ggremove_margin <- function(plot, direction) {
+    if (!is.null(direction) && packageVersion("ggplot2") > "3.5.1") {
+        plot <- plot + switch_direction(
+            direction,
+            theme(plot.margin = margin(t = 0, r = NA, b = 0, l = NA)),
+            theme(plot.margin = margin(t = NA, r = 0, b = NA, l = 0))
+        )
+    }
+    plot
+}
+
 ######################################################
 default_expansion <- function(x = NULL, y = NULL) {
     structure(list(x = x, y = y), class = c("ggalign_default_expansion"))

R/layout-stack-composer.R

@@ -119,13 +119,6 @@ stack_composer_add.ggalign_plot <- function(plot, composer, design, ...,
     # let `align` add other components
     plot <- align$build_plot(plot, design = design, ...)
     plot <- align$finish_plot(plot, plot_schemes, theme)
-    if (packageVersion("ggplot2") > "3.5.1") {
-        plot <- plot + switch_direction(
-            direction,
-            theme(plot.margin = margin(t = 0, r = NA, b = 0, l = NA)),
-            theme(plot.margin = margin(t = NA, r = 0, b = NA, l = 0))
-        )
-    }
     stack_composer_align_plot(composer, plot, size)
 }
 

R/plot-.R

@@ -121,7 +121,8 @@ AlignProto <- ggproto("AlignProto",
         plot
     },
     finish_plot = function(self, plot, schemes, theme) {
-        plot_add_schemes(plot, schemes) + theme_recycle()
+        plot <- plot_add_schemes(plot, schemes)
+        ggremove_margin(plot, self$direction) + theme_recycle()
     },
 
     # utils method to print the object, should return a character vector