improve code readability, reuse existing code/logic in test

plotly · Nov 21, 2018 · c1b871d · c1b871d
1 parent a375c99
commit c1b871d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/src/components/legend/style.js b/src/components/legend/style.js
@@ -26,11 +26,17 @@ module.exports = function style(s, gd) {
         layers.style('opacity', d[0].trace.opacity);
 
         // Marker vertical alignment
-        var valignFactor = 0;
-        if(gd._fullLayout.legend.valign === 'top') valignFactor = 1.0;
-        if(gd._fullLayout.legend.valign === 'bottom') valignFactor = -1.0;
-        var markerOffsetY = valignFactor * (0.5 * (d[0].lineHeight - d[0].height + 3));
-        if(!isNaN(markerOffsetY)) layers.attr('transform', 'translate(0,' + markerOffsetY + ')');
+        var valign = gd._fullLayout.legend.valign;
+        var lineHeight = d[0].lineHeight;
+        var height = d[0].height;
+
+        if(valign === 'middle' || !lineHeight || !height) {
+            layers.attr('transform', null); // this here is a fun d3 trick to unset DOM attributes
+        } else {
+            var factor = {top: 1, bottom: -1}[valign];
+            var markerOffsetY = factor * (0.5 * (lineHeight - height + 3));
+            layers.attr('transform', 'translate(0,' + markerOffsetY + ')');
+        }
 
         var fill = layers
             .selectAll('g.legendfill')

diff --git a/test/jasmine/tests/legend_test.js b/test/jasmine/tests/legend_test.js
@@ -16,6 +16,8 @@ var createGraphDiv = require('../assets/create_graph_div');
 var destroyGraphDiv = require('../assets/destroy_graph_div');
 var assertPlotSize = require('../assets/custom_assertions').assertPlotSize;
 
+var Drawing = require('@src/components/drawing');
+
 describe('legend defaults', function() {
     'use strict';
 
@@ -676,8 +678,8 @@ describe('legend relayout update', function() {
         afterEach(destroyGraphDiv);
 
         function markerOffsetY() {
-            var translateY = d3.select('.legend .traces .layers').attr('transform').match(/translate\(\d+,(-?\d+)\)/)[1];
-            return parseFloat(translateY);
+            var translate = Drawing.getTranslate(d3.select('.legend .traces .layers'));
+            return translate.y;
         }
 
         it('it should translate markers', function(done) {