@cdc/chart 1.3.2 → 1.3.3

package/src/components/BarChart.tsx

@@ -1,20 +1,95 @@
-import React, { useContext } from 'react';
+import React, { useContext, useState, useEffect } from 'react';
 
 import { Group } from '@visx/group';
 import { BarGroup, BarStack } from '@visx/shape';
 import { Text } from '@visx/text';
+import chroma from 'chroma-js';
 
 import ErrorBoundary from '@cdc/core/components/ErrorBoundary';
 
 import Context from '../context';
+import ReactTooltip from 'react-tooltip';
+import { BarStackHorizontal } from '@visx/shape';
+
+
 
 export default function BarChart({ xScale, yScale, seriesScale, xMax, yMax, getXAxisData, getYAxisData }) {
-  const { filteredData:data, colorScale, seriesHighlight, config, formatNumber } = useContext<any>(Context);
+  const { transformedData: data, colorScale, seriesHighlight, config, formatNumber, updateConfig, setParentConfig, colorPalettes,formatDate,parseDate } = useContext<any>(Context);
+  const { orientation, visualizationSubType } = config;
+  const isHorizontal = orientation === 'horizontal';
+
+  const lollipopBarWidth = config.lollipopSize === 'large' ? 7 : config.lollipopSize === 'medium' ? 6 : 5;
+  const lollipopShapeSize = config.lollipopSize === 'large' ? 14 : config.lollipopSize === 'medium' ? 12 : 10;
+
+  const isLabelBelowBar = config.yAxis.labelPlacement === "Below Bar";
+  const isLabelOnYAxis = config.yAxis.labelPlacement === "On Date/Category Axis";
+  const isLabelOnBar = config.yAxis.labelPlacement === "On Bar";
+  const isLabelMissing = !config.yAxis.labelPlacement;
+  const displayNumbersOnBar = config.yAxis.displayNumbersOnBar;
+  const section = config.orientation ==='horizontal' ? 'yAxis' :'xAxis';
+
+  const isRounded = config.barStyle==='rounded';
+  const isStacked = config.visualizationSubType === 'stacked'
+  const tipRounding =  config.tipRounding ;
+  const radius = config.roundingStyle ==='standard' ? '8px' : config.roundingStyle ==='shallow' ? '5px': config.roundingStyle ==='finger' ? '15px':'0px';
+  const stackCount = config.runtime.seriesKeys.length;
+
+  const applyRadius = (index:number)=>{
+    if(index === undefined || index === null || !isRounded) return;
+    let style = {};
+    
+    if((isStacked && index+1 === stackCount) || !isStacked){
+      style = isHorizontal ? {borderRadius:`0 ${radius}  ${radius}  0`} : {borderRadius:`${radius} ${radius} 0 0`};
+    };
+    if(tipRounding === 'full' && isStacked && index === 0 && stackCount > 1){
+      style = isHorizontal ? {borderRadius:`${radius} 0 0 ${radius}`} : {borderRadius:`0 0 ${radius} ${radius}`};
+   };
+    if(tipRounding === 'full' && ((isStacked && index === 0 && stackCount === 1) || !isStacked)){
+      style = {borderRadius:radius};  
+   };
+   
+   return style;
+ }
+
+  // Using State
+  const [horizBarHeight, setHorizBarHeight] = useState(null);
+  const [textWidth, setTextWidth] = useState(null);
+
+  useEffect(() => {
+    if(orientation === "horizontal" && !config.yAxis.labelPlacement) {
+      updateConfig({
+        ...config,
+        yAxis: {
+          ...config,
+          labelPlacement: "Below Bar"
+        }
+      })
+    }
+  }, [config, updateConfig]);
+
+  useEffect(() => {
+    if(config.isLollipopChart === false && config.barHeight < 25) {
+      updateConfig({ ...config, barHeight: 25 })
+    }
+  }, [config.isLollipopChart]);
+
+  useEffect(() => {
+    if(config.visualizationSubType === 'horizontal') {
+      updateConfig({
+        ...config,
+        orientation: 'horizontal'
+      })
+    }
+  }, []);
+
+  // config.runtime.seriesKeys.sort().reverse();
 
   return (
     <ErrorBoundary component="BarChart">
       <Group left={config.runtime.yAxis.size}>
-        { config.visualizationSubType === 'stacked' ? (
+        
+        {/* Stacked Vertical */}
+        { config.visualizationSubType === 'stacked' && !isHorizontal && (
           <BarStack
             data={data}
             keys={(config.runtime.barSeriesKeys || config.runtime.seriesKeys)}
@@ -24,8 +99,9 @@ export default function BarChart({ xScale, yScale, seriesScale, xMax, yMax, getX
             color={colorScale}
           >
             {barStacks => barStacks.reverse().map(barStack => barStack.bars.map(bar => {
+              const xAxisValue = config.runtime.xAxis.type==='date' ? formatDate(parseDate( data[bar.index][config.runtime.xAxis.dataKey])) :  data[bar.index][config.runtime.xAxis.dataKey]
               let yAxisTooltip = config.runtime.yAxis.label ? `${config.runtime.yAxis.label}: ${formatNumber(bar.bar ? bar.bar.data[bar.key] : 0)}` : formatNumber(bar.bar ? bar.bar.data[bar.key] : 0)
-              let xAxisTooltip = config.runtime.xAxis.label ? `${config.runtime.xAxis.label}: ${data[bar.index][config.runtime.xAxis.dataKey]}` : data[bar.index][config.runtime.xAxis.dataKey]
+              let xAxisTooltip = config.runtime.xAxis.label ? `${config.runtime.xAxis.label}: ${xAxisValue}` : xAxisValue;
 
               const tooltip = `<div>
               ${yAxisTooltip}<br />
@@ -39,7 +115,7 @@ export default function BarChart({ xScale, yScale, seriesScale, xMax, yMax, getX
               let offset = barThickness * (1 - (config.barThickness || 0.8)) / 2;
               return (
               <Group key={`bar-stack-${barStack.index}-${bar.index}`}>
-              <Text 
+              <Text
                 display={config.labels && displayBar ? 'block' : 'none'}
                 opacity={transparentBar ? 0.5 : 1}
                 x={barThickness * (bar.index + 0.5) + offset}
@@ -64,10 +140,126 @@ export default function BarChart({ xScale, yScale, seriesScale, xMax, yMax, getX
                 />
               </Group>
             )}
-            ))
-            }
+            ))}
           </BarStack>
-        ) : (
+        )}
+
+        {/* Stacked Horizontal */}
+        { config.visualizationSubType === 'stacked' && isHorizontal && (
+          <>
+          <BarStackHorizontal
+              data={data}
+              keys={(config.runtime.barSeriesKeys || config.runtime.seriesKeys)}
+              height={yMax }
+              y={(d: any) => d[config.runtime.yAxis.dataKey]}
+              xScale={xScale}
+              yScale={yScale}
+              color={colorScale}
+              offset="none"
+            >
+              {(barStacks) =>
+                barStacks.map((barStack) =>
+                  barStack.bars.map((bar, index) => {
+                    const xAxisValue =  config.runtime.yAxis.type==='date'  ? formatDate(parseDate(data[bar.index][config.runtime.originalXAxis.dataKey])) : data[bar.index][config.runtime.originalXAxis.dataKey]
+                    let yAxisTooltip = config.yAxis.label ? `${config.yAxis.label}: ${formatNumber(data[bar.index][bar.key])}` : `${bar.key}: ${formatNumber(data[bar.index][bar.key])}`
+                    let xAxisTooltip = config.xAxis.label ? `${config.xAxis.label}: ${xAxisValue}` : xAxisValue
+
+                    const tooltip = `<div>
+                    ${yAxisTooltip}<br />
+                    ${xAxisTooltip}<br />
+                    ${config.seriesLabel ? `${config.seriesLabel}: ${bar.key}` : ''}`
+                    let transparentBar = config.legend.behavior === 'highlight' && seriesHighlight.length > 0 && seriesHighlight.indexOf(bar.key) === -1;
+                    let displayBar = config.legend.behavior === 'highlight' || seriesHighlight.length === 0 || seriesHighlight.indexOf(bar.key) !== -1;
+                    const barsPerGroup = config.series.length;
+                    let barHeight = config.barHeight ? config.barHeight : 25;
+                    let barPadding = barHeight;
+
+                    config.barHeight = Number(config.barHeight)
+                    
+                    if (orientation=== "horizontal") {
+  
+                      if(isLabelBelowBar || isLabelMissing || isLabelOnYAxis) {
+                        if(barHeight < 40) {
+                          config.barPadding = 40;
+                        } else {
+                          config.barPadding = Number(barPadding);
+                        }
+                      } else {
+                        config.barPadding = Number(barPadding) / 2;
+                      }
+                    }
+
+                    config.height = (Number(barHeight) ) * data.length + (Number(config.barPadding) * data.length);
+
+                    let labelColor = "#000000";
+
+                    let textPosition = (bar.y - config.barPadding/2 - Number(config.barHeight/2) + Number(config.barHeight) ) + 5;
+
+                    if (chroma.contrast(labelColor, bar.color) < 4.9) {
+                      labelColor = '#FFFFFF';
+                    }
+
+                    return (
+                      <Group key={index}>
+                        <rect
+                          key={`barstack-horizontal-${barStack.index}-${bar.index}-${index}`}
+                          x={bar.x}
+                          y={ bar.y - config.barPadding/2 - config.barHeight/2 }
+                          width={bar.width}
+                          height={config.barHeight}
+                          fill={bar.color}
+                          stroke="#333"
+                          strokeWidth={config.barBorderThickness || 1}
+                          opacity={transparentBar ? 0.5 : 1}
+                          display={displayBar ? 'block' : 'none'}
+                          data-tip={tooltip}
+                          data-for={`cdc-open-viz-tooltip-${config.runtime.uniqueId}`}
+                        />
+
+                      {(orientation === 'horizontal' && visualizationSubType === 'stacked') && isLabelBelowBar && barStack.index === 0 && !config.yAxis.hideLabel &&
+                          <Text
+                            x={ `${bar.x + (config.isLollipopChart ? 15 : 5)}` } // padding
+                            y={textPosition}
+                            fill={ '#000000' }
+                            textAnchor="start"
+                            verticalAnchor="start"
+                          >
+                           {isHorizontal ? xAxisValue : formatNumber(xAxisValue)}
+                          </Text>
+                      }
+
+                      { displayNumbersOnBar && textWidth + 50 < bar.width &&
+                          <Text
+                            display={displayBar ? 'block' : 'none'}
+                            x={ bar.x + barStack.bars[bar.index].width / 2 } // padding
+                            y={ textPosition - 5 - config.barHeight/2 }
+                            fill={ labelColor }
+                            textAnchor="middle"
+                            verticalAnchor="middle"
+                            innerRef={
+                              (e) => {
+                                if(e) {
+                                  // use font sizes and padding to set the bar height
+                                  let elem = e.getBBox()
+                                    setTextWidth(elem.width)
+                                }
+                              }
+                            }
+                          >
+                            {formatNumber(data[bar.index][bar.key])}
+                          </Text>
+                      }
+                      </Group>
+                    )
+                  }
+                ))
+              }
+            </BarStackHorizontal>
+          </>
+        )}
+
+        {/* Bar Groups: Not Stacked */}
+        { config.visualizationSubType !== 'stacked' && (
           <Group>
             <BarGroup
               data={data}
@@ -79,38 +271,89 @@ export default function BarChart({ xScale, yScale, seriesScale, xMax, yMax, getX
               yScale={config.runtime.horizontal ? xScale : yScale}
               color={() => {return '';}}
             >
-              {(barGroups) => barGroups.map((barGroup) => (
-                <Group key={`bar-group-${barGroup.index}-${barGroup.x0}`} top={config.runtime.horizontal ? yMax / barGroups.length * barGroup.index : 0} left={config.runtime.horizontal ? 0 : xMax / barGroups.length * barGroup.index}>
-                  {barGroup.bars.map((bar) => {
+              {(barGroups) => {
+
+                if (orientation=== "horizontal") {
+                  const barsPerGroup = config.series.length;
+                  let barHeight = config.barHeight ? config.barHeight : 25;
+                  let barPadding = barHeight;
+
+                  if(isLabelBelowBar || isLabelMissing || isLabelOnYAxis) {
+                    if(barHeight < 40) {
+                      config.barPadding = 40;
+                    } else {
+                      config.barPadding = barPadding;
+                    }
+                  } else {
+                    config.barPadding = barPadding / 2;
+                  }
+
+                  if(config.isLollipopChart && config.yAxis.labelPlacement === 'Below Bar') {
+                    config.barPadding = config.barPadding + 7;
+                  }
+                  config.barHeight = config.isLollipopChart ? lollipopBarWidth : barHeight;
+                  config.height = (barsPerGroup * barHeight) * barGroups.length + (config.barPadding * barGroups.length);
+                }
+
+                return barGroups.map((barGroup, index) => (
+                <Group 
+                  className={`bar-group-${barGroup.index}-${barGroup.x0}--${index}`}
+                  key={`bar-group-${barGroup.index}-${barGroup.x0}--${index}`} 
+                  top={config.runtime.horizontal ? yMax / barGroups.length * barGroup.index : 0} 
+                  left={config.runtime.horizontal ? 0 : xMax / barGroups.length * barGroup.index}>
+                  {barGroup.bars.map((bar,index) => {
+
                     let transparentBar = config.legend.behavior === 'highlight' && seriesHighlight.length > 0 && seriesHighlight.indexOf(bar.key) === -1;
                     let displayBar = config.legend.behavior === 'highlight' || seriesHighlight.length === 0 || seriesHighlight.indexOf(bar.key) !== -1;
-                    let barHeight = Math.abs(yScale(bar.value) - yScale(0));
+                    let barHeight = orientation === "horizontal" ? config.barHeight : Math.abs(yScale(bar.value) - yScale(0));
                     let barY = bar.value >= 0 ? bar.y : yScale(0);
                     let barGroupWidth = (config.runtime.horizontal ? yMax : xMax) / barGroups.length * (config.barThickness || 0.8);
                     let offset = (config.runtime.horizontal ? yMax : xMax) / barGroups.length * (1 - (config.barThickness || 0.8)) / 2;
-                    let barWidth = barGroupWidth / barGroup.bars.length;
+
+                    // ! Unsure if this should go back.
+                    if(config.isLollipopChart) {
+                      offset = ( (config.runtime.horizontal ? yMax : xMax) / barGroups.length / 2) - lollipopBarWidth / 2
+                    }
+
+                    let barWidth = config.isLollipopChart ? lollipopBarWidth : barGroupWidth / barGroup.bars.length;
                     let barColor = config.runtime.seriesLabels && config.runtime.seriesLabels[bar.key] ? colorScale(config.runtime.seriesLabels[bar.key]) : colorScale(bar.key);
 
                     let yAxisValue = formatNumber(bar.value);
-                    let xAxisValue = data[barGroup.index][config.runtime.originalXAxis.dataKey];
+                    let xAxisValue = config.runtime[section].type==='date' ? formatDate(parseDate(data[barGroup.index][config.runtime.originalXAxis.dataKey])) : data[barGroup.index][config.runtime.originalXAxis.dataKey]
 
                     if(config.runtime.horizontal){
                       let tempValue = yAxisValue;
                       yAxisValue = xAxisValue;
                       xAxisValue = tempValue;
+                      barWidth = config.barHeight
                     }
 
                     let yAxisTooltip = config.runtime.yAxis.label ? `${config.runtime.yAxis.label}: ${yAxisValue}` : yAxisValue
                     let xAxisTooltip = config.runtime.xAxis.label ? `${config.runtime.xAxis.label}: ${xAxisValue}` : xAxisValue
-      
+                    let horizBarLabelPadding = null;
+                    let labelColor = "#000000";
+
+                    // Set label color
+                    if (chroma.contrast(labelColor, barColor) < 4.9) {
+                      labelColor = '#FFFFFF';
+                    }
+
+                    // font size and text spacing used for centering text on bar
+                    if(config.fontSize === "small") {
+                      horizBarLabelPadding = 16;
+                    } else if(config.fontSize === "medium") {
+                      horizBarLabelPadding = 18;
+                    } else{
+                      horizBarLabelPadding = 20;
+                    }
+                    const onBarTextSpacing = 25;
                     const tooltip = `<div>
                     ${yAxisTooltip}<br />
                     ${xAxisTooltip}<br />
                     ${config.seriesLabel ? `${config.seriesLabel}: ${bar.key}` : ''}`
-
                     return (
-                    <Group key={`bar-sub-group-${barGroup.index}-${barGroup.x0}`}>
-                      <Text 
+                    <Group key={`bar-sub-group-${barGroup.index}-${barGroup.x0}-${barY}--${index}`}>
+                      <Text
                         display={config.labels && displayBar ? 'block' : 'none'}
                         opacity={transparentBar ? 0.5 : 1}
                         x={barWidth * (barGroup.bars.length - bar.index - 0.5) + offset}
@@ -121,25 +364,189 @@ export default function BarChart({ xScale, yScale, seriesScale, xMax, yMax, getX
                       </Text>
                       <rect
                         key={`bar-group-bar-${barGroup.index}-${bar.index}-${bar.value}-${bar.key}`}
-                        x={config.runtime.horizontal ? 0 : barWidth * (barGroup.bars.length - bar.index - 1) + offset}
-                        y={config.runtime.horizontal ? barWidth * (barGroup.bars.length - bar.index - 1) : barY}
+                        x={ config.runtime.horizontal ? 0 : barWidth * (barGroup.bars.length - bar.index - 1) + offset }
+                        y={config.runtime.horizontal ? barWidth * (barGroup.bars.length - bar.index - 1) + (config.isLollipopChart && isLabelOnYAxis ? offset : 0) : barY }
                         width={config.runtime.horizontal ?  bar.y : barWidth}
                         height={config.runtime.horizontal ? barWidth : barHeight}
-                        fill={barColor}
+                        fill={config.isLollipopChart && config.lollipopColorStyle === 'regular' ? barColor : 
+                              config.isLollipopChart && config.lollipopColorStyle === 'two-tone' ? chroma(barColor).brighten(1) : barColor }
                         stroke="#333"
-                        strokeWidth={config.barBorderThickness || 1}
-                        style={{fill: barColor}}
+                        strokeWidth={config.isLollipopChart ? 0 : config.barBorderThickness || 1}
                         opacity={transparentBar ? 0.5 : 1}
                         display={displayBar ? 'block' : 'none'}
                         data-tip={tooltip}
                         data-for={`cdc-open-viz-tooltip-${config.runtime.uniqueId}`}
                       />
+                      {config.isLollipopChart && config.lollipopShape === 'circle' &&
+                        <circle 
+                          cx={orientation === 'horizontal' ? bar.y : barWidth * (barGroup.bars.length - bar.index - 1) + (isLabelBelowBar && orientation === 'horizontal' ? 0 : offset) + lollipopShapeSize/3.5}
+                          cy={orientation === 'horizontal' ? lollipopShapeSize/3.5 + (isLabelBelowBar && orientation === 'horizontal' ? 0: offset) : bar.y}
+                          r={lollipopShapeSize/2} 
+                          fill={barColor} 
+                          key={`circle--${bar.index}`}
+                          data-tip={tooltip}
+                          data-for={`cdc-open-viz-tooltip-${config.runtime.uniqueId}`}
+                          style={{ 'opacity': 1, filter: 'unset' }}
+                        />
+                      }
+                      {config.isLollipopChart && config.lollipopShape === 'square' &&
+                        <rect 
+                          x={
+                            (orientation === 'horizontal' && bar.y > 10) ? bar.y - lollipopShapeSize / 2 : (orientation === 'horizontal' && bar.y < 10) ? 0 :
+                            (orientation !== 'horizontal') ? offset - lollipopBarWidth / 2 : barWidth * (barGroup.bars.length - bar.index - 1) + offset - 5.25
+                          }
+                          y={
+                            orientation === 'horizontal' ? 0 - lollipopBarWidth / 2 + (isLabelBelowBar ? 0 : offset) : config.height - bar.y > 10 ? bar.y - lollipopShapeSize / 2 : 0 }
+                          width={lollipopShapeSize}
+                          height={lollipopShapeSize}
+                          fill={barColor} 
+                          key={`circle--${bar.index}`}
+                          data-tip={tooltip}
+                          data-for={`cdc-open-viz-tooltip-${config.runtime.uniqueId}`}
+                          style={{ 'opacity': 1, filter: 'unset' }}
+                        />
+                      }
+                      {orientation === "horizontal" && textWidth + 100 < bar.y ?
+                        config.yAxis.labelPlacement === "On Bar" &&
+                          <Group>
+                              <Text
+                                innerRef={
+                                  (e) => {
+                                    if(e) {
+                                      // use font sizes and padding to set the bar height
+                                      let elem = e.getBBox()
+                                        setTextWidth(elem.width)
+                                        config.barHeight = ( (elem.height * 2) + (horizBarLabelPadding * 2) + onBarTextSpacing / 2 )
+                                        config.barPadding = ( horizBarHeight / 2 )
+                                    }
+                                  }
+                                }
+                                x={ bar.y - horizBarLabelPadding }
+                                y={ barHeight * (barGroup.bars.length - bar.index - 1) + ( horizBarLabelPadding * 2 ) }
+                                fill={ labelColor }
+                                textAnchor="end"
+                              >
+                                { yAxisValue }
+                              </Text>
+                              <Text
+                                x={ bar.y - horizBarLabelPadding }
+                                y={ barWidth * (barGroup.bars.length - bar.index - 1) + ( horizBarLabelPadding * 2 ) + onBarTextSpacing }
+                                fill={ labelColor }
+                                textAnchor="end"
+                              >
+                                { xAxisValue }
+                              </Text>
+                          </Group>
+                        :
+                        (isLabelOnBar) &&
+                          <Group>
+                              {/* hide y label if we're only showing data on bar */}
+                              <Text
+                                  x={ bar.y + horizBarLabelPadding }
+                                  y={ barWidth * (barGroup.bars.length - bar.index - 1) + ( horizBarLabelPadding * 2 ) }
+                                  fill={ "#000" }
+                                  textAnchor="start"
+                                  verticalAnchor="end"
+                                >{yAxisValue}</Text>
+                              <Text
+                                  x={ bar.y + horizBarLabelPadding }
+                                  y={ barWidth * (barGroup.bars.length - bar.index - 1) + ( horizBarLabelPadding * 2 ) + onBarTextSpacing }
+                                  fill={ "#000" }
+                                  textAnchor="start"
+                                  verticalAnchor="start"
+                                >
+                                  { xAxisValue }
+                                </Text>
+                          </Group>
+                      }
+
+                      { orientation === "horizontal" && isLabelBelowBar && !config.yAxis.hideLabel &&
+                      <>
+                        <Text
+                            x={ config.yAxis.hideAxis ? 0 : 5 } // padding
+                            y={ config.isLollipopChart ? lollipopShapeSize * config.series.length + 2 : barWidth * config.series.length + 7   }
+                            verticalAnchor={"start"}
+                            textAnchor={"start"}
+                          >{config.runtime.yAxis.type==='date' ? formatDate(parseDate(data[barGroup.index][config.runtime.originalXAxis.dataKey])) :isHorizontal?data[barGroup.index][config.runtime.originalXAxis.dataKey]: formatNumber(data[barGroup.index][config.runtime.originalXAxis.dataKey])}
+                        </Text>
+
+                        { (displayNumbersOnBar) ?
+                           (textWidth + 100 < bar.y && !config.isLollipopChart) ?
+                            (
+                                <Text
+                                  display={displayBar ? 'block' : 'none'}
+                                  x={ bar.y - 5 } // padding
+                                  y={ config.isLollipopChart ? offset : (config.barHeight / 2 ) + config.barHeight * (barGroup.bars.length - bar.index - 1) }
+                                  fill={ labelColor }
+                                  textAnchor="end"
+                                  verticalAnchor="middle"
+                                >
+                                  { xAxisValue }
+                                </Text>
+                            )
+                            : (
+                                <Text
+                                  display={displayBar ? 'block' : 'none'}
+                                  x={ `${bar.y + (config.isLollipopChart ? 15 : 5) + (config.isLollipopChart && barGroup.bars.length === bar.index ? offset : 0 ) }`} // padding
+                                  y={ config.isLollipopChart ? 0 : (config.barHeight / 2 ) + config.barHeight * (barGroup.bars.length - bar.index - 1)}
+                                  fill={ '#000000'}
+                                  textAnchor="start"
+                                  verticalAnchor="middle"
+                                  fontWeight={'normal'}
+                                >
+                                  { xAxisValue }
+                                </Text>
+                            )
+                          : ""
+                        }
+                      </>
+                      }
+
+                      { (isLabelOnYAxis && orientation === "horizontal") &&
+                        <>
+                          { (displayNumbersOnBar) ?
+                            (textWidth + 100 < bar.y && !config.isLollipopChart) ?
+                              (
+                                  <Text
+                                    display={displayBar ? 'block' : 'none'}
+                                    x={ bar.y - 5 } // padding
+                                    y={ 
+                                        config.isLollipopChart ? (config.barHeight * (barGroup.bars.length - bar.index - 1) ) + offset :
+                                        (config.barHeight * (barGroup.bars.length - bar.index - 1) )  + (config.barHeight / 2 )
+                                      }
+                                    fill={ labelColor }
+                                    textAnchor="end"
+                                    verticalAnchor="middle"
+                                  >
+                                    { formatNumber(xAxisValue )}
+                                  </Text>
+                              )
+                              : (
+                                  <Text
+                                    display={displayBar ? 'block' : 'none'}
+                                    x={ `${bar.y + (config.isLollipopChart ? 15 : 5)}` } // padding
+                                    y={ 
+                                        config.isLollipopChart ? (config.barHeight * (barGroup.bars.length - bar.index - 1) ) + offset :
+                                        (config.barHeight * (barGroup.bars.length - bar.index - 1) )  + (config.barHeight / 2 )
+                                      }
+                                    fill={ '#000000' }
+                                    textAnchor="start"
+                                    verticalAnchor="middle"
+                                  >
+                                    {formatNumber( xAxisValue) }
+                                  </Text>
+                              )
+                            : ""
+                          }
+                          </>
+                          }
                     </Group>
                   )}
                   )}
                 </Group>
-              ))}
+                  ))}}
             </BarGroup>
+
             {Object.keys(config.confidenceKeys).length > 0 ? data.map((d) => {
               let xPos = xScale(getXAxisData(d));
               let upperPos = yScale(getYAxisData(d, config.confidenceKeys.lower));