From 67fa572f1bbcc6779767d410864000a6675655ef Mon Sep 17 00:00:00 2001 From: Carson Date: Fri, 5 Jan 2024 09:18:48 -0600 Subject: [PATCH 1/3] Start v4.10.4 release candidate --- DESCRIPTION | 2 +- NEWS.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index a5a21ffe0f..4f54df705e 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: plotly Title: Create Interactive Web Graphics via 'plotly.js' -Version: 4.10.3.9000 +Version: 4.10.4 Authors@R: c(person("Carson", "Sievert", role = c("aut", "cre"), email = "cpsievert1@gmail.com", comment = c(ORCID = "0000-0002-4958-2844")), person("Chris", "Parmer", role = "aut", diff --git a/NEWS.md b/NEWS.md index 2cd1a650ea..3c71a8bec2 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# plotly (development version) +# 4.10.4 ## Improvements From a796406f6efeed98f28f67970de15f9ae3fdc854 Mon Sep 17 00:00:00 2001 From: Carson Date: Sat, 6 Jan 2024 15:08:07 -0600 Subject: [PATCH 2/3] Bugfix for guide logic added to accomodate new ggplot2 guide logic Issue was silently introduced by #2315, but didn't become an issue until https://github.com/tidyverse/ggplot2/commit/851233fa756d94cdde2f86074aa027fd3c27ba57 --- R/ggplotly.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/ggplotly.R b/R/ggplotly.R index 2759ef27ba..98bf487a96 100644 --- a/R/ggplotly.R +++ b/R/ggplotly.R @@ -1005,7 +1005,7 @@ gg2list <- function(p, width = NULL, height = NULL, theme$legend.box.just <- theme$legend.box.just %||% c("center", "center") # scales -> data for guides gdefs <- if (inherits(plot$guides, "ggproto")) { - get_gdefs_ggproto(npscales$scales, theme, plot, layers, data) + get_gdefs_ggproto(npscales$scales, theme, plot, layers, layer_data) } else { get_gdefs(scales, theme, plot, layers) } From 782968f7c26bdc3fcebae9b18b7f58000bdf5ecc Mon Sep 17 00:00:00 2001 From: Carson Date: Sat, 6 Jan 2024 15:33:23 -0600 Subject: [PATCH 3/3] Update snapshots --- .../shiny/event_data/tests/shinytest/mytest-expected/001.json | 4 ++-- .../shiny/event_data/tests/shinytest/mytest-expected/002.json | 4 ++-- .../shiny/event_data/tests/shinytest/mytest-expected/003.json | 4 ++-- .../shiny/event_data/tests/shinytest/mytest-expected/004.json | 4 ++-- tests/testthat/_snaps/ggplot-labels/factor-labels.svg | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/inst/examples/shiny/event_data/tests/shinytest/mytest-expected/001.json b/inst/examples/shiny/event_data/tests/shinytest/mytest-expected/001.json index 0a80458075..aafb5d9688 100644 --- a/inst/examples/shiny/event_data/tests/shinytest/mytest-expected/001.json +++ b/inst/examples/shiny/event_data/tests/shinytest/mytest-expected/001.json @@ -430,9 +430,9 @@ }, { "name": "crosstalk", - "version": "1.2.0", + "version": "1.2.1", "src": { - "href": "crosstalk-1.2.0" + "href": "crosstalk-1.2.1" }, "meta": null, "script": "js/crosstalk.min.js", diff --git a/inst/examples/shiny/event_data/tests/shinytest/mytest-expected/002.json b/inst/examples/shiny/event_data/tests/shinytest/mytest-expected/002.json index 52807af51f..b089eae1e3 100644 --- a/inst/examples/shiny/event_data/tests/shinytest/mytest-expected/002.json +++ b/inst/examples/shiny/event_data/tests/shinytest/mytest-expected/002.json @@ -448,9 +448,9 @@ }, { "name": "crosstalk", - "version": "1.2.0", + "version": "1.2.1", "src": { - "href": "crosstalk-1.2.0" + "href": "crosstalk-1.2.1" }, "meta": null, "script": "js/crosstalk.min.js", diff --git a/inst/examples/shiny/event_data/tests/shinytest/mytest-expected/003.json b/inst/examples/shiny/event_data/tests/shinytest/mytest-expected/003.json index 069ced6f20..264b18e0a8 100644 --- a/inst/examples/shiny/event_data/tests/shinytest/mytest-expected/003.json +++ b/inst/examples/shiny/event_data/tests/shinytest/mytest-expected/003.json @@ -452,9 +452,9 @@ }, { "name": "crosstalk", - "version": "1.2.0", + "version": "1.2.1", "src": { - "href": "crosstalk-1.2.0" + "href": "crosstalk-1.2.1" }, "meta": null, "script": "js/crosstalk.min.js", diff --git a/inst/examples/shiny/event_data/tests/shinytest/mytest-expected/004.json b/inst/examples/shiny/event_data/tests/shinytest/mytest-expected/004.json index 2b72add64b..5552f3edd5 100644 --- a/inst/examples/shiny/event_data/tests/shinytest/mytest-expected/004.json +++ b/inst/examples/shiny/event_data/tests/shinytest/mytest-expected/004.json @@ -453,9 +453,9 @@ }, { "name": "crosstalk", - "version": "1.2.0", + "version": "1.2.1", "src": { - "href": "crosstalk-1.2.0" + "href": "crosstalk-1.2.1" }, "meta": null, "script": "js/crosstalk.min.js", diff --git a/tests/testthat/_snaps/ggplot-labels/factor-labels.svg b/tests/testthat/_snaps/ggplot-labels/factor-labels.svg index 53f11d16c8..b6e619ca26 100644 --- a/tests/testthat/_snaps/ggplot-labels/factor-labels.svg +++ b/tests/testthat/_snaps/ggplot-labels/factor-labels.svg @@ -1 +1 @@ -abcde05000100001500020000cutcount +abcde05000100001500020000Cutcount