Skip to content

Commit 9681682

Browse files
archmojarchmoj
committed
resolved conflicts and revised code based on comments
2 parents fe9968e + 212a219 commit 9681682

File tree

290 files changed

+21345
-3272
lines changed

Some content is hidden

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

290 files changed

+21345
-3272
lines changed

‎CHANGELOG.md

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,39 @@ 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.44.4] -- 2019-02-12
14+
15+
### Fixed
16+
- Fix `Plotly.react` used with `uirevision` when removing traces [#3527]
17+
- Fix `scattergl` update calls that change the number of on-graph text elements [#3536]
18+
- Fix annotations SVG errors on trace-less subplots [#3534]
19+
- Fix `ohlc` and `candlestick` hover on blank coordinates (bug introduced in 1.43.2) [#3537]
20+
21+
22+
## [1.44.3] -- 2019-02-06
23+
24+
### Fixed
25+
- Fix axis `automargin` push offset which resulted in clipped
26+
tick labels in some scenarios [#3510]
27+
- Fix handling of alpha channel in marker, line and error bar `rgba`
28+
coloring in `scatter3d` traces [#3496]
29+
- Fix subplots with multiple `carpet` traces each with a `scattercarpet`
30+
trace on top of them [#3512]
31+
- Fix MathJax placement in ternary `aaxis` titles [#3513]
32+
33+
34+
## [1.44.2] -- 2019-02-04
35+
36+
### Fixed
37+
- Fix vertical modebars in IE11 [@3491]
38+
- Fix `hovertemplate` for traces with blank `name` [#3480]
39+
- Fix 3D grid lines and tick labels colored by rgba color
40+
with full transparency [#3494]
41+
- Fix white highlights rendering problems for `mesh3d` trace on
42+
some devices (bug introduced in 1.44.0) [#3483]
43+
- Fix `fill.color` description for `table` traces [#3481]
44+
45+
1346
## [1.44.1] -- 2019-01-24
1447

1548
### Fixed

‎build/plotcss.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ var rules = {
3535
"X .ease-bg": "-webkit-transition:background-color 0.3s ease 0s;-moz-transition:background-color 0.3s ease 0s;-ms-transition:background-color 0.3s ease 0s;-o-transition:background-color 0.3s ease 0s;transition:background-color 0.3s ease 0s;",
3636
"X .modebar--hover>:not(.watermark)": "opacity:0;-webkit-transition:opacity 0.3s ease 0s;-moz-transition:opacity 0.3s ease 0s;-ms-transition:opacity 0.3s ease 0s;-o-transition:opacity 0.3s ease 0s;transition:opacity 0.3s ease 0s;",
3737
"X:hover .modebar--hover .modebar-group": "opacity:1;",
38-
"X .modebar-group": "float:left;display:inline-block;box-sizing:border-box;margin-left:8px;position:relative;vertical-align:middle;white-space:nowrap;",
38+
"X .modebar-group": "float:left;display:inline-block;box-sizing:border-box;padding-left:8px;position:relative;vertical-align:middle;white-space:nowrap;",
3939
"X .modebar-btn": "position:relative;font-size:16px;padding:3px 4px;height:22px;cursor:pointer;line-height:normal;box-sizing:border-box;",
4040
"X .modebar-btn svg": "position:relative;top:2px;",
4141
"X .modebar.vertical": "display:flex;flex-direction:column;flex-wrap:wrap;align-content:flex-end;max-height:100%;",
4242
"X .modebar.vertical svg": "top:-1px;",
43-
"X .modebar.vertical .modebar-group": "display:block;float:none;margin-left:0px;margin-bottom:8px;",
43+
"X .modebar.vertical .modebar-group": "display:block;float:none;padding-left:0px;padding-bottom:8px;",
4444
"X .modebar.vertical .modebar-group .modebar-btn": "display:block;text-align:center;",
4545
"X [data-title]:before,X [data-title]:after": "position:absolute;-webkit-transform:translate3d(0, 0, 0);-moz-transform:translate3d(0, 0, 0);-ms-transform:translate3d(0, 0, 0);-o-transform:translate3d(0, 0, 0);transform:translate3d(0, 0, 0);display:none;opacity:0;z-index:1001;pointer-events:none;top:110%;right:50%;",
4646
"X [data-title]:hover:before,X [data-title]:hover:after": "display:block;opacity:1;",

‎dist/README.md

Lines changed: 25 additions & 25 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.44.1.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.44.4.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.44.1.min.js
77+
- using CDN URL https://cdn.plot.ly/plotly-latest.min.js OR https://cdn.plot.ly/plotly-1.44.4.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.44.1.js
82+
- using CDN URL https://cdn.plot.ly/plotly-latest.js OR https://cdn.plot.ly/plotly-1.44.4.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.1 MB | 2.8 MB | 849.1 kB | 6.3 MB |
91+
| 6.1 MB | 2.8 MB | 849.5 kB | 6.3 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 | 810.6 kB | 264.7 kB |
114+
| 2.3 MB | 810.9 kB | 264.8 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.44.1.js |
123-
| Tagged minified | https://cdn.plot.ly/plotly-basic-1.44.1.min.js |
122+
| Tagged | https://cdn.plot.ly/plotly-basic-1.44.4.js |
123+
| Tagged minified | https://cdn.plot.ly/plotly-basic-1.44.4.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 | 924.2 kB | 300.7 kB |
160+
| 2.6 MB | 924.5 kB | 300.8 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.44.1.js |
169-
| Tagged minified | https://cdn.plot.ly/plotly-cartesian-1.44.1.min.js |
168+
| Tagged | https://cdn.plot.ly/plotly-cartesian-1.44.4.js |
169+
| Tagged minified | https://cdn.plot.ly/plotly-cartesian-1.44.4.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 | 828.9 kB | 272.8 kB |
206+
| 2.3 MB | 829.2 kB | 272.9 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.44.1.js |
215-
| Tagged minified | https://cdn.plot.ly/plotly-geo-1.44.1.min.js |
214+
| Tagged | https://cdn.plot.ly/plotly-geo-1.44.4.js |
215+
| Tagged minified | https://cdn.plot.ly/plotly-geo-1.44.4.min.js |
216216

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

@@ -249,16 +249,16 @@ The `gl3d` partial bundle contains trace modules `scatter`, `scatter3d`, `surfac
249249

250250
| Raw size | Minified size | Minified + gzip size |
251251
|------|-----------------|------------------------|
252-
| 3.3 MB | 1.3 MB | 424.9 kB |
252+
| 3.4 MB | 1.3 MB | 425.2 kB |
253253

254254
#### CDN links
255255

256256
| Flavor | URL |
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.44.1.js |
261-
| Tagged minified | https://cdn.plot.ly/plotly-gl3d-1.44.1.min.js |
260+
| Tagged | https://cdn.plot.ly/plotly-gl3d-1.44.4.js |
261+
| Tagged minified | https://cdn.plot.ly/plotly-gl3d-1.44.4.min.js |
262262

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

@@ -295,16 +295,16 @@ The `gl2d` partial bundle contains trace modules `scatter`, `scattergl`, `splom`
295295

296296
| Raw size | Minified size | Minified + gzip size |
297297
|------|-----------------|------------------------|
298-
| 3.4 MB | 1.4 MB | 442.4 kB |
298+
| 3.4 MB | 1.4 MB | 442.6 kB |
299299

300300
#### CDN links
301301

302302
| Flavor | URL |
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.44.1.js |
307-
| Tagged minified | https://cdn.plot.ly/plotly-gl2d-1.44.1.min.js |
306+
| Tagged | https://cdn.plot.ly/plotly-gl2d-1.44.4.js |
307+
| Tagged minified | https://cdn.plot.ly/plotly-gl2d-1.44.4.min.js |
308308

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

@@ -341,16 +341,16 @@ The `mapbox` partial bundle contains trace modules `scatter` and `scattermapbox`
341341

342342
| Raw size | Minified size | Minified + gzip size |
343343
|------|-----------------|------------------------|
344-
| 2.8 MB | 1.4 MB | 410.6 kB |
344+
| 2.8 MB | 1.4 MB | 410.8 kB |
345345

346346
#### CDN links
347347

348348
| Flavor | URL |
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.44.1.js |
353-
| Tagged minified | https://cdn.plot.ly/plotly-mapbox-1.44.1.min.js |
352+
| Tagged | https://cdn.plot.ly/plotly-mapbox-1.44.4.js |
353+
| Tagged minified | https://cdn.plot.ly/plotly-mapbox-1.44.4.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 | 843.2 kB | 274.7 kB |
390+
| 2.4 MB | 843.5 kB | 274.9 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.44.1.js |
399-
| Tagged minified | https://cdn.plot.ly/plotly-finance-1.44.1.min.js |
398+
| Tagged | https://cdn.plot.ly/plotly-finance-1.44.4.js |
399+
| Tagged minified | https://cdn.plot.ly/plotly-finance-1.44.4.min.js |
400400

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

‎dist/plot-schema.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33139,7 +33139,7 @@
3313933139
"arrayOk": true,
3314033140
"dflt": "white",
3314133141
"role": "style",
33142-
"description": "Sets the cell fill color. It accepts either a specific color or an array of colors.",
33142+
"description": "Sets the cell fill color. It accepts either a specific color or an array of colors or a 2D array of colors.",
3314333143
"editType": "calc"
3314433144
},
3314533145
"editType": "calc",
@@ -33316,7 +33316,7 @@
3331633316
"arrayOk": true,
3331733317
"role": "style",
3331833318
"dflt": "white",
33319-
"description": "Sets the cell fill color. It accepts either a specific color or an array of colors.",
33319+
"description": "Sets the cell fill color. It accepts either a specific color or an array of colors or a 2D array of colors.",
3332033320
"editType": "calc"
3332133321
},
3332233322
"editType": "calc",

‎dist/plotly-basic.js

Lines changed: 46 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* plotly.js (basic) v1.44.1
2+
* plotly.js (basic) v1.44.4
33
* Copyright 2012-2019, Plotly, Inc.
44
* All rights reserved.
55
* Licensed under the MIT license
@@ -15655,6 +15655,9 @@ function drawOne(gd, index) {
1565515655
var xa = Axes.getFromId(gd, options.xref);
1565615656
var ya = Axes.getFromId(gd, options.yref);
1565715657

15658+
if(xa) xa.setScale();
15659+
if(ya) ya.setScale();
15660+
1565815661
drawRaw(gd, options, index, false, xa, ya);
1565915662
}
1566015663

@@ -23102,8 +23105,9 @@ function createHoverText(hoverData, opts, gd) {
2310223105
if(d.extraText !== undefined) text += (text ? '<br>' : '') + d.extraText;
2310323106

2310423107
// if 'text' is empty at this point,
23108+
// and hovertemplate is not defined,
2310523109
// put 'name' in main label and don't show secondary label
23106-
if(text === '') {
23110+
if(text === '' && !d.hovertemplate) {
2310723111
// if 'name' is also empty, remove entire label
2310823112
if(name === '') g.remove();
2310923113
text = name;
@@ -27703,7 +27707,7 @@ proto.update = function(graphInfo, buttons) {
2770327707
}
2770427708

2770527709
if(fullLayout.modebar.orientation === 'v') {
27706-
this.element.prepend(logoGroup);
27710+
this.element.insertBefore(logoGroup, this.element.childNodes[0]);
2770727711
} else {
2770827712
this.element.appendChild(logoGroup);
2770927713
}
@@ -33771,7 +33775,7 @@ exports.svgAttrs = {
3377133775
'use strict';
3377233776

3377333777
// package version injected by `npm run preprocess`
33774-
exports.version = '1.44.1';
33778+
exports.version = '1.44.4';
3377533779

3377633780
// inject promise polyfill
3377733781
_dereq_('es6-promise').polyfill();
@@ -39341,7 +39345,7 @@ exports.convertToTspans = function(_context, gd, _callback) {
3934139345
else if(svgClass[0] === 'l') {
3934239346
newSvg.attr({x: _context.attr('x'), y: dy - (newSvgH / 2)});
3934339347
}
39344-
else if(svgClass[0] === 'a') {
39348+
else if(svgClass[0] === 'a' && svgClass.indexOf('atitle') !== 0) {
3934539349
newSvg.attr({x: 0, y: dy});
3934639350
}
3934739351
else {
@@ -43924,7 +43928,7 @@ function getTraceIndexFromUid(uid, data, tracei) {
4392443928
if(data[i].uid === uid) return i;
4392543929
}
4392643930
// fall back on trace order, but only if user didn't provide a uid for that trace
43927-
return data[tracei].uid ? -1 : tracei;
43931+
return (!data[tracei] || data[tracei].uid) ? -1 : tracei;
4392843932
}
4392943933

4393043934
function valsMatch(v1, v2) {
@@ -51187,27 +51191,53 @@ axes.drawOne = function(gd, ax, opts) {
5118751191
var hasRangeSlider = Registry.getComponentMethod('rangeslider', 'isVisible')(ax);
5118851192

5118951193
function doAutoMargins() {
51190-
var push, rangeSliderPush;
51194+
var s = ax.side.charAt(0);
51195+
var push;
51196+
var rangeSliderPush;
5119151197

5119251198
if(hasRangeSlider) {
5119351199
rangeSliderPush = Registry.getComponentMethod('rangeslider', 'autoMarginOpts')(gd, ax);
5119451200
}
5119551201
Plots.autoMargin(gd, rangeSliderAutoMarginID(ax), rangeSliderPush);
5119651202

51197-
var s = ax.side.charAt(0);
5119851203
if(ax.automargin && (!hasRangeSlider || s !== 'b')) {
5119951204
push = {x: 0, y: 0, r: 0, l: 0, t: 0, b: 0};
5120051205

51201-
if(axLetter === 'x') {
51202-
push.y = (ax.anchor === 'free' ? ax.position :
51203-
ax._anchorAxis.domain[s === 't' ? 1 : 0]);
51204-
push[s] += ax._boundingBox.height;
51205-
} else {
51206-
push.x = (ax.anchor === 'free' ? ax.position :
51207-
ax._anchorAxis.domain[s === 'r' ? 1 : 0]);
51208-
push[s] += ax._boundingBox.width;
51206+
var bbox = ax._boundingBox;
51207+
var counterAx = mainPlotinfo[counterLetter + 'axis'];
51208+
var anchorAxDomainIndex;
51209+
var offset;
51210+
51211+
switch(axLetter + s) {
51212+
case 'xb':
51213+
anchorAxDomainIndex = 0;
51214+
offset = bbox.top - counterAx._length - counterAx._offset;
51215+
push[s] = bbox.height;
51216+
break;
51217+
case 'xt':
51218+
anchorAxDomainIndex = 1;
51219+
offset = counterAx._offset - bbox.bottom;
51220+
push[s] = bbox.height;
51221+
break;
51222+
case 'yl':
51223+
anchorAxDomainIndex = 0;
51224+
offset = counterAx._offset - bbox.right;
51225+
push[s] = bbox.width;
51226+
break;
51227+
case 'yr':
51228+
anchorAxDomainIndex = 1;
51229+
offset = bbox.left - counterAx._length - counterAx._offset;
51230+
push[s] = bbox.width;
51231+
break;
5120951232
}
5121051233

51234+
push[counterLetter] = ax.anchor === 'free' ?
51235+
ax.position :
51236+
ax._anchorAxis.domain[anchorAxDomainIndex];
51237+
51238+
if(push[s] > 0) {
51239+
push[s] += offset;
51240+
}
5121151241
if(ax.title.text !== fullLayout._dfltTitle[axLetter]) {
5121251242
push[s] += ax.title.font.size;
5121351243
}

‎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.

0 commit comments

Comments
 (0)