Skip to content

Commit 51aeb12

Browse files
cpsievertcran-robot
cpsievert
authored and
cran-robot
committed
version 4.10.4
1 parent 6b58449 commit 51aeb12

File tree

9 files changed

+30
-24
lines changed

9 files changed

+30
-24
lines changed

‎DESCRIPTION

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: plotly
22
Title: Create Interactive Web Graphics via 'plotly.js'
3-
Version: 4.10.3
3+
Version: 4.10.4
44
Authors@R: c(person("Carson", "Sievert", role = c("aut", "cre"),
55
email = "[email protected]", comment = c(ORCID = "0000-0002-4958-2844")),
66
person("Chris", "Parmer", role = "aut",
@@ -39,7 +39,7 @@ RoxygenNote: 7.2.3
3939
Encoding: UTF-8
4040
Config/Needs/check: tidyverse/ggplot2, rcmdcheck, devtools, reshape2
4141
NeedsCompilation: no
42-
Packaged: 2023-10-20 21:40:32 UTC; cpsievert
42+
Packaged: 2024-01-13 20:51:33 UTC; cpsievert
4343
Author: Carson Sievert [aut, cre] (<https://orcid.org/0000-0002-4958-2844>),
4444
Chris Parmer [aut],
4545
Toby Hocking [aut],
@@ -51,4 +51,4 @@ Author: Carson Sievert [aut, cre] (<https://orcid.org/0000-0002-4958-2844>),
5151
Plotly Technologies Inc. [cph]
5252
Maintainer: Carson Sievert <[email protected]>
5353
Repository: CRAN
54-
Date/Publication: 2023-10-21 22:50:09 UTC
54+
Date/Publication: 2024-01-13 22:40:02 UTC

‎MD5

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
a96572e374de13500987376f53eec1f5 *DESCRIPTION
1+
d9bff256dc235a129b5a826ae42ed2c9 *DESCRIPTION
22
dcd388f52af8e3cb24839540e1b67823 *LICENSE
33
a399b4f8c25af79733d9d10de285fe62 *NAMESPACE
4-
a1619afcef56113a594c65f1644e5483 *NEWS.md
4+
f9d9f6ee5f50b0d811baca41131a4300 *NEWS.md
55
882d8c5439e82ed501d34991bec72516 *R/add.R
66
7ea933b6ee33d4874a074fba7d767bb5 *R/animate.R
77
aa316aa1242ced4aaafec86d95c67cbc *R/api.R
@@ -11,7 +11,7 @@ bf049db2e4b7d4fc786b1eef0fc92d22 *R/data.R
1111
7265dd4d930c2b3d7c3f415824e6fba1 *R/dev.R
1212
5826d0bf9c7ec0ecd95386c0f26ffa3a *R/embed.R
1313
056b8ec48c1c58299f6dd314ad75dec2 *R/export.R
14-
87d4427b2cd424e2f2e0ca3dfaaf76f2 *R/ggplotly.R
14+
4e00a2d803108d2cf383840b97e070ba *R/ggplotly.R
1515
8ff3b5cc791e42d475f2e73a01a2c2ab *R/group2NA.R
1616
87dd29f499c5a6f0ca17ee971937954b *R/helpers.R
1717
c01b8a62191181fa21215e03e24a057d *R/highlight.R
@@ -107,13 +107,13 @@ be31f8397bafdff521fd7f323fd9fa6d *inst/examples/shiny/crossfilter_scatter/app.R
107107
fe6f94f53f942b11efcad97a5399d9ab *inst/examples/shiny/drill_down/app.R
108108
9f1155a821a463cf49b16dee0a734df2 *inst/examples/shiny/event_data/DESCRIPTION
109109
2dce591961cca4fd83f9c05efd583e69 *inst/examples/shiny/event_data/app.R
110-
d0fb9baa69db2a7880fb35846049a1c0 *inst/examples/shiny/event_data/tests/shinytest/mytest-expected/001.json
110+
c4cfd387a3a3b5cc0c8018699caf3f27 *inst/examples/shiny/event_data/tests/shinytest/mytest-expected/001.json
111111
2601b824e212eca71cb55138bced6e40 *inst/examples/shiny/event_data/tests/shinytest/mytest-expected/001.png
112-
901b2993a7fdfae602df0c37859fdecf *inst/examples/shiny/event_data/tests/shinytest/mytest-expected/002.json
112+
0eadcd196a26a1b7757a7f2bb84e6fff *inst/examples/shiny/event_data/tests/shinytest/mytest-expected/002.json
113113
bb0f8fbcf0cf5a9713178a30ca38d91f *inst/examples/shiny/event_data/tests/shinytest/mytest-expected/002.png
114-
e9c0dfca6f3d4da2df16433beefcc3f7 *inst/examples/shiny/event_data/tests/shinytest/mytest-expected/003.json
114+
14f9951af14b8ec301988a95985127e8 *inst/examples/shiny/event_data/tests/shinytest/mytest-expected/003.json
115115
304f08baed23074b22d455ba6cbc83ee *inst/examples/shiny/event_data/tests/shinytest/mytest-expected/003.png
116-
5e4a2ffc6da7d4476806500c5a6b3fe4 *inst/examples/shiny/event_data/tests/shinytest/mytest-expected/004.json
116+
3976707de97de9c1b2bcf9bef623eec8 *inst/examples/shiny/event_data/tests/shinytest/mytest-expected/004.json
117117
2601b824e212eca71cb55138bced6e40 *inst/examples/shiny/event_data/tests/shinytest/mytest-expected/004.png
118118
2692ed93c52c36fc127a985828b36d96 *inst/examples/shiny/event_data/tests/shinytest/mytest.R
119119
d41f30fd715492a608094e165ee9e900 *inst/examples/shiny/event_data_3D/app.R
@@ -426,7 +426,7 @@ d3cd3d8768904126d855927d68d0ddb9 *tests/testthat/_snaps/ggplot-histogram/histogr
426426
40c889f1e339083ca10ceeab6002eb0b *tests/testthat/_snaps/ggplot-hline/hline.svg
427427
c9c58a3ce0c895aae8eb30217c39848d *tests/testthat/_snaps/ggplot-hline/split-hline-vline-abline.svg
428428
b9383e809e65036eec57d654fceaeaa3 *tests/testthat/_snaps/ggplot-jitter/jitter-basic.svg
429-
32f7a1a0a6d97a43041b6e89caa65f96 *tests/testthat/_snaps/ggplot-labels/factor-labels.svg
429+
de16edb7ee5d201275e85d2b1c94d126 *tests/testthat/_snaps/ggplot-labels/factor-labels.svg
430430
1e8666adf79677e2884ce27faa2c63ce *tests/testthat/_snaps/ggplot-labels/labels-angles.svg
431431
547958f4810a70c6e1de0e3606bcff00 *tests/testthat/_snaps/ggplot-labels/labels-ggtitle.svg
432432
fa0840202f10f26a65f33293eea9f267 *tests/testthat/_snaps/ggplot-labels/labels-scale-x-continuous-name.svg

‎NEWS.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# 4.10.4
2+
3+
## Improvements
4+
5+
* `ggplotly()` now works better with the development version of ggplot2 (> v3.4.4). (#2315)
6+
17
# 4.10.3
28

39
## Improvements

‎R/ggplotly.R

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1005,7 +1005,7 @@ gg2list <- function(p, width = NULL, height = NULL,
10051005
theme$legend.box.just <- theme$legend.box.just %||% c("center", "center")
10061006
# scales -> data for guides
10071007
gdefs <- if (inherits(plot$guides, "ggproto")) {
1008-
get_gdefs_ggproto(npscales$scales, theme, plot, layers)
1008+
get_gdefs_ggproto(npscales$scales, theme, plot, layers, layer_data)
10091009
} else {
10101010
get_gdefs(scales, theme, plot, layers)
10111011
}
@@ -1511,7 +1511,7 @@ scales_add_missing <- function(plot, aesthetics) {
15111511
# which away from guides_train(), guides_merge(), guides_geom()
15121512
# towards ggproto methods attached to `plot$guides`
15131513
# -------------------------------------------------------------------------
1514-
get_gdefs_ggproto <- function(scales, theme, plot, layers) {
1514+
get_gdefs_ggproto <- function(scales, theme, plot, layers, layer_data) {
15151515

15161516
# Unfortunate duplication of logic in tidyverse/ggplot2#5428
15171517
# which ensures a 1:1 mapping between aesthetics and scales
@@ -1520,10 +1520,10 @@ get_gdefs_ggproto <- function(scales, theme, plot, layers) {
15201520
aesthetics <- unlist(aesthetics, recursive = FALSE, use.names = FALSE)
15211521

15221522
guides <- plot$guides$setup(scales, aesthetics = aesthetics)
1523-
guides$train(scales, theme$legend.direction, plot$labels)
1523+
guides$train(scales, plot$labels)
15241524
if (length(guides$guides) > 0) {
15251525
guides$merge()
1526-
guides$process_layers(layers)
1526+
guides$process_layers(layers, layer_data)
15271527
}
15281528
# Add old legend/colorbar classes to guide params so that ggplotly() code
15291529
# can continue to work the same way it always has

‎inst/examples/shiny/event_data/tests/shinytest/mytest-expected/001.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -430,9 +430,9 @@
430430
},
431431
{
432432
"name": "crosstalk",
433-
"version": "1.2.0",
433+
"version": "1.2.1",
434434
"src": {
435-
"href": "crosstalk-1.2.0"
435+
"href": "crosstalk-1.2.1"
436436
},
437437
"meta": null,
438438
"script": "js/crosstalk.min.js",

‎inst/examples/shiny/event_data/tests/shinytest/mytest-expected/002.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -448,9 +448,9 @@
448448
},
449449
{
450450
"name": "crosstalk",
451-
"version": "1.2.0",
451+
"version": "1.2.1",
452452
"src": {
453-
"href": "crosstalk-1.2.0"
453+
"href": "crosstalk-1.2.1"
454454
},
455455
"meta": null,
456456
"script": "js/crosstalk.min.js",

‎inst/examples/shiny/event_data/tests/shinytest/mytest-expected/003.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -452,9 +452,9 @@
452452
},
453453
{
454454
"name": "crosstalk",
455-
"version": "1.2.0",
455+
"version": "1.2.1",
456456
"src": {
457-
"href": "crosstalk-1.2.0"
457+
"href": "crosstalk-1.2.1"
458458
},
459459
"meta": null,
460460
"script": "js/crosstalk.min.js",

‎inst/examples/shiny/event_data/tests/shinytest/mytest-expected/004.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -453,9 +453,9 @@
453453
},
454454
{
455455
"name": "crosstalk",
456-
"version": "1.2.0",
456+
"version": "1.2.1",
457457
"src": {
458-
"href": "crosstalk-1.2.0"
458+
"href": "crosstalk-1.2.1"
459459
},
460460
"meta": null,
461461
"script": "js/crosstalk.min.js",

‎tests/testthat/_snaps/ggplot-labels/factor-labels.svg

Lines changed: 1 addition & 1 deletion
Loading

0 commit comments

Comments
 (0)