Skip to content

Commit c6cdcea

Browse files
authored
Merge pull request #2990 from plotly/regl-line2d-bump
Fix scattergl missing lines after non-line trace
2 parents d0ee187 + 045a162 commit c6cdcea

File tree

7 files changed

+50
-10
lines changed

7 files changed

+50
-10
lines changed

Diff for: package-lock.json

+7-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
"gl-streamtube3d": "^1.0.0",
8787
"gl-surface3d": "^1.3.5",
8888
"gl-text": "^1.1.6",
89-
"glslify": "^6.2.1",
89+
"glslify": "^6.3.1",
9090
"has-hover": "^1.0.1",
9191
"has-passive-events": "^1.0.0",
9292
"mapbox-gl": "0.45.0",
@@ -102,7 +102,7 @@
102102
"polybooljs": "^1.2.0",
103103
"regl": "^1.3.7",
104104
"regl-error2d": "^2.0.5",
105-
"regl-line2d": "^3.0.9",
105+
"regl-line2d": "^3.0.11",
106106
"regl-scatter2d": "^3.0.6",
107107
"regl-splom": "^1.0.4",
108108
"right-now": "^1.0.0",

Diff for: src/traces/scattergl/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ function plot(gd, subplot, cdata) {
431431
if(scene.fill2d) {
432432
scene.fillOptions = scene.fillOptions.map(function(fillOptions, i) {
433433
var cdscatter = cdata[i];
434-
if(!fillOptions || !cdscatter || !cdscatter[0] || !cdscatter[0].trace) return null;
434+
if(!fillOptions || !cdscatter || !cdscatter[0] || !cdscatter[0].trace) return;
435435
var cd = cdscatter[0];
436436
var trace = cd.trace;
437437
var stash = cd.t;

Diff for: test/image/baselines/gl2d_fill-ordering.png

27.6 KB
Loading

Diff for: test/image/baselines/gl2d_text_chart_basic.png

-43 Bytes
Loading
-42 Bytes
Loading

Diff for: test/image/mocks/gl2d_fill-ordering.json

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
{
2+
"data": [
3+
{
4+
"x": [1, 2, 3, 4, 5, 6],
5+
"y": [100, 100, 0, 0, 0, 0],
6+
"fill": "tozeroy",
7+
"type": "scattergl"
8+
},
9+
{
10+
"x": [1, 2, 3, 4, 5, 6],
11+
"y": [0, 0, 0, 100, 100, 0],
12+
"fill": "tozeroy",
13+
"type": "scattergl",
14+
"mode": "none"
15+
},
16+
{
17+
"x": [1, 2, 3, 4, 5, 6],
18+
"y": [99, 99, 99, 100, 100, 100],
19+
"type": "scattergl",
20+
"mode": "lines+markers"
21+
},
22+
{
23+
"x": [1, 2, 3, 4, 5, 6],
24+
"y": [0, 0, 0, null, 50, 50],
25+
"fill": "tozeroy",
26+
"type": "scattergl",
27+
"mode": "none"
28+
},
29+
{
30+
"x": [1, 2, 3, 4, 5, 6],
31+
"y": [100, 0, 0, 0, 0, 100],
32+
"type": "scattergl",
33+
"mode": "lines+markers"
34+
}
35+
],
36+
"layout": {
37+
"margin": {"l": 40, "r": 50, "b": 80, "t": 40},
38+
"legend": {"orientation": "h", "x": "0.5", "xanchor": "center"}
39+
}
40+
}

0 commit comments

Comments
 (0)