Cc rebase plotly4.11

.Rbuildignore

@@ -21,3 +21,4 @@ README.Rmd
 abbvie.R
 ^\.httr-oauth$
 ^\.github$
+^\.circleci$

.circleci/config.yml

@@ -0,0 +1,42 @@
+version: 2.1
+jobs:
+  test:
+    docker:
+      - image: cimg/base:stable
+    steps:
+      # - checkout
+      # Replace this with a real test runner invocation
+      - run:
+          name: Run tests
+          command: echo 'replace me with real tests!' && true
+  build:
+    docker:
+      - image: cimg/base:stable
+    steps:
+      - checkout
+      # Replace this with steps to build a package, or executable
+      - run:
+          name: Build an artifact
+          command: touch example.txt
+      - store_artifacts:
+          path: example.txt
+  deploy:
+    # This is an example deploy job, not actually used by the workflow
+    docker:
+      - image: cimg/base:stable
+    steps:
+      # Replace this with steps to deploy to users
+      - run:
+          name: deploy
+          command: '#e.g. ./deploy.sh'
+workflows:
+  example:
+    jobs:
+      - test
+      #- build:
+      #    requires:
+      #      - test
+      - deploy:
+          requires:
+            - test
+

.github/pull.yml

@@ -0,0 +1,9 @@
+version: "1"
+rules:
+  - base: master
+    upstream: ropensci:master    # change `wei` to the owner of upstream repo
+    mergeMethod: none
+    assignees:
+      - chschan
+    reviewers:
+      - chschan

R/plotly.R

