Skip to content

Commit 7bb4003

Browse files
committed
Fix - VueUiXy - Fixed positioning issue with axis yLabel & added offsets to yLabel & xLabel
1 parent f2fa154 commit 7bb4003

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

src/components/vue-ui-xy.vue

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -612,15 +612,23 @@
612612

613613
<!-- AXIS LABELS -->
614614
<g>
615-
<text data-cy="xy-axis-yLabel" v-if="chartConfig.chart.grid.labels.axis.yLabel" :font-size="chartConfig.chart.grid.labels.axis.fontSize" :fill="chartConfig.chart.grid.labels.color" id="yAxisLabel" text-anchor="middle" style="transition: none">
615+
<text
616+
data-cy="xy-axis-yLabel"
617+
v-if="chartConfig.chart.grid.labels.axis.yLabel && ! chartConfig.chart.grid.labels.yAxis.useIndividualScale"
618+
:font-size="chartConfig.chart.grid.labels.axis.fontSize"
619+
:fill="chartConfig.chart.grid.labels.color"
620+
:transform="`translate(${chartConfig.chart.grid.labels.axis.fontSize + chartConfig.chart.grid.labels.axis.yLabelOffsetX}, ${drawingArea.top + drawingArea.height / 2}) rotate(-90)`"
621+
text-anchor="middle"
622+
style="transition: none"
623+
>
616624
{{ chartConfig.chart.grid.labels.axis.yLabel }}
617625
</text>
618626
<text
619627
data-cy="xy-axis-xLabel"
620628
v-if="chartConfig.chart.grid.labels.axis.xLabel"
621629
text-anchor="middle"
622630
:x="chartConfig.chart.width / 2"
623-
:y="drawingArea.bottom + chartConfig.chart.grid.labels.axis.fontSize + chartConfig.chart.grid.labels.xAxisLabels.fontSize * 1.3"
631+
:y="drawingArea.bottom + chartConfig.chart.grid.labels.axis.fontSize + (chartConfig.chart.grid.labels.xAxisLabels.fontSize * 1.3) + chartConfig.chart.grid.labels.axis.xLabelOffsetY"
624632
:font-size="chartConfig.chart.grid.labels.axis.fontSize"
625633
:fill="chartConfig.chart.grid.labels.color"
626634
>
@@ -1498,18 +1506,6 @@ export default {
14981506
})
14991507
}
15001508
1501-
const that = this;
1502-
const yLabel = document.getElementById("yAxisLabel");
1503-
if(yLabel) {
1504-
const bboxY = yLabel.getBBox();
1505-
const xPosition = bboxY.height / 2 + this.chartConfig.chart.padding.left / 5;
1506-
const yPosition = this.chartConfig.chart.height / 2;
1507-
yLabel.setAttributeNS(null, "transform", `rotate(-90, ${xPosition}, ${yPosition})`);
1508-
yLabel.setAttributeNS(null, "x", xPosition);
1509-
yLabel.setAttributeNS(null, "y", yPosition);
1510-
yLabel.setAttributeNS(null, "font-size", this.chartConfig.chart.grid.labels.axis.fontSize);
1511-
}
1512-
15131509
if(this.chartConfig.showWarnings) {
15141510
this.dataset.forEach((datapoint) => {
15151511
datapoint.series.forEach((s, j) => {

src/default_configs.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,9 @@
212212
"fontSize": 12,
213213
"axis": {
214214
"yLabel": "",
215+
"yLabelOffsetX": 0,
215216
"xLabel": "",
217+
"xLabelOffsetY": 0,
216218
"fontSize": 12
217219
},
218220
"yAxis": {

types/vue-data-ui.d.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2338,7 +2338,9 @@ declare module 'vue-data-ui' {
23382338
fontSize?: number;
23392339
axis?: {
23402340
yLabel?: string;
2341+
yLabelOffsetX?: number;
23412342
xLabel?: string;
2343+
xLabelOffsetY?: number;
23422344
fontSize?: number;
23432345
};
23442346
yAxis?: {

0 commit comments

Comments
 (0)