Merge branch 'all-array-attrs-in-event-data' into booz_2

Author: etpinard

src/components/fx/helpers.js

@@ -8,6 +8,7 @@
 
 'use strict';
 
+var Lib = require('../../lib');
 var constants = require('./constants');
 
 // look for either subplot or xaxis and yaxis attributes
@@ -83,3 +84,29 @@ function quadrature(dx, dy) {
         return Math.sqrt(x * x + y * y);
     };
 }
+
+/** Appends values inside array attributes corresponding to given point number
+ *
+ * @param {object} pointData : point data object (gets mutated here)
+ * @param {object} trace : full trace object
+ * @param {number} ptNumber : point number
+ */
+exports.appendArrayPointValue = function(pointData, trace, ptNumber) {
+    var arrayAttrs = trace._arrayAttrs;
+
+    for(var i = 0; i < arrayAttrs.length; i++) {
+        var astr = arrayAttrs[i];
+        var key;
+
+        if(astr === 'ids') key = 'id';
+        else if(astr === 'locations') key = 'location';
+        else key = astr;
+
+        if(pointData[key] === undefined) {
+            var val = Lib.nestedProperty(trace, astr).get();
+            pointData[key] = Array.isArray(ptNumber) ?
+                val[ptNumber[0]][ptNumber[1]] :
+                val[ptNumber];
+        }
+    }
+};

src/components/fx/hover.js

@@ -457,6 +457,7 @@ function _hover(gd, evt, subplot) {
             if(pt.zLabelVal !== undefined) out.z = pt.zLabelVal;
         }
 
+        helpers.appendArrayPointValue(out, pt.trace, pt.index);
         newhoverdata.push(out);
     }
 

src/components/fx/index.js

