Skip to content

Commit ab30f93

Browse files
etpinardetpinard
committed
Merge branch 'master' into scattergl-lasso
2 parents 27811d6 + ffb3791 commit ab30f93

24 files changed

+232
-92
lines changed

‎src/components/annotations/draw.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ function drawRaw(gd, options, index, subplotId, xa, ya) {
237237
// at the end, even if their position changes
238238
annText.selectAll('tspan.line').attr({y: 0, x: 0});
239239

240-
var mathjaxGroup = annTextGroupInner.select('.annotation-math-group');
240+
var mathjaxGroup = annTextGroupInner.select('.annotation-text-math-group');
241241
var hasMathjax = !mathjaxGroup.empty();
242242
var anntextBB = Drawing.bBox(
243243
(hasMathjax ? mathjaxGroup : annText).node());

‎src/components/fx/helpers.js

+27
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
'use strict';
1010

11+
var Lib = require('../../lib');
1112
var constants = require('./constants');
1213

1314
// look for either subplot or xaxis and yaxis attributes
@@ -83,3 +84,29 @@ function quadrature(dx, dy) {
8384
return Math.sqrt(x * x + y * y);
8485
};
8586
}
87+
88+
/** Appends values inside array attributes corresponding to given point number
89+
*
90+
* @param {object} pointData : point data object (gets mutated here)
91+
* @param {object} trace : full trace object
92+
* @param {number} pointNumber : point number
93+
*/
94+
exports.appendArrayPointValue = function(pointData, trace, pointNumber) {
95+
var arrayAttrs = trace._arrayAttrs;
96+
97+
for(var i = 0; i < arrayAttrs.length; i++) {
98+
var astr = arrayAttrs[i];
99+
var key;
100+
101+
if(astr === 'ids') key = 'id';
102+
else if(astr === 'locations') key = 'location';
103+
else key = astr;
104+
105+
if(pointData[key] === undefined) {
106+
var val = Lib.nestedProperty(trace, astr).get();
107+
pointData[key] = Array.isArray(pointNumber) ?
108+
val[pointNumber[0]][pointNumber[1]] :
109+
val[pointNumber];
110+
}
111+
}
112+
};

‎src/components/fx/hover.js

+1
Original file line numberDiff line numberDiff line change
@@ -457,6 +457,7 @@ function _hover(gd, evt, subplot) {
457457
if(pt.zLabelVal !== undefined) out.z = pt.zLabelVal;
458458
}
459459

460+
helpers.appendArrayPointValue(out, pt.trace, pt.index);
460461
newhoverdata.push(out);
461462
}
462463

