Skip to content

Commit 109f77e

Browse files
antoinergantoinerg
committed
Merge branch 'master' into sankey-selection2
2 parents 506da4c + e111300 commit 109f77e

File tree

104 files changed

+11157
-522
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+11157
-522
lines changed

‎CHANGELOG.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,15 @@ https://github.com/plotly/plotly.js/compare/vX.Y.Z...master
1010
where X.Y.Z is the semver of most recent plotly.js release.
1111

1212

13+
## [1.46.1] -- 2019-04-02
14+
15+
### Fixed
16+
- Fix `bar` traces that set `textfont` but don't have `text`
17+
(bug introduced in 1.46.0) [#3715]
18+
- Fix hover text formatting in `waterfall` traces [#3711]
19+
- Fix `surface` and `mesh3d` color scales with more than 256 items [#3702]
20+
21+
1322
## [1.46.0] -- 2019-04-01
1423

1524
### Added

‎dist/README.md‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ object. This property must be set before the plotly.js script tag, for example:
5151
Plotly.js defaults to US English (en-US) and includes British English (en) in the standard bundle.
5252
Many other localizations are available - here is an example using Swiss-German (de-CH),
5353
see the contents of this directory for the full list.
54-
They are also available on our CDN as https://cdn.plot.ly/plotly-locale-de-ch-latest.js OR https://cdn.plot.ly/plotly-locale-de-ch-1.46.0.js
54+
They are also available on our CDN as https://cdn.plot.ly/plotly-locale-de-ch-latest.js OR https://cdn.plot.ly/plotly-locale-de-ch-1.46.1.js
5555
Note that the file names are all lowercase, even though the region is uppercase when you apply a locale.
5656

5757
*After* the plotly.js script tag, add:
@@ -74,12 +74,12 @@ The main plotly.js bundle includes all the official (non-beta) trace modules.
7474

7575
It be can imported as minified javascript
7676
- using dist file `dist/plotly.min.js`
77-
- using CDN URL https://cdn.plot.ly/plotly-latest.min.js OR https://cdn.plot.ly/plotly-1.46.0.min.js
77+
- using CDN URL https://cdn.plot.ly/plotly-latest.min.js OR https://cdn.plot.ly/plotly-1.46.1.min.js
7878

7979
or as raw javascript:
8080
- using the `plotly.js-dist` npm package (starting in `v1.39.0`)
8181
- using dist file `dist/plotly.js`
82-
- using CDN URL https://cdn.plot.ly/plotly-latest.js OR https://cdn.plot.ly/plotly-1.46.0.js
82+
- using CDN URL https://cdn.plot.ly/plotly-latest.js OR https://cdn.plot.ly/plotly-1.46.1.js
8383
- using CommonJS with `require('plotly.js')`
8484

8585
If you would like to have access to the attribute meta information (including attribute descriptions as on the [schema reference page](https://plot.ly/javascript/reference/)), use dist file `dist/plotly-with-meta.js`
@@ -88,7 +88,7 @@ The main plotly.js bundle weights in at:
8888

8989
| plotly.js | plotly.min.js | plotly.min.js + gzip | plotly-with-meta.js |
9090
|-----------|---------------|----------------------|---------------------|
91-
| 6.3 MB | 2.9 MB | 879.6 kB | 6.6 MB |
91+
| 6.3 MB | 2.9 MB | 879.7 kB | 6.6 MB |
9292

9393
## Partial bundles
9494

@@ -119,8 +119,8 @@ The `basic` partial bundle contains trace modules `scatter`, `bar` and `pie`.
119119
| ------ | --- |
120120
| Latest | https://cdn.plot.ly/plotly-basic-latest.js |
121121
| Latest minified | https://cdn.plot.ly/plotly-basic-latest.min.js |
122-
| Tagged | https://cdn.plot.ly/plotly-basic-1.46.0.js |
123-
| Tagged minified | https://cdn.plot.ly/plotly-basic-1.46.0.min.js |
122+
| Tagged | https://cdn.plot.ly/plotly-basic-1.46.1.js |
123+
| Tagged minified | https://cdn.plot.ly/plotly-basic-1.46.1.min.js |
124124

125125
#### npm package (starting in `v1.39.0`)
126126

@@ -165,8 +165,8 @@ The `cartesian` partial bundle contains trace modules `scatter`, `bar`, `box`, `
165165
| ------ | --- |
166166
| Latest | https://cdn.plot.ly/plotly-cartesian-latest.js |
167167
| Latest minified | https://cdn.plot.ly/plotly-cartesian-latest.min.js |
168-
| Tagged | https://cdn.plot.ly/plotly-cartesian-1.46.0.js |
169-
| Tagged minified | https://cdn.plot.ly/plotly-cartesian-1.46.0.min.js |
168+
| Tagged | https://cdn.plot.ly/plotly-cartesian-1.46.1.js |
169+
| Tagged minified | https://cdn.plot.ly/plotly-cartesian-1.46.1.min.js |
170170

171171
#### npm package (starting in `v1.39.0`)
172172

@@ -211,8 +211,8 @@ The `geo` partial bundle contains trace modules `scatter`, `scattergeo` and `cho
211211
| ------ | --- |
212212
| Latest | https://cdn.plot.ly/plotly-geo-latest.js |
213213
| Latest minified | https://cdn.plot.ly/plotly-geo-latest.min.js |
214-
| Tagged | https://cdn.plot.ly/plotly-geo-1.46.0.js |
215-
| Tagged minified | https://cdn.plot.ly/plotly-geo-1.46.0.min.js |
214+
| Tagged | https://cdn.plot.ly/plotly-geo-1.46.1.js |
215+
| Tagged minified | https://cdn.plot.ly/plotly-geo-1.46.1.min.js |
216216

217217
#### npm package (starting in `v1.39.0`)
218218

@@ -257,8 +257,8 @@ The `gl3d` partial bundle contains trace modules `scatter`, `scatter3d`, `surfac
257257
| ------ | --- |
258258
| Latest | https://cdn.plot.ly/plotly-gl3d-latest.js |
259259
| Latest minified | https://cdn.plot.ly/plotly-gl3d-latest.min.js |
260-
| Tagged | https://cdn.plot.ly/plotly-gl3d-1.46.0.js |
261-
| Tagged minified | https://cdn.plot.ly/plotly-gl3d-1.46.0.min.js |
260+
| Tagged | https://cdn.plot.ly/plotly-gl3d-1.46.1.js |
261+
| Tagged minified | https://cdn.plot.ly/plotly-gl3d-1.46.1.min.js |
262262

263263
#### npm package (starting in `v1.39.0`)
264264

@@ -303,8 +303,8 @@ The `gl2d` partial bundle contains trace modules `scatter`, `scattergl`, `splom`
303303
| ------ | --- |
304304
| Latest | https://cdn.plot.ly/plotly-gl2d-latest.js |
305305
| Latest minified | https://cdn.plot.ly/plotly-gl2d-latest.min.js |
306-
| Tagged | https://cdn.plot.ly/plotly-gl2d-1.46.0.js |
307-
| Tagged minified | https://cdn.plot.ly/plotly-gl2d-1.46.0.min.js |
306+
| Tagged | https://cdn.plot.ly/plotly-gl2d-1.46.1.js |
307+
| Tagged minified | https://cdn.plot.ly/plotly-gl2d-1.46.1.min.js |
308308

309309
#### npm package (starting in `v1.39.0`)
310310

@@ -349,8 +349,8 @@ The `mapbox` partial bundle contains trace modules `scatter` and `scattermapbox`
349349
| ------ | --- |
350350
| Latest | https://cdn.plot.ly/plotly-mapbox-latest.js |
351351
| Latest minified | https://cdn.plot.ly/plotly-mapbox-latest.min.js |
352-
| Tagged | https://cdn.plot.ly/plotly-mapbox-1.46.0.js |
353-
| Tagged minified | https://cdn.plot.ly/plotly-mapbox-1.46.0.min.js |
352+
| Tagged | https://cdn.plot.ly/plotly-mapbox-1.46.1.js |
353+
| Tagged minified | https://cdn.plot.ly/plotly-mapbox-1.46.1.min.js |
354354

355355
#### npm package (starting in `v1.39.0`)
356356

@@ -387,16 +387,16 @@ The `finance` partial bundle contains trace modules `scatter`, `bar`, `histogram
387387

388388
| Raw size | Minified size | Minified + gzip size |
389389
|------|-----------------|------------------------|
390-
| 2.4 MB | 862.1 kB | 280.6 kB |
390+
| 2.4 MB | 862.3 kB | 280.7 kB |
391391

392392
#### CDN links
393393

394394
| Flavor | URL |
395395
| ------ | --- |
396396
| Latest | https://cdn.plot.ly/plotly-finance-latest.js |
397397
| Latest minified | https://cdn.plot.ly/plotly-finance-latest.min.js |
398-
| Tagged | https://cdn.plot.ly/plotly-finance-1.46.0.js |
399-
| Tagged minified | https://cdn.plot.ly/plotly-finance-1.46.0.min.js |
398+
| Tagged | https://cdn.plot.ly/plotly-finance-1.46.1.js |
399+
| Tagged minified | https://cdn.plot.ly/plotly-finance-1.46.1.min.js |
400400

401401
#### npm package (starting in `v1.39.0`)
402402

‎dist/plotly-basic.js‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* plotly.js (basic) v1.46.0
2+
* plotly.js (basic) v1.46.1
33
* Copyright 2012-2019, Plotly, Inc.
44
* All rights reserved.
55
* Licensed under the MIT license
@@ -18812,7 +18812,7 @@ var scales = {
1881218812
],
1881318813

1881418814
// modified RdBu based on
18815-
// www.sandia.gov/~kmorel/documents/ColorMaps/ColorMapsExpanded.pdf
18815+
// http://www.kennethmoreland.com/color-maps/
1881618816
'RdBu': [
1881718817
[0, 'rgb(5,10,172)'], [0.35, 'rgb(106,137,247)'],
1881818818
[0.5, 'rgb(190,190,190)'], [0.6, 'rgb(220,170,132)'],
@@ -33922,7 +33922,7 @@ exports.svgAttrs = {
3392233922
'use strict';
3392333923

3392433924
// package version injected by `npm run preprocess`
33925-
exports.version = '1.46.0';
33925+
exports.version = '1.46.1';
3392633926

3392733927
// inject promise polyfill
3392833928
_dereq_('es6-promise').polyfill();
@@ -67510,11 +67510,6 @@ function appendBarText(gd, bar, calcTrace, i, x0, x1, y0, y1) {
6751067510
var text = getText(trace, i);
6751167511
textPosition = getTextPosition(trace, i);
6751267512

67513-
var layoutFont = fullLayout.font;
67514-
var barColor = style.getBarColor(calcTrace[i], trace);
67515-
var insideTextFont = style.getInsideTextFont(trace, i, layoutFont, barColor);
67516-
var outsideTextFont = style.getOutsideTextFont(trace, i, layoutFont);
67517-
6751867513
// compute text position
6751967514
var prefix = trace.type === 'waterfall' ? 'waterfall' : 'bar';
6752067515
var barmode = fullLayout[prefix + 'mode'];
@@ -67523,16 +67518,21 @@ function appendBarText(gd, bar, calcTrace, i, x0, x1, y0, y1) {
6752367518
var calcBar = calcTrace[i];
6752467519
var isOutmostBar = !inStackOrRelativeMode || calcBar._outmost;
6752567520

67526-
// padding excluded
67527-
var barWidth = Math.abs(x1 - x0) - 2 * TEXTPAD;
67528-
var barHeight = Math.abs(y1 - y0) - 2 * TEXTPAD;
67529-
6753067521
if(!text || textPosition === 'none' ||
6753167522
(calcBar.isBlank && (textPosition === 'auto' || textPosition === 'inside'))) {
6753267523
bar.select('text').remove();
6753367524
return;
6753467525
}
6753567526

67527+
var layoutFont = fullLayout.font;
67528+
var barColor = style.getBarColor(calcTrace[i], trace);
67529+
var insideTextFont = style.getInsideTextFont(trace, i, layoutFont, barColor);
67530+
var outsideTextFont = style.getOutsideTextFont(trace, i, layoutFont);
67531+
67532+
// padding excluded
67533+
var barWidth = Math.abs(x1 - x0) - 2 * TEXTPAD;
67534+
var barHeight = Math.abs(y1 - y0) - 2 * TEXTPAD;
67535+
6753667536
var textSelection;
6753767537
var textBB;
6753867538
var textWidth;

‎dist/plotly-basic.min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/plotly-cartesian.js‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* plotly.js (cartesian) v1.46.0
2+
* plotly.js (cartesian) v1.46.1
33
* Copyright 2012-2019, Plotly, Inc.
44
* All rights reserved.
55
* Licensed under the MIT license
@@ -18924,7 +18924,7 @@ var scales = {
1892418924
],
1892518925

1892618926
// modified RdBu based on
18927-
// www.sandia.gov/~kmorel/documents/ColorMaps/ColorMapsExpanded.pdf
18927+
// http://www.kennethmoreland.com/color-maps/
1892818928
'RdBu': [
1892918929
[0, 'rgb(5,10,172)'], [0.35, 'rgb(106,137,247)'],
1893018930
[0.5, 'rgb(190,190,190)'], [0.6, 'rgb(220,170,132)'],
@@ -34072,7 +34072,7 @@ exports.svgAttrs = {
3407234072
'use strict';
3407334073

3407434074
// package version injected by `npm run preprocess`
34075-
exports.version = '1.46.0';
34075+
exports.version = '1.46.1';
3407634076

3407734077
// inject promise polyfill
3407834078
_dereq_('es6-promise').polyfill();
@@ -68822,11 +68822,6 @@ function appendBarText(gd, bar, calcTrace, i, x0, x1, y0, y1) {
6882268822
var text = getText(trace, i);
6882368823
textPosition = getTextPosition(trace, i);
6882468824

68825-
var layoutFont = fullLayout.font;
68826-
var barColor = style.getBarColor(calcTrace[i], trace);
68827-
var insideTextFont = style.getInsideTextFont(trace, i, layoutFont, barColor);
68828-
var outsideTextFont = style.getOutsideTextFont(trace, i, layoutFont);
68829-
6883068825
// compute text position
6883168826
var prefix = trace.type === 'waterfall' ? 'waterfall' : 'bar';
6883268827
var barmode = fullLayout[prefix + 'mode'];
@@ -68835,16 +68830,21 @@ function appendBarText(gd, bar, calcTrace, i, x0, x1, y0, y1) {
6883568830
var calcBar = calcTrace[i];
6883668831
var isOutmostBar = !inStackOrRelativeMode || calcBar._outmost;
6883768832

68838-
// padding excluded
68839-
var barWidth = Math.abs(x1 - x0) - 2 * TEXTPAD;
68840-
var barHeight = Math.abs(y1 - y0) - 2 * TEXTPAD;
68841-
6884268833
if(!text || textPosition === 'none' ||
6884368834
(calcBar.isBlank && (textPosition === 'auto' || textPosition === 'inside'))) {
6884468835
bar.select('text').remove();
6884568836
return;
6884668837
}
6884768838

68839+
var layoutFont = fullLayout.font;
68840+
var barColor = style.getBarColor(calcTrace[i], trace);
68841+
var insideTextFont = style.getInsideTextFont(trace, i, layoutFont, barColor);
68842+
var outsideTextFont = style.getOutsideTextFont(trace, i, layoutFont);
68843+
68844+
// padding excluded
68845+
var barWidth = Math.abs(x1 - x0) - 2 * TEXTPAD;
68846+
var barHeight = Math.abs(y1 - y0) - 2 * TEXTPAD;
68847+
6884868848
var textSelection;
6884968849
var textBB;
6885068850
var textWidth;

‎dist/plotly-cartesian.min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/plotly-finance.js‎

Lines changed: 29 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* plotly.js (finance) v1.46.0
2+
* plotly.js (finance) v1.46.1
33
* Copyright 2012-2019, Plotly, Inc.
44
* All rights reserved.
55
* Licensed under the MIT license
@@ -18868,7 +18868,7 @@ var scales = {
1886818868
],
1886918869

1887018870
// modified RdBu based on
18871-
// www.sandia.gov/~kmorel/documents/ColorMaps/ColorMapsExpanded.pdf
18871+
// http://www.kennethmoreland.com/color-maps/
1887218872
'RdBu': [
1887318873
[0, 'rgb(5,10,172)'], [0.35, 'rgb(106,137,247)'],
1887418874
[0.5, 'rgb(190,190,190)'], [0.6, 'rgb(220,170,132)'],
@@ -33978,7 +33978,7 @@ exports.svgAttrs = {
3397833978
'use strict';
3397933979

3398033980
// package version injected by `npm run preprocess`
33981-
exports.version = '1.46.0';
33981+
exports.version = '1.46.1';
3398233982

3398333983
// inject promise polyfill
3398433984
_dereq_('es6-promise').polyfill();
@@ -67566,11 +67566,6 @@ function appendBarText(gd, bar, calcTrace, i, x0, x1, y0, y1) {
6756667566
var text = getText(trace, i);
6756767567
textPosition = getTextPosition(trace, i);
6756867568

67569-
var layoutFont = fullLayout.font;
67570-
var barColor = style.getBarColor(calcTrace[i], trace);
67571-
var insideTextFont = style.getInsideTextFont(trace, i, layoutFont, barColor);
67572-
var outsideTextFont = style.getOutsideTextFont(trace, i, layoutFont);
67573-
6757467569
// compute text position
6757567570
var prefix = trace.type === 'waterfall' ? 'waterfall' : 'bar';
6757667571
var barmode = fullLayout[prefix + 'mode'];
@@ -67579,16 +67574,21 @@ function appendBarText(gd, bar, calcTrace, i, x0, x1, y0, y1) {
6757967574
var calcBar = calcTrace[i];
6758067575
var isOutmostBar = !inStackOrRelativeMode || calcBar._outmost;
6758167576

67582-
// padding excluded
67583-
var barWidth = Math.abs(x1 - x0) - 2 * TEXTPAD;
67584-
var barHeight = Math.abs(y1 - y0) - 2 * TEXTPAD;
67585-
6758667577
if(!text || textPosition === 'none' ||
6758767578
(calcBar.isBlank && (textPosition === 'auto' || textPosition === 'inside'))) {
6758867579
bar.select('text').remove();
6758967580
return;
6759067581
}
6759167582

67583+
var layoutFont = fullLayout.font;
67584+
var barColor = style.getBarColor(calcTrace[i], trace);
67585+
var insideTextFont = style.getInsideTextFont(trace, i, layoutFont, barColor);
67586+
var outsideTextFont = style.getOutsideTextFont(trace, i, layoutFont);
67587+
67588+
// padding excluded
67589+
var barWidth = Math.abs(x1 - x0) - 2 * TEXTPAD;
67590+
var barHeight = Math.abs(y1 - y0) - 2 * TEXTPAD;
67591+
6759267592
var textSelection;
6759367593
var textBB;
6759467594
var textWidth;
@@ -76713,7 +76713,8 @@ module.exports = {
7671376713

7671476714
'use strict';
7671576715

76716-
var Color = _dereq_('../../components/color');
76716+
var hoverLabelText = _dereq_('../../plots/cartesian/axes').hoverLabelText;
76717+
var opacity = _dereq_('../../components/color').opacity;
7671776718
var hoverOnBars = _dereq_('../bar/hover').hoverOnBars;
7671876719

7671976720
var DIRSYMBOL = {
@@ -76727,28 +76728,35 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode) {
7672776728

7672876729
var cd = point.cd;
7672976730
var trace = cd[0].trace;
76731+
var isHorizontal = (trace.orientation === 'h');
76732+
76733+
var vAxis = isHorizontal ? pointData.xa : pointData.ya;
76734+
76735+
function formatNumber(a) {
76736+
return hoverLabelText(vAxis, a);
76737+
}
7673076738

7673176739
// the closest data point
7673276740
var index = point.index;
7673376741
var di = cd[index];
7673476742

76735-
var sizeLetter = (trace.orientation === 'h') ? 'x' : 'y';
76743+
var sizeLetter = isHorizontal ? 'x' : 'y';
7673676744

7673776745
var size = (di.isSum) ? di.b + di.s : di.rawS;
7673876746

7673976747
if(!di.isSum) {
7674076748
// format delta numbers:
7674176749
if(size > 0) {
76742-
point.extraText = size + ' ' + DIRSYMBOL.increasing;
76750+
point.extraText = formatNumber(size) + ' ' + DIRSYMBOL.increasing;
7674376751
} else if(size < 0) {
76744-
point.extraText = '(' + (-size) + ') ' + DIRSYMBOL.decreasing;
76752+
point.extraText = '(' + (formatNumber(-size)) + ') ' + DIRSYMBOL.decreasing;
7674576753
} else {
7674676754
return;
7674776755
}
7674876756
// display initial value
76749-
point.extraText += '<br>Initial: ' + (di.b + di.s - size);
76757+
point.extraText += '<br>Initial: ' + formatNumber(di.b + di.s - size);
7675076758
} else {
76751-
point[sizeLetter + 'LabelVal'] = size;
76759+
point[sizeLetter + 'LabelVal'] = formatNumber(size);
7675276760
}
7675376761

7675476762
point.color = getTraceColor(trace, di);
@@ -76761,11 +76769,11 @@ function getTraceColor(trace, di) {
7676176769
var mc = cont.color;
7676276770
var mlc = cont.line.color;
7676376771
var mlw = cont.line.width;
76764-
if(Color.opacity(mc)) return mc;
76765-
else if(Color.opacity(mlc) && mlw) return mlc;
76772+
if(opacity(mc)) return mc;
76773+
else if(opacity(mlc) && mlw) return mlc;
7676676774
}
7676776775

76768-
},{"../../components/color":47,"../bar/hover":262}],348:[function(_dereq_,module,exports){
76776+
},{"../../components/color":47,"../../plots/cartesian/axes":207,"../bar/hover":262}],348:[function(_dereq_,module,exports){
7676976777
/**
7677076778
* Copyright 2012-2019, Plotly, Inc.
7677176779
* All rights reserved.

‎dist/plotly-finance.min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)