Modify scatter fill behavior

Author: rreusser

src/traces/scatter/plot.js

@@ -204,7 +204,6 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
 
     // initialize line join data / method
     var segments = [],
-        lineSegments = [],
         makeUpdate = Lib.noop;
 
     ownFillEl3 = trace._ownFill;
@@ -225,7 +224,7 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
         else if(line.shape === 'spline') {
             pathfn = revpathbase = function(pts) {
                 var pLast = pts[pts.length - 1];
-                if(pts[0][0] === pLast[0] && pts[0][1] === pLast[1]) {
+                if(pts.length > 2 && pts[0][0] === pLast[0] && pts[0][1] === pLast[1]) {
                     // identical start and end points: treat it as a
                     // closed curve so we don't get a kink
                     return Drawing.smoothclosed(pts.slice(1), line.smoothing);
@@ -270,10 +269,6 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
             pt1 = lastSegment[lastSegment.length - 1];
         }
 
-        lineSegments = segments.filter(function(s, i) {
-            return s.length > 1 || i === segments.length - 1 || i === 0;
-        });
-
         makeUpdate = function(isEnter) {
             return function(pts) {
                 thispath = pathfn(pts);
@@ -312,7 +307,7 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
         };
     }
 
-    var lineJoin = tr.selectAll('.js-line').data(lineSegments);
+    var lineJoin = tr.selectAll('.js-line').data(segments);
 
     transition(lineJoin.exit())
         .style('opacity', 0)

test/image/baselines/scatter_fill_corner_cases.png

@@ -2,28 +2,81 @@
   "data": [
     {
       "x": [1.5],
-      "y": [1.75],
-      "fill": "tozeroy"
+      "y": [1.25],
+      "fill": "tozeroy",
+      "showlegend": false
     },
     {
       "x": [0, 1, 2, 3],
-      "y": [1.5, null, 1.5, 1.5],
-      "fill": "tozeroy"
+      "y": [1, null, 1, 1],
+      "fill": "tozeroy",
+      "showlegend": false
     },
     {
       "x": [0, 1, 1.5, 2, 2.5, 3],
-      "y": [1.25, 1.25, null, 1.35, null, 1.25, 1.25],
-      "fill": "tozeroy"
+      "y": [0.75, 0.75, null, 0.85, null, 0.75, 0.75],
+      "fill": "tozeroy",
+      "showlegend": false
     },
     {
       "x": [0, 1, 2, 3],
-      "y": [1.0, 1.1, null, 1.0],
-      "fill": "tozeroy"
+      "y": [0.5, 0.6, null, 0.5],
+      "fill": "tozeroy",
+      "showlegend": false
     },
     {
       "x": [0, 1.5, 3],
-      "y": [0.75, null, 0.75],
-      "fill": "tozeroy"
+      "y": [0.25, null, 0.25],
+      "fill": "tozeroy",
+      "showlegend": false
+    },
+    {
+      "x": [1.5],
+      "y": [1.25],
+      "fill": "tozeroy",
+      "line": {"shape": "spline"},
+      "xaxis": "x2",
+      "showlegend": false
+    },
+    {
+      "x": [0, 1, 2, 3],
+      "y": [1, null, 1, 1],
+      "fill": "tozeroy",
+      "line": {"shape": "spline"},
+      "xaxis": "x2",
+      "showlegend": false
+    },
+    {
+      "x": [0, 1, 1.5, 2, 2.5, 3],
+      "y": [0.75, 0.75, null, 0.85, null, 0.75, 0.75],
+      "fill": "tozeroy",
+      "line": {"shape": "spline"},
+      "xaxis": "x2",
+      "showlegend": false
+    },
+    {
+      "x": [0, 1, 2, 3],
+      "y": [0.5, 0.6, null, 0.5],
+      "fill": "tozeroy",
+      "line": {"shape": "spline"},
+      "xaxis": "x2",
+      "showlegend": false
+    },
+    {
+      "x": [0, 1.5, 3],
+      "y": [0.25, null, 0.25],
+      "fill": "tozeroy",
+      "line": {"shape": "spline"},
+      "xaxis": "x2",
+      "showlegend": false
+    }
+  ],
+  "layout": {
+    "xaxis": {
+      "domain": [0, 0.45]
+    },
+    "xaxis2": {
+      "domain": [0.55, 1]
     }
-  ]
+  }
 }