Skip to content

Commit 05dc1bf

Browse files
committed
Merge remote-tracking branch 'origin/master' into finalist-cluster-scattermapbox
2 parents 050c3bc + 437f70e commit 05dc1bf

Some content is hidden

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

41 files changed

+558
-418
lines changed

.circleci/download_google_fonts.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,6 @@ def download(repo, family, types) :
1010
req = requests.get(url, allow_redirects=True)
1111
open(dirOut + name, 'wb').write(req.content)
1212

13-
download(
14-
'https://github.com/eliheuer/dosis-vf/blob/master/fonts/static-fonts/',
15-
'Dosis',
16-
[
17-
'-Regular',
18-
'-Bold'
19-
]
20-
)
21-
2213
download(
2314
'https://github.com/googlefonts/noto-fonts/blob/main/hinted/ttf/NotoSansMono/',
2415
'NotoSansMono',

CONTRIBUTING.md

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,21 +84,33 @@ We use the following [labels](https://github.com/plotly/plotly.js/labels) to tra
8484
[`package-lock.json`](https://docs.npmjs.com/files/package-lock.json) file is
8585
used and updated correctly.
8686

87-
#### Step 1: Clone the plotly.js repo and install its dependencies
87+
#### Step 1: Fork the plotly.js repository, clone your fork and step into it
8888

8989
```bash
90-
git clone https://github.com/plotly/plotly.js.git
90+
git clone --depth 1 git@github.com:<your-GitHub-username>/plotly.js.git
9191
cd plotly.js
92+
```
93+
94+
#### Step 2: Switch to a dev branch
95+
96+
```bash
97+
# please do not use master or main for your dev branch
98+
git checkout dev-branch-name
99+
```
100+
101+
#### Step 3: Install dependencies
102+
103+
```bash
92104
npm install
93105
```
94106

95-
#### Step 2: Setup test environment
107+
#### Step 4: Setup test environment
96108

97109
```bash
98110
npm run pretest
99111
```
100112

101-
#### Step 3: Start the test dashboard
113+
#### Step 5: Start the test dashboard
102114

103115
```bash
104116
npm start
@@ -110,7 +122,7 @@ This command bundles up the source files with source maps using
110122
dev plotly.js bundle update every time a source file is saved) and opens up a
111123
tab in your browser.
112124

113-
#### Step 4: Open up the console and start developing
125+
#### Step 6: Open up the console and start developing
114126

115127
A typical workflow is to make some modifications to the source, update the
116128
test dashboard, inspect and debug the changes, then repeat. The test dashboard
@@ -138,13 +150,13 @@ Three additional helpers exist that are refreshed every second:
138150
There is also a search bar in the top right of the dashboard. This fuzzy-searches
139151
image mocks based on their file name and trace type.
140152

141-
#### Step 5: Regenerate plot-schema in "test" folder then review & commit potential changes
153+
#### Step 7: Regenerate plot-schema in "test" folder then review & commit potential changes
142154

143155
```bash
144156
npm run schema
145157
```
146158

147-
#### Step 6: Review & commit potential changes made to test/plot-schema.json
159+
#### Step 8: Review & commit potential changes made to test/plot-schema.json
148160

149161
> If you are editing attribute descriptions or implementing a new feature this file located in the test folder records the proposed changes to the API. Note that there is another plot-schema.json file located in the dist folder, which should only be updated by the maintainers at release time.
150162

draftlogs/5615_add.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Add new formatting options by replacing `d3.format` method with more recent `d3-format` module [[#5615](https://github.com/plotly/plotly.js/pull/5615)]

draftlogs/5673_change.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
- Relax the valType of `constraintrange` in `parcoords` trace [[#5673](https://github.com/plotly/plotly.js/pull/5673)]
2+

draftlogs/5771_fix.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
- Allow clickable legend group titles when group has no pie-like traces [[#5771](https://github.com/plotly/plotly.js/pull/5771)]
2+

draftlogs/5791_change.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Adjust CONTRIBUTING document on how to clone plotly.js and submit pull requests from your fork [[#5791](https://github.com/plotly/plotly.js/pull/5791)]

draftlogs/5813_change.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Sort object key values in schema [[#5813](https://github.com/plotly/plotly.js/pull/5813)]

package-lock.json

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

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
]
6767
},
6868
"dependencies": {
69-
"@plotly/d3": "3.7.0",
69+
"@plotly/d3": "3.8.0",
7070
"@plotly/d3-sankey": "0.7.2",
7171
"@plotly/d3-sankey-circular": "0.33.1",
7272
"@plotly/point-cluster": "^3.1.9",
@@ -82,10 +82,12 @@
8282
"convex-hull": "^1.0.3",
8383
"country-regex": "^1.1.0",
8484
"d3-force": "^1.2.1",
85+
"d3-format": "^1.4.5",
8586
"d3-geo": "^1.12.1",
8687
"d3-geo-projection": "^2.9.0",
8788
"d3-hierarchy": "^1.1.9",
8889
"d3-interpolate": "^1.4.0",
90+
"d3-time": "^1.1.0",
8991
"d3-time-format": "^2.2.3",
9092
"delaunay-triangulate": "^1.1.6",
9193
"fast-isnumeric": "^1.1.4",

src/components/calendars/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ var ONEDAY = constants.ONEDAY;
1010

1111
var attributes = {
1212
valType: 'enumerated',
13-
values: Object.keys(calendars.calendars),
13+
values: Lib.sortObjectKeys(calendars.calendars),
1414
editType: 'calc',
1515
dflt: 'gregorian'
1616
};

0 commit comments

Comments
 (0)