Skip to content

Commit e339280

Browse files
authored
FS2-2955: Update to use plotly 2.35.2 (#22)
* Use latest bundle 2.35.2 * Turn off warning for barcornerradius * Add documentation * Only run standard tests * Remove github workflow * Remove travis CI config * Use same circle CI config as other flip packages * Replace with default config * Try to turn off all tests * Stop returning error * Turn off build
1 parent 4c7f410 commit e339280

File tree

8 files changed

+57
-221
lines changed

8 files changed

+57
-221
lines changed

.circleci/config.yml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
version: 2.1
2+
jobs:
3+
test:
4+
docker:
5+
- image: cimg/base:stable
6+
steps:
7+
# - checkout
8+
# Replace this with a real test runner invocation
9+
- run:
10+
name: Run tests
11+
command: echo 'replace me with real tests!' && true
12+
build:
13+
docker:
14+
- image: cimg/base:stable
15+
steps:
16+
- checkout
17+
# Replace this with steps to build a package, or executable
18+
- run:
19+
name: Build an artifact
20+
command: touch example.txt
21+
- store_artifacts:
22+
path: example.txt
23+
deploy:
24+
# This is an example deploy job, not actually used by the workflow
25+
docker:
26+
- image: cimg/base:stable
27+
steps:
28+
# Replace this with steps to deploy to users
29+
- run:
30+
name: deploy
31+
command: '#e.g. ./deploy.sh'
32+
workflows:
33+
example:
34+
jobs:
35+
- test
36+
#- build:
37+
# requires:
38+
# - test
39+
- deploy:
40+
requires:
41+
- test
42+

.github/workflows/R-CMD-check.yaml

Lines changed: 0 additions & 143 deletions
This file was deleted.

.travis.yml

Lines changed: 0 additions & 9 deletions
This file was deleted.

DESCRIPTION

Lines changed: 1 addition & 1 deletion
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.0.9001
3+
Version: 4.10.0.9002
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",

R/plotly.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ typedArrayPolyfill <- function() {
485485
plotlyMainBundle <- function() {
486486
htmltools::htmlDependency(
487487
name = "plotly-main",
488-
version = "2.11.1",
488+
version = "2.35.2",
489489
package = "plotly",
490490
src = dependency_dir("plotlyjs"),
491491
script = "plotly-latest.min.js",

R/utils.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ verify_attr_names <- function(p) {
424424
# some layout attributes (e.g., [x-y]axis can have trailing numbers)
425425
attrs_name_check(
426426
sub("[0-9]+$", "", names(p$x$layout)),
427-
c(names(Schema$layout$layoutAttributes), c("barmode", "bargap", "bargroupgap", "mapType")),
427+
c(names(Schema$layout$layoutAttributes), c("barmode", "bargap", "bargroupgap", "barcornerradius", "mapType")),
428428
"layout"
429429
)
430430
attrs_name_check(

README.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,8 @@
1-
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.
1+
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.
2+
3+
This fork diverges from the plotly/plotly.R in that
4+
* 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
5+
* Add support for handling the QTable class
6+
* Some changes that so that plotly runs tests and exports in the Displayr environment
7+
8+
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.

inst/htmlwidgets/lib/plotlyjs/plotly-latest.min.js

Lines changed: 4 additions & 65 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)