@cdc/map 4.25.5-1 → 4.25.6-1

package/examples/private/m.json

@@ -0,0 +1,427 @@
+{
+    "general": {
+        "geoType": "us",
+        "geoBorderColor": "darkGray",
+        "showTitle": false,
+        "showSidebar": true,
+        "showDownloadButton": false,
+        "showDownloadMediaButton": false,
+        "displayAsHex": true,
+        "displayStateLabels": false,
+        "territoriesLabel": "Territories",
+        "language": "en",
+        "hasRegions": false,
+        "expandDataTable": false,
+        "fullBorder": false,
+        "type": "data",
+        "palette": {
+            "isReversed": true
+        },
+        "geoLabelOverride": "",
+        "convertFipsCodes": true,
+        "allowMapZoom": true,
+        "hideGeoColumnInTooltip": false,
+        "hidePrimaryColumnInTooltip": false,
+        "superTitle": "",
+        "equalNumberOptIn": true,
+        "navigationTarget": "_self",
+        "noStateFoundMessage": "Map Unavailable",
+        "annotationDropdownText": "Annotations",
+        "headerColor": "theme-blue",
+        "title": "",
+        "territoriesAlwaysShow": false,
+        "statePicked": {
+            "fipsCode": "01",
+            "stateName": "Alabama"
+        }
+    },
+    "type": "map",
+    "customColors": [
+        "gray",
+        "#edf8fb",
+        "gray",
+        "#b3cde3",
+        "gray",
+        "#8c96c6",
+        "#8856a7",
+        "#810f7c"
+    ],
+    "columns": {
+        "geo": {
+            "name": "state",
+            "label": "Location",
+            "tooltip": false,
+            "dataTable": true
+        },
+        "primary": {
+            "dataTable": true,
+            "tooltip": true,
+            "prefix": "",
+            "suffix": "%",
+            "name": "value",
+            "label": "",
+            "roundToPlace": 1
+        },
+        "navigate": {
+            "name": ""
+        },
+        "latitude": {
+            "name": ""
+        },
+        "longitude": {
+            "name": ""
+        }
+    },
+    "legend": {
+        "descriptions": {},
+        "specialClasses": [
+            {
+                "key": "value",
+                "value": "",
+                "label": "No data"
+            }
+        ],
+        "unified": false,
+        "singleColumn": false,
+        "dynamicDescription": false,
+        "type": "equalnumber",
+        "numberOfItems": 5,
+        "position": "side",
+        "title": "Legend",
+        "singleRow": false,
+        "verticalSorted": false,
+        "showSpecialClassesLast": true,
+        "categoryValuesOrder": [
+            "No",
+            "Yes"
+        ]
+    },
+    "filters": [],
+    "table": {
+        "wrapColumns": false,
+        "label": "Data Table",
+        "expanded": false,
+        "limitHeight": false,
+        "height": "",
+        "caption": "",
+        "showDownloadUrl": false,
+        "showDataTableLink": false,
+        "showFullGeoNameInCSV": false,
+        "forceDisplay": false,
+        "download": true,
+        "indexLabel": "",
+        "showDownloadLinkBelow": true,
+        "cellMinWidth": "0"
+    },
+    "tooltips": {
+        "appearanceType": "hover",
+        "linkLabel": "Learn More",
+        "capitalizeLabels": true,
+        "opacity": 90
+    },
+    "visual": {
+        "minBubbleSize": 1,
+        "maxBubbleSize": 20,
+        "extraBubbleBorder": false,
+        "cityStyle": "circle",
+        "cityStyleLabel": "",
+        "showBubbleZeros": false,
+        "additionalCityStyles": [],
+        "geoCodeCircleSize": 8
+    },
+    "mapPosition": {
+        "coordinates": [
+            0,
+            30
+        ],
+        "zoom": 1
+    },
+    "map": {
+        "layers": [],
+        "patterns": []
+    },
+    "filterBehavior": "Filter Change",
+    "dataTable": {
+        "title": "Data Table",
+        "forceDisplay": true,
+        "caption": "Lorem Ipsum - Text added to Data Table Caption",
+        "limitHeight": true,
+        "height": "100"
+    },
+    "orientation": null,
+    "visualizationSubType": null,
+    "validated": "4.24.3",
+    "version": "4.24.12",
+    "data": [
+        {
+            "state": "Alaska",
+            "stratification": "Total",
+            "value": "33.3"
+        },
+        {
+            "state": "Alabama",
+            "stratification": "Total",
+            "value": "32.7"
+        },
+        {
+            "state": "Arkansas",
+            "stratification": "Total",
+            "value": "31.8"
+        },
+        {
+            "state": "Arizona",
+            "stratification": "Total",
+            "value": "34.5"
+        },
+        {
+            "state": "California",
+            "stratification": "Total",
+            "value": "36.4"
+        },
+        {
+            "state": "Colorado",
+            "stratification": "Total",
+            "value": "35.0"
+        },
+        {
+            "state": "Connecticut",
+            "stratification": "Total",
+            "value": "36.5"
+        },
+        {
+            "state": "District of Columbia",
+            "stratification": "Total",
+            "value": "33.5"
+        },
+        {
+            "state": "Delaware",
+            "stratification": "Total",
+            "value": "35.6"
+        },
+        {
+            "state": "Florida",
+            "stratification": "Total",
+            "value": "35.6"
+        },
+        {
+            "state": "Georgia",
+            "stratification": "Total",
+            "value": "33.7"
+        },
+        {
+            "state": "Guam",
+            "stratification": "Total",
+            "value": "34.9"
+        },
+        {
+            "state": "Hawaii",
+            "stratification": "Total",
+            "value": "34.4"
+        },
+        {
+            "state": "Iowa",
+            "stratification": "Total",
+            "value": "34.3"
+        },
+        {
+            "state": "Idaho",
+            "stratification": "Total",
+            "value": "35.7"
+        },
+        {
+            "state": "Illinois",
+            "stratification": "Total",
+            "value": "35.0"
+        },
+        {
+            "state": "Indiana",
+            "stratification": "Total",
+            "value": "33.3"
+        },
+        {
+            "state": "Kansas",
+            "stratification": "Total",
+            "value": "33.3"
+        },
+        {
+            "state": "Kentucky",
+            "stratification": "Total",
+            "value": ""
+        },
+        {
+            "state": "Louisiana",
+            "stratification": "Total",
+            "value": "32.1"
+        },
+        {
+            "state": "Massachusetts",
+            "stratification": "Total",
+            "value": "35.2"
+        },
+        {
+            "state": "Maryland",
+            "stratification": "Total",
+            "value": "34.7"
+        },
+        {
+            "state": "Maine",
+            "stratification": "Total",
+            "value": "35.3"
+        },
+        {
+            "state": "Michigan",
+            "stratification": "Total",
+            "value": "33.4"
+        },
+        {
+            "state": "Minnesota",
+            "stratification": "Total",
+            "value": "34.2"
+        },
+        {
+            "state": "Missouri",
+            "stratification": "Total",
+            "value": "34.3"
+        },
+        {
+            "state": "Mississippi",
+            "stratification": "Total",
+            "value": "31.6"
+        },
+        {
+            "state": "Montana",
+            "stratification": "Total",
+            "value": "35.2"
+        },
+        {
+            "state": "North Carolina",
+            "stratification": "Total",
+            "value": "35.0"
+        },
+        {
+            "state": "North Dakota",
+            "stratification": "Total",
+            "value": "35.8"
+        },
+        {
+            "state": "Nebraska",
+            "stratification": "Total",
+            "value": "34.8"
+        },
+        {
+            "state": "New Hampshire",
+            "stratification": "Total",
+            "value": "35.6"
+        },
+        {
+            "state": "New Jersey",
+            "stratification": "Total",
+            "value": "35.9"
+        },
+        {
+            "state": "New Mexico",
+            "stratification": "Total",
+            "value": "33.9"
+        },
+        {
+            "state": "Nevada",
+            "stratification": "Total",
+            "value": "35.6"
+        },
+        {
+            "state": "New York",
+            "stratification": "Total",
+            "value": "36.1"
+        },
+        {
+            "state": "Ohio",
+            "stratification": "Total",
+            "value": "33.2"
+        },
+        {
+            "state": "Oklahoma",
+            "stratification": "Total",
+            "value": "31.9"
+        },
+        {
+            "state": "Oregon",
+            "stratification": "Total",
+            "value": "33.4"
+        },
+        {
+            "state": "Pennsylvania",
+            "stratification": "Total",
+            "value": ""
+        },
+        {
+            "state": "Puerto Rico",
+            "stratification": "Total",
+            "value": "35.1"
+        },
+        {
+            "state": "Rhode Island",
+            "stratification": "Total",
+            "value": "34.8"
+        },
+        {
+            "state": "South Carolina",
+            "stratification": "Total",
+            "value": "33.9"
+        },
+        {
+            "state": "South Dakota",
+            "stratification": "Total",
+            "value": "34.3"
+        },
+        {
+            "state": "Tennessee",
+            "stratification": "Total",
+            "value": "33.1"
+        },
+        {
+            "state": "Texas",
+            "stratification": "Total",
+            "value": "35.0"
+        },
+        {
+            "state": "Utah",
+            "stratification": "Total",
+            "value": "34.3"
+        },
+        {
+            "state": "Virginia",
+            "stratification": "Total",
+            "value": "34.3"
+        },
+        {
+            "state": "Virgin Islands",
+            "stratification": "Total",
+            "value": "38.2"
+        },
+        {
+            "state": "Vermont",
+            "stratification": "Total",
+            "value": "34.8"
+        },
+        {
+            "state": "Washington",
+            "stratification": "Total",
+            "value": "35.2"
+        },
+        {
+            "state": "Wisconsin",
+            "stratification": "Total",
+            "value": "34.1"
+        },
+        {
+            "state": "West Virginia",
+            "stratification": "Total",
+            "value": "32.0"
+        },
+        {
+            "state": "Wyoming",
+            "stratification": "Total",
+            "value": "35.7"
+        }
+    ]
+}

