fix and add hover test for prefix and tickformat

Author: archmoj

src/plots/smith/layout_defaults.js

@@ -7,6 +7,7 @@ var Template = require('../../plot_api/plot_template');
 var handleSubplotDefaults = require('../subplot_defaults');
 var getSubplotData = require('../get_data').getSubplotData;
 
+var handlePrefixSuffixDefaults = require('../cartesian/prefix_suffix_defaults');
 var handleTickLabelDefaults = require('../cartesian/tick_label_defaults');
 var handleLineGridDefaults = require('../cartesian/line_grid_defaults');
 
@@ -45,7 +46,6 @@ function handleDefaults(contIn, contOut, coerce, opts) {
 
         axOut.type = 'linear';
         setConvert(axOut, contOut, layoutOut);
-        delete axOut.type;
 
         var dfltColor;
         var dfltFontColor;
@@ -67,14 +67,16 @@ function handleDefaults(contIn, contOut, coerce, opts) {
         // range[1] > range[0], and vice-versa for `autorange: 'reversed'` below.
         axOut._m = 1;
 
+        handlePrefixSuffixDefaults(axIn, axOut, coerceAxis, axOut.type);
+
         if(visible) {
             if(axName === 'realaxis') {
                 coerceAxis('side');
             }
 
             coerceAxis('tickvals');
 
-            handleTickLabelDefaults(axIn, axOut, coerceAxis, axOut.type, {});
+            handleTickLabelDefaults(axIn, axOut, coerceAxis, axOut.type);
 
             Lib.coerce2(contIn, contOut, layoutAttributes, axName + '.ticklen');
             Lib.coerce2(contIn, contOut, layoutAttributes, axName + '.tickwidth');
@@ -114,6 +116,8 @@ function handleDefaults(contIn, contOut, coerce, opts) {
 
         coerceAxis('hoverformat');
 
+        delete axOut.type;
+
         axOut._input = axIn;
     }
 }

test/jasmine/tests/scattersmith_test.js

@@ -1,4 +1,5 @@
 var Plotly = require('@lib/index');
+var Lib = require('@src/lib');
 var ScatterSmith = require('@src/traces/scattersmith');
 
 var basicMock = require('@mocks/zzz_smith_basic.json');
@@ -53,19 +54,65 @@ describe('Test scattersmith hover:', function() {
     function run(specs) {
         gd = createGraphDiv();
 
-        var fig = basicMock;
-        var pos = specs.pos;
+        var fig = Lib.extendDeep(basicMock);
+
+        if(specs.patch) {
+            fig = specs.patch(fig);
+        }
 
         return Plotly.newPlot(gd, fig).then(function() {
-            mouseEvent('mousemove', pos[0], pos[1]);
+            mouseEvent('mousemove', 400, 70);
             assertHoverLabelContent(specs);
         });
     }
 
     [{
         desc: 'base',
-        pos: [400, 70],
         nums: 'real: 0\nimag: 1'
+    }, {
+        desc: 'with tickformat',
+        patch: function(fig) {
+            fig.layout.smith = {
+                realaxis: { tickformat: '.1f' },
+                imaginaryaxis: { tickformat: '.2f' }
+            };
+            return fig;
+        },
+        nums: 'real: 0.0\nimag: 1.00'
+    }, {
+        desc: 'with prefix and suffix',
+        patch: function(fig) {
+            fig.layout.smith = {
+                realaxis: {
+                    tickprefix: '(',
+                    ticksuffix: ')'
+                },
+                imaginaryaxis: {
+                    tickprefix: '[',
+                    ticksuffix: ']'
+                }
+            };
+            return fig;
+        },
+        nums: 'real: (0)\nimag: [1]'
+    }, {
+        desc: 'with prefix and suffix on invisible axes',
+        patch: function(fig) {
+            fig.layout.smith = {
+                realaxis: {
+                    visible: false,
+                    tickprefix: '(',
+                    ticksuffix: ')'
+                },
+                imaginaryaxis: {
+                    visible: false,
+                    tickprefix: '[',
+                    ticksuffix: ']'
+                }
+            };
+            return fig;
+        },
+        nums: 'real: (0)\nimag: [1]'
     }].forEach(function(specs) {
         it('should generate correct hover labels ' + specs.desc, function(done) {
             run(specs).then(done, done.fail);