Skip to content

Commit a2e6e5b

Browse files
archmojarchmoj
committed
Merge remote-tracking branch 'origin/master' into fix3777-textinfo-waterfall-fin
2 parents 711a16d + 0c669de commit a2e6e5b

Some content is hidden

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

77 files changed

+1066
-938
lines changed

‎.eslintrc

+2-1
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
"no-loop-func": [2],
7171
"no-console": [0],
7272
"no-unused-labels": [2],
73-
"no-useless-escape": [0]
73+
"no-useless-escape": [0],
74+
"func-name-matching": ["error", "always"]
7475
}
7576
}

‎CHANGELOG.md

+11
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,17 @@ 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.47.3] -- 2019-04-18
14+
15+
### Fixed
16+
- Fix MathJax rendering in Firefox [#3783]
17+
- Fix `waterfall` hover under `hovermode: 'closest'` [#3778]
18+
- Fix `waterfall` `connector.line.width` updates [#3789]
19+
- Fix `waterfall` positioning on date axes [#3791]
20+
- Fix `waterfall` default connector line color [#3788]
21+
- Fix `hoverlabel.align` behavior for centered hover labels [#3781]
22+
23+
1324
## [1.47.2] -- 2019-04-15
1425

1526
### Fixed

‎dist/README.md

+22-22
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.47.2.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.47.3.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.47.2.min.js
77+
- using CDN URL https://cdn.plot.ly/plotly-latest.min.js OR https://cdn.plot.ly/plotly-1.47.3.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.47.2.js
82+
- using CDN URL https://cdn.plot.ly/plotly-latest.js OR https://cdn.plot.ly/plotly-1.47.3.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 | 883.7 kB | 6.6 MB |
91+
| 6.3 MB | 2.9 MB | 883.8 kB | 6.6 MB |
9292

9393
## Partial bundles
9494

@@ -111,16 +111,16 @@ The `basic` partial bundle contains trace modules `scatter`, `bar` and `pie`.
111111

112112
| Raw size | Minified size | Minified + gzip size |
113113
|------|-----------------|------------------------|
114-
| 2.3 MB | 822 kB | 269 kB |
114+
| 2.3 MB | 822.1 kB | 269 kB |
115115

116116
#### CDN links
117117

118118
| Flavor | URL |
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.47.2.js |
123-
| Tagged minified | https://cdn.plot.ly/plotly-basic-1.47.2.min.js |
122+
| Tagged | https://cdn.plot.ly/plotly-basic-1.47.3.js |
123+
| Tagged minified | https://cdn.plot.ly/plotly-basic-1.47.3.min.js |
124124

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

@@ -157,16 +157,16 @@ The `cartesian` partial bundle contains trace modules `scatter`, `bar`, `box`, `
157157

158158
| Raw size | Minified size | Minified + gzip size |
159159
|------|-----------------|------------------------|
160-
| 2.6 MB | 937.9 kB | 305.5 kB |
160+
| 2.6 MB | 938 kB | 305.6 kB |
161161

162162
#### CDN links
163163

164164
| Flavor | URL |
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.47.2.js |
169-
| Tagged minified | https://cdn.plot.ly/plotly-cartesian-1.47.2.min.js |
168+
| Tagged | https://cdn.plot.ly/plotly-cartesian-1.47.3.js |
169+
| Tagged minified | https://cdn.plot.ly/plotly-cartesian-1.47.3.min.js |
170170

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

@@ -203,16 +203,16 @@ The `geo` partial bundle contains trace modules `scatter`, `scattergeo` and `cho
203203

204204
| Raw size | Minified size | Minified + gzip size |
205205
|------|-----------------|------------------------|
206-
| 2.3 MB | 837.8 kB | 276.2 kB |
206+
| 2.3 MB | 837.9 kB | 276.2 kB |
207207

208208
#### CDN links
209209

210210
| Flavor | URL |
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.47.2.js |
215-
| Tagged minified | https://cdn.plot.ly/plotly-geo-1.47.2.min.js |
214+
| Tagged | https://cdn.plot.ly/plotly-geo-1.47.3.js |
215+
| Tagged minified | https://cdn.plot.ly/plotly-geo-1.47.3.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.47.2.js |
261-
| Tagged minified | https://cdn.plot.ly/plotly-gl3d-1.47.2.min.js |
260+
| Tagged | https://cdn.plot.ly/plotly-gl3d-1.47.3.js |
261+
| Tagged minified | https://cdn.plot.ly/plotly-gl3d-1.47.3.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.47.2.js |
307-
| Tagged minified | https://cdn.plot.ly/plotly-gl2d-1.47.2.min.js |
306+
| Tagged | https://cdn.plot.ly/plotly-gl2d-1.47.3.js |
307+
| Tagged minified | https://cdn.plot.ly/plotly-gl2d-1.47.3.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.47.2.js |
353-
| Tagged minified | https://cdn.plot.ly/plotly-mapbox-1.47.2.min.js |
352+
| Tagged | https://cdn.plot.ly/plotly-mapbox-1.47.3.js |
353+
| Tagged minified | https://cdn.plot.ly/plotly-mapbox-1.47.3.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 | 864.3 kB | 281.6 kB |
390+
| 2.4 MB | 864.5 kB | 281.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.47.2.js |
399-
| Tagged minified | https://cdn.plot.ly/plotly-finance-1.47.2.min.js |
398+
| Tagged | https://cdn.plot.ly/plotly-finance-1.47.3.js |
399+
| Tagged minified | https://cdn.plot.ly/plotly-finance-1.47.3.min.js |
400400

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

‎dist/plot-schema.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -14544,14 +14544,15 @@
1454414544
"role": "style",
1454514545
"editType": "style",
1454614546
"anim": true,
14547-
"description": "Sets the line color."
14547+
"description": "Sets the line color.",
14548+
"dflt": "#444"
1454814549
},
1454914550
"width": {
1455014551
"valType": "number",
1455114552
"min": 0,
1455214553
"dflt": 2,
1455314554
"role": "style",
14554-
"editType": "style",
14555+
"editType": "plot",
1455514556
"anim": true,
1455614557
"description": "Sets the line width (in px)."
1455714558
},

‎dist/plotly-basic.js

+22-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* plotly.js (basic) v1.47.2
2+
* plotly.js (basic) v1.47.3
33
* Copyright 2012-2019, Plotly, Inc.
44
* All rights reserved.
55
* Licensed under the MIT license
@@ -23394,10 +23394,14 @@ function alignHoverText(hoverLabels, rotateLabels) {
2339423394
if(textAlign !== 'auto') {
2339523395
if(textAlign === 'left' && anchor !== 'start') {
2339623396
tx.attr('text-anchor', 'start');
23397-
posX = -d.bx - HOVERTEXTPAD;
23397+
posX = anchor === 'middle' ?
23398+
-d.bx / 2 - d.tx2width / 2 + HOVERTEXTPAD :
23399+
-d.bx - HOVERTEXTPAD;
2339823400
} else if(textAlign === 'right' && anchor !== 'end') {
2339923401
tx.attr('text-anchor', 'end');
23400-
posX = d.bx + HOVERTEXTPAD;
23402+
posX = anchor === 'middle' ?
23403+
d.bx / 2 - d.tx2width / 2 - HOVERTEXTPAD :
23404+
d.bx + HOVERTEXTPAD;
2340123405
}
2340223406
}
2340323407

@@ -33830,7 +33834,7 @@ exports.svgAttrs = {
3383033834
'use strict';
3383133835

3383233836
// package version injected by `npm run preprocess`
33833-
exports.version = '1.47.2';
33837+
exports.version = '1.47.3';
3383433838

3383533839
// inject promise polyfill
3383633840
_dereq_('es6-promise').polyfill();
@@ -39337,10 +39341,11 @@ exports.convertToTspans = function(_context, gd, _callback) {
3933739341
.style({overflow: 'visible', 'pointer-events': 'none'});
3933839342

3933939343
var fill = _context.node().style.fill || 'black';
39340-
newSvg.select('g').attr({fill: fill, stroke: fill});
39344+
var g = newSvg.select('g');
39345+
g.attr({fill: fill, stroke: fill});
3934139346

39342-
var newSvgW = getSize(newSvg, 'width');
39343-
var newSvgH = getSize(newSvg, 'height');
39347+
var newSvgW = getSize(g, 'width');
39348+
var newSvgH = getSize(g, 'height');
3934439349
var newX = +_context.attr('x') - newSvgW *
3934539350
{start: 0, middle: 0.5, end: 1}[_context.attr('text-anchor') || 'start'];
3934639351
// font baseline is about 1/4 fontSize below centerline
@@ -66715,6 +66720,7 @@ function hoverOnBars(pointData, xval, yval, hovermode) {
6671566720
var trace = cd[0].trace;
6671666721
var t = cd[0].t;
6671766722
var isClosest = (hovermode === 'closest');
66723+
var isWaterfall = (trace.type === 'waterfall');
6671866724
var maxHoverDistance = pointData.maxHoverDistance;
6671966725
var maxSpikeDistance = pointData.maxSpikeDistance;
6672066726

@@ -66763,10 +66769,17 @@ function hoverOnBars(pointData, xval, yval, hovermode) {
6676366769
}
6676466770

6676566771
function sizeFn(di) {
66772+
var v = sizeVal;
66773+
var b = di.b;
66774+
var s = di[sizeLetter];
66775+
66776+
if(isWaterfall) {
66777+
s += Math.abs(di.rawS || 0);
66778+
}
66779+
6676666780
// add a gradient so hovering near the end of a
6676766781
// bar makes it a little closer match
66768-
return Fx.inbox(di.b - sizeVal, di[sizeLetter] - sizeVal,
66769-
maxHoverDistance + (di[sizeLetter] - sizeVal) / (di[sizeLetter] - di.b) - 1);
66782+
return Fx.inbox(b - v, s - v, maxHoverDistance + (s - v) / (s - b) - 1);
6677066783
}
6677166784

6677266785
if(trace.orientation === 'h') {

‎dist/plotly-basic.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/plotly-cartesian.js

+22-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* plotly.js (cartesian) v1.47.2
2+
* plotly.js (cartesian) v1.47.3
33
* Copyright 2012-2019, Plotly, Inc.
44
* All rights reserved.
55
* Licensed under the MIT license
@@ -23506,10 +23506,14 @@ function alignHoverText(hoverLabels, rotateLabels) {
2350623506
if(textAlign !== 'auto') {
2350723507
if(textAlign === 'left' && anchor !== 'start') {
2350823508
tx.attr('text-anchor', 'start');
23509-
posX = -d.bx - HOVERTEXTPAD;
23509+
posX = anchor === 'middle' ?
23510+
-d.bx / 2 - d.tx2width / 2 + HOVERTEXTPAD :
23511+
-d.bx - HOVERTEXTPAD;
2351023512
} else if(textAlign === 'right' && anchor !== 'end') {
2351123513
tx.attr('text-anchor', 'end');
23512-
posX = d.bx + HOVERTEXTPAD;
23514+
posX = anchor === 'middle' ?
23515+
d.bx / 2 - d.tx2width / 2 - HOVERTEXTPAD :
23516+
d.bx + HOVERTEXTPAD;
2351323517
}
2351423518
}
2351523519

@@ -33980,7 +33984,7 @@ exports.svgAttrs = {
3398033984
'use strict';
3398133985

3398233986
// package version injected by `npm run preprocess`
33983-
exports.version = '1.47.2';
33987+
exports.version = '1.47.3';
3398433988

3398533989
// inject promise polyfill
3398633990
_dereq_('es6-promise').polyfill();
@@ -39487,10 +39491,11 @@ exports.convertToTspans = function(_context, gd, _callback) {
3948739491
.style({overflow: 'visible', 'pointer-events': 'none'});
3948839492

3948939493
var fill = _context.node().style.fill || 'black';
39490-
newSvg.select('g').attr({fill: fill, stroke: fill});
39494+
var g = newSvg.select('g');
39495+
g.attr({fill: fill, stroke: fill});
3949139496

39492-
var newSvgW = getSize(newSvg, 'width');
39493-
var newSvgH = getSize(newSvg, 'height');
39497+
var newSvgW = getSize(g, 'width');
39498+
var newSvgH = getSize(g, 'height');
3949439499
var newX = +_context.attr('x') - newSvgW *
3949539500
{start: 0, middle: 0.5, end: 1}[_context.attr('text-anchor') || 'start'];
3949639501
// font baseline is about 1/4 fontSize below centerline
@@ -68022,6 +68027,7 @@ function hoverOnBars(pointData, xval, yval, hovermode) {
6802268027
var trace = cd[0].trace;
6802368028
var t = cd[0].t;
6802468029
var isClosest = (hovermode === 'closest');
68030+
var isWaterfall = (trace.type === 'waterfall');
6802568031
var maxHoverDistance = pointData.maxHoverDistance;
6802668032
var maxSpikeDistance = pointData.maxSpikeDistance;
6802768033

@@ -68070,10 +68076,17 @@ function hoverOnBars(pointData, xval, yval, hovermode) {
6807068076
}
6807168077

6807268078
function sizeFn(di) {
68079+
var v = sizeVal;
68080+
var b = di.b;
68081+
var s = di[sizeLetter];
68082+
68083+
if(isWaterfall) {
68084+
s += Math.abs(di.rawS || 0);
68085+
}
68086+
6807368087
// add a gradient so hovering near the end of a
6807468088
// bar makes it a little closer match
68075-
return Fx.inbox(di.b - sizeVal, di[sizeLetter] - sizeVal,
68076-
maxHoverDistance + (di[sizeLetter] - sizeVal) / (di[sizeLetter] - di.b) - 1);
68089+
return Fx.inbox(b - v, s - v, maxHoverDistance + (s - v) / (s - b) - 1);
6807768090
}
6807868091

6807968092
if(trace.orientation === 'h') {

‎dist/plotly-cartesian.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)