Merge pull request #5355 from ruijin/scattkeep null in x,y so regl kn…

…ows the end of polygonergl_fill_fix
plotly · Dec 26, 2020 · 4ce0c8b · 4ce0c8b
2 parents 278950b + 4775030
commit 4ce0c8b
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 87 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -110,7 +110,7 @@
     "polybooljs": "^1.2.0",
     "regl": "^1.6.1",
     "regl-error2d": "^2.0.11",
-    "regl-line2d": "^3.0.18",
+    "regl-line2d": "^3.1.0",
     "regl-scatter2d": "^3.2.1",
     "regl-splom": "^1.0.12",
     "right-now": "^1.0.0",

diff --git a/src/traces/scattergl/plot.js b/src/traces/scattergl/plot.js
@@ -182,10 +182,14 @@ module.exports = function plot(gd, subplot, cdata) {
                 } else if(trace.fill === 'toself' || trace.fill === 'tonext') {
                     pos = [];
                     last = 0;
+
+                    fillOptions.splitNull = true;
+
                     for(j = 0; j < srcPos.length; j += 2) {
                         if(isNaN(srcPos[j]) || isNaN(srcPos[j + 1])) {
                             pos = pos.concat(srcPos.slice(last, j));
                             pos.push(srcPos[last], srcPos[last + 1]);
+                            pos.push(null, null); // keep null to mark end of polygon
                             last = j + 2;
                         }
                     }

diff --git a/test/image/baselines/gl2d_scatter_fill_self_next.png b/test/image/baselines/gl2d_scatter_fill_self_next.png
diff --git a/test/image/mocks/gl2d_scatter_fill_self_next.json b/test/image/mocks/gl2d_scatter_fill_self_next.json
@@ -17,7 +17,29 @@
             "y": [5, 6, 5],
             "fill": "toself",
             "type": "scattergl"
-        }
+        },
+        {
+          "x": [1.1, 1.1, 2.1, null,
+                -1.9,-1.9,-0.9,null,
+                -4.9,-4.9,-3.9],
+          "y": [6.1, 7.1, 7.1, null, 
+                1.1, 2.1, 2.1, null, 
+                1.1, 2.1, 2.1],
+          "type": "scattergl",
+          "fill": "tonext"
+      },
+      {
+          "x": [ 0, 0, 2, 2, 0, null,
+              1,1,3,3,1,null,
+              -2,-2,0,0,-2,null,
+              -5,-5,-3,-3,-5],
+          "y": [9, 10, 10, 9, 9, null,
+                6,8, 8, 6,6,null,
+                1,3,3,1, 1,null,
+                1,3,3,1,1],
+            "type": "scattergl",
+            "fill": "tonext"
+      }
     ],
     "layout":{
         "title": {"text": "Fill toself and tonext"},