Commit 270d20e

authored

Fix geom2trace.geompoint incorrect filling (closes #2298) (#2299)

1 parent a1c3089 commit 270d20eCopy full SHA for 270d20e

File tree

+18

-1

lines changed

+18

-1

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@`
`6`	`6`
`7`	`7`	`* Closed #1214: Do not warn in RStudio on Windows when scattergl is used. Recent RStudio versions can render scattergl correctly.`
`8`	`8`
	`9`	`+* Closed #2298: Fix fill assignment in geom_point when a single shape value was used with multiple fill and colour values mapped (@zeehio)`
	`10`	`+`
`9`	`11`	`# 4.10.2`
`10`	`12`
`11`	`13`	`## New features`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -767,7 +767,12 @@ geom2trace.GeomPoint <- function(data, params, p) {`
`767`	`767`	`# fill is only relevant for pch %in% 21:25`
`768`	`768`	`pch <- uniq(data$shape) %\|\|% params$shape %\|\|% GeomPoint$default_aes$shape`
`769`	`769`	`if (any(idx <- pch %in% 21:25) \|\| any(idx <- !is.null(data[["fill_plotlyDomain"]]))) {`
`770`		`- L$marker$color[idx] <- aes2plotly(data, params, "fill")[idx]`
	`770`	`+ fill_value <- aes2plotly(data, params, "fill")`
	`771`	`+ if (length(idx) == 1) {`
	`772`	`+ L$marker$color <- fill_value`
	`773`	`+ } else {`
	`774`	`+ L$marker$color[idx] <- fill_value[idx]`
	`775`	`+ }`
`771`	`776`	`}`
`772`	`777`	`compact(L)`
`773`	`778`	`}`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,16 @@ test_that("marker color inherits from fill, when appropriate", {`
`48`	`48`	`})`
`49`	`49`
`50`	`50`
	`51`	`+test_that("when marker color inherits from fill, colours are assigned correctly #2298", {`
	`52`	`+ df <- data.frame(x = c(1,2), y = c(0,0), color = rep("yellow", 2), fill = 1:2)`
	`53`	`+ p <- ggplot(df) +`
	`54`	`+ geom_point(aes(x = x, y = y, fill = fill, color = color), size = 5, shape = 21) +`
	`55`	`+ scale_fill_gradient(low = "green", high = "red")`
	`56`	`+ pb <- plotly_build(p)`
	`57`	`+ expect_equivalent(pb$x$data[[1]]$marker$color, c("rgba(0,255,0,1)", "rgba(255,0,0,1)"))`
	`58`	`+})`
	`59`	`+`
	`60`	`+`
`51`	`61`	`test_that("can plot on sub-second time scale", {`
`52`	`62`	`d <- data.frame(`
`53`	`63`	`x = as.POSIXct("2018年09月28日 15:13:06 CDT") + 1e-3 * c(1:9, 5000),`

Comments

(0)