@@ -138,10 +138,11 @@ const useAggregatedData = (): {
138138 } ) ;
139139 const barOffset = groupIndex * ( barWidth + offset ) ;
140140
141- const { stackedData } = series [ seriesId ] ;
141+ const { stackedData, data : currentSeriesData , layout } = series [ seriesId ] ;
142142
143- return stackedData
144- . map ( ( values , dataIndex : number ) => {
143+ return baseScaleConfig
144+ . data ! . map ( ( baseValue , dataIndex : number ) => {
145+ const values = stackedData [ dataIndex ] ;
145146 const valueCoordinates = values . map ( ( v ) => ( verticalLayout ? yScale ( v ) ! : xScale ( v ) ! ) ) ;
146147
147148 const minValueCoord = Math . round ( Math . min ( ...valueCoordinates ) ) ;
@@ -152,19 +153,15 @@ const useAggregatedData = (): {
152153 const result = {
153154 seriesId,
154155 dataIndex,
155- layout : series [ seriesId ] . layout ,
156- x : verticalLayout
157- ? xScale ( xAxis [ xAxisId ] . data ?. [ dataIndex ] ) ! + barOffset
158- : minValueCoord ,
159- y : verticalLayout
160- ? minValueCoord
161- : yScale ( yAxis [ yAxisId ] . data ?. [ dataIndex ] ) ! + barOffset ,
156+ layout,
157+ x : verticalLayout ? xScale ( baseValue ) ! + barOffset : minValueCoord ,
158+ y : verticalLayout ? minValueCoord : yScale ( baseValue ) ! + barOffset ,
162159 xOrigin : xScale ( 0 ) ! ,
163160 yOrigin : yScale ( 0 ) ! ,
164161 height : verticalLayout ? maxValueCoord - minValueCoord : barWidth ,
165162 width : verticalLayout ? barWidth : maxValueCoord - minValueCoord ,
166163 color : colorGetter ( dataIndex ) ,
167- value : series [ seriesId ] . data [ dataIndex ] ,
164+ value : currentSeriesData [ dataIndex ] ,
168165 maskId : `${ chartId } _${ stackId || seriesId } _${ groupIndex } _${ dataIndex } ` ,
169166 } ;
170167
0 commit comments