Pull out plot hook registration into our function (#170)

r-lib · Jun 21, 2024 · a6a367d · a6a367d
1 parent 8a5de64
commit a6a367d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/R/eval.R b/R/eval.R
@@ -139,15 +139,7 @@ evaluate_top_level_expression <- function(exprs,
   }
 
   local_output_handler(function() handle_output(FALSE))
-
-  # Hooks to capture plot creation
-  hook_list <- list(
-    persp = handle_output,
-    before.plot.new = handle_output,
-    before.grid.newpage = handle_output
-  )
-  set_hooks(hook_list)
-  on.exit(remove_hooks(hook_list), add = TRUE)
+  local_plot_hooks(handle_output)
 
   # Handlers for warnings, errors and messages
   mHandler <- function(cnd) {

diff --git a/R/graphics.R b/R/graphics.R
@@ -1,3 +1,14 @@
+local_plot_hooks <- function(f, frame = parent.frame()) {
+  hook_list <- list(
+    persp = f,
+    before.plot.new = f,
+    before.grid.newpage = f
+  )
+  set_hooks(hook_list)
+  defer(remove_hooks(hook_list), frame)
+  invisible()
+}
+
 looks_different <- function(old_dl, new_dl) {
   if (identical(old_dl, new_dl)) {
     return(FALSE)