Skip to content

Commit be650ed

Browse files
authored
Merge pull request #3792 from SwiftPackageIndex/rfs6-chart-axis
Ready for Swift 6 Chart fixes for extended data
2 parents 2a87747 + 8ba83db commit be650ed

File tree

2 files changed

+12
-14
lines changed

2 files changed

+12
-14
lines changed

FrontEnd/scripts/controllers/vega_chart_controller.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ export class VegaChartController extends Controller {
8989

9090
const labelTextElement = document.createTextNode(dataSet.name)
9191
labelElement.appendChild(labelTextElement)
92-
labelElement.replaceChild
9392
})
9493
return formElement
9594
}
@@ -239,7 +238,7 @@ class ReadyForSwift6Chart {
239238
{
240239
name: 'xscale',
241240
type: 'time',
242-
domain: [{ signal: 'datetime("2024-05-01")' }, { signal: 'datetime("2024-12-31")' }],
241+
domain: { fields: data.map((d) => ({ data: d.id, field: 'date' })) },
243242
range: 'width',
244243
},
245244
{
@@ -257,7 +256,6 @@ class ReadyForSwift6Chart {
257256
{
258257
orient: 'bottom',
259258
scale: 'xscale',
260-
grid: true,
261259
labelAngle: { value: -45 },
262260
labelAlign: { value: 'right' },
263261
},
@@ -321,7 +319,7 @@ class ReadyForSwift6Chart {
321319
y: { scale: 'yscale', signal: 'minYScale' },
322320
y2: { scale: 'yscale', signal: 'maxYScale' },
323321
fill: { value: '#000000' },
324-
opacity: { value: 0.3 },
322+
opacity: { value: 0.1 },
325323
tooltip: {
326324
signal: 'datum.value',
327325
},
Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,46 @@
11
[
22
{
33
"date": "2024-06-10",
4-
"value": "Xcode 16 beta 1 released at WWDC '24"
4+
"value": "Xcode 16 beta 1 released at WWDC '24 (Swift 6.0)"
55
},
66
{
77
"date": "2024-06-25",
8-
"value": "Xcode 16 beta 2 released"
8+
"value": "Xcode 16 beta 2 released (Swift 6.0)"
99
},
1010
{
1111
"date": "2024-07-08",
12-
"value": "Xcode 16 beta 3 released"
12+
"value": "Xcode 16 beta 3 released (Swift 6.0)"
1313
},
1414
{
1515
"date": "2024-07-23",
16-
"value": "Xcode 16 beta 4 released"
16+
"value": "Xcode 16 beta 4 released (Swift 6.0)"
1717
},
1818
{
1919
"date": "2024-08-06",
20-
"value": "Xcode 16 beta 5 released"
20+
"value": "Xcode 16 beta 5 released (Swift 6.0)"
2121
},
2222
{
2323
"date": "2024-08-20",
24-
"value": "Xcode 16 beta 6 released"
24+
"value": "Xcode 16 beta 6 released (Swift 6.0)"
2525
},
2626
{
2727
"date": "2024-09-09",
28-
"value": "Xcode 16 RC released"
28+
"value": "Xcode 16 RC released (Swift 6.0)"
2929
},
3030
{
3131
"date": "2024-09-16",
32-
"value": "Xcode 16 released"
32+
"value": "Xcode 16 released (Swift 6.0)"
3333
},
3434
{
3535
"date": "2024-10-28",
36-
"value": "Xcode 16.1 released"
36+
"value": "Xcode 16.1 released (Swift 6.0)"
3737
},
3838
{
3939
"date": "2024-11-22",
4040
"value": "Added more Swift build flags"
4141
},
4242
{
4343
"date": "2025-03-31",
44-
"value": "Xcode"
44+
"value": "Xcode 16.3 released (Swift 6.1)"
4545
}
4646
]

0 commit comments

Comments
 (0)