merge conflicts

Author: cpsievert

NEWS.md

@@ -39,6 +39,7 @@
 * `subplot()` now works much better with annotations, images, and shapes:
   - When `xref`/`yref` references an x/y axis these references are bumped accordingly (#1181).
   - When `xref`/`yref` references paper coordinates, these coordinates are updated accordingly (#1332).
+* `subplot()` now repositions shapes with fixed height/width (i.e., `xsizemode`/`ysizemode` of `"pixel"`) correctly (#1494).
 * The colorscale generated via the `color` argument in `plot_ly()` now uses an evenly spaced grid of values instead of quantiles (#1308).
 * When using **shinytest** to test a **shiny** that contains **plotly** graph, false positive differences are no longer reported (rstudio/shinytest#174). 
 * When the `size` argument maps to `marker.size`, it now converts to an array of appropriate length (#1479).
@@ -51,6 +52,7 @@
 * Recursive attribute validation is now only performed on recursive objects (#1315).
 * The `text` attribute is no longer collapsed to a string when `hoveron='fills+points'` (#1448). 
 * `layout.[x-y]axis.domain` is no longer supplied a default when `layout.grid` is specified (#1427).
+* When uploading charts to a plot.ly account via `api_create()`, layout attributes are no longer incorrectly src-ified, which was causing inconsistencies in local/remote rendering of `ggplotly()` charts (#1197).
 
 # 4.8.0
 

R/subplots.R

@@ -416,7 +416,7 @@ reposition <- function(obj, domains) {
     o <- obj[[i]]
     xs <- if (identical(o$xref, "paper")) {
       if (is.numeric(o$sizex)) obj[[i]]$sizex <- o$sizex * abs(diff(xdom))
-      c("x", "x0", "x1")
+      if (identical(o$xsizemode, "pixel")) "xanchor" else c("x", "x0", "x1")
     }
     for (j in xs) {
       if (is.numeric(o[[j]])) {
@@ -425,7 +425,7 @@ reposition <- function(obj, domains) {
     }
     ys <- if (identical(o$yref, "paper")) {
       if (is.numeric(o$sizey)) obj[[i]]$sizey <- o$sizey * abs(diff(ydom))
-      c("y", "y0", "y1")
+      if (identical(o$ysizemode, "pixel")) "yanchor" else c("y", "y0", "y1")
     }
     for (j in ys) {
       if (is.numeric(o[[j]])) {

R/utils.R

@@ -441,7 +441,7 @@ verify_attr_names <- function(p) {
 verify_attr_spec <- function(p) {
   if (!is.null(p$x$layout)) {
     p$x$layout <- verify_attr(
-      p$x$layout, Schema$layout$layoutAttributes
+      p$x$layout, Schema$layout$layoutAttributes, layoutAttr = TRUE
     )
   }
   for (tr in seq_along(p$x$data)) {
@@ -456,7 +456,7 @@ verify_attr_spec <- function(p) {
   p
 }
 
-verify_attr <- function(proposed, schema) {
+verify_attr <- function(proposed, schema, layoutAttr = FALSE) {
   for (attr in names(proposed)) {
     attrSchema <- schema[[attr]] %||% schema[[sub("[0-9]+$", "", attr)]]
     # if schema is missing (i.e., this is an un-official attr), move along
@@ -485,8 +485,10 @@ verify_attr <- function(proposed, schema) {
     }
 
     # tag 'src-able' attributes (needed for api_create())
+    # note that layout has 'src-able' attributes that shouldn't
+    # be turned into grids https://github.com/ropensci/plotly/pull/1489
     isSrcAble <- !is.null(schema[[paste0(attr, "src")]]) && length(proposed[[attr]]) > 1
-    if (isDataArray || isSrcAble) {
+    if ((isDataArray || isSrcAble) && !isTRUE(layoutAttr)) {
       proposed[[attr]] <- structure(proposed[[attr]], apiSrc = TRUE)
     }
 
@@ -514,7 +516,7 @@ verify_attr <- function(proposed, schema) {
 
     # do the same for "sub-attributes"
     if (identical(role, "object") && is.recursive(proposed[[attr]])) {
-      proposed[[attr]] <- verify_attr(proposed[[attr]], schema[[attr]])
+      proposed[[attr]] <- verify_attr(proposed[[attr]], schema[[attr]], layoutAttr = layoutAttr)
     }
   }