bugfix geom_point stroke param

Author: tdhock

inst/htmljs/animint.js

@@ -1444,7 +1444,7 @@ var animint = function (to_select, json_file) {
       if (g_info.geom == "point") {
 	g_info.style_list = [
 	  "opacity","stroke","stroke-width","stroke-dasharray","fill"];
-	style_on_funs["stroke-width"] = get_attr("stroke");
+	style_on_funs["stroke-width"] = get_stroke_width;
 	eActions = function (e) {
           e.attr("cx", toXY("x", "x"))
             .attr("cy", toXY("y", "y"))

tests/testthat/test-renderer4-geom-point-stroke.R

@@ -1,41 +1,39 @@
 acontext("geom_point_stroke")
 
 stroke_in_R <- 5
-p1 <- ggplot(mtcars, aes(wt, mpg)) +
-  geom_point(shape = 21, colour = "black", fill = "white",
-             size = 5, stroke = stroke_in_R)
+viz <- animint(
+  param_stroke=ggplot(mtcars, aes(
+    wt, mpg)) +
+    geom_point(
+      shape = 21, colour = "black", fill = "white",
+      size = 5, stroke = stroke_in_R),
+  aes_stroke=ggplot(mtcars, aes(
+    wt, mpg, stroke=cyl)) +
+    geom_point(
+      shape = 21, colour = "black", fill = "white", size = 5))
 
-p2 <- ggplot(mtcars, aes(wt, mpg, stroke=cyl)) +
-  geom_point(shape = 21, colour = "black", fill = "white", size = 5)
-
-viz <- list(p1=p1, p2=p2)
 info <- animint2HTML(viz)
 
-test_that("points are rendered with stroke-width", {
-  stroke_vals <-
-    getStyleValue(info$html, '//g[@class="geom1_point_p1"]//circle', 
-                  "stroke-width")
-  # stroke-width is rendered for every point
+test_that("geom_point stroke param rendered with stroke-width", {
+  stroke_vals <- getStyleValue(
+    info$html,
+    '//g[@class="geom1_point_param_stroke"]//circle', 
+    "stroke-width")
   expect_equal(length(stroke_vals), length(mtcars$wt))
-  
   stroke_vals_unique <- unique(stroke_vals)
   expect_equal(length(stroke_vals_unique), 1)
-  
   stroke_width_val <- as.numeric(gsub("[^0-9]", "", stroke_vals_unique))
   expect_equal(stroke_width_val, stroke_in_R)
 })
 
 test_that("aes(stroke) works", {
-  stroke_vals_2 <-
-    getStyleValue(info$html, '//g[@class="geom2_point_p2"]//circle',
-                  "stroke-width")
-  
-  expect_equal(length(stroke_vals_2), length(mtcars$wt))
-  
-  stroke_vals_unique_2 <- unique(stroke_vals_2)
-  expect_equal(length(stroke_vals_unique_2), length(unique(mtcars$cyl)))
-  
-  # Check that the values of the stroke are taken from mtcars$cyl
-  stroke_width_vals <- as.numeric(gsub("[^0-9]", "", stroke_vals_unique_2))
+  stroke_vals_aes <- getStyleValue(
+    info$html,
+    '//g[@class="geom2_point_aes_stroke"]//circle',
+    "stroke-width")
+  expect_equal(length(stroke_vals_aes), length(mtcars$wt))
+  stroke_vals_unique_aes <- unique(stroke_vals_aes)
+  expect_equal(length(stroke_vals_unique_aes), length(unique(mtcars$cyl)))
+  stroke_width_vals <- as.numeric(gsub("[^0-9]", "", stroke_vals_unique_aes))
   expect_identical(sort(stroke_width_vals), sort(unique(mtcars$cyl)))
 })