‎src/components/fx/index.js

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ module.exports = {
3535
getDistanceFunction: helpers.getDistanceFunction,
3636
getClosest: helpers.getClosest,
3737
inbox: helpers.inbox,
38+
appendArrayPointValue: helpers.appendArrayPointValue,
3839

3940
castHoverOption: castHoverOption,
4041
castHoverinfo: castHoverinfo,

‎src/lib/svg_text_utils.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@ exports.convertToTspans = function(_context, gd, _callback) {
3030

3131
// Until we get tex integrated more fully (so it can be used along with non-tex)
3232
// allow some elements to prohibit it by attaching 'data-notex' to the original
33-
var tex = (!_context.attr('data-notex')) && str.match(FIND_TEX);
33+
var tex = (!_context.attr('data-notex')) &&
34+
(typeof MathJax !== 'undefined') &&
35+
str.match(FIND_TEX);
36+
3437
var parent = d3.select(_context.node().parentNode);
3538
if(parent.empty()) return;
3639
var svgClass = (_context.attr('class')) ? _context.attr('class').split(' ')[0] : 'text';

‎src/plot_api/plot_schema.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,9 @@ exports.findArrayAttributes = function(trace) {
157157
}
158158

159159
exports.crawl(baseAttributes, callback);
160-
exports.crawl(trace._module.attributes, callback);
160+
if(trace._module && trace._module.attributes) {
161+
exports.crawl(trace._module.attributes, callback);
162+
}
161163

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

‎src/plots/attributes.js

+16
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,22 @@ module.exports = {
6969
role: 'info',
7070
dflt: ''
7171
},
72+
ids: {
73+
valType: 'data_array',
74+
description: [
75+
'Assigns id labels to each datum.',
76+
'These ids for object constancy of data points during animation.'
77+
].join(' ')
78+
},
79+
customdata: {
80+
valType: 'data_array',
81+
description: [
82+
'Assigns extra data each datum.',
83+
'This may be useful when listening to hover, click and selection events.',
84+
'Note that, *scatter* traces also appends customdata items in the markers',
85+
'DOM elements'
86+
].join(' ')
87+
},
7288
hoverinfo: {
7389
valType: 'flaglist',
7490
role: 'info',

‎src/plots/cartesian/dragbox.js

+9-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ var setCursor = require('../../lib/setcursor');
2222
var dragElement = require('../../components/dragelement');
2323
var FROM_TL = require('../../constants/alignment').FROM_TL;
2424

25+
var Plots = require('../plots');
26+
2527
var doTicks = require('./axes').doTicks;
2628
var getFromId = require('./axis_ids').getFromId;
2729
var prepSelect = require('./select');
@@ -655,7 +657,13 @@ module.exports = function dragBox(gd, plotinfo, x, y, w, h, ns, ew) {
655657
// be repositioning the data in the relayout. But DON'T call
656658
// ticksAndAnnotations again - it's unnecessary and would overwrite `updates`
657659
updateSubplots([0, 0, pw, ph]);
658-
Plotly.relayout(gd, updates);
660+
661+
// since we may have been redrawing some things during the drag, we may have
662+
// accumulated MathJax promises - wait for them before we relayout.
663+
Lib.syncOrAsync([
664+
Plots.previousPromises,
665+
function() { Plotly.relayout(gd, updates); }
666+
], gd);
659667
}
660668

661669
// updateSubplots - find all plot viewboxes that should be

‎src/plots/cartesian/select.js

+21-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
var polygon = require('../../lib/polygon');
1313
var color = require('../../components/color');
14+
var appendArrayPointValue = require('../../components/fx/helpers').appendArrayPointValue;
1415

1516
var axes = require('./axes');
1617
var constants = require('./constants');
@@ -151,7 +152,9 @@ module.exports = function prepSelect(e, startX, startY, dragOptions, mode) {
151152
selection = [];
152153
for(i = 0; i < searchTraces.length; i++) {
153154
searchInfo = searchTraces[i];
154-
[].push.apply(selection, searchInfo.selectPoints(searchInfo, poly));
155+
[].push.apply(selection, fillSelectionItem(
156+
searchInfo.selectPoints(searchInfo, poly), searchInfo
157+
));
155158
}
156159

157160
eventData = {points: selection};
@@ -196,3 +199,20 @@ module.exports = function prepSelect(e, startX, startY, dragOptions, mode) {
196199
}
197200
};
198201
};
202+
203+
function fillSelectionItem(selection, searchInfo) {
204+
if(Array.isArray(selection)) {
205+
var trace = searchInfo.cd[0].trace;
206+
207+
for(var i = 0; i < selection.length; i++) {
208+
var sel = selection[i];
209+
210+
sel.curveNumber = trace.index;
211+
sel.data = trace._input;
212+
sel.fullData = trace;
213+
appendArrayPointValue(sel, trace, sel.pointNumber);
214+
}
215+
}
216+
217+
return selection;
218+
}

‎src/plots/gl2d/scene2d.js

+15-12
Original file line numberDiff line numberDiff line change
@@ -534,6 +534,7 @@ proto.updateFx = function(dragmode) {
534534

535535
proto.emitPointAction = function(nextSelection, eventType) {
536536
var uid = nextSelection.trace.uid;
537+
var ptNumber = nextSelection.pointIndex;
537538
var trace;
538539

539540
for(var i = 0; i < this.fullData.length; i++) {
@@ -542,18 +543,20 @@ proto.emitPointAction = function(nextSelection, eventType) {
542543
}
543544
}
544545

545-
this.graphDiv.emit(eventType, {
546-
points: [{
547-
x: nextSelection.traceCoord[0],
548-
y: nextSelection.traceCoord[1],
549-
curveNumber: trace.index,
550-
pointNumber: nextSelection.pointIndex,
551-
data: trace._input,
552-
fullData: this.fullData,
553-
xaxis: this.xaxis,
554-
yaxis: this.yaxis
555-
}]
556-
});
546+
var pointData = {
547+
x: nextSelection.traceCoord[0],
548+
y: nextSelection.traceCoord[1],
549+
curveNumber: trace.index,
550+
pointNumber: ptNumber,
551+
data: trace._input,
552+
fullData: this.fullData,
553+
xaxis: this.xaxis,
554+
yaxis: this.yaxis
555+
};
556+
557+
Fx.appendArrayPointValue(pointData, trace, ptNumber);
558+
559+
this.graphDiv.emit(eventType, {points: [pointData]});
557560
};
558561

559562
proto.draw = function() {

‎src/plots/gl3d/scene.js

+12-10
Original file line numberDiff line numberDiff line change
@@ -103,18 +103,20 @@ function render(scene) {
103103
});
104104
}
105105

106-
var eventData = {
107-
points: [{
108-
x: selection.traceCoordinate[0],
109-
y: selection.traceCoordinate[1],
110-
z: selection.traceCoordinate[2],
111-
data: trace._input,
112-
fullData: trace,
113-
curveNumber: trace.index,
114-
pointNumber: ptNumber
115-
}]
106+
var pointData = {
107+
x: selection.traceCoordinate[0],
108+
y: selection.traceCoordinate[1],
109+
z: selection.traceCoordinate[2],
110+
data: trace._input,
111+
fullData: trace,
112+
curveNumber: trace.index,
113+
pointNumber: ptNumber
116114
};
117115

116+
Fx.appendArrayPointValue(pointData, trace, ptNumber);
117+
118+
var eventData = {points: [pointData]};
119+
118120
if(selection.buttons && selection.distance < 5) {
119121
scene.graphDiv.emit('plotly_click', eventData);
120122
}

‎src/plots/plots.js

+10-1
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@ plots.supplyDefaults = function(gd) {
521521

522522
function remapTransformedArrays(cd0, newTrace) {
523523
var oldTrace = cd0.trace;
524-
var arrayAttrs = PlotSchema.findArrayAttributes(oldTrace);
524+
var arrayAttrs = oldTrace._arrayAttrs;
525525
var transformedArrayHash = {};
526526
var i, astr;
527527

@@ -862,6 +862,9 @@ plots.supplyTraceDefaults = function(traceIn, traceOutIndex, layout, traceInInde
862862
}
863863

864864
if(visible) {
865+
coerce('customdata');
866+
coerce('ids');
867+
865868
var _module = plots.getModule(traceOut);
866869
traceOut._module = _module;
867870

@@ -2032,6 +2035,12 @@ plots.doCalcdata = function(gd, traces) {
20322035
}
20332036
}
20342037

2038+
// find array attributes in trace
2039+
for(i = 0; i < fullData.length; i++) {
2040+
trace = fullData[i];
2041+
trace._arrayAttrs = PlotSchema.findArrayAttributes(trace);
2042+
}
2043+
20352044
initCategories(axList);
20362045

20372046
var hasCalcTransform = false;

‎src/traces/scatter/attributes.js

-8
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,6 @@ module.exports = {
5757
'where `y0` is the starting coordinate and `dy` the step.'
5858
].join(' ')
5959
},
60-
customdata: {
61-
valType: 'data_array',
62-
description: 'Assigns extra data to each scatter point DOM element'
63-
},
6460
dy: {
6561
valType: 'number',
6662
dflt: 1,
@@ -70,10 +66,6 @@ module.exports = {
7066
'See `y0` for more info.'
7167
].join(' ')
7268
},
73-
ids: {
74-
valType: 'data_array',
75-
description: 'A list of keys for object constancy of data points during animation'
76-
},
7769
text: {
7870
valType: 'string',
7971
role: 'info',

‎src/traces/scatter/defaults.js

-2
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,9 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
3636
return;
3737
}
3838

39-
coerce('customdata');
4039
coerce('text');
4140
coerce('hovertext');
4241
coerce('mode', defaultMode);
43-
coerce('ids');
4442

4543
if(subTypes.hasLines(traceOut)) {
4644
handleLineDefaults(traceIn, traceOut, defaultColor, layout, coerce);

‎src/traces/scatter/select.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ module.exports = function selectPoints(searchInfo, polygon) {
1919
ya = searchInfo.yaxis,
2020
selection = [],
2121
trace = cd[0].trace,
22-
curveNumber = trace.index,
2322
marker = trace.marker,
2423
i,
2524
di,
@@ -43,11 +42,9 @@ module.exports = function selectPoints(searchInfo, polygon) {
4342

4443
if(polygon.contains([x, y])) {
4544
selection.push({
46-
curveNumber: curveNumber,
4745
pointNumber: i,
4846
x: di.x,
49-
y: di.y,
50-
id: di.id
47+
y: di.y
5148
});
5249
di.dim = 0;
5350
}

‎src/transforms/filter.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
var Lib = require('../lib');
1212
var Registry = require('../registry');
13-
var PlotSchema = require('../plot_api/plot_schema');
1413
var Axes = require('../plots/cartesian/axes');
1514

1615
var COMPARISON_OPS = ['=', '!=', '<', '>=', '>', '<='];
@@ -148,6 +147,7 @@ exports.calcTransform = function(gd, trace, opts) {
148147
var target = opts.target;
149148
var len = targetArray.length;
150149
var targetCalendar = opts.targetcalendar;
150+
var arrayAttrs = trace._arrayAttrs;
151151

152152
// even if you provide targetcalendar, if target is a string and there
153153
// is a calendar attribute matching target it will get used instead.
@@ -158,7 +158,6 @@ exports.calcTransform = function(gd, trace, opts) {
158158

159159
var d2c = Axes.getDataToCoordFunc(gd, trace, target, targetArray);
160160
var filterFunc = getFilterFunc(opts, d2c, targetCalendar);
161-
var arrayAttrs = PlotSchema.findArrayAttributes(trace);
162161
var originalArrays = {};
163162

164163
function forAllAttrs(fn, index) {

‎src/transforms/sort.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
'use strict';
1010

1111
var Lib = require('../lib');
12-
var PlotSchema = require('../plot_api/plot_schema');
1312
var Axes = require('../plots/cartesian/axes');
1413

1514
exports.moduleType = 'transform';
@@ -78,7 +77,7 @@ exports.calcTransform = function(gd, trace, opts) {
7877

7978
var target = opts.target;
8079
var len = targetArray.length;
81-
var arrayAttrs = PlotSchema.findArrayAttributes(trace);
80+
var arrayAttrs = trace._arrayAttrs;
8281
var d2c = Axes.getDataToCoordFunc(gd, trace, target, targetArray);
8382
var indices = getIndices(opts, targetArray, d2c);
8483

‎test/jasmine/tests/annotations_test.js

+6
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,12 @@ describe('annotations relayout', function() {
159159
var mockData = Lib.extendDeep([], mock.data),
160160
mockLayout = Lib.extendDeep({}, mock.layout);
161161

162+
// insert some MathJax text - to make sure we fall back correctly
163+
// when MathJax is not provided (as is the case in our normal
164+
// jasmine test suite)
165+
expect(typeof MathJax).toBe('undefined');
166+
mockLayout.annotations[14].text = '$x+y+z$';
167+
162168
Plotly.plot(gd, mockData, mockLayout).then(done);
163169

164170
spyOn(Loggers, 'warn');

0 commit comments

Comments
 (0)