package/index.html

@@ -1,38 +1,39 @@
 <!DOCTYPE html>
 <html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-    <style type="text/css">
-      body {
-        margin: 0;
-        border-top: none !important;
-      }
 
-      .cdc-map-outer-container {
-        min-height: 100vh;
-      }
-    </style>
-    <link rel="stylesheet prefetch" href="https://www.cdc.gov/TemplatePackage/5.0/css/app.min.css?_=71669" />
+<head>
+  <meta charset="utf-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
+  <style type="text/css">
+    body {
+      margin: 0;
+      border-top: none !important;
+    }
 
-    <!-- This is temporary and for testing until Nunito/900 is added to TP -->
-    <link href="https://fonts.googleapis.com/css2?family=Nunito:wght@900&display=swap" rel="stylesheet" />
-    <style type="text/css">
-      @font-face {
-        font-family: 'Nunito';
-        font-weight: 900;
-        font-display: swap;
-        src: url('https://app.unpkg.com/@fontsource/nunito@5.0.18/files/files/nunito-latin-900-normal.woff2')
-          format('woff2');
-      }
-    </style>
-  </head>
+    .cdc-map-outer-container {
+      min-height: 100vh;
+    }
+  </style>
+  <link rel="stylesheet prefetch" href="https://www.cdc.gov/TemplatePackage/5.0/css/app.min.css?_=71669" />
 
