change extract/drop_landing into extract/drop_module with class argument

R/init.R

@@ -139,9 +139,9 @@ init <- function(data,
     modules <- do.call(teal::modules, modules)
   }
 
-  landing <- extract_landing(modules)
+  landing <- extract_module(modules, "teal_module_landing")
   if (length(landing) > 1L) stop("teal only supports apps with one module of `tm_landing_popup` class.")
-  modules <- drop_landing(modules)
+  modules <- drop_module(modules, "teal_module_landing")
 
   # resolve modules datanames
   datanames <- teal.data::get_dataname(data)

R/module_teal.R

@@ -226,16 +226,7 @@ srv_teal <- function(id, modules, raw_data, filter = teal_slices()) {
     })
 
     reporter <- teal.reporter::Reporter$new()
-    is_any_previewer <- function(modules) {
-      if (inherits(modules, "teal_modules")) {
-        any(unlist(lapply(modules$children, is_any_previewer), use.names = FALSE))
-      } else if (inherits(modules, "teal_module_previewer")) {
-        TRUE
-      } else {
-        FALSE
-      }
-    }
-    if (is_arg_used(modules, "reporter") && !is_any_previewer(modules)) {
+    if (is_arg_used(modules, "reporter") && length(extract_module(modules, 'teal_module_previewer')) == 0) {
       modules <- append_module(modules, reporter_previewer_module())
     }
 

R/modules.R

@@ -103,25 +103,26 @@ append_module <- function(modules, module) {
   modules
 }
 
-#' Extract a `teal_module_landing` from list of `modules`
+#' Extract specific class from a list of `modules`
 #' @param modules `teal_modules`
 #' @keywords internal
 #' @return `teal_module_landing`
-extract_landing <- function(modules) {
-  if (inherits(modules, "teal_module_landing")) {
+extract_module <- function(modules, class) {
+  if (inherits(modules, class)) {
     modules
   } else if (inherits(modules, "teal_module")) {
     NULL
   } else if (inherits(modules, "teal_modules")) {
-    Filter(function(x) length(x) > 0L, lapply(modules$children, extract_landing))
+    Filter(function(x) length(x) > 0L, lapply(modules$children, extract_module))
   }
 }
-#' Remove a `teal_module_landing` from list of `modules`
+
+#' Remove a specific class from list of `modules`
 #' @param modules `teal_modules`
 #' @keywords internal
 #' @return `teal_modules`
-drop_landing <- function(modules) {
-  if (inherits(modules, "teal_module_landing")) {
+drop_module <- function(modules, class) {
+  if (inherits(modules, class)) {
     NULL
   } else if (inherits(modules, "teal_module")) {
     modules