Skip to content

Conversation

chschan
Copy link

@chschan chschan commented Sep 28, 2025

This PR rebases our fork. We skip some of merge commits which conflicts with changes in the upstream directory so we can pick up all the changes plotly.R, especially the latest changes to support ggplotly.

Commits skipped:

  • Previous merges with ropensci/plotly
  • Updates to inst/htmlwidgets/lib/plotlyjs/plotly-latest.min.js apart from the last one which updated to 2.35.2
  • Note that Alex's changes were incorporated into the upstream repo

(Maybe easier to look at it like this: plotly#2454)

cpsievert and others added 30 commits June 8, 2021 13:36
…lotly#1964)

* Follow up to plotly#1952: add crosstalk mapping to computed_mapping (not mapping) when present

* use dev version; update news
* v4.9.4.1 release candidate

* Reduce some of the warning noise

* Reduce some of the warning noise
* wip upgrade to plotly.js 2.0

* patch plotly.js source to support phantomjs/shinytest

reverts part of plotly/plotly.js#5380

* bump mathjax version

* use npm instead of yarn

* make geom_bar() default to textposition='none'; approve new vdiffr 0.4 + plotly.js 2.0 baselines

* Migrate to vdiffr 1.0

* Use layout.legend.title over layout.annotations to when converting guides for discrete scales

* wip migrate to gha

* try npm install

* setup node

* use recommended node version

* try mac instead

* install phantomjs; various cleanup

* intentionally break a visual test

* fix

* use thematic's approach to testing

* bump version

* regenerate snapshots

* map secrets to env variables

* accept new gha baselines

* whoops

* hmm

* approve shinytest baseline

* intentionally break a visual test

* always upload

* revert change; new baselines

* Remove the vdiffr dependency and use testthat snaphots directly

* More obvious env var naming

* more gha details

* always upload

* new snaps

* intentionally break a visual test (again)

* Revert "intentionally break a visual test (again)"

This reverts commit a4e306c.
To get rid of "Error is get_domains(length(plots), nrows, margin, widths = widths, heights = heights): The sum of the widths and heights arguments must be less than 1.
…ed (plotly#2001)

* Use Plotly.react() to redraw in Shiny if layout.transition is populated

* update news
* update to plotly.js v2.5.1

* new visual baselines
…aes_fix

`ggplotly` not recognizing `color` as aesthetic mapping
…unction

Closes plotly#1872. Implemented to_basic for `geom_function`
cpsievert and others added 26 commits June 5, 2025 16:28
* Run tests against dev ggplot2

* Take changes from plotly#2440

* Approve (a subset of) new snapshots

* Ensure ticktext/tickvals is atomic character/numeric vector

* Fix geom_sf() break positions

* Fix for geom_violin()

* Update news

* Approve good visual changes

* Approve more visual changes; fix test expectation

* Accept new snapshot

* Zero length ticktext/tickvals should remain NULL

* Zero length vs NULL can actually be meaningful so just safe guard against error

* Approve new snapshot

* Refactor

* Update NEWS.md

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* v4.11.0 release candidate

* Try checking with dev GGally

* Accept new snaps

* Skip tests with ggplot2 code that fails on old R versions

* Skip more

* Check workarounds

* More workarounds
* Initial commit

* Remove prepush

* Final line for plotly.yml

* Re-add lib

* Refactor

* Create test

* Specify rhtmlBuildUtils version

* Remove preinstall script

* Delete package-lock.json

* Update documentation

* Update documentation and remove library

* Restore files

* Restore file

* Update build files
* Test callback

* Update compiled files

* Add rhtmlwidget-status attribute

* wording change
* Candidate fix

* Bump version
* 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
@chschan chschan requested a review from JustinCCYap September 29, 2025 01:02
Copy link

@JustinCCYap JustinCCYap left a comment

Choose a reason for hiding this comment

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

LGTM, how will you address the conflicts?

@chschan chschan merged commit e920751 into master Sep 29, 2025
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.