Skip to content

Commit 17ffddb

Browse files
FarkitesFarkites
committed
Merge branch 'master' into trace-zindex
2 parents 27f51ec + baa752d commit 17ffddb

Some content is hidden

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

54 files changed

+11994
-3156
lines changed

‎.circleci/config.yml‎

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
version: 2.1
22
orbs:
3-
browser-tools: circleci/browser-tools@1.2.2
3+
browser-tools: circleci/browser-tools@1.4.8
44

55
# Inspired by:
66
# https://github.com/CircleCI-Public/circleci-demo-workflows/blob/workspace-forwarding/.circleci/config.yml
@@ -56,7 +56,6 @@ jobs:
5656
working_directory: ~/plotly.js
5757
steps:
5858
- browser-tools/install-browser-tools: &browser-versions
59-
chrome-version: 110.0.5481.100
6059
install-firefox: false
6160
install-geckodriver: false
6261
- attach_workspace:
@@ -93,7 +92,6 @@ jobs:
9392
working_directory: ~/plotly.js
9493
steps:
9594
- browser-tools/install-browser-tools: &browser-versions
96-
chrome-version: 110.0.5481.100
9795
install-firefox: false
9896
install-geckodriver: false
9997
- attach_workspace:
@@ -113,7 +111,6 @@ jobs:
113111
working_directory: ~/plotly.js
114112
steps:
115113
- browser-tools/install-browser-tools: &browser-versions
116-
chrome-version: 110.0.5481.100
117114
install-firefox: false
118115
install-geckodriver: false
119116
- attach_workspace:
@@ -133,7 +130,6 @@ jobs:
133130
working_directory: ~/plotly.js
134131
steps:
135132
- browser-tools/install-browser-tools: &browser-versions
136-
chrome-version: 110.0.5481.100
137133
install-firefox: false
138134
install-geckodriver: false
139135
- attach_workspace:
@@ -152,7 +148,6 @@ jobs:
152148
working_directory: ~/plotly.js
153149
steps:
154150
- browser-tools/install-browser-tools: &browser-versions
155-
chrome-version: 110.0.5481.100
156151
install-firefox: false
157152
install-geckodriver: false
158153
- attach_workspace:
@@ -171,7 +166,6 @@ jobs:
171166
working_directory: ~/plotly.js
172167
steps:
173168
- browser-tools/install-browser-tools: &browser-versions
174-
chrome-version: 110.0.5481.100
175169
install-firefox: false
176170
install-geckodriver: false
177171
- attach_workspace:
@@ -499,6 +493,25 @@ jobs:
499493
name: Display function constructors in all bundles
500494
command: npm run no-new-func
501495

496+
test-stackgl-bundle:
497+
docker:
498+
- image: cimg/node:16.17.1
499+
working_directory: ~/plotly.js
500+
steps:
501+
- checkout
502+
- run:
503+
name: Set up build environment
504+
command: cd stackgl_modules && npm ci
505+
- run:
506+
name: Bundle bundle-stackgl/index.js
507+
command: cd stackgl_modules && cp index.js INDEX.js && npm run bundle-stackgl
508+
- run:
509+
name: Test stackgl_modules/index.js diff - If failed please remember this file in auto generated and you should not modify it directly until a dependeny change. To suggest changes please submit pull request to the relevant dependency.
510+
command: diff --unified --color stackgl_modules/INDEX.js stackgl_modules/index.js
511+
- store_artifacts:
512+
path: stackgl_modules/index.js
513+
destination: stackgl_modules/index.js
514+
502515
workflows:
503516
version: 2
504517
build-and-test:
@@ -571,3 +584,5 @@ workflows:
571584
- install-and-cibuild
572585

573586
- publish-dist
587+
588+
- test-stackgl-bundle

‎CHANGELOG.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,15 @@ To see all merged commits on the master branch that will be part of the next plo
99

1010
where X.Y.Z is the semver of most recent plotly.js release.
1111

