From c2a135f9004bc40d66183e3dd84ef364fc1a8ef5 Mon Sep 17 00:00:00 2001
From: alexcjohnson <alex@plot.ly>
Date: Wed, 30 Aug 2017 12:35:26 -0400
Subject: [PATCH] fix and test shapes on overlaid axes
---
src/components/shapes/draw.js | 2 +-
test/jasmine/tests/shapes_test.js | 62 +++++++++++++++++++++----------
2 files changed, 43 insertions(+), 21 deletions(-)
diff --git a/src/components/shapes/draw.js b/src/components/shapes/draw.js
index 468ab55894a..6b51ce15461 100644
--- a/src/components/shapes/draw.js
+++ b/src/components/shapes/draw.js
@@ -77,7 +77,7 @@ function drawOne(gd, index) {
else {
var plotinfo = gd._fullLayout._plots[options.xref + options.yref];
if(plotinfo) {
- var mainPlot = plotinfo.mainplot || plotinfo;
+ var mainPlot = plotinfo.mainplotinfo || plotinfo;
drawShape(mainPlot.shapelayer);
}
else {
diff --git a/test/jasmine/tests/shapes_test.js b/test/jasmine/tests/shapes_test.js
index dc0e197f895..63d0f461b70 100644
--- a/test/jasmine/tests/shapes_test.js
+++ b/test/jasmine/tests/shapes_test.js
@@ -580,32 +580,54 @@ describe('Test shapes: a plot with shapes and an overlaid axis', function() {
gd = createGraphDiv();
data = [{
- 'y': [1934.5, 1932.3, 1930.3],
- 'x': ['1947-01-01', '1947-04-01', '1948-07-01'],
- 'type': 'scatter'
+ y: [1934.5, 1932.3, 1930.3],
+ x: ['1947-01-01', '1947-04-01', '1948-07-01'],
+ type: 'scatter'
}];
layout = {
- 'yaxis': {
- 'type': 'linear'
+ yaxis: {
+ type: 'linear'
},
- 'xaxis': {
- 'type': 'date'
+ xaxis: {
+ type: 'date'
},
- 'yaxis2': {
- 'side': 'right',
- 'overlaying': 'y'
+ yaxis2: {
+ side: 'right',
+ overlaying: 'y'
},
- 'shapes': [{
- 'fillcolor': '#ccc',
- 'type': 'rect',
- 'x0': '1947-01-01',
- 'x1': '1947-04-01',
- 'xref': 'x',
- 'y0': 0,
- 'y1': 1,
- 'yref': 'paper',
- 'layer': 'below'
+ shapes: [{
+ fillcolor: '#ccc',
+ type: 'rect',
+ x0: '1947-01-01',
+ x1: '1947-04-01',
+ xref: 'x',
+ y0: 0,
+ y1: 1,
+ yref: 'paper',
+ layer: 'below'
+ }, {
+ type: 'path',
+ xref: 'x',
+ yref: 'y2',
+ path: 'M1947-01-01_12:00,2V4H1947-03-01Z'
+ }, {
+ type: 'rect',
+ xref: 'x',
+ yref: 'y2',
+ x0: '1947-02-01',
+ x1: '1947-03-01',
+ y0: 3,
+ y1: 5,
+ layer: 'below'
+ }, {
+ type: 'circle',
+ xref: 'x',
+ yref: 'y',
+ x0: '1947-01-15',
+ x1: '1947-02-15',
+ y0: 1931,
+ y1: 1934
}]
};
});