Skip to content

Commit 37d4d15

Browse files
committed
Fix - VueUiWaffle - Keep cells centered when applying spaceBetween
1 parent 23ba6ae commit 37d4d15

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/components/vue-ui-waffle.vue

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -716,8 +716,8 @@ defineExpose({
716716
v-for="(position, i) in positions"
717717
:data-cy="`waffle-rect-underlayer-${i}`"
718718
:rx="FINAL_CONFIG.style.chart.layout.rect.rounded ? FINAL_CONFIG.style.chart.layout.rect.rounding : 0"
719-
:x="position.x"
720-
:y="position.y"
719+
:x="position.x + FINAL_CONFIG.style.chart.layout.grid.spaceBetween / 2"
720+
:y="position.y + FINAL_CONFIG.style.chart.layout.grid.spaceBetween / 2"
721721
:height="rectDimensionY <= 0 ? 0.0001 : rectDimensionY"
722722
:width="rectDimension <= 0 ? 0.0001 : rectDimension"
723723
fill="white"
@@ -728,8 +728,8 @@ defineExpose({
728728
<rect
729729
v-for="(position, i) in positions"
730730
:rx="FINAL_CONFIG.style.chart.layout.rect.rounded ? FINAL_CONFIG.style.chart.layout.rect.rounding : 0"
731-
:x="position.x"
732-
:y="position.y"
731+
:x="position.x + FINAL_CONFIG.style.chart.layout.grid.spaceBetween / 2"
732+
:y="position.y + FINAL_CONFIG.style.chart.layout.grid.spaceBetween / 2"
733733
:height="rectDimensionY <= 0 ? 0.0001 : rectDimensionY"
734734
:width="rectDimension <= 0 ? 0.0001 : rectDimension"
735735
:fill="FINAL_CONFIG.style.chart.layout.rect.useGradient && FINAL_CONFIG.style.chart.layout.rect.gradientIntensity > 0 ? `url(#gradient_${uid}_${i})` : rects[i].color"
@@ -743,8 +743,8 @@ defineExpose({
743743
<template v-for="(position, i) in positions">
744744
<foreignObject
745745
v-if="!isAnimating && !FINAL_CONFIG.style.chart.layout.grid.vertical && FINAL_CONFIG.style.chart.layout.labels.captions.show && ((rects[i].isFirst && position.position < FINAL_CONFIG.style.chart.layout.grid.size - 2) || (rects[i].isAbsoluteFirst && i % FINAL_CONFIG.style.chart.layout.grid.size === 0 && rects[i].absoluteStartIndex))"
746-
:x="position.x + FINAL_CONFIG.style.chart.layout.labels.captions.offsetX"
747-
:y="position.y + FINAL_CONFIG.style.chart.layout.labels.captions.offsetY"
746+
:x="position.x + FINAL_CONFIG.style.chart.layout.labels.captions.offsetX + FINAL_CONFIG.style.chart.layout.grid.spaceBetween / 2"
747+
:y="position.y + FINAL_CONFIG.style.chart.layout.labels.captions.offsetY + FINAL_CONFIG.style.chart.layout.grid.spaceBetween / 2"
748748
:height="absoluteRectDimensionY <= 0 ? 0.0001 : absoluteRectDimensionY"
749749
:width="absoluteRectDimension * FINAL_CONFIG.style.chart.layout.grid.size <= 0 ? 0.0001 : absoluteRectDimension * FINAL_CONFIG.style.chart.layout.grid.size"
750750
:filter="getBlurFilter(rects[i].serieIndex)"
@@ -771,8 +771,8 @@ defineExpose({
771771
:data-cy="`waffle-rect-${i}`"
772772
@mouseover="useTooltip(i)"
773773
@mouseleave="isTooltip = false; selectedSerie = null"
774-
:x="position.x"
775-
:y="position.y"
774+
:x="position.x + FINAL_CONFIG.style.chart.layout.grid.spaceBetween / 2"
775+
:y="position.y + FINAL_CONFIG.style.chart.layout.grid.spaceBetween / 2"
776776
:height="absoluteRectDimensionY <= 0 ? 0.0001 : absoluteRectDimensionY"
777777
:width="absoluteRectDimension <= 0 ? 0.0001 : absoluteRectDimension"
778778
fill="transparent"

0 commit comments

Comments
 (0)