12+
## [2.30.1] -- 2024-03-15
13+
14+
### Fixed
15+
- Fix centering multi-line headers for treemap traces [[#6923](https://github.com/plotly/plotly.js/pull/6923)]
16+
- Fix heatmap text color and `texttemplate` on cells with missing data [[#6924](https://github.com/plotly/plotly.js/pull/6924)]
17+
- Fix scattergl rendering when colors include capital letters [[#6928](https://github.com/plotly/plotly.js/pull/6928)],
18+
with thanks to @28raining and @dy for the contribution!
19+
20+
1221
## [2.30.0] -- 2024-03-06
1322

1423
### Added

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ You may also consider using [`plotly.js-dist`](https://www.npmjs.com/package/plo
5555
5656
```html
5757
<head>
58-
<script src="https://cdn.plot.ly/plotly-2.30.0.min.js" charset="utf-8"></script>
58+
<script src="https://cdn.plot.ly/plotly-2.30.1.min.js" charset="utf-8"></script>
5959
</head>
6060
<body>
6161
<div id="gd"></div>
@@ -72,7 +72,7 @@ You may also consider using [`plotly.js-dist`](https://www.npmjs.com/package/plo
7272
Alternatively you may consider using [native ES6 import](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Modules) in the script tag.
7373
```html
7474
<script type="module">
75-
import "https://cdn.plot.ly/plotly-2.30.0.min.js"
75+
import "https://cdn.plot.ly/plotly-2.30.1.min.js"
7676
Plotly.newPlot("gd", [{ y: [1, 2, 3] }])
7777
</script>
7878
```
@@ -82,7 +82,7 @@ Fastly supports Plotly.js with free CDN service. Read more at <https://www.fastl
8282
### Un-minified versions are also available on CDN
8383
While non-minified source files may contain characters outside UTF-8, it is recommended that you specify the `charset` when loading those bundles.
8484
```html
85-
<script src="https://cdn.plot.ly/plotly-2.30.0.js" charset="utf-8"></script>
85+
<script src="https://cdn.plot.ly/plotly-2.30.1.js" charset="utf-8"></script>
8686
```
8787

8888
> Please note that as of v2 the "plotly-latest" outputs (e.g. https://cdn.plot.ly/plotly-latest.min.js) will no longer be updated on the CDN, and will stay at the last v1 patch v1.58.5. Therefore, to use the CDN with plotly.js v2 and higher, you must specify an exact plotly.js version.

‎dist/README.md‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ The main plotly.js bundles weight in at:
4646
| 8.2 MB | 3.5 MB | 1 MB | 8.5 MB |
4747

4848
#### CDN links
49-
> https://cdn.plot.ly/plotly-2.30.0.js
49+
> https://cdn.plot.ly/plotly-2.30.1.js
5050
51-
> https://cdn.plot.ly/plotly-2.30.0.min.js
51+
> https://cdn.plot.ly/plotly-2.30.1.min.js
5252
5353

5454
#### npm packages
@@ -94,9 +94,9 @@ The `basic` partial bundle contains trace modules `bar`, `pie` and `scatter`.
9494
| 2.6 MB | 986.7 kB | 330.3 kB |
9595

9696
#### CDN links
97-
> https://cdn.plot.ly/plotly-basic-2.30.0.js
97+
> https://cdn.plot.ly/plotly-basic-2.30.1.js
9898
99-
> https://cdn.plot.ly/plotly-basic-2.30.0.min.js
99+
> https://cdn.plot.ly/plotly-basic-2.30.1.min.js
100100
101101

102102
#### npm packages
@@ -117,9 +117,9 @@ The `cartesian` partial bundle contains trace modules `bar`, `box`, `contour`, `
117117
| 3.3 MB | 1.2 MB | 417.7 kB |
118118

119119
#### CDN links
120-
> https://cdn.plot.ly/plotly-cartesian-2.30.0.js
120+
> https://cdn.plot.ly/plotly-cartesian-2.30.1.js
121121
122-
> https://cdn.plot.ly/plotly-cartesian-2.30.0.min.js
122+
> https://cdn.plot.ly/plotly-cartesian-2.30.1.min.js
123123
124124

125125
#### npm packages
@@ -137,12 +137,12 @@ The `geo` partial bundle contains trace modules `choropleth`, `scatter` and `sca
137137

138138
| Raw size | Minified size | Minified + gzip size |
139139
|------|-----------------|------------------------|
140-
| 3.1 MB | 1.1 MB | 372.9 kB |
140+
| 3.1 MB | 1.1 MB | 373 kB |
141141

142142
#### CDN links
143-
> https://cdn.plot.ly/plotly-geo-2.30.0.js
143+
> https://cdn.plot.ly/plotly-geo-2.30.1.js
144144
145-
> https://cdn.plot.ly/plotly-geo-2.30.0.min.js
145+
> https://cdn.plot.ly/plotly-geo-2.30.1.min.js
146146
147147

148148
#### npm packages
@@ -160,12 +160,12 @@ The `gl3d` partial bundle contains trace modules `cone`, `isosurface`, `mesh3d`,
160160

161161
| Raw size | Minified size | Minified + gzip size |
162162
|------|-----------------|------------------------|
163-
| 3.6 MB | 1.5 MB | 493.7 kB |
163+
| 3.6 MB | 1.5 MB | 493.6 kB |
164164

165165
#### CDN links
166-
> https://cdn.plot.ly/plotly-gl3d-2.30.0.js
166+
> https://cdn.plot.ly/plotly-gl3d-2.30.1.js
167167
168-
> https://cdn.plot.ly/plotly-gl3d-2.30.0.min.js
168+
> https://cdn.plot.ly/plotly-gl3d-2.30.1.min.js
169169
170170

171171
#### npm packages
@@ -186,9 +186,9 @@ The `gl2d` partial bundle contains trace modules `heatmapgl`, `parcoords`, `poin
186186
| 4.4 MB | 1.9 MB | 600.3 kB |
187187

188188
#### CDN links
189-
> https://cdn.plot.ly/plotly-gl2d-2.30.0.js
189+
> https://cdn.plot.ly/plotly-gl2d-2.30.1.js
190190
191-
> https://cdn.plot.ly/plotly-gl2d-2.30.0.min.js
191+
> https://cdn.plot.ly/plotly-gl2d-2.30.1.min.js
192192
193193

194194
#### npm packages
@@ -209,9 +209,9 @@ The `mapbox` partial bundle contains trace modules `choroplethmapbox`, `densitym
209209
| 4.4 MB | 1.8 MB | 531.9 kB |
210210

211211
#### CDN links
212-
> https://cdn.plot.ly/plotly-mapbox-2.30.0.js
212+
> https://cdn.plot.ly/plotly-mapbox-2.30.1.js
213213
214-
> https://cdn.plot.ly/plotly-mapbox-2.30.0.min.js
214+
> https://cdn.plot.ly/plotly-mapbox-2.30.1.min.js
215215
216216

217217
#### npm packages
@@ -232,9 +232,9 @@ The `finance` partial bundle contains trace modules `bar`, `candlestick`, `funne
232232
| 2.8 MB | 1.1 MB | 359.4 kB |
233233

234234
#### CDN links
235-
> https://cdn.plot.ly/plotly-finance-2.30.0.js
235+
> https://cdn.plot.ly/plotly-finance-2.30.1.js
236236
237-
> https://cdn.plot.ly/plotly-finance-2.30.0.min.js
237+
> https://cdn.plot.ly/plotly-finance-2.30.1.min.js
238238
239239

240240
#### npm packages
@@ -255,9 +255,9 @@ The `strict` partial bundle contains trace modules `bar`, `barpolar`, `box`, `ca
255255
| 8.7 MB | 3.8 MB | 1.1 MB |
256256

257257
#### CDN links
258-
> https://cdn.plot.ly/plotly-strict-2.30.0.js
258+
> https://cdn.plot.ly/plotly-strict-2.30.1.js
259259
260-
> https://cdn.plot.ly/plotly-strict-2.30.0.min.js
260+
> https://cdn.plot.ly/plotly-strict-2.30.1.min.js
261261
262262

263263
#### npm packages

‎dist/plotly-basic.js‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* plotly.js (basic) v2.30.0
2+
* plotly.js (basic) v2.30.1
33
* Copyright 2012-2024, Plotly, Inc.
44
* All rights reserved.
55
* Licensed under the MIT license
@@ -26416,7 +26416,10 @@ function templateFormatString(string, labels, d3locale) {
2641626416
var fmt;
2641726417
if (format[0] === ':') {
2641826418
fmt = d3locale ? d3locale.numberFormat : lib.numberFormat;
26419-
value = fmt(format.replace(TEMPLATE_STRING_FORMAT_SEPARATOR, ''))(value);
26419+
if (value !== '') {
26420+
// e.g. skip missing data on heatmap
26421+
value = fmt(format.replace(TEMPLATE_STRING_FORMAT_SEPARATOR, ''))(value);
26422+
}
2642026423
}
2642126424
if (format[0] === '|') {
2642226425
fmt = d3locale ? d3locale.timeFormat : utcFormat;
@@ -61544,7 +61547,7 @@ function getSortFunc(opts, d2c) {
6154461547

6154561548

6154661549
// package version injected by `npm run preprocess`
61547-
exports.version = '2.30.0';
61550+
exports.version = '2.30.1';
6154861551

6154961552
/***/ }),
6155061553

‎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: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* plotly.js (cartesian) v2.30.0
2+
* plotly.js (cartesian) v2.30.1
33
* Copyright 2012-2024, Plotly, Inc.
44
* All rights reserved.
55
* Licensed under the MIT license
@@ -26525,7 +26525,10 @@ function templateFormatString(string, labels, d3locale) {
2652526525
var fmt;
2652626526
if (format[0] === ':') {
2652726527
fmt = d3locale ? d3locale.numberFormat : lib.numberFormat;
26528-
value = fmt(format.replace(TEMPLATE_STRING_FORMAT_SEPARATOR, ''))(value);
26528+
if (value !== '') {
26529+
// e.g. skip missing data on heatmap
26530+
value = fmt(format.replace(TEMPLATE_STRING_FORMAT_SEPARATOR, ''))(value);
26531+
}
2652926532
}
2653026533
if (format[0] === '|') {
2653126534
fmt = d3locale ? d3locale.timeFormat : utcFormat;
@@ -62204,7 +62207,7 @@ module.exports = function (gd, plotinfo, cdheatmaps, heatmapLayer) {
6220462207
var thisLabel = d3.select(this);
6220562208
var fontColor = font.color;
6220662209
if (!fontColor || fontColor === 'auto') {
62207-
fontColor = Color.contrast('rgba(' + sclFunc(d.z).join() + ')');
62210+
fontColor = Color.contrast(d.z === undefined ? gd._fullLayout.plot_bgcolor : 'rgba(' + sclFunc(d.z).join() + ')');
6220862211
}
6220962212
thisLabel.attr('data-notex', 1).call(svgTextUtils.positionText, xFn(d), yFn(d)).call(Drawing.font, fontFamily, fontSize, fontColor).text(d.t).call(svgTextUtils.convertToTspans, gd);
6221062213
});
@@ -72026,7 +72029,7 @@ function getSortFunc(opts, d2c) {
7202672029

7202772030

7202872031
// package version injected by `npm run preprocess`
72029-
exports.version = '2.30.0';
72032+
exports.version = '2.30.1';
7203072033

7203172034
/***/ }),
7203272035

‎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: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* plotly.js (finance) v2.30.0
2+
* plotly.js (finance) v2.30.1
33
* Copyright 2012-2024, Plotly, Inc.
44
* All rights reserved.
55
* Licensed under the MIT license
@@ -26505,7 +26505,10 @@ function templateFormatString(string, labels, d3locale) {
2650526505
var fmt;
2650626506
if (format[0] === ':') {
2650726507
fmt = d3locale ? d3locale.numberFormat : lib.numberFormat;
26508-
value = fmt(format.replace(TEMPLATE_STRING_FORMAT_SEPARATOR, ''))(value);
26508+
if (value !== '') {
26509+
// e.g. skip missing data on heatmap
26510+
value = fmt(format.replace(TEMPLATE_STRING_FORMAT_SEPARATOR, ''))(value);
26511+
}
2650926512
}
2651026513
if (format[0] === '|') {
2651126514
fmt = d3locale ? d3locale.timeFormat : utcFormat;
@@ -67883,7 +67886,7 @@ function getSortFunc(opts, d2c) {
6788367886

6788467887

6788567888
// package version injected by `npm run preprocess`
67886-
exports.version = '2.30.0';
67889+
exports.version = '2.30.1';
6788767890

6788867891
/***/ }),
6788967892

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