Merge branch 'main' into redesign_extraction@main

Author: gogonzo

.pre-commit-config.yaml

@@ -15,7 +15,6 @@ repos:
       - id: roxygenize
         name: Regenerate package documentation
         additional_dependencies:
-          - ggmosaic
           - ggplot2
           - shiny
           - insightsengineering/teal

DESCRIPTION

@@ -1,8 +1,8 @@
 Type: Package
 Package: teal.modules.general
 Title: General Modules for 'teal' Applications
-Version: 0.5.0.9009
-Date: 2025-10-17
+Version: 0.5.1.9010
+Date: 2025-10-27
 Authors@R: c(
     person("Dawid", "Kaledkowski", , "[email protected]", role = c("aut", "cre")),
     person("Pawel", "Rucki", , "[email protected]", role = "aut"),
@@ -23,7 +23,6 @@ URL: https://insightsengineering.github.io/teal.modules.general/,
 BugReports:
     https://github.com/insightsengineering/teal.modules.general/issues
 Depends:
-    ggmosaic (>= 0.3.0),
     ggplot2 (>= 3.4.0),
     R (>= 4.1),
     shiny (>= 1.8.1),

NAMESPACE

@@ -52,7 +52,6 @@ export(tm_rmarkdown)
 export(tm_t_crosstable)
 export(tm_t_reactables)
 export(tm_variable_browser)
-import(ggmosaic)
 import(ggplot2)
 import(shiny)
 import(teal)

NEWS.md

@@ -1,9 +1,13 @@
-# teal.modules.general 0.5.0.9009
+# teal.modules.general 0.5.1.9010
 
 ### Enhancements
 
 - Modules now return a `teal_report` object that contains the data, code and reporter. All the reporter buttons were removed from the modules' UI.
 
+# teal.modules.general 0.5.1
+
+- Removed ggmosaic package dependency to avoid being archived on CRAN (#932).
+
 # teal.modules.general 0.5.0
 
 ### Breaking changes

R/teal.modules.general.R

@@ -4,7 +4,6 @@
 #' (not necessarily for clinical trials data).
 #'
 #' @import ggplot2
-#' @import ggmosaic
 #' @import shiny
 #' @import teal
 #' @import teal.transform
@@ -15,11 +14,5 @@
 #' @keywords internal
 "_PACKAGE"
 
-# nolint start
-# Note ggmosaic (version <= 0.3.3) needs to be in DEPENDS as the following does not work if it is imported
-# df <- data.frame(x = c("A", "B", "C", "A"), y = c("Z", "Z", "W", "W"))
-# ggplot(df) + ggmosaic::geom_mosaic(aes(x = ggmosaic::product(x), fill = y))
-# nolint end
-
 # Needed to avoid R CMD note on no visible binding
 utils::globalVariables("count")

R/tm_g_association.R

@@ -363,7 +363,7 @@ srv_tm_g_association.default <- function(id,
           teal.reporter::teal_card(obj),
           teal.reporter::teal_card("## Module's output(s)")
         )
-      teal.code::eval_code(obj, 'library("ggplot2");library("dplyr");library("ggmosaic")') # nolint: quotes
+      teal.code::eval_code(obj, 'library("ggplot2");library("dplyr")') # nolint: quotes
     })
     anl_merged_q <- reactive({
       req(anl_merged_input())

R/tm_g_bivariate.R

@@ -920,13 +920,7 @@ bivariate_ggplot_call <- function(x_class,
     )
     # Factor and character plots
   } else if (x_class == "factor" && y_class == "factor") {
-    plot_call <- reduce_plot_call(
-      plot_call,
-      substitute(
-        ggmosaic::geom_mosaic(aes(x = ggmosaic::product(xval), fill = yval), na.rm = TRUE),
-        env = list(xval = x, yval = y)
-      )
-    )
+    stop("Categorical variables 'x' and 'y' are currently not supported.")
   } else {
     stop("x y type combination not allowed")
   }

inst/WORDLIST

@@ -8,6 +8,7 @@ UI
 datatables
 facetting
 funder
+ggmosaic
 ggplot
 pre
 qq

tests/testthat/test_bivariate_ggplot_call.R

@@ -19,33 +19,34 @@ testthat::test_that("bivariate_ggplot_call with numerics", {
 })
 
 testthat::test_that("bivariate_ggplot_call with factor, char, logical", {
-  testthat::expect_match(
+  error_message <- "Categorical variables 'x' and 'y' are currently not supported."
+  testthat::expect_error(
     bivariate_ggplot_call("factor", "factor") %>% deparse(width.cutoff = 300),
-    "geom_mosaic"
+    error_message
   )
-  testthat::expect_match(
+  testthat::expect_error(
     bivariate_ggplot_call("logical", "factor") %>% deparse(width.cutoff = 300),
-    "geom_mosaic"
+    error_message
   )
-  testthat::expect_match(
+  testthat::expect_error(
     bivariate_ggplot_call("character", "factor") %>% deparse(width.cutoff = 300),
-    "geom_mosaic"
+    error_message
   )
-  testthat::expect_match(
+  testthat::expect_error(
     bivariate_ggplot_call("logical", "character") %>% deparse(width.cutoff = 300),
-    "geom_mosaic"
+    error_message
   )
-  testthat::expect_match(
+  testthat::expect_error(
     bivariate_ggplot_call("character", "logical") %>% deparse(width.cutoff = 300),
-    "geom_mosaic"
+    error_message
   )
-  testthat::expect_match(
+  testthat::expect_error(
     bivariate_ggplot_call("logical", "logical") %>% deparse(width.cutoff = 300),
-    "geom_mosaic"
+    error_message
   )
-  testthat::expect_match(
+  testthat::expect_error(
     bivariate_ggplot_call("character", "character") %>% deparse(width.cutoff = 300),
-    "geom\\_mosaic"
+    error_message
   )
 })