Merge remote-tracking branch 'origin/master' into dont-call-autotype-for-3d

Author: archmoj

src/plots/cartesian/axes.js

@@ -1585,9 +1585,13 @@ axes.draw = function(gd, arg, opts) {
             plotinfo.xaxislayer.selectAll('.' + xa._id + 'tick').remove();
             plotinfo.yaxislayer.selectAll('.' + ya._id + 'tick').remove();
             plotinfo.xaxislayer.selectAll('.' + xa._id + 'tick2').remove();
+            plotinfo.yaxislayer.selectAll('.' + ya._id + 'tick2').remove();
             plotinfo.xaxislayer.selectAll('.' + xa._id + 'divider').remove();
+            plotinfo.yaxislayer.selectAll('.' + ya._id + 'divider').remove();
+
             if(plotinfo.gridlayer) plotinfo.gridlayer.selectAll('path').remove();
             if(plotinfo.zerolinelayer) plotinfo.zerolinelayer.selectAll('path').remove();
+
             fullLayout._infolayer.select('.g-' + xa._id + 'title').remove();
             fullLayout._infolayer.select('.g-' + ya._id + 'title').remove();
         });

src/traces/contour/plot.js

@@ -240,8 +240,7 @@ function makeLinesAndLabels(plotgroup, pathinfo, gd, cd0, contours, perimeter) {
         .classed('contourlabels', true);
 
     if(showLabels) {
-        var labelClipPathData = [perimeter];
-
+        var labelClipPathData = [];
         var labelData = [];
 
         // invalidate the getTextLocation cache in case paths changed
@@ -287,6 +286,13 @@ function makeLinesAndLabels(plotgroup, pathinfo, gd, cd0, contours, perimeter) {
         bounds.middle = (bounds.top + bounds.bottom) / 2;
         bounds.center = (bounds.left + bounds.right) / 2;
 
+        labelClipPathData.push([
+            [bounds.left, bounds.top],
+            [bounds.right, bounds.top],
+            [bounds.right, bounds.bottom],
+            [bounds.left, bounds.bottom]
+        ]);
+
         var plotDiagonal = Math.sqrt(xLen * xLen + yLen * yLen);
 
         // the path length to use to scale the number of labels to draw:

test/image/baselines/contour_label-reversed-axes.png

@@ -3,21 +3,61 @@
     {
       "type": "contour",
       "z": [
-        [1, 2, 1],
-        [2, 1, 2],
-        [2, 1, 2]
+        [1, 2, 3],
+        [2, 0, 0],
+        [3, 0, 3]
       ],
-      "contours": {
-        "showlabels": true
-      }
+      "contours": {"showlabels": true},
+      "showscale": false
+    },
+    {
+      "type": "contour",
+      "z": [
+        [1, 2, 3],
+        [2, 0, 0],
+        [3, 0, 3]
+      ],
+      "contours": {"showlabels": true},
+      "showscale": false,
+      "xaxis": "x2",
+      "yaxis": "y2"
+    },
+    {
+      "type": "contour",
+      "z": [
+        [1, 2, 3],
+        [2, 0, 0],
+        [3, 0, 3]
+      ],
+      "contours": {"showlabels": true},
+      "showscale": false,
+      "xaxis": "x3",
+      "yaxis": "y3"
+    },
+    {
+      "type": "contour",
+      "z": [
+        [1, 2, 3],
+        [2, 0, 0],
+        [3, 0, 3]
+      ],
+      "contours": {"showlabels": true},
+      "showscale": false,
+      "xaxis": "x4",
+      "yaxis": "y4"
     }
   ],
   "layout": {
-    "yaxis": {
-      "autorange": "reversed"
-    },
-    "xaxis": {
-      "autorange": "reversed"
-    }
+    "grid": {"rows": 2, "columns": 2, "pattern": "independent"},
+
+    "xaxis": {"autorange": "reversed"},
+    "yaxis": {"autorange": "reversed"},
+
+    "xaxis2": {"autorange": "reversed"},
+
+    "yaxis3": {"autorange": "reversed"},
+
+    "xaxis4": {"range": [2.05, -0.05]},
+    "yaxis4": {"range": [2.2, -0.2]}
   }
 }

test/image/mocks/contour_label-reversed-axes.json

@@ -907,4 +907,65 @@ describe('subplot creation / deletion:', function() {
         .catch(failTest)
         .then(done);
     });
+
+    it('clears secondary labels and divider when updating out of axis type multicategory (y-axis case)', function(done) {
+        function _assert(msg, exp) {
+            var gd3 = d3.select(gd);
+            expect(gd3.selectAll('.ytick > text').size())
+                .toBe(exp.tickCnt, msg + ' # labels');
+            expect(gd3.selectAll('.ytick2 > text').size())
+                .toBe(exp.tick2Cnt, msg + ' # secondary labels');
+            expect(gd3.selectAll('.ydivider').size())
+                .toBe(exp.dividerCnt, msg + ' # dividers');
+        }
+
+        Plotly.react(gd, [{
+            type: 'bar',
+            orientation: 'h',
+            y: ['a', 'b', 'c'],
+            x: [1, 2, 1]
+        }])
+        .then(function() {
+            _assert('base - category axis', {
+                tickCnt: 3,
+                tick2Cnt: 0,
+                dividerCnt: 0
+            });
+        })
+        .then(function() {
+            return Plotly.react(gd, [{
+                type: 'bar',
+                orientation: 'h',
+                y: [
+                    ['d', 'd', 'e'],
+                    ['a', 'b', 'c']
+                ],
+                x: [1, 2, 3]
+            }]);
+        })
+        .then(function() {
+            _assert('multicategory axis', {
+                tickCnt: 3,
+                tick2Cnt: 2,
+                dividerCnt: 3
+            });
+        })
+        .then(function() {
+            return Plotly.react(gd, [{
+                type: 'bar',
+                orientation: 'h',
+                y: ['a', 'b', 'c'],
+                x: [1, 2, 1]
+            }]);
+        })
+        .then(function() {
+            _assert('back to category axis', {
+                tickCnt: 3,
+                tick2Cnt: 0,
+                dividerCnt: 0
+            });
+        })
+        .catch(failTest)
+        .then(done);
+    });
 });