@@ -35,6 +35,7 @@ module.exports = {
     getDistanceFunction: helpers.getDistanceFunction,
     getClosest: helpers.getClosest,
     inbox: helpers.inbox,
+    appendArrayPointValue: helpers.appendArrayPointValue,
 
     castHoverOption: castHoverOption,
     castHoverinfo: castHoverinfo,

src/plot_api/plot_schema.js

@@ -157,7 +157,9 @@ exports.findArrayAttributes = function(trace) {
     }
 
     exports.crawl(baseAttributes, callback);
-    exports.crawl(trace._module.attributes, callback);
+    if(trace._module && trace._module.attributes) {
+        exports.crawl(trace._module.attributes, callback);
+    }
 
     if(trace.transforms) {
         var transforms = trace.transforms;
@@ -177,9 +179,8 @@ exports.findArrayAttributes = function(trace) {
     // At the moment, we need this block to make sure that
     // ohlc and candlestick 'open', 'high', 'low', 'close' can be
     // used with filter ang groupby transforms.
-    if(trace._fullInput) {
+    if(trace._fullInput && trace._fullInput._module && trace._fullInput._module.attributes) {
         exports.crawl(trace._fullInput._module.attributes, callback);
-
         arrayAttributes = Lib.filterUnique(arrayAttributes);
     }
 

src/plots/attributes.js

@@ -69,6 +69,22 @@ module.exports = {
         role: 'info',
         dflt: ''
     },
+    ids: {
+        valType: 'data_array',
+        description: [
+            'Assigns id labels to each datum.',
+            'These ids for object constancy of data points during animation.'
+        ].join(' ')
+    },
+    customdata: {
+        valType: 'data_array',
+        description: [
+            'Assigns extra data each datum.',
+            'This may be useful when listening to hover, click and selection events.',
+            'Note that, *scatter* traces also appends customdata items in the markers',
+            'DOM elements'
+        ].join(' ')
+    },
     hoverinfo: {
         valType: 'flaglist',
         role: 'info',

src/plots/cartesian/select.js

@@ -11,6 +11,7 @@
 
 var polygon = require('../../lib/polygon');
 var color = require('../../components/color');
+var appendArrayPointValue = require('../../components/fx/helpers').appendArrayPointValue;
 
 var axes = require('./axes');
 var constants = require('./constants');
@@ -196,3 +197,7 @@ module.exports = function prepSelect(e, startX, startY, dragOptions, mode) {
         }
     };
 };
+
+function makePointData(selection) {
+    // appendArrayPointValue()
+}

src/plots/gl2d/scene2d.js

@@ -534,6 +534,7 @@ proto.updateFx = function(dragmode) {
 
 proto.emitPointAction = function(nextSelection, eventType) {
     var uid = nextSelection.trace.uid;
+    var ptNumber = nextSelection.pointIndex;
     var trace;
 
     for(var i = 0; i < this.fullData.length; i++) {
@@ -542,18 +543,20 @@ proto.emitPointAction = function(nextSelection, eventType) {
         }
     }
 
-    this.graphDiv.emit(eventType, {
-        points: [{
-            x: nextSelection.traceCoord[0],
-            y: nextSelection.traceCoord[1],
-            curveNumber: trace.index,
-            pointNumber: nextSelection.pointIndex,
-            data: trace._input,
-            fullData: this.fullData,
-            xaxis: this.xaxis,
-            yaxis: this.yaxis
-        }]
-    });
+    var pointData = {
+        x: nextSelection.traceCoord[0],
+        y: nextSelection.traceCoord[1],
+        curveNumber: trace.index,
+        pointNumber: ptNumber,
+        data: trace._input,
+        fullData: this.fullData,
+        xaxis: this.xaxis,
+        yaxis: this.yaxis
+    };
+
+    Fx.appendArrayPointValue(pointData, trace, ptNumber);
+
+    this.graphDiv.emit(eventType, {points: [pointData]});
 };
 
 proto.draw = function() {

src/plots/gl3d/scene.js

@@ -103,18 +103,20 @@ function render(scene) {
             });
         }
 
-        var eventData = {
-            points: [{
-                x: selection.traceCoordinate[0],
-                y: selection.traceCoordinate[1],
-                z: selection.traceCoordinate[2],
-                data: trace._input,
-                fullData: trace,
-                curveNumber: trace.index,
-                pointNumber: ptNumber
-            }]
+        var pointData = {
+            x: selection.traceCoordinate[0],
+            y: selection.traceCoordinate[1],
+            z: selection.traceCoordinate[2],
+            data: trace._input,
+            fullData: trace,
+            curveNumber: trace.index,
+            pointNumber: ptNumber
         };
 
+        Fx.appendArrayPointValue(pointData, trace, ptNumber);
+
+        var eventData = {points: [pointData]};
+
         if(selection.buttons && selection.distance < 5) {
             scene.graphDiv.emit('plotly_click', eventData);
         }

src/plots/plots.js

@@ -521,7 +521,7 @@ plots.supplyDefaults = function(gd) {
 
 function remapTransformedArrays(cd0, newTrace) {
     var oldTrace = cd0.trace;
-    var arrayAttrs = PlotSchema.findArrayAttributes(oldTrace);
+    var arrayAttrs = oldTrace._arrayAttrs;
     var transformedArrayHash = {};
     var i, astr;
 
@@ -862,6 +862,9 @@ plots.supplyTraceDefaults = function(traceIn, traceOutIndex, layout, traceInInde
     }
 
     if(visible) {
+        coerce('customdata');
+        coerce('ids');
+
         var _module = plots.getModule(traceOut);
         traceOut._module = _module;
 
@@ -2032,6 +2035,12 @@ plots.doCalcdata = function(gd, traces) {
         }
     }
 
+    // find array attributes in trace
+    for(i = 0; i < fullData.length; i++) {
+        trace = fullData[i];
+        trace._arrayAttrs = PlotSchema.findArrayAttributes(trace);
+    }
+
     initCategories(axList);
 
     var hasCalcTransform = false;

src/traces/scatter/attributes.js

@@ -57,10 +57,6 @@ module.exports = {
             'where `y0` is the starting coordinate and `dy` the step.'
         ].join(' ')
     },
-    customdata: {
-        valType: 'data_array',
-        description: 'Assigns extra data to each scatter point DOM element'
-    },
     dy: {
         valType: 'number',
         dflt: 1,
@@ -70,10 +66,6 @@ module.exports = {
             'See `y0` for more info.'
         ].join(' ')
     },
-    ids: {
-        valType: 'data_array',
-        description: 'A list of keys for object constancy of data points during animation'
-    },
     text: {
         valType: 'string',
         role: 'info',