diff --git a/DESCRIPTION b/DESCRIPTION index a5a21ffe0..4f54df705 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 2cd1a650e..3c71a8bec 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# plotly (development version) +# 4.10.4 ## Improvements diff --git a/R/ggplotly.R b/R/ggplotly.R index 2759ef27b..98bf487a9 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) } 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 0a8045807..aafb5d968 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 52807af51..b089eae1e 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 069ced6f2..264b18e0a 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 2b72add64..5552f3edd 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 53f11d16c..b6e619ca2 100644 --- a/tests/testthat/_snaps/ggplot-labels/factor-labels.svg +++ b/tests/testthat/_snaps/ggplot-labels/factor-labels.svg @@ -1 +1 @@ -abcde05000100001500020000cutcount +abcde05000100001500020000Cutcount