From dfb4aead95c33457ddc68c6d7d70609903a20752 Mon Sep 17 00:00:00 2001 From: Eliad Moosavi Date: Fri, 13 Aug 2021 15:19:58 -0400 Subject: [PATCH 1/2] docs(dataviz): add histogram --- package.json | 2 +- .../data-visualization/chart-types/index.mdx | 2 +- yarn.lock | 18 +++++++++--------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index aa823204a70..8167f81f0c6 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "gatsby-remark-images": "^3.3.33" }, "dependencies": { - "@carbon/charts-react": "0.41.101", + "@carbon/charts-react": "0.42.1", "@carbon/elements": "^10.40.0", "@carbon/icons": "^10.37.0", "@carbon/icons-react": "^10.37.0", diff --git a/src/pages/data-visualization/chart-types/index.mdx b/src/pages/data-visualization/chart-types/index.mdx index 0696d5f0f97..44ddeb1a818 100644 --- a/src/pages/data-visualization/chart-types/index.mdx +++ b/src/pages/data-visualization/chart-types/index.mdx @@ -130,7 +130,7 @@ appropriate chart type. ![GATSBY_EMPTY_ALT](images/histogram.svg) diff --git a/yarn.lock b/yarn.lock index e5704e394a8..4532be492e6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1144,19 +1144,19 @@ lodash "^4.17.19" to-fast-properties "^2.0.0" -"@carbon/charts-react@0.41.101": - version "0.41.101" - resolved "https://registry.yarnpkg.com/@carbon/charts-react/-/charts-react-0.41.101.tgz#7ac2ac5666dd22cd7458cab05323eb04f0f2e8b3" - integrity sha512-+mho+cliPvnA9izBgftNitUScFdsq2FRy67a4oHSHgVFVLxIjGiI0W5DoBH5hlK1dhBIjpjd/JIxVRzJZgozBQ== +"@carbon/charts-react@0.42.1": + version "0.42.1" + resolved "https://registry.yarnpkg.com/@carbon/charts-react/-/charts-react-0.42.1.tgz#17b12e1fbefbdaddd805f0e740f8e4850acadcaf" + integrity sha512-1GLksHYOqMfD6xPfjbanpcsm4RTd0xzyhDc4yOVVXVPRjcdOhf493VL0kwXXD8iZ8/IkLduuCNEqZkW+LKWrqQ== dependencies: - "@carbon/charts" "^0.41.101" + "@carbon/charts" "^0.42.1" "@carbon/icons-react" "^10.32.0" "@carbon/telemetry" "0.0.0-alpha.6" -"@carbon/charts@^0.41.101": - version "0.41.101" - resolved "https://registry.yarnpkg.com/@carbon/charts/-/charts-0.41.101.tgz#eece1fdb8879dd74bbd45dd67e9bd9a65578798e" - integrity sha512-T2srw+wmMSxxY+b9EdaXjpzR1nqratnh4N3qLqwW6/yhTLAqnlfIcyNssQulEc6rp7AlqOHCTd32V1HV+Dougg== +"@carbon/charts@^0.42.1": + version "0.42.1" + resolved "https://registry.yarnpkg.com/@carbon/charts/-/charts-0.42.1.tgz#eddfb3482dde883be0d7a5a5652d6b987564bfca" + integrity sha512-SJYsUuj8TlOrcHYg1sH0AzDrbjrVs1Jim2zu4DRLIs6yTXAqj4ihOC0kU57vF6o/ms7z+UamejvmhXLjrxaFGw== dependencies: "@carbon/colors" "10.29.0" "@carbon/telemetry" "0.0.0-alpha.6" From 302ef6fcdc1979dec2ccb0a240d8337d899525b0 Mon Sep 17 00:00:00 2001 From: theiliad Date: Wed, 15 Sep 2021 14:45:34 -0400 Subject: [PATCH 2/2] demos(dataviz): add alluvial chart --- package.json | 2 +- .../data-visualization/chart-types/index.mdx | 1 - .../complex-charts/index.mdx | 30 ++--------- yarn.lock | 51 +++++++++++++++---- 4 files changed, 46 insertions(+), 38 deletions(-) diff --git a/package.json b/package.json index d125b631926..bc7bd73dd51 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "@carbon/icons-react": "^10.38.0" }, "dependencies": { - "@carbon/charts-react": "0.48.0", + "@carbon/charts-react": "0.49.0", "@carbon/elements": "^10.42.0", "@carbon/icons": "^10.38.0", "@carbon/icons-react": "^10.38.0", diff --git a/src/pages/data-visualization/chart-types/index.mdx b/src/pages/data-visualization/chart-types/index.mdx index 48c43c97517..9ce07e569dc 100644 --- a/src/pages/data-visualization/chart-types/index.mdx +++ b/src/pages/data-visualization/chart-types/index.mdx @@ -295,7 +295,6 @@ appropriate chart type. ![GATSBY_EMPTY_ALT](images/alluvial.svg) diff --git a/src/pages/data-visualization/complex-charts/index.mdx b/src/pages/data-visualization/complex-charts/index.mdx index bca4818c49a..09e97e303d1 100755 --- a/src/pages/data-visualization/complex-charts/index.mdx +++ b/src/pages/data-visualization/complex-charts/index.mdx @@ -53,33 +53,9 @@ chart does not show correlations between indicators that are not directly connected. This is usually emphasized using a different set of colors for each block. - - - -![Alluvial diagram](images/01_adv_alluvial_928.png) - -Example of alluvial diagram made with two blocks - - - - - - - -![Alluvial node hover detail](images/02_adv_alluvial_detail_288.png) - -Detail of an alluvial diagram on node hover - - - - - -![Alluvial link hover detail](images/03_adv_alluvial_288.png) - -Detail of an alluvial diagram on link hover - - - +
+ +
## Heat maps diff --git a/yarn.lock b/yarn.lock index 3e17230eae2..7648747c1b2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1081,25 +1081,26 @@ "@babel/helper-validator-identifier" "^7.14.9" to-fast-properties "^2.0.0" -"@carbon/charts-react@0.48.0": - version "0.48.0" - resolved "https://registry.yarnpkg.com/@carbon/charts-react/-/charts-react-0.48.0.tgz#034d5ba8e8e18c6a14c9f2ceb0de0e7a2f77348c" - integrity sha512-3schxAeQCU7HXa/GkGohlPbjUWzJOTttXGpebziETKvTxQgUUdXsvPzduq+taNmpiHx2T4xLMVhDSSGzKCBqOQ== +"@carbon/charts-react@0.49.0": + version "0.49.0" + resolved "https://registry.yarnpkg.com/@carbon/charts-react/-/charts-react-0.49.0.tgz#3b66184267f160faeb6c51071447feb271462d1e" + integrity sha512-t1kCYOuTX2CbrSRQW+9tL+zG0SkJFCMOzG3JG3ZlVNccsouNkfUtkKZll6btEM6gusxpaFHtJSdtYUnC5koICA== dependencies: - "@carbon/charts" "^0.48.0" + "@carbon/charts" "^0.49.0" "@carbon/icons-react" "^10.32.0" "@carbon/telemetry" "0.0.0-alpha.6" -"@carbon/charts@^0.48.0": - version "0.48.0" - resolved "https://registry.yarnpkg.com/@carbon/charts/-/charts-0.48.0.tgz#0ff963d0e410656f4300256e259e3adc731f5399" - integrity sha512-TbWxDx0phwAngnja08rpg2+lWzZkoayHPfXYjpl1uCCM+zaRKxsqdXLWnLF/1IsaCniT18CHA7XkLf/50ChKzg== +"@carbon/charts@^0.49.0": + version "0.49.0" + resolved "https://registry.yarnpkg.com/@carbon/charts/-/charts-0.49.0.tgz#bf226d5ec3eb69cacbd950a2c99cc23f6c4f8e8a" + integrity sha512-lmoM509u4BSjv5y7gEjQ8WlBKpSGM0+XYR46Ft3lWtTho6PE58ccxv+94taUnjybqyorWd4geAGDyJ5GfWhenA== dependencies: "@carbon/colors" "10.29.0" "@carbon/telemetry" "0.0.0-alpha.6" "@carbon/utils-position" "1.1.1" carbon-components "10.40.0" d3-cloud "1.2.5" + d3-sankey "0.12.3" date-fns "2.8.1" dom-to-image "2.6.0" lodash-es "4.17.21" @@ -5511,6 +5512,13 @@ cyclist@^1.0.1: resolved "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9" integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk= +"d3-array@1 - 2": + version "2.12.1" + resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-2.12.1.tgz#e20b41aafcdffdf5d50928004ececf815a465e81" + integrity sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ== + dependencies: + internmap "^1.0.0" + "d3-array@2 - 3", "d3-array@2.10.0 - 3", "d3-array@2.5.0 - 3", d3-array@3: version "3.0.2" resolved "https://registry.npmjs.org/d3-array/-/d3-array-3.0.2.tgz#7a65593784cfc0150eee1aba8d3e69a6fe73be7b" @@ -5639,6 +5647,11 @@ d3-hierarchy@3: dependencies: d3-color "1 - 3" +d3-path@1: + version "1.0.9" + resolved "https://registry.yarnpkg.com/d3-path/-/d3-path-1.0.9.tgz#48c050bb1fe8c262493a8caf5524e3e9591701cf" + integrity sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg== + "d3-path@1 - 3", d3-path@3: version "3.0.1" resolved "https://registry.npmjs.org/d3-path/-/d3-path-3.0.1.tgz#f09dec0aaffd770b7995f1a399152bf93052321e" @@ -5659,6 +5672,14 @@ d3-random@3: resolved "https://registry.npmjs.org/d3-random/-/d3-random-3.0.1.tgz#d4926378d333d9c0bfd1e6fa0194d30aebaa20f4" integrity sha512-FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ== +d3-sankey@0.12.3: + version "0.12.3" + resolved "https://registry.yarnpkg.com/d3-sankey/-/d3-sankey-0.12.3.tgz#b3c268627bd72e5d80336e8de6acbfec9d15d01d" + integrity sha512-nQhsBRmM19Ax5xEIPLMY9ZmJ/cDvd1BG3UVvt5h3WRxKg5zGRbvnteTyWAbzeSvlh3tW7ZEmq4VwR5mB3tutmQ== + dependencies: + d3-array "1 - 2" + d3-shape "^1.2.0" + d3-scale-chromatic@3: version "3.0.0" resolved "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-3.0.0.tgz#15b4ceb8ca2bb0dcb6d1a641ee03d59c3b62376a" @@ -5690,6 +5711,13 @@ d3-shape@3: dependencies: d3-path "1 - 3" +d3-shape@^1.2.0: + version "1.3.7" + resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.3.7.tgz#df63801be07bc986bc54f63789b4fe502992b5d7" + integrity sha512-EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw== + dependencies: + d3-path "1" + "d3-time-format@2 - 4", d3-time-format@4: version "4.0.0" resolved "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.0.0.tgz#930ded86a9de761702344760d8a25753467f28b7" @@ -10045,6 +10073,11 @@ internal-slot@^1.0.3: resolved "https://registry.npmjs.org/internmap/-/internmap-2.0.1.tgz#33d0fa016185397549fb1a14ea3dbe5a2949d1cd" integrity sha512-Ujwccrj9FkGqjbY3iVoxD1VV+KdZZeENx0rphrtzmRXbFvkFO88L80BL/zeSIguX/7T+y8k04xqtgWgS5vxwxw== +internmap@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/internmap/-/internmap-1.0.1.tgz#0017cc8a3b99605f0302f2b198d272e015e5df95" + integrity sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw== + into-stream@^3.1.0: version "3.1.0" resolved "https://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz#96fb0a936c12babd6ff1752a17d05616abd094c6"