-  <body>
-    <!-- DEFAULT EXAMPLES -->
-    <div class="react-container" data-config="/examples/custom-map-layers.json"></div>
+  <!-- This is temporary and for testing until Nunito/900 is added to TP -->
+  <link href="https://fonts.googleapis.com/css2?family=Nunito:wght@900&display=swap" rel="stylesheet" />
+  <style type="text/css">
+    @font-face {
+      font-family: 'Nunito';
+      font-weight: 900;
+      font-display: swap;
+      src: url('https://app.unpkg.com/@fontsource/nunito@5.0.18/files/files/nunito-latin-900-normal.woff2') format('woff2');
+    }
+  </style>
+</head>
 
-    <noscript>You need to enable JavaScript to run this app.</noscript>
-    <script type="module" src="./src/index.jsx"></script>
-  </body>
-</html>
+<body>
+  <!-- DEFAULT EXAMPLES -->
+  <div class="react-container" data-config="/examples/default-hex.json"></div>
+
+  <noscript>You need to enable JavaScript to run this app.</noscript>
+  <script type="module" src="./src/index.jsx"></script>
+</body>
+
+</html>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cdc/map",
-  "version": "4.25.5-1",
+  "version": "4.25.6-1",
   "description": "React component for visualizing tabular data on a map of the United States or the world.",
   "moduleName": "CdcMap",
   "main": "dist/cdcmap",
