@@ -39,43 +39,43 @@ const SegmentedBarChart: React.FC<SegmentedBarChartProps> = ({
39
39
40
40
const renderValue = ( value : string | number , label : string ) => (
41
41
< span className = { countClassName } data-testid = { `segmented-bar-chart-${ label } -value` } >
42
- { value } /{ total }
42
+ { isProportional ? ` ${ value } /$ {total } ` : value }
43
43
</ span >
44
44
)
45
45
46
- const renderContent = ( entity : Entity ) => {
46
+ const renderContent = ( ) => {
47
47
if ( isProportional ) {
48
- if ( entity . value === 0 ) {
49
- return null
50
- }
51
- return (
52
- < >
53
- { renderValue ( entity . value , entity . label ) }
54
- < div className = "flex left dc__gap-6" >
55
- < span style = { { backgroundColor : entity . color } } className = "h-12 dc__border-radius-2 w-4" />
56
- { renderLabel ( entity . label ) }
48
+ return entities ?. map ( ( entity ) => {
49
+ if ( entity . value === 0 ) {
50
+ return null
51
+ }
52
+ return (
53
+ < div className = "flexbox-col" >
54
+ { renderValue ( entity . value , entity . label ) }
55
+ < div className = "flex left dc__gap-6" >
56
+ < span style = { { backgroundColor : entity . color } } className = "h-12 dc__border-radius-2 w-4" />
57
+ { renderLabel ( entity . label ) }
58
+ </ div >
57
59
</ div >
58
- </ >
59
- )
60
+ )
61
+ } )
60
62
}
61
- return (
62
- < >
63
+ return entities ?. map ( ( entity ) => (
64
+ < div className = { ` ${ isProportional ? 'flexbox-col' : 'flexbox dc__gap-4 dc__align-items-center' } ` } >
63
65
< div className = "dot" style = { { backgroundColor : entity . color , width : '10px' , height : '10px' } } />
64
66
{ renderValue ( entity . value , entity . label ) }
65
67
{ renderLabel ( entity . label ) }
66
- </ >
67
- )
68
+ </ div >
69
+ ) )
70
+ }
71
+
72
+ if ( ! entities . length ) {
73
+ return null
68
74
}
69
75
70
76
return (
71
77
< div className = { `flexbox-col w-100 dc__gap-12 ${ rootClassName } ` } >
72
- < div className = { `flexbox ${ isProportional ? 'dc__gap-24' : 'dc__gap-16' } ` } >
73
- { entities ?. map ( ( entity ) => (
74
- < div className = { `${ isProportional ? 'flexbox-col' : 'flexbox dc__gap-4 dc__align-items-center' } ` } >
75
- { renderContent ( entity ) }
76
- </ div >
77
- ) ) }
78
- </ div >
78
+ < div className = { `flexbox ${ isProportional ? 'dc__gap-24' : 'dc__gap-16' } ` } > { renderContent ( ) } </ div >
79
79
< div className = "flexbox dc__gap-2" >
80
80
{ filteredEntities ?. map ( ( entity , index , map ) => (
81
81
< div
0 commit comments