@cdc/chart 4.23.1 → 4.23.3

package/src/components/{Filters.js → Filters.jsx}

@@ -1,9 +1,9 @@
-import React, { useEffect, useState, useContext } from 'react'
-import Context from './../context'
+import React, { useState, useContext } from 'react'
+import ConfigContext from './../ConfigContext'
 import Button from '@cdc/core/components/elements/Button'
 
 const useFilters = () => {
-  const { config, setConfig, filteredData, setFilteredData, excludedData, filterData, runtimeFilters } = useContext(Context)
+  const { config, setConfig, setFilteredData, excludedData, filterData } = useContext(ConfigContext)
   const [showApplyButton, setShowApplyButton] = useState(false)
 
   const sortAsc = (a, b) => {
@@ -38,6 +38,7 @@ const useFilters = () => {
     // reset to first item in values array.
     newFilters.map(filter => {
       filter.active = filter.values[0]
+      return null
     })
 
     setFilteredData(filterData(newFilters, excludedData))
@@ -48,7 +49,7 @@ const useFilters = () => {
 }
 
 const Filters = () => {
-  const { config } = useContext(Context)
+  const { config } = useContext(ConfigContext)
   const { handleApplyButton, changeFilterActive, announceChange, sortAsc, sortDesc, showApplyButton, handleReset } = useFilters()
   const { filters } = config
   const buttonText = 'Apply Filters'
@@ -105,13 +106,7 @@ const Filters = () => {
 
   return (
     <section className={`filters-section`} style={{ display: 'block', width: '100%' }}>
-      {config.filters.length > 0 && (
-        <>
-          <h3 className='filters-section__title'>Filters</h3>
-          <hr />
-        </>
-      )}
-      <div className='filters-section__wrapper' style={{ flexWrap: 'wrap', display: 'flex', gap: '7px 15px' }}>
+      <div className='filters-section__wrapper' style={{ flexWrap: 'wrap', display: 'flex', gap: '7px 15px', marginTop: '15px' }}>
         <FilterList />
         {config.filters.length > 0 && (
           <div className='filter-section__buttons' style={{ width: '100%' }}>

package/src/components/Legend.jsx

@@ -0,0 +1,316 @@
+import React, { useContext, useEffect } from 'react'
+import ConfigContext from '../ConfigContext'
+import parse from 'html-react-parser'
+import { LegendOrdinal, LegendItem, LegendLabel } from '@visx/legend'
+import LegendCircle from '@cdc/core/components/LegendCircle'
+
+import useLegendClasses from './../hooks/useLegendClasses'
+
+const Legend = () => {
+  const { config, legend, colorScale, seriesHighlight, highlight, twoColorPalette, highlightReset, setSeriesHighlight, dynamicLegendItems, setDynamicLegendItems, transformedData: data, colorPalettes, rawData, setConfig, currentViewport } = useContext(ConfigContext)
+
+  const { innerClasses, containerClasses } = useLegendClasses(config)
+
+  useEffect(() => {
+    if (dynamicLegendItems.length === 0) return
+
+    let itemsToHighlight = dynamicLegendItems.map(item => item.text)
+
+    setSeriesHighlight(itemsToHighlight)
+
+    let colsToKeep = [...itemsToHighlight]
+    let tmpLabels = []
+
+    rawData.map(dataItem => {
+      let tmp = {}
+      colsToKeep.map(col => {
+        tmp[col] = isNaN(dataItem[col]) ? dataItem[col] : dataItem[col]
+        return null
+      })
+      return tmp
+    })
+
+    colsToKeep.map(col => {
+      tmpLabels[col] = col
+      return null
+    })
+
+    if (dynamicLegendItems.length > 0) {
+      setConfig({
+        ...config,
+        runtime: {
+          ...config.runtime,
+          seriesKeys: colsToKeep,
+          seriesLabels: tmpLabels
+        }
+      })
+    }
+  }, [dynamicLegendItems]) // eslint-disable-line
+
+  useEffect(() => {
+    if (dynamicLegendItems.length === 0) {
+      // loop through all labels and add keys
+      let resetSeriesNames = [...config.runtime.seriesLabelsAll]
+      let tmpLabels = []
+      config.runtime.seriesLabelsAll.map(item => {
+        resetSeriesNames.map(col => {
+          tmpLabels[col] = col
+          return null
+        })
+        return null
+      })
+
+      setConfig({
+        ...config,
+        runtime: {
+          ...config.runtime,
+          seriesKeys: config.runtime.seriesLabelsAll,
+          seriesLabels: tmpLabels
+        }
+      })
+    }
+  }, [dynamicLegendItems]) // eslint-disable-line
+
+  const removeDynamicLegendItem = label => {
+    let newLegendItems = dynamicLegendItems.filter(item => item.text !== label.text)
+    let newLegendItemsText = newLegendItems.map(item => item.text)
+    setDynamicLegendItems(newLegendItems)
+    setSeriesHighlight(newLegendItemsText)
+  }
+  const handleDynamicLegendChange = e => {
+    setDynamicLegendItems([...dynamicLegendItems, JSON.parse(e.target.value)])
+  }
+
+  const createLegendLabels = defaultLabels => {
+    const colorCode = config.legend?.colorCode
+    if (config.visualizationType === 'Deviation Bar') {
+      const [belowColor, aboveColor] = twoColorPalette[config.twoColor.palette]
+      const labelBelow = {
+        datum: 'X',
+        index: 0,
+        text: `Below ${config.xAxis.targetLabel}`,
+        value: belowColor
+      }
+      const labelAbove = {
+        datum: 'X',
+        index: 1,
+        text: `Above ${config.xAxis.targetLabel}`,
+        value: aboveColor
+      }
+
+      return [labelBelow, labelAbove]
+    }
+    if (config.visualizationType === 'Bar' && config.visualizationSubType === 'regular' && colorCode && config.series?.length === 1) {
+      let palette = colorPalettes[config.palette]
+
+      while (data.length > palette.length) {
+        palette = palette.concat(palette)
+      }
+      palette = palette.slice(0, data.length)
+      //store uniq values to Set by colorCode
+      const set = new Set()
+
+      data.forEach(d => set.add(d[colorCode]))
+
+      // create labels with uniq values
+      const uniqeLabels = Array.from(set).map((val, i) => {
+        const newLabel = {
+          datum: val,
+          index: i,
+          text: val,
+          value: palette[i]
+        }
+        return newLabel
+      })
+
+      return uniqeLabels
+    }
+    return defaultLabels
+  }
+
+  const isBottomOrSmallViewport = config.legend.position === 'bottom' || currentViewport === 'sm' || currentViewport === 'xs'
+  const isHorizontal = config.orientation === 'horizontal'
+  const marginTop = isBottomOrSmallViewport && isHorizontal ? `${config.runtime.xAxis.size}px` : '0px'
+  const marginBottom = isBottomOrSmallViewport ? '15px' : '0px'
+
+  if (!legend) return null
+
+  if (!legend.dynamicLegend)
+    return config.visualizationType !== 'Box Plot' ? (
+      <aside style={{ marginTop, marginBottom }} id='legend' className={containerClasses.join(' ')} role='region' aria-label='legend' tabIndex={0}>
+        {legend.label && <h2>{parse(legend.label)}</h2>}
+        {legend.description && <p>{parse(legend.description)}</p>}
+        <LegendOrdinal scale={colorScale} itemDirection='row' labelMargin='0 20px 0 0' shapeMargin='0 10px 0'>
+          {labels => (
+            <div className={innerClasses.join(' ')}>
+              {createLegendLabels(labels).map((label, i) => {
+                let className = 'legend-item'
+                let itemName = label.datum
+
+                // Filter excluded data keys from legend
+                if (config.exclusions.active && config.exclusions.keys?.includes(itemName)) {
+                  return null
+                }
+
+                if (config.runtime.seriesLabels) {
+                  let index = config.runtime.seriesLabelsAll.indexOf(itemName)
+                  itemName = config.runtime.seriesKeys[index]
+                }
+
+                if (seriesHighlight.length > 0 && false === seriesHighlight.includes(itemName)) {
+                  className += ' inactive'
+                }
+
+                return (
+                  <LegendItem
+                    className={className}
+                    tabIndex={0}
+                    key={`legend-quantile-${i}`}
+                    onKeyPress={e => {
+                      if (e.key === 'Enter') {
+                        highlight(label)
+                      }
+                    }}
+                    onClick={() => {
+                      highlight(label)
+                    }}
+                  >
+                    <LegendCircle fill={label.value} />
+                    <LegendLabel align='left' margin='0 0 0 4px'>
+                      {label.text}
+                    </LegendLabel>
+                  </LegendItem>
+                )
+              })}
+              {seriesHighlight.length > 0 && (
+                <button className={`legend-reset ${config.theme}`} onClick={labels => highlightReset(labels)} tabIndex={0}>
+                  Reset
+                </button>
+              )}
+            </div>
+          )}
+        </LegendOrdinal>
+      </aside>
+    ) : (
+      <aside id='legend' className={containerClasses.join(' ')} role='region' aria-label='legend' tabIndex={0}>
+        {config.boxplot.legend.displayHowToReadText && <h3>{config.boxplot.legend.howToReadText}</h3>}
+      </aside>
+    )
+  return (
+    config.visualizationType !== 'Box Plot' && (
+      <aside id='legend' className={containerClasses.join(' ')} role='region' aria-label='legend' tabIndex={0}>
+        {legend.label && <h2>{parse(legend.label)}</h2>}
+        {legend.description && <p>{parse(legend.description)}</p>}
+
+        <LegendOrdinal scale={colorScale} itemDirection='row' labelMargin='0 20px 0 0' shapeMargin='0 10px 0'>
+          {labels => {
+            if (
+              Number(config.legend.dynamicLegendItemLimit) > dynamicLegendItems.length && // legend items are less than limit
+              dynamicLegendItems.length !== config.runtime.seriesLabelsAll.length
+            ) {
+              // legend items are equal to series length
+              return (
+                <select className='dynamic-legend-dropdown' onChange={e => handleDynamicLegendChange(e)}>
+                  <option className={'all'} tabIndex={0} value={JSON.stringify({ text: config.legend.dynamicLegendDefaultText })}>
+                    {config.legend.dynamicLegendDefaultText}
+                  </option>
+                  {labels.map((label, i) => {
+                    let className = 'legend-item'
+                    let itemName = label.datum
+                    let inDynamicList = false
+
+                    // Filter excluded data keys from legend
+                    if (config.exclusions.active && config.exclusions.keys?.includes(itemName)) {
+                      return null
+                    }
+
+                    if (config.runtime.seriesLabels) {
+                      let index = config.runtime.seriesLabelsAll.indexOf(itemName)
+                      itemName = config.runtime.seriesKeys[index]
+                    }
+
+                    if (seriesHighlight.length > 0 && false === seriesHighlight.includes(itemName)) {
+                      className += ' inactive'
+                    }
+
+                    dynamicLegendItems.map(listItem => {
+                      if (listItem.text === label.text) {
+                        inDynamicList = true
+                      }
+                      return null
+                    })
+
+                    if (inDynamicList) return true
+                    let palette = colorPalettes[config.palette]
+
+                    label.value = palette[dynamicLegendItems.length]
+
+                    return (
+                      <option className={className} tabIndex={0} value={JSON.stringify(label)}>
+                        {label.text}
+                      </option>
+                    )
+                  })}
+                </select>
+              )
+            } else {
+              return config.legend.dynamicLegendItemLimitMessage
+            }
+          }}
+        </LegendOrdinal>
+
+        <div className='dynamic-legend-list'>
+          {dynamicLegendItems.map((label, i) => {
+            let className = ['legend-item']
+            let itemName = label.text
+            let palette = colorPalettes[config.palette]
+
+            // Filter excluded data keys from legend
+            if (config.exclusions.active && config.exclusions.keys?.includes(itemName)) {
+              return null
+            }
+
+            if (config.runtime.seriesLabels && !config.legend.dynamicLegend) {
+              let index = config.runtime.seriesLabelsAll.indexOf(itemName)
+              itemName = config.runtime.seriesKeys[index]
+            }
+
+            if (seriesHighlight.length > 0 && !seriesHighlight.includes(itemName)) {
+              className.push('inactive')
+            }
+
+            if (seriesHighlight.length === 0 && config.legend.dynamicLegend) {
+              className.push('inactive')
+            }
+
+            return (
+              <>
+                <LegendItem className={className.join(' ')} tabIndex={0} key={`dynamic-legend-item-${i}`} alignItems='center'>
+                  <button
+                    className='btn-wrapper'
+                    onClick={() => {
+                      highlight(label)
+                    }}
+                  >
+                    <LegendCircle fill={palette[i]} config={config} />
+                    <LegendLabel align='space-between' margin='4px 0 0 4px'>
+                      {label.text}
+                    </LegendLabel>
+                  </button>
+                  <button onClick={() => removeDynamicLegendItem(label)}>x</button>
+                </LegendItem>
+              </>
+            )
+          })}
+        </div>
+        {seriesHighlight.length < dynamicLegendItems.length && (
+          <button className={`legend-reset legend-reset--dynamic ${config.theme}`} onClick={highlightReset} tabIndex={0}>
+            Reset
+          </button>
+        )}
+      </aside>
+    )
+  )
+}
+
+export default Legend

package/src/components/{LineChart.tsx → LineChart.jsx}

@@ -7,28 +7,21 @@ import { Text } from '@visx/text'
 
 import ErrorBoundary from '@cdc/core/components/ErrorBoundary'
 
-import Context from '../context'
+import ConfigContext from '../ConfigContext'
 
 import useRightAxis from '../hooks/useRightAxis'
 
 export default function LineChart({ xScale, yScale, getXAxisData, getYAxisData, xMax, yMax, seriesStyle = 'Line' }) {
-  const { colorPalettes, transformedData: data, colorScale, seriesHighlight, config, formatNumber, formatDate, parseDate, updateConfig } = useContext<any>(Context)
+  const { colorPalettes, transformedData: data, colorScale, seriesHighlight, config, formatNumber, formatDate, parseDate, isNumber, cleanData, updateConfig, handleLineType } = useContext(ConfigContext)
+  // Just do this once up front otherwise we end up
+  // calling clean several times on same set of data (TT)
+  const cleanedData = cleanData(data, config.xAxis.dataKey)
   const { yScaleRight } = useRightAxis({ config, yMax, data, updateConfig })
 
-  const handleLineType = lineType => {
-    switch (lineType) {
-      case 'dashed-sm':
-        return '5 5'
-      case 'dashed-md':
-        return '10 5'
-      case 'dashed-lg':
-        return '15 5'
-      default:
-        return 0
-    }
-  }
-
   const handleAxisFormating = (axis = 'left', label, value) => {
+    // if this is an x axis category/date value return without doing any formatting.
+    // if (label === config.runtime.xAxis.label) return value
+
     axis = String(axis).toLocaleLowerCase()
     if (label) {
       return `${label}: ${formatNumber(value, axis)}`
@@ -38,7 +31,9 @@ export default function LineChart({ xScale, yScale, getXAxisData, getYAxisData,
 
   return (
     <ErrorBoundary component='LineChart'>
-      <Group left={config.runtime.yAxis.size}>
+      <Group left={config.runtime.yAxis.size ? parseInt(config.runtime.yAxis.size) : 66}>
+        {' '}
+        {/* left - expects a number not a string */}
         {(config.runtime.lineSeriesKeys || config.runtime.seriesKeys).map((seriesKey, index) => {
           let lineType = config.series.filter(item => item.dataKey === seriesKey)[0].type
           const seriesData = config.series.filter(item => item.dataKey === seriesKey)
@@ -50,7 +45,7 @@ export default function LineChart({ xScale, yScale, getXAxisData, getYAxisData,
               opacity={config.legend.behavior === 'highlight' && seriesHighlight.length > 0 && seriesHighlight.indexOf(seriesKey) === -1 ? 0.5 : 1}
               display={config.legend.behavior === 'highlight' || (seriesHighlight.length === 0 && !config.legend.dynamicLegend) || seriesHighlight.indexOf(seriesKey) !== -1 ? 'block' : 'none'}
             >
-              {data.map((d, dataIndex) => {
+              {cleanedData.map((d, dataIndex) => {
                 // Find the series object from the config.series array that has a dataKey matching the seriesKey variable.
                 const series = config.series.find(({ dataKey }) => dataKey === seriesKey)
                 const { axis } = series
@@ -73,11 +68,13 @@ export default function LineChart({ xScale, yScale, getXAxisData, getYAxisData,
                     ${xAxisTooltip}
                   </div>`
                 let circleRadii = 4.5
+
                 return (
                   d[seriesKey] !== undefined &&
                   d[seriesKey] !== '' &&
                   d[seriesKey] !== null && (
                     <Group key={`series-${seriesKey}-point-${dataIndex}`}>
+                      {/* Render legend */}
                       <Text
                         display={config.labels ? 'block' : 'none'}
                         x={xScale(getXAxisData(d))}
@@ -85,18 +82,18 @@ export default function LineChart({ xScale, yScale, getXAxisData, getYAxisData,
                         fill={colorScale ? colorScale(config.runtime.seriesLabels ? config.runtime.seriesLabels[seriesKey] : seriesKey) : '#000'}
                         textAnchor='middle'
                       >
-                        {formatNumber(d[seriesKey])}
+                        {formatNumber(d[seriesKey], 'left')}
                       </Text>
 
                       <circle
                         key={`${seriesKey}-${dataIndex}`}
                         r={circleRadii}
-                        cx={xScale(getXAxisData(d))}
+                        cx={Number(xScale(getXAxisData(d)))}
                         cy={seriesAxis === 'Right' ? yScaleRight(getYAxisData(d, seriesKey)) : yScale(getYAxisData(d, seriesKey))}
                         fill={colorScale ? colorScale(config.runtime.seriesLabels ? config.runtime.seriesLabels[seriesKey] : seriesKey) : '#000'}
                         style={{ fill: colorScale ? colorScale(config.runtime.seriesLabels ? config.runtime.seriesLabels[seriesKey] : seriesKey) : '#000' }}
-                        data-tip={tooltip}
-                        data-for={`cdc-open-viz-tooltip-${config.runtime.uniqueId}`}
+                        data-tooltip-html={tooltip}
+                        data-tooltip-id={`cdc-open-viz-tooltip-${config.runtime.uniqueId}`}
                       />
                     </Group>
                   )
@@ -105,7 +102,7 @@ export default function LineChart({ xScale, yScale, getXAxisData, getYAxisData,
 
               <LinePath
                 curve={allCurves.curveLinear}
-                data={data}
+                data={cleanedData}
                 x={d => xScale(getXAxisData(d))}
                 y={d => (seriesAxis === 'Right' ? yScaleRight(getYAxisData(d, seriesKey)) : yScale(getYAxisData(d, seriesKey)))}
                 stroke={
@@ -122,14 +119,14 @@ export default function LineChart({ xScale, yScale, getXAxisData, getYAxisData,
                 shapeRendering='geometricPrecision'
                 strokeDasharray={lineType ? handleLineType(lineType) : 0}
                 defined={(item, i) => {
-                  return item[config.runtime.seriesLabels[seriesKey]] !== '' && item[config.runtime.seriesLabels[seriesKey]] !== null
+                  return item[config.runtime.seriesLabels[seriesKey]] !== '' && item[config.runtime.seriesLabels[seriesKey]] !== null && item[config.runtime.seriesLabels[seriesKey]] !== undefined
                 }}
               />
               {config.animate && (
                 <LinePath
                   className='animation'
                   curve={allCurves.curveLinear}
-                  data={data}
+                  data={cleanedData}
                   x={d => xScale(getXAxisData(d))}
                   y={d => (seriesAxis === 'Right' ? yScaleRight(getYAxisData(d, seriesKey)) : yScale(getYAxisData(d, seriesKey)))}
                   stroke='#fff'
@@ -138,7 +135,7 @@ export default function LineChart({ xScale, yScale, getXAxisData, getYAxisData,
                   shapeRendering='geometricPrecision'
                   strokeDasharray={lineType ? handleLineType(lineType) : 0}
                   defined={(item, i) => {
-                    return item[config.runtime.seriesLabels[seriesKey]] !== '' && item[config.runtime.seriesLabels[seriesKey]] !== null
+                    return isNumber(item[config.runtime.seriesLabels[seriesKey]])
                   }}
                 />
               )}
@@ -165,7 +162,6 @@ export default function LineChart({ xScale, yScale, getXAxisData, getYAxisData,
             </Group>
           )
         })}
-
         {/* Message when dynamic legend and nothing has been picked */}
         {config.legend.dynamicLegend && seriesHighlight.length === 0 && (
           <Text x={xMax / 2} y={yMax / 2} fill='black' textAnchor='middle' color='black'>