@@ -140,7 +140,13 @@ plot_ly <- function(data = data.frame(), ..., type = NULL, name,
   if (!is.data.frame(data) && !crosstalk::is.SharedData(data)) {
     stop("First argument, `data`, must be a data frame or shared data.", call. = FALSE)
   }
-
+
+  if (is.data.frame(data) && nrow(data) > 0L) {
+    qtables <- vapply(data, inherits, logical(1L), "QTable")
+    if (any(qtables))
+      data[qtables] <- lapply(data[qtables], as.vector)
+  }
+
   # "native" plotly arguments
   attrs <- list(...)
 
@@ -479,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",

R/utils.R

@@ -449,7 +449,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("boxmode", "barmode", "bargap", "mapType")),
+    c(names(Schema$layout$layoutAttributes), c("boxmode", "barmode", "bargap", "bargroupgap", "barcornerradius", "mapType")),
     "layout"
   )
   attrs_name_check(

README.md

@@ -1,115 +1,8 @@
+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.
 
-<!-- README.md is generated from README.Rmd. Please edit that file -->
+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
 
-<img src="man/figures/plotly.png" width="200" />
-
-<!-- badges: start -->
-[![R-CMD-check](https://github.com/ropensci/plotly/workflows/R-CMD-check/badge.svg)](https://github.com/plotly/plotly.R/actions)
-[![CRAN Status](https://www.r-pkg.org/badges/version/plotly)](https://cran.r-project.org/package=plotly)
-[![CRAN Downloads](https://cranlogs.r-pkg.org/badges/grand-total/plotly)](https://cranlogs.r-pkg.org/badges/grand-total/plotly)
-[![monthly](https://cranlogs.r-pkg.org/badges/plotly)](https://cranlogs.r-pkg.org/badges/plotly)
-<!-- badges: end -->
-
-An R package for creating interactive web graphics via the open source
-JavaScript graphing library
-[plotly.js](https://github.com/plotly/plotly.js).
-
-<div align="center">
-  <a href="https://dash.plotly.com/project-maintenance">
-    <img src="https://dash.plotly.com/assets/images/maintained-by-community.png" width="400px" alt="Maintained by the Plotly Community">
-  </a>
-</div>
-
-## Installation
-
-Install from CRAN:
-
-``` r
-install.packages("plotly")
-```
-
-Or install the latest development version (on GitHub) via `{remotes}`:
-
-``` r
-remotes::install_github("plotly/plotly")
-```
-
-## Getting started
-
-### Web-based ggplot2 graphics
-
-If you use [ggplot2](https://github.com/tidyverse/ggplot2), `ggplotly()`
-converts your static plots to an interactive web-based version\!
-
-``` r
-library(plotly)
-g <- ggplot(faithful, aes(x = eruptions, y = waiting)) +
-  stat_density_2d(aes(fill = ..level..), geom = "polygon") + 
-  xlim(1, 6) + ylim(40, 100)
-ggplotly(g)
-```
-
-![<https://i.imgur.com/G1rSArP.gifv>](https://i.imgur.com/G1rSArP.gif)
-
-By default, `ggplotly()` tries to replicate the static ggplot2 version
-exactly (before any interaction occurs), but sometimes you need greater
-control over the interactive behavior. The `ggplotly()` function itself
-has some convenient “high-level” arguments, such as `dynamicTicks`,
-which tells plotly.js to dynamically recompute axes, when appropriate.
-The `style()` function also comes in handy for *modifying* the
-underlying trace
-attributes (e.g. [hoveron](https://plotly.com/r/reference/#scatter-hoveron)) used to generate the plot:
-
-``` r
-gg <- ggplotly(g, dynamicTicks = "y")
-style(gg, hoveron = "points", hoverinfo = "x+y+text", hoverlabel = list(bgcolor = "white"))
-```
-
-![<https://i.imgur.com/qRvLgea.gifv>](https://imgur.com/qRvLgea.gif)
-
-Moreover, since `ggplotly()` returns a plotly object, you can apply
-essentially any function from the R package on that object. Some useful
-ones include `layout()` (for [customizing the
-layout](https://plotly-r.com/improving-ggplotly.html#modifying-layout)),
-`add_traces()` (and its higher-level `add_*()` siblings, for example
-`add_polygons()`, for [adding new
-traces/data](https://plotly-r.com/improving-ggplotly.html#leveraging-statistical-output)),
-`subplot()` (for [combining multiple plotly
-objects](https://plotly-r.com/arranging-views.html#arranging-plotly-objects)),
-and `plotly_json()` (for inspecting the underlying JSON sent to
-plotly.js).
-
-The `ggplotly()` function will also respect some “unofficial”
-**ggplot2** aesthetics, namely `text` (for [customizing the
-tooltip](https://plotly-r.com/controlling-tooltips.html#tooltip-text-ggplotly)),
-`frame` (for [creating
-animations](https://plotly-r.com/animating-views.html)),
-and `ids` (for ensuring sensible smooth transitions).
-
-### Using plotly without ggplot2
-
-The `plot_ly()` function provides a more direct interface to plotly.js
-so you can leverage more specialized chart types (e.g., [parallel
-coordinates](https://plotly.com/r/parallel-coordinates-plot/) or
-[maps](https://plotly.com/r/maps/)) or even some visualization that the
-ggplot2 API won’t ever support (e.g., surface,
-[mesh](https://plotly.com/r/3d-mesh/),
-[trisurf](https://plotly.com/r/trisurf/), etc).
-
-``` r
-plot_ly(z = ~volcano, type = "surface")
-```
-
-![<https://plotly.com/~brnvg/1134>](https://plotly.com/~brnvg/1134.png)
-
-## Learn more
-
-To learn more about special features that the plotly R package provides (e.g., [client-side linking](https://plotly-r.com/client-side-linking.html), [**shiny** integration](https://plotly-r.com/linking-views-with-shiny.html), [editing and generating static images](https://plotly-r.com/publish.html), [custom events in JavaScript](https://plotly-r.com/javascript.html), and more), see <https://plotly-r.com>. You may already be familiar with existing plotly documentation (e.g., <https://plotly.com/r/>), which is essentially a language-agnostic how-to guide for learning plotly.js, whereas <https://plotly-r.com> is meant to be more wholistic tutorial written by and for the R user. The package itself ships with a number of demos (list them by running `demo(package = "plotly")`) and shiny/rmarkdown examples (list them by running `plotly_example("shiny")` or `plotly_example("rmd")`). [Carson](https://cpsievert.me) also keeps numerous [slide decks](https://talks.cpsievert.me) with useful examples and concepts.
-
-## Contributing
-
-Please read through our [contributing
-guidelines](https://github.com/plotly/plotly.R/blob/master/CONTRIBUTING.md).
-Included are directions for opening issues, asking questions,
-contributing changes to plotly, and our code of
-conduct.
+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. 

build/config/widget.config.js

@@ -0,0 +1,11 @@
+const cliArgs = require('yargs').argv
+const _ = require('lodash')
+
+const config = {
+  widgetEntryPoint: 'theSrc/scripts/plotly.js',
+  widgetFactory: 'theSrc/scripts/plotly.factory.js',
+  widgetName: 'plotly',
+}
+
+const commandLineOverides = _.omit(cliArgs, ['_', '$0'])
+module.exports = _.merge(config, commandLineOverides)

gulpfile.js

@@ -0,0 +1,8 @@
+const gulp = require('gulp')
+const rhtmlBuildUtils = require('rhtmlBuildUtils')
+
+const dontRegisterTheseTasks = []
+rhtmlBuildUtils.registerGulpTasks({ 
+  gulp: gulp, 
+  exclusions: dontRegisterTheseTasks 
+})