@cdc/waffle-chart 4.25.8 → 4.25.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cdc/waffle-chart",
-  "version": "4.25.8",
+  "version": "4.25.11",
   "description": "React component for displaying a single piece of data in a card module",
   "moduleName": "CdcWaffleChart",
   "main": "dist/cdcwafflechart",
@@ -27,15 +27,23 @@
   "license": "Apache-2.0",
   "homepage": "https://github.com/CDCgov/cdc-open-viz#readme",
   "dependencies": {
-    "@cdc/core": "^4.25.8",
+    "@cdc/core": "^4.25.11",
     "@visx/shape": "^3.12.0",
     "@visx/text": "^3.12.0",
     "chroma": "0.0.1",
-    "react-accessible-accordion": "^5.0.1"
+    "html-react-parser": "5.2.3",
+    "react-accessible-accordion": "^5.0.1",
+    "resize-observer-polyfill": "^1.5.1"
   },
   "peerDependencies": {
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
-  "gitHead": "e369994230b5e3facff224e1d89d5937528ac5a0"
+  "devDependencies": {
+    "@vitejs/plugin-react": "^4.3.4",
+    "vite": "^4.4.11",
+    "vite-plugin-css-injected-by-js": "^2.4.0",
+    "vite-plugin-svgr": "^2.4.0"
+  },
+  "gitHead": "5f09a137c22f454111ab5f4cd7fdf1d2d58e31bd"
 }

package/src/CdcWaffleChart.tsx

@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useReducer, useState } from 'react'
+import React, { useCallback, useEffect, useMemo, useReducer, useState } from 'react'
 
 // visx
 import { Circle, Bar } from '@visx/shape'
@@ -13,6 +13,7 @@ import ResizeObserver from 'resize-observer-polyfill'
 import { Config } from './types/Config'
 import getViewport from '@cdc/core/helpers/getViewport'
 import fetchRemoteData from '@cdc/core/helpers/fetchRemoteData'
+import { DATA_OPERATORS } from '@cdc/core/helpers/constants'
 
 import ErrorBoundary from '@cdc/core/components/ErrorBoundary'
 import Loading from '@cdc/core/components/Loading'
@@ -28,7 +29,6 @@ import useDataVizClasses from '@cdc/core/helpers/useDataVizClasses'
 import './scss/main.scss'
 import Title from '@cdc/core/components/ui/Title'
 import Layout from '@cdc/core/components/Layout'
-import { publishAnalyticsEvent } from '@cdc/core/helpers/metrics/helpers'
 
 type CdcWaffleChartProps = {
   configUrl?: string
@@ -68,7 +68,7 @@ const WaffleChart = ({ config, isEditor, link = '', showConfigConfirm, updateCon
   const gaugeColor = config.visual.colors[config.theme]
   let dataFontSize = config.fontSize ? { fontSize: config.fontSize + 'px' } : null
 
-  const calculateData = useCallback(() => {
+  const [dataPercentage, waffleDenominator, waffleNumerator] = useMemo(() => {
     //If either the column or function aren't set, do not calculate
     if (!dataColumn || !dataFunction) {
       return ''
@@ -240,22 +240,20 @@ const WaffleChart = ({ config, isEditor, link = '', showConfigConfirm, updateCon
       applyPrecision(waffleNumerator)
     ]
   }, [
-    dataColumn,
-    dataFunction,
     config.data,
     filters,
+    dataColumn,
+    dataFunction,
     dataConditionalColumn,
     dataConditionalOperator,
     dataConditionalComparate,
     customDenom,
+    dataDenom,
     dataDenomColumn,
     dataDenomFunction,
-    roundToPlace,
-    dataDenom
+    roundToPlace
   ])
 
-  const [dataPercentage, waffleDenominator, waffleNumerator] = calculateData()
-
   const buildWaffle = useCallback(() => {
     let waffleData = []
     let nodeWidthNum = parseInt(nodeWidth, 10)
@@ -509,7 +507,6 @@ const CdcWaffleChart = ({
   useEffect(() => {
     if (config && !coveLoadedHasRan && container) {
       publish('cove_loaded', { config: config })
-      publishAnalyticsEvent('waffle-chart_loaded', 'load', interactionLabel, 'waffle-chart')
       dispatch({ type: 'SET_COVE_LOADED_HAS_RAN', payload: true })
     }
   }, [config, container])
@@ -581,18 +578,5 @@ export const DATA_FUNCTIONS = [
   DATA_FUNCTION_SUM
 ]
 
-export const DATA_OPERATOR_LESS = '<'
-export const DATA_OPERATOR_GREATER = '>'
-export const DATA_OPERATOR_LESSEQUAL = '<='
-export const DATA_OPERATOR_GREATEREQUAL = '>='
-export const DATA_OPERATOR_EQUAL = '='
-export const DATA_OPERATOR_NOTEQUAL = '≠'
-
-export const DATA_OPERATORS = [
-  DATA_OPERATOR_LESS,
-  DATA_OPERATOR_GREATER,
-  DATA_OPERATOR_LESSEQUAL,
-  DATA_OPERATOR_GREATEREQUAL,
-  DATA_OPERATOR_EQUAL,
-  DATA_OPERATOR_NOTEQUAL
-]
+// Re-export DATA_OPERATORS for backward compatibility
+export { DATA_OPERATORS }