match horizontal colorbar.y with vertical

Author: archmoj

src/components/colorbar/attributes.js

@@ -88,7 +88,7 @@ module.exports = overrideAll({
         max: 3,
         description: [
             'Sets the y position of the color bar (in plot fraction).',
-            'Defaults to -0.02 when `orientation` if *v* and ',
+            'Defaults to 1.02 when `orientation` if *v* and ',
             'defaults to 0.5 when `orientation` if *h*.'
         ].join(' ')
     },

src/components/colorbar/defaults.js

@@ -40,7 +40,7 @@ module.exports = function colorbarDefaults(containerIn, containerOut, layout) {
     coerce('x', isVertical ? 1.02 : 0.5);
     coerce('xanchor', isVertical ? 'left' : 'center');
     coerce('xpad');
-    coerce('y', isVertical ? 0.5 : -0.02);
+    coerce('y', isVertical ? 0.5 : 1.02);
     coerce('yanchor', isVertical ? 'middle' : 'bottom');
     coerce('ypad');
     Lib.noneOrAll(colorbarIn, colorbarOut, ['x', 'y']);

src/components/colorbar/draw.js

@@ -167,6 +167,7 @@ function makeColorBarData(gd) {
 }
 
 function drawColorBar(g, opts, gd) {
+    var isVertical = opts.orientation === 'v';
     var len = opts.len;
     var lenmode = opts.lenmode;
     var thickness = opts.thickness;
@@ -178,7 +179,7 @@ function drawColorBar(g, opts, gd) {
     var xpad = opts.xpad;
     var ypad = opts.ypad;
     var optsX = opts.x;
-    var optsY = opts.y;
+    var optsY = isVertical ? opts.y : 1 - opts.y;
 
     var fullLayout = gd._fullLayout;
     var gs = fullLayout._size;
@@ -209,7 +210,6 @@ function drawColorBar(g, opts, gd) {
     // when the colorbar itself is pushing the margins.
     // but then the fractional size is calculated based on the
     // actual graph size, so that the axes will size correctly.
-    var isVertical = opts.orientation === 'v';
     var thickPx = Math.round(thickness * (thicknessmode === 'fraction' ? (isVertical ? gs.w : gs.h) : 1));
     var thickFrac = thickPx / (isVertical ? gs.w : gs.h);
     var lenPx = Math.round(len * (lenmode === 'fraction' ? (isVertical ? gs.h : gs.w) : 1));

test/image/mocks/z_h-colorbar02.json

@@ -11,7 +11,7 @@
         "showscale": true,
         "colorbar": {
           "orientation": "h",
-          "y": 1.1,
+          "y": -0.1,
           "yanchor": "top",
           "thickness": 20,
           "ticks": "inside",

test/image/mocks/z_h-colorbar05.json

@@ -13,7 +13,7 @@
           "orientation": "h",
           "xanchor": "right",
           "x": 1,
-          "y": 1.02,
+          "y": -0.02,
           "yanchor": "top",
           "thickness": 20,
           "len": 0.5,

test/image/mocks/z_h-colorbar08.json

@@ -12,7 +12,7 @@
         "colorbar": {
           "orientation": "h",
           "yanchor": "top",
-          "y": 1.5,
+          "y": -0.5,
           "xanchor": "right",
           "x": 1,
           "thickness": 10,

test/image/mocks/z_h-colorbar_airfoil.json

@@ -218,7 +218,7 @@
       "colorbar":{
         "orientation": "h",
         "x":0.75,
-        "y":1.1,
+        "y":-0.1,
         "yanchor":"top",
         "len":0.5,
         "title":{