@@ -25,31 +25,25 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@cdc/core": "^4.25.5-1",
-    "@emotion/core": "^10.0.28",
-    "@emotion/react": "^11.1.5",
+    "@cdc/core": "^4.25.6-1",
     "@googlemaps/markerclusterer": "^2.5.3",
     "@hello-pangea/dnd": "^16.2.0",
-    "@react-google-maps/api": "^2.20.3",
-    "@visx/geo": "^1.13.0",
+    "@react-google-maps/api": "^2.20.6",
+    "@visx/geo": "^3.12.0",
     "chroma": "0.0.1",
-    "d3": "^7.8.2",
+    "d3": "^7.9.0",
     "d3-composite-projections": "^1.4.0",
     "d3-selection": "^3.0.0",
     "d3-zoom": "^3.0.0",
-    "html2canvas": "^1.0.0-rc.7",
     "leaflet": "^1.9.4",
     "lodash.debounce": "^4.0.8",
     "react-accessible-accordion": "^3.0.1",
-    "react-leaflet": "^4.2.1",
-    "react-leaflet-markercluster": "^4.1.1",
-    "react-tag-autocomplete": "^6.0.0",
     "topojson-client": "^3.1.0",
-    "use-debounce": "^5.2.0"
+    "use-debounce": "^10.0.5"
   },
   "peerDependencies": {
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
-  "gitHead": "1d0a6e716bc113e6bea3636fcae90ebf2d19bb5c"
+  "gitHead": "ac45ee0f1d6a4045648c4e083992fc091795e084"
 }

package/src/CdcMap.tsx

@@ -7,7 +7,7 @@ import coveUpdateWorker from '@cdc/core/helpers/coveUpdateWorker'
 import { addUIDs, validateFipsCodeLength } from './helpers'
 import EditorContext from '@cdc/editor/src/ConfigContext'
 import { MapConfig } from './types/MapConfig'
-import _ from 'lodash'
+import _, { set } from 'lodash'
 
 type CdcMapProps = {
   config: MapConfig
@@ -30,7 +30,7 @@ const CdcMap: React.FC<CdcMapProps> = ({
   config: editorsConfig
 }) => {
   const editorContext = useContext(EditorContext)
-  const [config, _setConfig] = useState(null)
+  const [config, _setConfig] = useState(editorsConfig ?? null)
 
   const setConfig = newConfig => {
     _setConfig(newConfig)
@@ -113,6 +113,14 @@ const CdcMap: React.FC<CdcMapProps> = ({
     init()
   }, [])
 
+  useEffect(() => {
+    init()
+  }, [configUrl])
+
+  useEffect(() => {
+    setConfig(editorsConfig)
+  }, [editorsConfig])
+
   if (loading) return null
 
   return (