Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

improve border radius implementation in stacked bar charts #4747

Merged
merged 1 commit into from
Oct 5, 2024
Merged

improve border radius implementation in stacked bar charts #4747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
149 changes: 149 additions & 0 deletions samples/vanilla-js/column/border-radius-test.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,149 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta http-equiv="X-UA-Compatible" content="ie=edge" />
<title>Border Radius Test - Stacked Column</title>

<link href="../../assets/styles.css" rel="stylesheet" />

<style>
#chart {
max-width: 650px;
margin: 35px auto;
}
</style>

<script>
window.Promise ||
document.write(
'<script src="https://cdn.jsdelivr.net/npm/promise-polyfill@8/dist/polyfill.min.js"><\/script>'
)
window.Promise ||
document.write(
'<script src="https://cdn.jsdelivr.net/npm/eligrey-classlist-js-polyfill@1.2.20171210/classList.min.js"><\/script>'
)
window.Promise ||
document.write(
'<script src="https://cdn.jsdelivr.net/npm/findindex_polyfill_mdn"><\/script>'
)
</script>

<script src="../../../dist/apexcharts.js"></script>

<script>
// Replace Math.random() with a pseudo-random number generator to get reproducible results in e2e tests
// Based on https://gist.github.com/blixt/f17b47c62508be59987b
var _seed = 42
Math.random = function () {
_seed = (_seed * 16807) % 2147483647
return (_seed - 1) / 2147483646
}
</script>
</head>

<body>
<div id="chart"></div>

<script>
var options = {
series: [
{
name: 'PRODUCT A',
data: [0, 0, 41, 67, 22, 0],
},
{
name: 'PRODUCT B',
data: [20, 0, -20, 0, 13, 0],
},
{
name: 'PRODUCT C',
data: [20, 17, -15, 0, 21, 14],
},
{
name: 'PRODUCT D',
data: [30, 7, 25, 13, 10, 8],
},
],
chart: {
type: 'bar',
height: 450,
stacked: true,
toolbar: {
show: true,
},
},
responsive: [
{
breakpoint: 480,
options: {
legend: {
position: 'bottom',
offsetX: -10,
offsetY: 0,
},
},
},
],
stroke: {
width: 0,
colors: ['#fff'],
},
plotOptions: {
bar: {
horizontal: false,
borderRadius: 10,
borderRadiusApplication: 'end', // 'around', 'end'
borderRadiusWhenStacked: 'last', // 'all', 'last'
dataLabels: {
total: {
enabled: true,
style: {
fontSize: '13px',
fontWeight: 900,
},
},
},
},
},
xaxis: {
stepSize: 11,
categories: [
'01/01/2011',
'01/02/2011',
'01/03/2011',
'01/04/2011',
'01/05/2011',
'01/06/2011',
],
},
yaxis: {
stepSize: 11,
},
legend: {
position: 'right',
offsetY: 40,
},
fill: {
opacity: 1,
},
grid: {
xaxis: {
lines: {
show: true,
},
},
yaxis: {
lines: {
show: true,
},
},
},
}

var chart = new ApexCharts(document.querySelector('#chart'), options)
chart.render()
</script>
</body>
</html>
11 changes: 11 additions & 0 deletions src/assets/apexcharts.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,3 +681,14 @@ rect.legend-mouseover-inactive,
.apexcharts-rangebar-goals-markers {
pointer-events: none
}

.apexcharts-flip-y {
transform: scaleY(-1) translateY(-100%);
transform-origin: top;
transform-box: fill-box;
}
.apexcharts-flip-x {
transform: scaleX(-1);
transform-origin: center;
transform-box: fill-box;
}
3 changes: 2 additions & 1 deletion src/charts/Bar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,7 @@ class Bar {
elBarShadows,
visibleSeries,
type,
classes,
}) {
const w = this.w
const graphics = new Graphics(this.ctx)
Expand Down Expand Up @@ -379,7 +380,7 @@ class Bar {
animationDelay: delay,
initialSpeed: w.config.chart.animations.speed,
dataChangeSpeed: w.config.chart.animations.dynamicAnimation.speed,
className: `apexcharts-${type}-area`,
className: `apexcharts-${type}-area ${classes}`,
chartType: type,
})

Expand Down
25 changes: 19 additions & 6 deletions src/charts/BarStacked.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,8 @@ class BarStacked extends Bar {
}

for (let j = 0; j < w.globals.dataPoints; j++) {
const strokeWidth = this.barHelpers.getStrokeWidth(i, j, realIndex)
const commonPathOpts = {
indexes: { i, j, realIndex, translationsIndex, bc },
strokeWidth,
x,
y,
elSeries,
Expand Down Expand Up @@ -169,6 +167,23 @@ class BarStacked extends Bar {

let pathFill = this.barHelpers.getPathFillColor(series, i, j, realIndex)

let classes = ''

if (w.globals.isBarHorizontal) {
if (
this.barHelpers.arrBorderRadius[realIndex][j] === 'bottom' &&
w.globals.series[realIndex][j] > 0
) {
classes = 'apexcharts-flip-x'
}
} else {
if (
this.barHelpers.arrBorderRadius[realIndex][j] === 'bottom' &&
w.globals.series[realIndex][j] > 0
) {
classes = 'apexcharts-flip-y'
}
}
elSeries = this.renderSeries({
realIndex,
pathFill,
Expand All @@ -177,7 +192,7 @@ class BarStacked extends Bar {
columnGroupIndex,
pathFrom: paths.pathFrom,
pathTo: paths.pathTo,
strokeWidth,
strokeWidth: this.barHelpers.getStrokeWidth(i, j, realIndex),
elSeries,
x,
y,
Expand All @@ -188,6 +203,7 @@ class BarStacked extends Bar {
elGoalsMarkers,
type: 'bar',
visibleSeries: columnGroupIndex,
classes,
})
}

Expand Down Expand Up @@ -291,7 +307,6 @@ class BarStacked extends Bar {
drawStackedBarPaths({
indexes,
barHeight,
strokeWidth,
zeroW,
x,
y,
Expand Down Expand Up @@ -355,7 +370,6 @@ class BarStacked extends Bar {
barHeight,
x1: barXPosition,
x2: x,
strokeWidth,
series: this.series,
realIndex: indexes.realIndex,
seriesGroup,
Expand Down Expand Up @@ -518,7 +532,6 @@ class BarStacked extends Bar {
y1: barYPosition,
y2: y,
yRatio: this.yRatio[translationsIndex],
strokeWidth: this.strokeWidth,
series: this.series,
seriesGroup,
realIndex: indexes.realIndex,
Expand Down
8 changes: 4 additions & 4 deletions src/charts/Line.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -953,8 +953,8 @@ class Line {

// Check for single isolated point
if (series[i][j + 1] === null) {
linePaths.push(linePath);
areaPaths.push(areaPath);
linePaths.push(linePath)
areaPaths.push(areaPath)
// Stay in pathState = 0;
break
}
Expand Down Expand Up @@ -1042,8 +1042,8 @@ class Line {

// Check for single isolated point
if (series[i][j + 1] === null) {
linePaths.push(linePath);
areaPaths.push(areaPath);
linePaths.push(linePath)
areaPaths.push(areaPath)
// Stay in pathState = 0
break
}
Expand Down
Loading
Loading