Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
143 changes: 0 additions & 143 deletions .github/workflows/R-CMD-check.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: plotly
Title: Create Interactive Web Graphics via 'plotly.js'
Version: 4.10.0.9001
Version: 4.10.0.9002
Authors@R: c(person("Carson", "Sievert", role = c("aut", "cre"),
email = "[email protected]", comment = c(ORCID = "0000-0002-4958-2844")),
person("Chris", "Parmer", role = "aut",
Expand Down
2 changes: 1 addition & 1 deletion R/plotly.R
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ typedArrayPolyfill <- function() {
plotlyMainBundle <- function() {
htmltools::htmlDependency(
name = "plotly-main",
version = "2.11.1",
version = "2.35.2",
package = "plotly",
src = dependency_dir("plotlyjs"),
script = "plotly-latest.min.js",
Expand Down
2 changes: 1 addition & 1 deletion R/utils.R
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ verify_attr_names <- function(p) {
# some layout attributes (e.g., [x-y]axis can have trailing numbers)
attrs_name_check(
sub("[0-9]+$", "", names(p$x$layout)),
c(names(Schema$layout$layoutAttributes), c("barmode", "bargap", "bargroupgap", "mapType")),
c(names(Schema$layout$layoutAttributes), c("barmode", "bargap", "bargroupgap", "barcornerradius", "mapType")),

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just curious how did you know to change this?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I changed it for bargroup gap a while ago as well. If you try to use barcornerradius you get an ugly warning. I set option(warning=2) to make it an error and checked the stack trace

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice. So that means we could get rounded corners just from this PR?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, rounded corners will work with this. Is there anything else we needed?

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"layout"
)
attrs_name_check(
Expand Down
9 changes: 8 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1 +1,8 @@
This is a fork of the ropensci/plotly HtmlWidget for use in Displayr. The repository has been modified to be an node package and use the rhtmlBuildUtils framework. This was done in order to run unit tests on the widget js code, which has been modified by Displayr. The integration with rhtmlBuildUtils is incomplete, and only the building and unit testing of widget js code is supported. Features from rhtmlBuildUtils such as visual regression testing, linting and the internal web server are absent.
This is a fork of the plotly/plotly.R HtmlWidget for use in Displayr. The repository has been modified to be an node package and use the rhtmlBuildUtils framework. This was done in order to run unit tests on the widget js code, which has been modified by Displayr. The integration with rhtmlBuildUtils is incomplete, and only the building and unit testing of widget js code is supported. Features from rhtmlBuildUtils such as visual regression testing, linting and the internal web server are absent.

This fork diverges from the plotly/plotly.R in that
* Uses a later version of the js bundle (2.35.2) compared to the upstream fork (2.11.1). In particular this allows us to use bar corner radius
* Add support for handling the QTable class
* Some changes that so that plotly runs tests and exports in the Displayr environment

This fork is also missing some of the more recent fixes for ggplotly. The latest version of ggplot2 is 3.5.1 but as of version 3.5.0 (released Feb 2024), there have been a number of breaking changes. the Displayr R server still uses 3.4.4.
69 changes: 4 additions & 65 deletions inst/htmlwidgets/lib/plotlyjs/plotly-latest.min.js

Large diffs are not rendered by default.