Test coord equal

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: animint2
 Title: Animated Interactive Grammar of Graphics
-Version: 2026.9.28
+Version: 2026.9.5
 URL: https://animint.github.io/animint2
 BugReports: https://github.com/animint/animint2/issues
 Authors@R: c(

NEWS.md

@@ -1,10 +1,6 @@
-# Changes in version 2026.9.29 (PR#288)
+# Changes in version 2026.7.29 (PR#253)
 
-- Plot SVGs use `display: block` (issue #279). Each ggplot is one SVG. Browsers treat an SVG as inline and leave space under it for text descenders, which is the extra whitespace below a facet_wrap plot. That gap is under the SVG, not between facet panels. This is required; without it the rendered gap is about 5px. Thanks @ANAMASGARD.
-
-# Changes in version 2026.9.28 (PR#285)
-
-- Clearer facet error messages when a facet variable is missing from the data, or when `facet_wrap(. ~ var)` uses invalid notation (issue #168).
+- Fixed `coord_equal()` and `coord_fixed()` to properly fill available plotting space. Issue #234 showed the problem when increasing plot width (800 vs default 400); the same JavaScript bug also affected tall viewports when height should fill. Previously `Math.min(1, aspect)` was applied independently to width and height proportions, shrinking both when the graph pixel aspect did not match the data aspect. The renderer now adjusts panel proportions for non-square graph cells and scale-to-fits so at least one dimension fills the available space while preserving the data aspect ratio.
 
 # Changes in version 2026.9.5
 

R/facet-layout.r

@@ -48,20 +48,6 @@ layout_wrap <- function(data, vars = NULL, nrow = NULL, ncol = NULL,
   vars <- as.quoted(vars)
   if (length(vars) == 0) return(layout_null())
 
-  # Notation error only when real vars exist; otherwise layout_base reports missing columns.
-  if ("." %in% names(vars)) {
-    real_vars <- names(vars)[names(vars) != "."]
-    all_data_vars <- unique(unlist(lapply(data, names)))
-    missing_vars <- setdiff(real_vars, all_data_vars)
-    if (length(missing_vars) == 0) {
-      stop(sprintf(
-        "Invalid facet_wrap formula (. ~ var). Use facet_wrap(~%s) or facet_wrap(\"%s\")",
-        paste(real_vars, collapse = " + "),
-        paste(real_vars, collapse = "\", \"")
-      ), call. = FALSE)
-    }
-  }
-
   base <- plyr::unrowname(layout_base(data, vars, drop = drop))
 
   id <- plyr::id(base, drop = TRUE)
@@ -107,22 +93,8 @@ layout_base <- function(data, vars = NULL, drop = TRUE) {
 
   # Form the base data frame which contains all combinations of facetting
   # variables that appear in the data
-  has_all <- unlist(lapply(values, length)) == length(vars)
+  has_all <- unlist(plyr::llply(values, length)) == length(vars)
   if (!any(has_all)) {
-    all_data_vars <- unique(unlist(lapply(data, names)))
-    missing_vars <- setdiff(names(vars)[names(vars) != "."], all_data_vars)
-    if (length(missing_vars) > 0) {
-      stop(sprintf(
-        "Facet variable%s not found in data: %s\nAvailable columns: %s",
-        if (length(missing_vars) > 1) "s" else "",
-        paste(missing_vars, collapse = ", "),
-        paste(all_data_vars, collapse = ", ")
-      ))
-    }
-    # Reached when all facet variables exist somewhere in the data, but no
-    # single layer has all of them together. For example, facet_grid(X ~ Y)
-    # where layer 1 only has column X and layer 2 only has column Y — neither
-    # layer alone satisfies all facetting variables, so has_all is FALSE for every layer.
     stop("At least one layer must contain all variables used for facetting")
   }
 

R/z_facets.R

@@ -150,5 +150,8 @@ fixed_spaces <- function(ranges, ratio = 1) {
                    function(z) diff(z$y.range) / diff(z$x.range) * ratio)
   spaces <- list(y = aspect)
   spaces$x <- 1/spaces$y
+  # Clamp each proportion to at most 1. Desired data aspect is spaces$y/spaces$x;
+  # the JS renderer then scale-to-fits these proportions into the available
+  # (possibly non-square) graph pixel space so at least one side fills.
   lapply(spaces, function(z) min(z, 1))
 }

inst/htmljs/animint.js

@@ -401,9 +401,7 @@ var setMultilineText = function(textElement, text) {
     var svg = tdLeft.append("svg")
       .attr("id", p_info.plot_id)
       .attr("height", p_info.options.height)
-      .attr("width", p_info.options.width)
-      // block avoids inline SVG baseline/descender gap below the plot (issue #279)
-      .style("display", "block");
+      .attr("width", p_info.options.width);
 
     // divvy up width/height based on the panel layout
     var nrows = Math.max.apply(null, p_info.layout.ROW);
@@ -540,6 +538,14 @@ var setMultilineText = function(textElement, text) {
       }
       return cumsum;
     }
+    function max_group_sum(group, values){
+      var sums = [];
+      for(var i=0; i<values.length; i++){
+        var g = group[i] - 1;
+        sums[g] = (sums[g] || 0) + values[i];
+      }
+      return d3.max(sums) || 0;
+    }
     var cum_height_per_row = cumsum_array(row_strip_heights);
     var cum_width_per_col = cumsum_array(col_strip_widths);
     var strip_width = d3.max(cum_width_per_col);
@@ -559,17 +565,28 @@ var setMultilineText = function(textElement, text) {
     // proportions calculated by the compiler. This has to be done on the
     // rendering side since the precomputed proportions apply to the *graph*
     // and the graph size depends upon results of measureText()
+    //
+    // R fixed_spaces() gives proportions for a square panel cell. Available
+    // cells may be non-square; aspect is cell_height/cell_width in pixels.
+    // Dividing heights by aspect makes panel pixel aspect match the data
+    // aspect (issue #234). Then scale so the largest row/column still fits.
     if (p_info.layout.coord_fixed[0]) {
       var aspect = (graph_height / nrows) / (graph_width / ncols);
     } else {
       var aspect = 1;
     }
-    var wp = p_info.layout.width_proportion.map(function(x){
-      return x * Math.min(1, aspect);
-    })
-    var hp = p_info.layout.height_proportion.map(function(x){
-      return x * Math.min(1, 1/aspect);
-    })
+    var wp = p_info.layout.width_proportion.slice();
+    var hp = p_info.layout.height_proportion.map(function(y){
+      return y / aspect;
+    });
+    var fit_prop = Math.max(
+      max_group_sum(p_info.layout.ROW, wp),
+      max_group_sum(p_info.layout.COL, hp)
+    );
+    if (fit_prop > 0) {
+      wp = wp.map(function(x) { return x / fit_prop; });
+      hp = hp.map(function(y) { return y / fit_prop; });
+    }
 
     // track the proportion of the graph that should be 'blank'
     // this is mainly used to implement coord_fixed()

tests/testthat/test-compiler-coord-equal-fix.R

@@ -0,0 +1,19 @@
+acontext("coord_equal fix for issue #234")
+
+test_that("fixed_spaces keeps at least one dimension filling space", {
+  # Test with iris petal data ranges (issue #234 example)
+  ranges <- list(list(x.range = c(1, 7), y.range = c(0, 2.5)))
+  spaces <- animint2:::fixed_spaces(ranges, ratio = 1)
+
+  # At least one dimension should be 1 (fills available space on a square cell)
+  max_prop <- max(spaces$x, spaces$y)
+  expect_equal(max_prop, 1)
+
+  # Both proportions should be positive and <= 1
+  expect_gt(spaces$x, 0)
+  expect_lte(spaces$x, 1)
+  expect_gt(spaces$y, 0)
+  expect_lte(spaces$y, 1)
+  # Data aspect y/x preserved for the JS scale-to-fit step
+  expect_equal(spaces$y / spaces$x, 2.5 / 6)
+})

tests/testthat/test-compiler-ghpages.R

@@ -51,28 +51,6 @@ reset_test_repo <- function(){
   gh::gh("POST /orgs/animint-test/repos", name = test_repo_name)
   Sys.sleep(3)
 }
-clone_test_repo <- function(github_url, new_clone){
-  max_attempts <- 5
-  wait_seconds <- 3
-  last_error <- NULL
-  for (attempt in seq_len(max_attempts)) {
-    result <- tryCatch({
-      clone <- gert::git_clone(github_url, new_clone)
-      last_error <- NULL
-      clone
-    }, error = function(err){
-      last_error <<- err
-      NULL
-    })
-    if (is.null(last_error)) return(result)
-    if (!grepl("status code: 404", conditionMessage(last_error), fixed = TRUE)) {
-      stop(last_error)
-    }
-    unlink(new_clone, recursive = TRUE, force = TRUE)
-    if (attempt < max_attempts) Sys.sleep(wait_seconds)
-  }
-  stop(last_error)
-}
 test_that("animint2pages(chromote_sleep_seconds=3) creates Capture.PNG", {
   reset_test_repo()
   ## first run of animint2pages creates new data viz.
@@ -118,7 +96,7 @@ test_that("animint2pages(chromote_sleep_seconds=NULL) does not create Capture.PN
   ## clone and add Capture.PNG
   new_clone <- tempfile()
   github_url <- paste0("https://github.com/", result_list$owner_repo, ".git")
-  clone_test_repo(github_url, new_clone)
+  gert::git_clone(github_url, new_clone)
   branch_name <- gert::git_branch(new_clone)
   expect_identical(branch_name, "gh-pages", info=paste(branch_name, "should be gh-pages"))
   cat("FOO", file=file.path(new_clone, "Capture.PNG"))

tests/testthat/test-renderer-coord_equal.R

@@ -0,0 +1,49 @@
+acontext("coord_equal renderer tests")
+
+test_that("coord_equal fills available space (issue #234)", {
+  # Create the iris petal plot from issue #234
+  # This test ensures coord_equal() doesn't shrink the plot unnecessarily
+  library(data.table)
+  data.mat <- as.matrix(iris[,c("Petal.Width","Petal.Length")])
+
+  # Create the visualization with a specific size
+  viz <- animint(
+    plot1=ggplot(data=data.table(data.mat), aes(Petal.Length, Petal.Width))+
+      geom_point()+
+      coord_equal()+
+      theme_animint(width=500, height=500)
+  )
+
+  # Render the plot using animint2HTML (not animint2dir)
+  info <- animint2HTML(viz)
+
+  # Extract SVG plotting area dimensions
+  # Get the SVG element to check overall plot dimensions
+  svg.nodes <- getNodeSet(info$html, '//svg[@id="plot_plot1"]')
+  expect_equal(length(svg.nodes), 1)
+  svg.attrs <- xmlAttrs(svg.nodes[[1]])
+
+  # Extract width and height attributes
+  svg.width <- as.numeric(svg.attrs[["width"]])
+  svg.height <- as.numeric(svg.attrs[["height"]])
+
+  # The key test: with coord_equal(), at least one dimension should 
+  # fill the available space (close to 500px as specified in theme_animint)
+  # On the old buggy code (before the fix in commit e4b9634b), BOTH dimensions
+  # would be unnecessarily shrunk below the available space.
+  # With the fix, at least one dimension uses nearly all available space.
+
+  # The iris petal data has aspect ratio of ~0.417 (y_range=2.5, x_range=6)
+  # So with coord_equal (ratio=1), the x-axis fills space (width≈500)
+  # and y-axis is constrained by aspect ratio (height≈200)
+
+  # Test that at least ONE dimension is close to requested size (500)
+  max_dimension <- max(svg.width, svg.height)
+  expect_gt(max_dimension, 450)
+
+  # Both dimensions should be positive
+  expect_gt(svg.width, 0)
+  expect_gt(svg.height, 0)
+  # Issue #234 acceptance: fill available space. Aspect-ratio math is covered by
+  # test-compiler-coord-equal-fix.R and test-renderer1-coord.R (normDiffs).
+})