Skip to content

Commit 0d9fd67

Browse files
adamdoeadamdoe
authored
Merge pull request #2503 from CDCgov/dev
Dev
2 parents 40cb31a + 588e18a commit 0d9fd67

File tree

169 files changed

+23930
-1231
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

169 files changed

+23930
-1231
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ lerna-debug.log
4848

4949
.history/
5050

51+
/openVizWrapper
52+
5153
# BackstopJS - ignore generated test files and reports
5254
/backstop_data/bitmaps_test/
5355
/backstop_data/html_report/

‎package.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@
137137
},
138138
"resolutions": {
139139
"jackspeak": "2.1.1",
140-
"esbuild": "^0.25.0"
140+
"esbuild": "^0.25.0",
141+
"js-yaml": "^4.1.1"
141142
}
142-
}
143+
}

‎packages/chart/examples/tech-adoption-with-links.json‎

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
},
135135
"table": {
136136
"label": "Data Table",
137-
"expanded": true,
137+
"expanded": false,
138138
"limitHeight": false,
139139
"height": "500",
140140
"caption": "",
@@ -149,7 +149,8 @@
149149
"showSuppressedSymbol": true,
150150
"collapsible": true,
151151
"show": true,
152-
"showDownloadImgButton": false,
152+
"showDownloadImgButton": true,
153+
"includeContextInDownload": true,
153154
"groupBy": "",
154155
"cellMinWidth": "150"
155156
},
@@ -270,23 +271,13 @@
270271
},
271272
"filters": [
272273
{
273-
"values": [
274-
"Social Media",
275-
"Cloud Services",
276-
"Development Tools",
277-
"Communication"
278-
],
274+
"values": ["Social Media", "Cloud Services", "Development Tools", "Communication"],
279275
"filterStyle": "dropdown",
280276
"id": 1765208699247,
281277
"showDropdown": true,
282278
"active": "Social Media",
283279
"columnName": "Category",
284-
"orderedValues": [
285-
"Social Media",
286-
"Cloud Services",
287-
"Development Tools",
288-
"Communication"
289-
],
280+
"orderedValues": ["Social Media", "Cloud Services", "Development Tools", "Communication"],
290281
"label": "Select technology category",
291282
"order": "cust"
292283
}
@@ -501,31 +492,31 @@
501492
"Learn More": "<a href=\"https://docs.digitalocean.com/\">DigitalOcean Documentation &raquo;</a>"
502493
},
503494
{
504-
"Category": "Development Tools",
495+
"Category": "Really really long long Development Tools",
505496
"Technology": "<a href=\"https://docs.github.com/\">GitHub</a>",
506497
"Adoption Rate": "94.6",
507498
"Users (millions)": "100.0",
508499
"Growth Rate": "9.2",
509500
"Learn More": "<a href=\"https://docs.github.com/\">GitHub Documentation &raquo;</a>"
510501
},
511502
{
512-
"Category": "Development Tools",
503+
"Category": "Really really long long Development Tools",
513504
"Technology": "<a href=\"https://code.visualstudio.com/docs\">VS Code</a>",
514505
"Adoption Rate": "87.3",
515506
"Users (millions)": "14.0",
516507
"Growth Rate": "11.5",
517508
"Learn More": "<a href=\"https://code.visualstudio.com/docs\">VS Code Documentation &raquo;</a>"
518509
},
519510
{
520-
"Category": "Development Tools",
511+
"Category": "Really really long long Development Tools",
521512
"Technology": "<a href=\"https://docs.docker.com/\">Docker</a>",
522513
"Adoption Rate": "79.8",
523514
"Users (millions)": "13.0",
524515
"Growth Rate": "14.3",
525516
"Learn More": "<a href=\"https://docs.docker.com/\">Docker Documentation &raquo;</a>"
526517
},
527518
{
528-
"Category": "Development Tools",
519+
"Category": "Really really long long Development Tools",
529520
"Technology": "<a href=\"https://docs.npmjs.com/\">npm</a>",
530521
"Adoption Rate": "85.2",
531522
"Users (millions)": "17.0",
@@ -566,4 +557,4 @@
566557
}
567558
],
568559
"datasets": {}
569-
}
560+
}

‎packages/chart/index.html‎

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,23 @@
11
<!DOCTYPE html>
22
<html lang="en">
3-
4-
<head>
5-
<meta charset="utf-8" />
6-
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
7-
<style>
8-
body {
9-
margin: 0;
10-
border-top: none !important;
11-
}
3+
<head>
4+
<meta charset="utf-8" />
5+
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
6+
<style>
7+
body {
8+
margin: 0;
9+
border-top: none !important;
10+
/* Force scrollbar so page stays consistent width */
11+
min-height: calc(100vh + 1px);
12+
}
1213

1314
.cdc-map-outer-container {
1415
min-height: 100vh;
1516
}
1617

17-
/* Add 1rem padding to mimic DFE when editor is not visible */
18-
.cdc-open-viz-module:not(.isEditor) {
19-
padding: 1rem;
20-
}
21-
</style>
22-
<link rel="stylesheet prefetch" href="https://www.cdc.gov/TemplatePackage/5.0/css/app.min.css?_=71669" />
23-
</head>
18+
<body>
19+
<!-- GENERIC CHART TYPES -->
20+
<div class="react-container" data-config="/examples/private/height.json"></div>
2421

2522
<body>
2623
<!-- GENERIC CHART TYPES -->

‎packages/chart/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@cdc/chart",
3-
"version": "4.25.10",
3+
"version": "4.25.11",
44
"description": "React component for visualizing tabular data in various types of charts",
55
"moduleName": "CdcChart",
66
"main": "dist/cdcchart",
@@ -26,7 +26,7 @@
2626
},
2727
"license": "Apache-2.0",
2828
"dependencies": {
29-
"@cdc/core": "^4.25.10",
29+
"@cdc/core": "^4.25.11",
3030
"@hello-pangea/dnd": "^16.2.0",
3131
"@react-spring/web": "^9.7.5",
3232
"@rollup/plugin-dsv": "^3.0.2",

0 commit comments

Comments
 (0)