Skip to content

Commit 1bd106d

Browse files
committed
Merge remote-tracking branch 'origin/main' into add-dimension-contiguous
# Conflicts: # CHANGELOG.md # src/chart/generator/plotbuilder.cpp
2 parents bc0e18b + d0cdcf2 commit 1bd106d

File tree

466 files changed

+2670
-2433
lines changed

Some content is hidden

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

466 files changed

+2670
-2433
lines changed

CHANGELOG.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,28 @@
22

33
## [Unreleased]
44

5+
### Fixed
6+
7+
- Fix invalid read/write when animation is contiguous (onFinish callback calls setKeyframe).
8+
- Waterfall chart preset not aligned.
9+
- Split chart count negative values too.
10+
- Split chart handled when same dimension on main and sub axis.
11+
12+
### Changed
13+
14+
- Channels 'set' rewrite doesn't clear AxisChannel properties.
15+
- Split charts
16+
- axis line multiplication.
17+
- axis labels multiplication.
18+
- axis range interpretation differently for all split part.
19+
- align center / stretch fix.
20+
521
### Added
622

23+
- Separate Channel properties to AxisChannel properties at config.
24+
- Move split align sort and reverse to AxisChannel
25+
- Add new sorting strategy: 'byLabel'.
26+
- Enable split and align on mainAxis.
727
- Add 'isContiguous' property for dimension series
828

929
## [0.16.0] - 2024-11-28

docs/assets/javascripts/mdchart.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,15 @@ class MdChart {
77
this.id = id
88
}
99

10+
async createFromConfig(snippets) {
11+
this.create(await loadAnimations(snippets))
12+
}
13+
1014
async create(snippets) {
11-
const animations = await loadAnimations(snippets)
1215
let chart = Promise.resolve()
13-
for (let i = 0; i < animations.length; i++) {
16+
for (let i = 0; i < snippets.length; i++) {
1417
const number = i + 1
15-
chart = this.animate(('0' + number).slice(-2), animations[i], chart)
18+
chart = this.animate(('0' + number).slice(-2), snippets[i], chart)
1619
}
1720
}
1821

docs/tutorial/align_range/01.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
chart.animate({
22
config: {
3-
align: 'center',
43
channels: {
54
y: {
5+
align: 'center',
66
labels: false
77
}
88
}

docs/tutorial/align_range/02_b.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
chart.animate({
22
config: {
3-
align: 'stretch',
4-
channels: {
5-
y: {
6-
labels: true
7-
}
3+
y: {
4+
align: 'stretch',
5+
labels: true
86
}
97
}
108
})

docs/tutorial/align_range/03_b.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
chart.animate({
22
config: {
3-
align: 'none'
3+
y: {
4+
align: 'none'
5+
}
46
}
57
})

docs/tutorial/assets/snippet.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ Promise.all([mdChartLoaded, dataLoaded, configLoaded]).then((results) => {
1212
const config = results[2].default
1313
const MdChart = results[0].default
1414
const mdchart = new MdChart(data, 'tutorial')
15-
mdchart.create(config)
15+
mdchart.createFromConfig(config)
1616
})
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
chart.animate({
22
config: {
3-
split: true
3+
x: { split: true }
44
}
55
})
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
chart.animate({
22
config: {
3-
split: false
3+
x: { split: false }
44
}
55
})
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
chart.animate({
22
// config: {
3-
align: 'stretch'
3+
y: {
4+
align: 'stretch'
5+
}
46
// }
57
})

docs/tutorial/shorthands_store/03_b.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ chart
99
},
1010
// y: { detach: [ 'Kinds' ] },
1111
y: {
12-
detach: 'Kinds'
12+
detach: 'Kinds',
13+
align: 'none'
1314
}
14-
},
15-
align: 'none'
15+
}
1616
})
1717
.activated.then((control) => {
1818
animation = control.store()

0 commit comments

Comments
 (0)