Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit fb5b11f

Browse files
alexshoealexshoe
committed
Merge remote-tracking branch 'origin/master' into clickable-legend-titles
2 parents 1fc81de + 43b2bff commit fb5b11f

Some content is hidden

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

44 files changed

+3121
-1602
lines changed

‎.circleci/config.yml‎

Lines changed: 39 additions & 39 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.5.1
3+
browser-tools: circleci/browser-tools@2.4.0
44

55
# Inspired by:
66
# https://github.com/CircleCI-Public/circleci-demo-workflows/blob/workspace-forwarding/.circleci/config.yml
@@ -40,11 +40,11 @@ jobs:
4040
working_directory: ~/plotly.js
4141
steps:
4242
- run: sudo apt-get update
43-
- browser-tools/install-browser-tools:
44-
install-firefox: false
45-
install-geckodriver: false
46-
install-chrome: true
47-
chrome-version: "132.0.6834.110"
43+
- browser-tools/install_browser_tools:
44+
install_firefox: false
45+
install_geckodriver: false
46+
install_chrome: true
47+
chrome_version: "133.0.6943.126"
4848
- attach_workspace:
4949
at: ~/
5050
- run:
@@ -79,11 +79,11 @@ jobs:
7979
working_directory: ~/plotly.js
8080
steps:
8181
- run: sudo apt-get update
82-
- browser-tools/install-browser-tools:
83-
install-firefox: false
84-
install-geckodriver: false
85-
install-chrome: true
86-
chrome-version: "132.0.6834.110"
82+
- browser-tools/install_browser_tools:
83+
install_firefox: false
84+
install_geckodriver: false
85+
install_chrome: true
86+
chrome_version: "133.0.6943.126"
8787
- attach_workspace:
8888
at: ~/
8989
- run:
@@ -101,11 +101,11 @@ jobs:
101101
working_directory: ~/plotly.js
102102
steps:
103103
- run: sudo apt-get update
104-
- browser-tools/install-browser-tools:
105-
install-firefox: false
106-
install-geckodriver: false
107-
install-chrome: true
108-
chrome-version: "132.0.6834.110"
104+
- browser-tools/install_browser_tools:
105+
install_firefox: false
106+
install_geckodriver: false
107+
install_chrome: true
108+
chrome_version: "133.0.6943.126"
109109
- attach_workspace:
110110
at: ~/
111111
- run:
@@ -123,11 +123,11 @@ jobs:
123123
working_directory: ~/plotly.js
124124
steps:
125125
- run: sudo apt-get update
126-
- browser-tools/install-browser-tools:
127-
install-firefox: false
128-
install-geckodriver: false
129-
install-chrome: true
130-
chrome-version: "132.0.6834.110"
126+
- browser-tools/install_browser_tools:
127+
install_firefox: false
128+
install_geckodriver: false
129+
install_chrome: true
130+
chrome_version: "133.0.6943.126"
131131
- attach_workspace:
132132
at: ~/
133133
- run:
@@ -144,11 +144,11 @@ jobs:
144144
parallelism: 8
145145
working_directory: ~/plotly.js
146146
steps:
147-
- browser-tools/install-browser-tools: &browser-versions
148-
install-firefox: false
149-
install-geckodriver: false
150-
install-chrome: true
151-
chrome-version: "143.0.7499.192" # TEMPORARY pin until WebGL issues with 144 are resolved
147+
- browser-tools/install_browser_tools: &browser-versions
148+
install_firefox: false
149+
install_geckodriver: false
150+
install_chrome: true
151+
chrome_version: "143.0.7499.192" # TEMPORARY pin until WebGL issues with 144 are resolved
152152
- attach_workspace:
153153
at: ~/
154154
- run:
@@ -165,11 +165,11 @@ jobs:
165165
working_directory: ~/plotly.js
166166
steps:
167167
- run: sudo apt-get update
168-
- browser-tools/install-browser-tools:
169-
install-firefox: false
170-
install-geckodriver: false
171-
install-chrome: true
172-
chrome-version: "132.0.6834.110"
168+
- browser-tools/install_browser_tools:
169+
install_firefox: false
170+
install_geckodriver: false
171+
install_chrome: true
172+
chrome_version: "133.0.6943.126"
173173
- attach_workspace:
174174
at: ~/
175175
- run:
@@ -186,11 +186,11 @@ jobs:
186186
working_directory: ~/plotly.js
187187
steps:
188188
- run: sudo apt-get update
189-
- browser-tools/install-browser-tools:
190-
install-firefox: false
191-
install-geckodriver: false
192-
install-chrome: true
193-
chrome-version: "132.0.6834.110"
189+
- browser-tools/install_browser_tools:
190+
install_firefox: false
191+
install_geckodriver: false
192+
install_chrome: true
193+
chrome_version: "133.0.6943.126"
194194
- attach_workspace:
195195
at: ~/
196196
- run:
@@ -206,9 +206,9 @@ jobs:
206206
TZ: "America/Anchorage"
207207
working_directory: ~/plotly.js
208208
steps:
209-
- browser-tools/install-browser-tools:
210-
install-chrome: false
211-
install-chromedriver: false
209+
- browser-tools/install_browser_tools:
210+
install_chrome: false
211+
install_chromedriver: false
212212
- attach_workspace:
213213
at: ~/
214214
- run:

‎.github/workflows/test.yml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,20 @@ jobs:
1515
node-version: [18.x]
1616

1717
steps:
18-
- uses: browser-actions/setup-chrome@v1
18+
- uses: browser-actions/setup-chrome@v2
19+
id: setup-chrome
1920
- uses: actions/checkout@v4
2021
- name: Use Node.js ${{ matrix.node-version }}
2122
uses: actions/setup-node@v4
2223
with:
2324
node-version: ${{ matrix.node-version }}
2425
cache: 'npm'
25-
- run: chrome --version
26+
- name: Set Chrome binary path
27+
run: echo "CHROME_BIN=${{ steps.setup-chrome.outputs.chrome-path }}" >> $GITHUB_ENV
28+
- name: Verify Chrome version
29+
run: |
30+
echo "Chrome path: $CHROME_BIN"
31+
$CHROME_BIN --version
2632
- run: ls
2733
- run: npm run pretest
2834
- run: npm ci

‎draftlogs/7666_add.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Add support for shapes to reference multiple axes [[#7666](https://github.com/plotly/plotly.js/pull/7666)]

‎draftlogs/7668_fix.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Fix issue where some traces in stacked area charts were not rendering their fill correctly after certain sequences of hide/show operations in the legend [[#7668](https://github.com/plotly/plotly.js/pull/7668)]

‎draftlogs/7673_add.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Add support for dashed marker lines in scatter plots [[#7673](https://github.com/plotly/plotly.js/pull/7673)], with thanks to @chrimaho for the contribution!

‎src/components/drawing/index.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -965,6 +965,8 @@ drawing.singlePointStyle = function (d, sel, trace, fns, gd, pt) {
965965
}
966966
}
967967

968+
const lineDash = d.mld || (markerLine || {}).dash;
969+
if (lineDash) drawing.dashLine(sel, lineDash, lineWidth);
968970
if (d.om) {
969971
// open markers can't have zero linewidth, default to 1px,
970972
// and use fill color as stroke color

0 commit comments

Comments
 (0)