@cdc/core 4.23.4 → 4.23.5

package/assets/external-link.svg

@@ -0,0 +1 @@
+<svg viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg"><path d="M432 320h-32c-8.837 0-16 7.163-16 16v112H64V128h144c8.837 0 16-7.163 16-16V80c0-8.837-7.163-16-16-16H48C21.49 64 0 85.49 0 112v352c0 26.51 21.49 48 48 48h352c26.51 0 48-21.49 48-48V336c0-8.837-7.163-16-16-16zM488 0H360c-21.37 0-32.05 25.91-17 41l35.73 35.73L135 320.37a24 24 0 000 34L157.67 377a24 24 0 0034 0l243.61-243.68L471 169c15 15 41 4.5 41-17V24c0-13.255-10.745-24-24-24z" fill-rule="nonzero"/></svg>

package/components/DataTable.jsx

@@ -0,0 +1,630 @@
+import React, { useEffect, useState, memo, useMemo } from 'react'
+
+import Papa from 'papaparse'
+import ExternalIcon from '../assets/external-link.svg' // TODO: Move to Icon component
+import Icon from '@cdc/core/components/ui/Icon'
+
+import ErrorBoundary from '@cdc/core/components/ErrorBoundary'
+import LegendCircle from '@cdc/core/components/LegendCircle'
+import CoveMediaControls from '@cdc/core/components/CoveMediaControls'
+
+import Loading from '@cdc/core/components/Loading'
+
+/* eslint-disable jsx-a11y/no-noninteractive-tabindex, jsx-a11y/no-static-element-interactions */
+const DataTable = props => {
+  const { config, tableTitle, indexTitle, vizTitle, rawData, runtimeData, headerColor, expandDataTable, columns, displayDataAsText, formatNumber, applyLegendToRow, displayGeoName, navigationHandler, viewport, formatLegendLocation, tabbingId, parseDate, formatDate, isDebug } = props
+  if (isDebug) console.log('core/DataTable: props=', props)
+  if (isDebug) console.log('core/DataTable: runtimeData=', runtimeData)
+  if (isDebug) console.log('core/DataTable: rawData=', rawData)
+  if (isDebug) console.log('core/DataTable: config=', config)
+
+  const [expanded, setExpanded] = useState(expandDataTable)
+
+  const [sortBy, setSortBy] = useState({ column: config.type === 'map' ? 'geo' : 'date', asc: false })
+
+  const [accessibilityLabel, setAccessibilityLabel] = useState('')
+
+  const fileName = `${vizTitle || 'data-table'}.csv`
+
+  // Catch all sorting method used on load by default but also on user click
+  // Having a custom method means we can add in any business logic we want going forward
+  const customSort = (a, b) => {
+    const digitRegex = /\d+/
+
+    const hasNumber = value => digitRegex.test(value)
+
+    // force null and undefined to the bottom
+    a = a === null || a === undefined ? '' : a
+    b = b === null || b === undefined ? '' : b
+
+    // convert any strings that are actually numbers to proper data type
+    const aNum = Number(a)
+
+    if (!Number.isNaN(aNum)) {
+      a = aNum
+    }
+
+    const bNum = Number(b)
+
+    if (!Number.isNaN(bNum)) {
+      b = bNum
+    }
+
+    // remove iso code prefixes
+    if (typeof a === 'string') {
+      a = a.replace('us-', '')
+      a = displayGeoName(a)
+    }
+
+    if (typeof b === 'string') {
+      b = b.replace('us-', '')
+      b = displayGeoName(b)
+    }
+
+    // force any string values to lowercase
+    a = typeof a === 'string' ? a.toLowerCase() : a
+    b = typeof b === 'string' ? b.toLowerCase() : b
+
+    // If the string contains a number, remove the text from the value and only sort by the number. Only uses the first number it finds.
+    if (typeof a === 'string' && hasNumber(a) === true) {
+      a = a.match(digitRegex)[0]
+
+      a = Number(a)
+    }
+
+    if (typeof b === 'string' && hasNumber(b) === true) {
+      b = b.match(digitRegex)[0]
+
+      b = Number(b)
+    }
+
+    // When comparing a number to a string, always send string to bottom
+    if (typeof a === 'number' && typeof b === 'string') {
+      return 1
+    }
+
+    if (typeof b === 'number' && typeof a === 'string') {
+      return -1
+    }
+
+    // Return either 1 or -1 to indicate a sort priority
+    if (a > b) {
+      return 1
+    }
+    if (a < b) {
+      return -1
+    }
+    // returning 0, undefined or any falsey value will use subsequent sorts or
+    // the index as a tiebreaker
+    return 0
+  }
+
+  // Optionally wrap cell with anchor if config defines a navigation url
+  const getCellAnchor = (markup, row) => {
+    if (columns.navigate && row[columns.navigate.name]) {
+      markup = (
+        <span
+          onClick={() => navigationHandler(row[columns.navigate.name])}
+          className='table-link'
+          title='Click for more information (Opens in a new window)'
+          role='link'
+          tabIndex='0'
+          onKeyDown={e => {
+            if (e.keyCode === 13) {
+              navigationHandler(row[columns.navigate.name])
+            }
+          }}
+        >
+          {markup}
+          <ExternalIcon className='inline-icon' />
+        </span>
+      )
+    }
+
+    return markup
+  }
+
+  const rand = Math.random().toString(16).substr(2, 8)
+  const skipId = `btn__${rand}`
+
+  const mapLookup = {
+    'us-county': 'United States County Map',
+    'single-state': 'State Map',
+    us: 'United States Map',
+    world: 'World Map'
+  }
+
+  const DownloadButton = memo(() => {
+    if (rawData !== undefined) {
+      let csvData
+      if (config.type === 'chart' || config.general.type === 'bubble') {
+        // Just Unparse
+        csvData = Papa.unparse(rawData)
+      } else if ((config.general.geoType !== 'single-state' && config.general.geoType !== 'us-county') || config.general.type === 'us-geocode') {
+        // Unparse + Add column for full Geo name
+        csvData = Papa.unparse(rawData.map(row => ({ FullGeoName: displayGeoName(row[config.columns.geo.name]), ...row })))
+      } else {
+        // Unparse + Add column for full Geo name along with State
+        csvData = Papa.unparse(rawData.map(row => ({ FullGeoName: formatLegendLocation(row[config.columns.geo.name]), ...row })))
+      }
+
+      const blob = new Blob([csvData], { type: 'text/csv;charset=utf-8;' })
+
+      const saveBlob = () => {
+        //@ts-ignore
+        if (typeof window.navigator.msSaveBlob === 'function') {
+          //@ts-ignore
+          navigator.msSaveBlob(blob, fileName)
+        }
+      }
+
+      return (
+        <a download={fileName} type='button' onClick={saveBlob} href={URL.createObjectURL(blob)} aria-label='Download this data in a CSV file format.' className={`${headerColor} no-border`} id={`${skipId}`} data-html2canvas-ignore role='button'>
+          Download Data (CSV)
+        </a>
+      )
+    } else {
+      return <></>
+    }
+  }, [rawData])
+
+  // Change accessibility label depending on expanded status
+  useEffect(() => {
+    const expandedLabel = 'Accessible data table.'
+    const collapsedLabel = 'Accessible data table. This table is currently collapsed visually but can still be read using a screen reader.'
+
+    if (expanded === true && accessibilityLabel !== expandedLabel) {
+      setAccessibilityLabel(expandedLabel)
+    }
+
+    if (expanded === false && accessibilityLabel !== collapsedLabel) {
+      setAccessibilityLabel(collapsedLabel)
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [expanded])
+
+  switch (config.visualizationType) {
+    case 'Box Plot':
+      if (!config.boxplot) return <Loading />
+      break
+    case 'Line' || 'Bar' || 'Combo' || 'Pie' || 'Deviation Bar' || 'Paired Bar':
+      if (!runtimeData) return <Loading />
+      break
+    default:
+      if (!runtimeData) return <Loading />
+      break
+  }
+
+  const rows = Object.keys(runtimeData).sort((a, b) => {
+    let sortVal
+    if (config.columns.length > 0) {
+      sortVal = customSort(runtimeData[a][config.columns[sortBy.column].name], runtimeData[b][config.columns[sortBy.column].name])
+    }
+    if (!sortBy.asc) return sortVal
+    if (sortVal === 0) return 0
+    if (sortVal < 0) return 1
+    return -1
+  })
+
+  function genMapRows(rows) {
+    const allrows = rows.map(row => {
+      return (
+        <tr role='row'>
+          {Object.keys(columns)
+            .filter(column => columns[column].dataTable === true && columns[column].name)
+            .map(column => {
+              let cellValue
+
+              if (column === 'geo') {
+                const rowObj = runtimeData[row]
+                const legendColor = applyLegendToRow(rowObj)
+
+                var labelValue
+                if ((config.general.geoType !== 'single-state' && config.general.geoType !== 'us-county') || config.general.type === 'us-geocode') {
+                  labelValue = displayGeoName(row)
+                } else {
+                  labelValue = formatLegendLocation(row)
+                }
+
+                labelValue = getCellAnchor(labelValue, rowObj)
+                cellValue = (
+                  <>
+                    <LegendCircle fill={legendColor[0]} />
+                    {labelValue}
+                  </>
+                )
+              } else {
+                // check for special classes
+                let specialValFound = ''
+                if (config.legend.specialClasses && config.legend.specialClasses.length && typeof config.legend.specialClasses[0] === 'object') {
+                  for (let i = 0; i < config.legend.specialClasses.length; i++) {
+                    if (config.legend.specialClasses[i].key === config.columns[column].name) {
+                      if (String(runtimeData[row][config.legend.specialClasses[i].key]) === config.legend.specialClasses[i].value) {
+                        specialValFound = config.legend.specialClasses[i].label
+                      }
+                    }
+                  }
+                }
+                cellValue = specialValFound ? displayDataAsText(specialValFound, column) : displayDataAsText(runtimeData[row][config.columns[column].name], column)
+              }
+
+              return (
+                <td tabIndex='0' role='gridcell' onClick={e => (config.general.type === 'bubble' && config.general.allowMapZoom && config.general.geoType === 'world' ? setFilteredCountryCode(row) : true)}>
+                  {cellValue}
+                </td>
+              )
+            })}
+        </tr>
+      )
+    })
+    return allrows
+  }
+
+  const dataSeriesColumns = () => {
+    let tmpSeriesColumns
+    if (config.visualizationType !== 'Pie') {
+      tmpSeriesColumns = [config.xAxis.dataKey] //, ...config.runtime.seriesLabelsAll
+      config.series.forEach(element => {
+        tmpSeriesColumns.push(element.dataKey)
+      })
+    } else {
+      tmpSeriesColumns = [config.xAxis.dataKey, config.yAxis.dataKey] //Object.keys(runtimeData[0])
+    }
+
+    // then add the additional Columns
+    if (Object.keys(config.columns).length > 0) {
+      Object.keys(config.columns).forEach(function (key) {
+        var value = config.columns[key]
+        // add if not the index AND it is enabled to be added to data table
+        if (value.name !== config.xAxis.dataKey && value.dataTable === true) {
+          tmpSeriesColumns.push(value.name)
+        }
+      })
+    }
+
+    return tmpSeriesColumns
+  }
+
+  const getLabel = name => {
+    let custLabel = ''
+    if (Object.keys(config.columns).length > 0) {
+      Object.keys(config.columns).forEach(function (key) {
+        var tmpColumn = config.columns[key]
+        // add if not the index AND it is enabled to be added to data table
+        if (tmpColumn.name === name) {
+          custLabel = tmpColumn.label
+        }
+      })
+      return custLabel
+    }
+  }
+
+  function genChartHeader(columns, data) {
+    return (
+      <tr>
+        {dataSeriesColumns().map(column => {
+          let custLabel = getLabel(column) ? getLabel(column) : column
+          let text = column === config.xAxis.dataKey ? config.table.indexLabel : custLabel
+          return (
+            <th
+              key={`col-header-${column}`}
+              tabIndex='0'
+              title={text}
+              role='columnheader'
+              scope='col'
+              onClick={() => {
+                setSortBy({ column, asc: sortBy.column === column ? !sortBy.asc : false })
+              }}
+              onKeyDown={e => {
+                if (e.keyCode === 13) {
+                  setSortBy({ column, asc: sortBy.column === column ? !sortBy.asc : false })
+                }
+              }}
+              className={sortBy.column === column ? (sortBy.asc ? 'sort sort-asc' : 'sort sort-desc') : 'sort'}
+              {...(sortBy.column === column ? (sortBy.asc ? { 'aria-sort': 'ascending' } : { 'aria-sort': 'descending' }) : null)}
+            >
+              {text}
+              <button>
+                <span className='cdcdataviz-sr-only'>{`Sort by ${text} in ${sortBy.column === column ? (!sortBy.asc ? 'descending' : 'ascending') : 'descending'} `} order</span>
+              </button>
+            </th>
+          )
+        })}
+      </tr>
+    )
+  }
+
+  function genChartRows(rows) {
+    const allrows = rows.map(row => {
+      return (
+        <tr role='row'>
+          {dataSeriesColumns()
+            //.filter(column => columns[column].dataTable === true && columns[column].name)
+            .map(column => {
+              let cellValue
+              if (column === config.xAxis.dataKey) {
+                const rowObj = runtimeData[row]
+                //const legendColor = applyLegendToRow(rowObj)
+                var labelValue = rowObj[column] // just raw X axis string
+                labelValue = getCellAnchor(labelValue, rowObj)
+                // no colors on row headers for charts bc it's Date not data
+                // Remove this - <LegendCircle fill={legendColor[row]} />
+                cellValue = <>{labelValue}</>
+              } else {
+                cellValue = displayDataAsText(runtimeData[row][column], column)
+              }
+
+              //MAP SPECIFIC- change to CHART specific
+              // onClick = { e => (config.general.type === 'bubble' && config.general.allowMapZoom && config.general.geoType === 'world' ? setFilteredCountryCode(row) : true)}
+              return (
+                <td tabIndex='0' role='gridcell' id={`${runtimeData[config.runtime.originalXAxis.dataKey]}--${row}`}>
+                  {cellValue}
+                </td>
+              )
+            })}
+        </tr>
+      )
+    })
+    return allrows
+  }
+
+  const limitHeight = {
+    maxHeight: config.table.limitHeight && `${config.table.height}px`,
+    overflowY: 'scroll'
+  }
+
+  const caption = useMemo(() => {
+    if (config.type === 'map') {
+      return config.table.caption ? config.table.caption : `Data table showing data for the ${mapLookup[config.general.geoType]} figure.`
+    } else {
+      return config.table.caption ? config.table.caption : `Data table showing data for the ${config.type} figure.`
+    }
+  }, [config.table.caption])
+
+  // prettier-ignore
+  const tableData = useMemo(() => (
+    config.visualizationType === 'Pie'
+      ? [config.yAxis.dataKey]
+      : config.visualizationType === 'Box Plot'
+        ? Object.entries(config.boxplot.tableData[0])
+        : config.runtime.seriesKeys),
+    [config.runtime.seriesKeys]) // eslint-disable-line
+
+  if (config.visualizationType !== 'Box Plot') {
+    function genMapHeader(columns) {
+      return (
+        <tr>
+          {Object.keys(columns)
+            .filter(column => columns[column].dataTable === true && columns[column].name)
+            .map(column => {
+              let text
+              if (column !== 'geo') {
+                text = columns[column].label ? columns[column].label : columns[column].name
+              } else {
+                text = config.type === 'map' ? indexTitle : config.xAxis.dataKey
+              }
+              if (config.type === 'map' && (text === undefined || text === '')) {
+                text = 'Location'
+              }
+              return (
+                <th
+                  key={`col-header-${column}`}
+                  tabIndex='0'
+                  title={text}
+                  role='columnheader'
+                  scope='col'
+                  onClick={() => {
+                    setSortBy({ column, asc: sortBy.column === column ? !sortBy.asc : false })
+                  }}
+                  onKeyDown={e => {
+                    if (e.keyCode === 13) {
+                      setSortBy({ column, asc: sortBy.column === column ? !sortBy.asc : false })
+                    }
+                  }}
+                  className={sortBy.column === column ? (sortBy.asc ? 'sort sort-asc' : 'sort sort-desc') : 'sort'}
+                  {...(sortBy.column === column ? (sortBy.asc ? { 'aria-sort': 'ascending' } : { 'aria-sort': 'descending' }) : null)}
+                >
+                  {text}
+                  <button>
+                    <span className='cdcdataviz-sr-only'>{`Sort by ${text} in ${sortBy.column === column ? (!sortBy.asc ? 'descending' : 'ascending') : 'descending'} `} order</span>
+                  </button>
+                </th>
+              )
+            })}
+        </tr>
+      )
+    }
+
+    return (
+      <ErrorBoundary component='DataTable'>
+        <CoveMediaControls.Section classes={['download-links']}>
+          <CoveMediaControls.Link config={config} />
+          {(config.table.download || config.general.showDownloadButton) && <DownloadButton />}
+        </CoveMediaControls.Section>
+        <section id={tabbingId.replace('#', '')} className={`data-table-container ${viewport}`} aria-label={accessibilityLabel}>
+          <a id='skip-nav' className='cdcdataviz-sr-only-focusable' href={`#${skipId}`}>
+            Skip Navigation or Skip to Content
+          </a>
+          <div
+            className={expanded ? 'data-table-heading' : 'collapsed data-table-heading'}
+            onClick={() => {
+              setExpanded(!expanded)
+            }}
+            tabIndex='0'
+            onKeyDown={e => {
+              if (e.keyCode === 13) {
+                setExpanded(!expanded)
+              }
+            }}
+          >
+            <Icon display={expanded ? 'minus' : 'plus'} base />
+            {tableTitle}
+          </div>
+          <div className='table-container' style={limitHeight}>
+            <table height={expanded ? null : 0} role='table' aria-live='assertive' className={expanded ? 'data-table' : 'data-table cdcdataviz-sr-only'} hidden={!expanded} aria-rowcount={config?.data?.length ? config.data.length : '-1'}>
+              <caption className='cdcdataviz-sr-only'>{caption}</caption>
+              <thead style={{ position: 'sticky', top: 0, zIndex: 999 }}>{config.type === 'map' ? genMapHeader(columns) : genChartHeader(columns, runtimeData)}</thead>
+              <tbody>{config.type === 'map' ? genMapRows(rows) : genChartRows(rows)}</tbody>
+            </table>
+
+            {/* REGION Data Table */}
+            {config.regions && config.regions.length > 0 && config.visualizationType !== 'Box Plot' ? (
+              <table className='region-table data-table'>
+                <caption className='visually-hidden'>Table of the highlighted regions in the visualization</caption>
+                <thead>
+                  <tr>
+                    <th>Region Name</th>
+                    <th>Start Date</th>
+                    <th>End Date</th>
+                  </tr>
+                </thead>
+                <tbody>
+                  {config.regions.map((region, index) => {
+                    if (config.visualizationType === 'Box Plot') return false
+                    if (!Object.keys(region).includes('from') || !Object.keys(region).includes('to')) return null
+                    // region.from and region.to had formatDate(parseDate()) on it
+                    // but they returned undefined - removed both for now (TT)
+                    return (
+                      <tr key={`row-${region.label}--${index}`}>
+                        <td>{region.label}</td>
+                        <td>{region.from}</td>
+                        <td>{region.to}</td>
+                      </tr>
+                    )
+                  })}
+                </tbody>
+              </table>
+            ) : (
+              ''
+            )}
+          </div>
+        </section>
+      </ErrorBoundary>
+    )
+  } else {
+    // Render Data Table for Box Plots
+    function genBoxplotHeader(categories) {
+      let columns = ['Measures', ...categories]
+      return (
+        <tr>
+          {columns.map(column => {
+            return (
+              <th key={`col-header-${column}`} tabIndex='0' title={column} role='columnheader' scope='col'>
+                {column}
+              </th>
+            )
+          })}
+        </tr>
+      )
+    }
+    const resolveName = key => {
+      let {
+        boxplot: { labels }
+      } = config
+      const columnLookup = {
+        columnMean: labels.mean,
+        columnMax: labels.maximum,
+        columnMin: labels.minimum,
+        columnIqr: labels.iqr,
+        columnCategory: 'Category',
+        columnMedian: labels.median,
+        columnFirstQuartile: labels.q1,
+        columnThirdQuartile: labels.q3,
+        columnOutliers: labels.outliers,
+        values: labels.values,
+        columnTotal: labels.total,
+        columnSd: 'Standard Deviation',
+        nonOutlierValues: 'Non Outliers',
+        columnLowerBounds: labels.lowerBounds,
+        columnUpperBounds: labels.upperBounds
+      }
+
+      let resolvedName = columnLookup[key]
+
+      return resolvedName
+    }
+    let resolveCell = (rowid, plot) => {
+      if (Number(rowid) === 0) return true
+      if (Number(rowid) === 1) return plot.columnMax
+      if (Number(rowid) === 2) return plot.columnThirdQuartile
+      if (Number(rowid) === 3) return plot.columnMedian
+      if (Number(rowid) === 4) return plot.columnFirstQuartile
+      if (Number(rowid) === 5) return plot.columnMin
+      if (Number(rowid) === 6) return plot.columnTotal
+      if (Number(rowid) === 7) return plot.columnSd
+      if (Number(rowid) === 8) return plot.columnMean
+      if (Number(rowid) === 9) return plot.columnOutliers.length > 0 ? plot.columnOutliers.toString() : '-'
+      if (Number(rowid) === 10) return plot.values.length > 0 ? plot.values.toString() : '-'
+      return <p>-</p>
+    }
+    function genBoxplotRows(rows) {
+      // get list of data keys for each row
+      let dataKeys = rows.map(row => {
+        return row[0]
+      })
+      let columns = ['Measures', ...config.boxplot.categories]
+      const allrows = dataKeys.map((rowkey, index) => {
+        if (index === 0) return '' // we did header column separately
+        let rowClass = `row-Box-Plot--${index}`
+        return (
+          <tr role='row' key={`tbody__tr-${index}`} className={rowClass}>
+            {columns.map((column, colnum) => {
+              let cellValue
+              if (column === 'Measures') {
+                let labelValue = index > 0 ? resolveName(rowkey) : ''
+                cellValue = <>{labelValue}</>
+              } else {
+                cellValue = resolveCell(index, config.boxplot.plots[colnum - 1])
+              }
+              return (
+                <td tabIndex='0' key={`tbody__tr__td-${index}`} className='boxplot-td' role='gridcell'>
+                  {cellValue}
+                </td>
+              )
+            })}
+          </tr>
+        )
+      })
+      return allrows
+    }
+    return (
+      <ErrorBoundary component='DataTable'>
+        {/* cove media results in error so disabling for now (TT)
+        <CoveMediaControls.Section classes={['download-links']}>
+          <CoveMediaControls.Link config={config} />
+          {config.general.showDownloadButton && <DownloadButton />}
+        </CoveMediaControls.Section>
+        */}
+        <section id={tabbingId.replace('#', '')} className={`data-table-container ${viewport}`} aria-label={accessibilityLabel}>
+          <a id='skip-nav' className='cdcdataviz-sr-only-focusable' href={`#${skipId}`}>
+            Skip Navigation or Skip to Content
+          </a>
+          <div
+            className={expanded ? 'data-table-heading' : 'collapsed data-table-heading'}
+            onClick={() => {
+              setExpanded(!expanded)
+            }}
+            tabIndex='0'
+            onKeyDown={e => {
+              if (e.keyCode === 13) {
+                setExpanded(!expanded)
+              }
+            }}
+          >
+            <Icon display={expanded ? 'minus' : 'plus'} base />
+            {tableTitle}
+          </div>
+          <div className='table-container' style={limitHeight}>
+            <table height={expanded ? null : 0} role='table' aria-live='assertive' className={expanded ? 'data-table' : 'data-table cdcdataviz-sr-only'} hidden={!expanded} aria-rowcount={'11'}>
+              <caption className='cdcdataviz-sr-only'>{caption}</caption>
+              <thead style={{ position: 'sticky', top: 0, zIndex: 999 }}>{genBoxplotHeader(config.boxplot.categories)}</thead>
+              <tbody>{genBoxplotRows(tableData)}</tbody>
+            </table>
+          </div>
+        </section>
+      </ErrorBoundary>
+    )
+  }
+}
+
+export default DataTable

package/components/Filters.jsx

@@ -1,4 +1,5 @@
-import React, { useState, useEffect } from 'react'
+import React, { useState, useEffect, useRef } from 'react'
+import { useId } from 'react'
 
 // CDC
 import Button from '@cdc/core/components/elements/Button'
@@ -72,7 +73,9 @@ export const useFilters = props => {
 
   const changeFilterActive = (index, value) => {
     let newFilters = visualizationConfig.type === 'map' ? [...filteredData] : [...visualizationConfig.filters]
+
     newFilters[index].active = value
+    setConfig({ ...visualizationConfig })
 
     // If this is a button filter type show the button.
     if (visualizationConfig.filterBehavior === 'Apply Button') {
@@ -183,6 +186,8 @@ const Filters = props => {
   const { config: visualizationConfig, filteredData, dimensions } = props
   const { filters, type, general, theme, filterBehavior } = visualizationConfig
   const [mobileFilterStyle, setMobileFilterStyle] = useState(false)
+  const [selectedFilter, setSelectedFilter] = useState('')
+  const id = useId()
 
   // useFilters hook provides data and logic for handling various filter functions
   // prettier-ignore
@@ -205,6 +210,13 @@ const Filters = props => {
     }
   }, [dimensions])
 
+  useEffect(() => {
+    if (selectedFilter) {
+      let el = document.getElementById(selectedFilter.id)
+      if (el) el.focus()
+    }
+  }, [changeFilterActive, selectedFilter])
+
   const Filters = props => props.children
 
   const filterSectionClassList = ['filters-section', type === 'map' ? general.headerColor : theme]
@@ -241,10 +253,24 @@ const Filters = props => {
     const { filter: singleFilter, index: outerIndex } = props
     return (
       <section className='single-filters__tab-bar'>
-        {singleFilter.values.map(filter => {
+        {singleFilter.values.map((filter, index) => {
           const buttonClassList = ['button__tab-bar', singleFilter.active === filter ? 'button__tab-bar--active' : '']
           return (
-            <button className={buttonClassList.join(' ')} key={filter} onClick={e => changeFilterActive(outerIndex, filter)}>
+            <button
+              id={`${filter}-${outerIndex}-${index}-${id}`}
+              className={buttonClassList.join(' ')}
+              key={filter}
+              onClick={e => {
+                changeFilterActive(outerIndex, filter)
+                setSelectedFilter(e.target)
+              }}
+              onKeyDown={e => {
+                if (e.keyCode === 13) {
+                  changeFilterActive(outerIndex, filter)
+                  setSelectedFilter(e.target)
+                }
+              }}
+            >
               {filter}
             </button>
           )
@@ -300,8 +326,22 @@ const Filters = props => {
           const tabClassList = ['tab', active === filterOption && 'tab--active', theme && theme]
 
           pillValues.push(
-            <div className='pill__wrapper'>
-              <button className={pillClassList.join(' ')} onClick={e => changeFilterActive(outerIndex, filterOption)} name={label}>
+            <div className='pill__wrapper' key={`pill-${index}`}>
+              <button
+                id={`${filterOption}-${outerIndex}-${index}-${id}`}
+                className={pillClassList.join(' ')}
+                onKeyDown={e => {
+                  if (e.keyCode === 13) {
+                    changeFilterActive(outerIndex, filterOption)
+                    setSelectedFilter(e.target)
+                  }
+                }}
+                onClick={e => {
+                  changeFilterActive(outerIndex, filterOption)
+                  setSelectedFilter(e.target)
+                }}
+                name={label}
+              >
                 {filterOption}
               </button>
             </div>
@@ -309,12 +349,25 @@ const Filters = props => {
 
           values.push(
             <option key={index} value={filterOption}>
-              {filterOption}
+              {singleFilter.labels && singleFilter.labels[filterOption] ? singleFilter.labels[filterOption] : filterOption}
             </option>
           )
 
           tabValues.push(
-            <button className={tabClassList.join(' ')} onClick={e => changeFilterActive(outerIndex, filterOption)}>
+            <button
+              id={`${filterOption}-${outerIndex}-${index}-${id}`}
+              className={tabClassList.join(' ')}
+              onClick={e => {
+                changeFilterActive(outerIndex, filterOption)
+                setSelectedFilter(e.target)
+              }}
+              onKeyDown={e => {
+                if (e.keyCode === 13) {
+                  changeFilterActive(outerIndex, filterOption)
+                  setSelectedFilter(e.target)
+                }
+              }}
+            >
               {filterOption}
             </button>
           )

package/components/LegendCircle.jsx

@@ -1,6 +1,6 @@
 import React from 'react'
 
-export default function LegendCircle({ fill }) {
+export default function LegendCircle({ fill, borderColor }) {
   const styles = {
     marginRight: '5px',
     borderRadius: '300px',
@@ -8,7 +8,7 @@ export default function LegendCircle({ fill }) {
     display: 'inline-block',
     height: '1em',
     width: '1em',
-    border: 'rgba(0,0,0,.3) 1px solid',
+    border: borderColor ? `${borderColor}  1px solid` : 'rgba(0,0,0,.3) 1px solid',
     backgroundColor: fill
   }
 

package/data/colorPalettes.js

@@ -51,16 +51,16 @@ export const colorPalettes3 = {
   'monochrome-4': ['#C2C0FC', '#6a3d9a'],
   'monochrome-5': ['#fedab8', '#bf5b17'],
   'cool-1': ['#b2df8a', '#1f78b4'],
-  'cool-2': ['#a6cee3', '#33A02C'],
+  'cool-2': ['#a6cee3', '#72D66B'],
   'cool-3': ['#C2C0FC', '#386cb0'],
-  'cool-4': ['#33A02c', '#6a3d9a'],
+  'cool-4': ['#72D66B', '#6a3d9a'],
   'cool-5': ['#a6cee3', '#6a3d9a'],
   'warm-1': ['#e31a1c', '#fedab8'],
   'complementary-1': ['#1f78b4', '#e6ab02'],
   'complementary-2': ['#1f78b4', '#ff7f00'],
   'complementary-3': ['#6a3d9a', '#ff7f00'],
   'complementary-4': ['#6a3d9a', '#e6ab02'],
-  'complementary-5': ['#e31a90', '#1b9e77']
+  'complementary-5': ['#df168c', '#1EB386']
 }
 
 export const colorPalettesChart = updatePaletteNames(colorPalettes2)

package/helpers/validateFipsCodeLength.js

@@ -28,7 +28,7 @@ export default function validateFipsCodeLength(stateOrData) {
   }
 
   // Only includes data - get column name from somewhere else
-  if (Array.isArray(stateOrData)) {
+  if (Array.isArray(stateOrData) && stateOrData.length > 0) {
     let columns = Object.keys(stateOrData[0])
 
     let potentialColumnNames = ['fips', 'FIPS', 'fips codes', 'FIPS CODES', 'Fips Codes', 'fips Codes', 'Fips codes', 'FIPS Codes']

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cdc/core",
-  "version": "4.23.4",
+  "version": "4.23.5",
   "description": "Core components, styles, hooks, and helpers, for the CDC Open Visualization project",
   "moduleName": "CdcCore",
   "main": "dist/cdccore",
@@ -30,5 +30,5 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
-  "gitHead": "dcd395d76f70b2d113f2b4c6fe50a52522655cd1"
+  "gitHead": "34add3436994ca3cf13e51f313add4d70377f53e"
 }

package/styles/_data-table.scss

@@ -39,6 +39,7 @@ table.data-table {
   border-collapse: collapse;
   overflow: auto;
   appearance: none;
+  table-layout: fixed;
   * {
     box-sizing: border-box;
   }
@@ -172,6 +173,15 @@ table.data-table {
       margin-left: 5px;
     }
   }
+
+  .boxplot-td {
+    //display: inline-block;
+    //box-sizing: border-box;
+    table-layout: fixed;
+    width: 200;
+    //min-width: 150px;
+    //max-width: 400px;
+  }
 }
 
 .no-data {