factor out gl2d / gl3d cast hover options logic into 1 Fx method

Author: etpinard

Diff for: src/components/fx/index.js

@@ -35,6 +35,7 @@ module.exports = {
     getDistanceFunction: helpers.getDistanceFunction,
     getClosest: helpers.getClosest,
     inbox: helpers.inbox,
+    castHoverOption: castHoverOption,
 
     hover: require('./hover').hover,
     unhover: dragElement.unhover,
@@ -55,3 +56,19 @@ function loneUnhover(containerOrSelection) {
     selection.selectAll('g.hovertext').remove();
     selection.selectAll('.spikeline').remove();
 }
+
+// Handler for trace-wide vs per-point hover label options
+function castHoverOption(trace, ptNumber, attr) {
+    var labelOpts = trace.hoverlabel || {};
+    var val = Lib.nestedProperty(labelOpts, attr).get();
+
+    if(Array.isArray(val)) {
+        if(Array.isArray(ptNumber) && Array.isArray(val[ptNumber[0]])) {
+            return val[ptNumber[0]][ptNumber[1]];
+        } else {
+            return val[ptNumber];
+        }
+    } else {
+        return val;
+    }
+}

Diff for: src/plots/gl2d/scene2d.js

@@ -9,7 +9,6 @@
 
 'use strict';
 
-var Lib = require('../../lib');
 var Registry = require('../../registry');
 var Axes = require('../../plots/cartesian/axes');
 var Fx = require('../../components/fx');
@@ -645,11 +644,11 @@ proto.draw = function() {
                     zLabel: selection.traceCoord[2],
                     text: selection.textLabel,
                     name: selection.name,
-                    color: this.castHoverOption(trace, ptNumber, 'bgcolor') || selection.color,
-                    borderColor: this.castHoverOption(trace, ptNumber, 'bordercolor'),
-                    fontFamily: this.castHoverOption(trace, ptNumber, 'font.family'),
-                    fontSize: this.castHoverOption(trace, ptNumber, 'font.size'),
-                    fontColor: this.castHoverOption(trace, ptNumber, 'font.color')
+                    color: Fx.castHoverOption(trace, ptNumber, 'bgcolor') || selection.color,
+                    borderColor: Fx.castHoverOption(trace, ptNumber, 'bordercolor'),
+                    fontFamily: Fx.castHoverOption(trace, ptNumber, 'font.family'),
+                    fontSize: Fx.castHoverOption(trace, ptNumber, 'font.size'),
+                    fontColor: Fx.castHoverOption(trace, ptNumber, 'font.color')
                 }, {
                     container: this.svgContainer
                 });
@@ -675,18 +674,3 @@ proto.hoverFormatter = function(axisName, val) {
     var axis = this[axisName];
     return Axes.tickText(axis, axis.c2l(val), 'hover').text;
 };
-
-proto.castHoverOption = function(trace, ptNumber, attr) {
-    var labelOpts = trace.hoverlabel || {};
-    var val = Lib.nestedProperty(labelOpts, attr).get();
-
-    if(Array.isArray(val)) {
-        if(Array.isArray(ptNumber) && Array.isArray(val[ptNumber[0]])) {
-            return val[ptNumber[0]][ptNumber[1]];
-        } else {
-            return val[ptNumber];
-        }
-    } else {
-        return val;
-    }
-};

Diff for: src/plots/gl3d/scene.js

@@ -62,21 +62,6 @@ function render(scene) {
         return Axes.tickText(axis, axis.d2l(val), 'hover').text;
     }
 
-    function castHoverOption(attr, ptNumber) {
-        var labelOpts = trace.hoverlabel || {};
-        var val = Lib.nestedProperty(labelOpts, attr).get();
-
-        if(Array.isArray(val)) {
-            if(Array.isArray(ptNumber) && Array.isArray(val[ptNumber[0]])) {
-                return val[ptNumber[0]][ptNumber[1]];
-            } else {
-                return val[ptNumber];
-            }
-        } else {
-            return val;
-        }
-    }
-
     var oldEventData;
 
     if(lastPicked !== null) {
@@ -107,11 +92,11 @@ function render(scene) {
                 zLabel: zVal,
                 text: selection.textLabel,
                 name: lastPicked.name,
-                color: castHoverOption('bgcolor', ptNumber) || lastPicked.color,
-                borderColor: castHoverOption('bordercolor', ptNumber),
-                fontFamily: castHoverOption('font.family', ptNumber),
-                fontSize: castHoverOption('font.size', ptNumber),
-                fontColor: castHoverOption('font.color', ptNumber)
+                color: Fx.castHoverOption(trace, ptNumber, 'bgcolor') || lastPicked.color,
+                borderColor: Fx.castHoverOption(trace, ptNumber, 'bordercolor'),
+                fontFamily: Fx.castHoverOption(trace, ptNumber, 'font.family'),
+                fontSize: Fx.castHoverOption(trace, ptNumber, 'font.size'),
+                fontColor: Fx.castHoverOption(trace, ptNumber, 'font.color')
             }, {
                 container: svgContainer
             });