Merge pull request #2990 from plotly/regl-line2d-bump

Fix scattergl missing lines after non-line trace

package.json

@@ -86,7 +86,7 @@
     "gl-streamtube3d": "^1.0.0",
     "gl-surface3d": "^1.3.5",
     "gl-text": "^1.1.6",
-    "glslify": "^6.2.1",
+    "glslify": "^6.3.1",
     "has-hover": "^1.0.1",
     "has-passive-events": "^1.0.0",
     "mapbox-gl": "0.45.0",
@@ -102,7 +102,7 @@
     "polybooljs": "^1.2.0",
     "regl": "^1.3.7",
     "regl-error2d": "^2.0.5",
-    "regl-line2d": "^3.0.9",
+    "regl-line2d": "^3.0.11",
     "regl-scatter2d": "^3.0.6",
     "regl-splom": "^1.0.4",
     "right-now": "^1.0.0",

src/traces/scattergl/index.js

@@ -431,7 +431,7 @@ function plot(gd, subplot, cdata) {
         if(scene.fill2d) {
             scene.fillOptions = scene.fillOptions.map(function(fillOptions, i) {
                 var cdscatter = cdata[i];
-                if(!fillOptions || !cdscatter || !cdscatter[0] || !cdscatter[0].trace) return null;
+                if(!fillOptions || !cdscatter || !cdscatter[0] || !cdscatter[0].trace) return;
                 var cd = cdscatter[0];
                 var trace = cd.trace;
                 var stash = cd.t;

test/image/mocks/gl2d_fill-ordering.json

@@ -0,0 +1,40 @@
+{
+  "data": [
+    {
+      "x": [1, 2, 3, 4, 5, 6],
+      "y": [100, 100, 0, 0, 0, 0],
+      "fill": "tozeroy",
+      "type": "scattergl"
+    },
+    {
+      "x": [1, 2, 3, 4, 5, 6],
+      "y": [0, 0, 0, 100, 100, 0],
+      "fill": "tozeroy",
+      "type": "scattergl",
+      "mode": "none"
+    },
+    {
+      "x": [1, 2, 3, 4, 5, 6],
+      "y": [99, 99, 99, 100, 100, 100],
+      "type": "scattergl",
+      "mode": "lines+markers"
+    },
+    {
+      "x": [1, 2, 3, 4, 5, 6],
+      "y": [0, 0, 0, null, 50, 50],
+      "fill": "tozeroy",
+      "type": "scattergl",
+      "mode": "none"
+    },
+    {
+      "x": [1, 2, 3, 4, 5, 6],
+      "y": [100, 0, 0, 0, 0, 100],
+      "type": "scattergl",
+      "mode": "lines+markers"
+    }
+  ],
+  "layout": {
+    "margin": {"l": 40, "r": 50, "b": 80, "t": 40},
+    "legend": {"orientation": "h", "x": "0.5", "xanchor": "center"}
+  }
+}