From 3447fa1249dcca54fcb27b601a80e23cd9f01c98 Mon Sep 17 00:00:00 2001 From: Jen Downs Date: Fri, 13 Dec 2019 11:01:10 -0600 Subject: [PATCH 01/19] docs(readme): update release notes link to point to changelog --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 247968ad31..84861e69d1 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ Get updates on Charts' development and chat with the core team and community. -- We use the **semantic-release** library to automatically version our releases within the guidelines of Semantic Versioning [Semantic Versioning guidelines](http://semver.org/). -See our [releases notes](https://github.com/carbon-design-system/carbon-charts/releases) for the changelog of each version of Charts. +See our [releases notes](https://github.com/carbon-design-system/carbon-charts/blob/master/CHANGELOG.md) for the changelog of each version of Charts. ## Core Team From 271b70d9f5ce2a534248259b5c7b840d72dacd73 Mon Sep 17 00:00:00 2001 From: Eliad Moosavi Date: Fri, 13 Dec 2019 12:11:10 -0500 Subject: [PATCH 02/19] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 247968ad31..8afe2a4caf 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,9 @@ - [React](./packages/react) - [Vue](./packages/vue) +## CHANGELOG +Read the release change logs [here](./CHANGELOG.md) + ## Component status :white_check_mark: Stable :hourglass_flowing_sand: In progress From c79e2237f873990a5b4cfed9d2a3a557c9fefdef Mon Sep 17 00:00:00 2001 From: Eliad Moosavi Date: Fri, 13 Dec 2019 12:48:31 -0500 Subject: [PATCH 03/19] Add codesandbox link for the vue package --- packages/vue/README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/vue/README.md b/packages/vue/README.md index 6cb01eb2e8..81e63aa26d 100644 --- a/packages/vue/README.md +++ b/packages/vue/README.md @@ -24,6 +24,9 @@ yarn add @carbon/charts @carbon/charts-vue d3 ## Step-by-step Instructions [Read on carbondesignsystem.com](https://www.carbondesignsystem.com/data-visualization/getting-started/vue) +## Sample Project +[![Edit Carbon Charts - React](https://codesandbox.io/static/img/play-codesandbox.svg)](https://codesandbox.io/s/carbon-charts-vue-gg15t) + ## Charting Data & Options Although we will definitely introduce new models in the future as we start shipping new components such as maps, Data and options follow the same model in all charts, with minor exceptions and differences in specific components, . From c53e2f8df6a15ebd15ff0602e4ee695c15669093 Mon Sep 17 00:00:00 2001 From: Jen Downs Date: Fri, 13 Dec 2019 15:17:45 -0600 Subject: [PATCH 04/19] docs(readme): apply PR feedback Co-Authored-By: Eliad Moosavi --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 84861e69d1..293a5993bd 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ Get updates on Charts' development and chat with the core team and community. -- We use the **semantic-release** library to automatically version our releases within the guidelines of Semantic Versioning [Semantic Versioning guidelines](http://semver.org/). -See our [releases notes](https://github.com/carbon-design-system/carbon-charts/blob/master/CHANGELOG.md) for the changelog of each version of Charts. +See our [release change logs](https://github.com/carbon-design-system/carbon-charts/blob/master/CHANGELOG.md) for the changelog of each version of Charts. ## Core Team From 764bf81684bc63a53bb119f8b03c396ab7438d88 Mon Sep 17 00:00:00 2001 From: carbon-bot Date: Mon, 16 Dec 2019 17:25:51 +0000 Subject: [PATCH 05/19] v0.22.2 --- CHANGELOG.md | 8 ++++++++ lerna.json | 2 +- packages/angular/CHANGELOG.md | 8 ++++++++ packages/angular/package.json | 4 ++-- packages/core/CHANGELOG.md | 8 ++++++++ packages/core/package.json | 2 +- packages/react/CHANGELOG.md | 8 ++++++++ packages/react/package.json | 4 ++-- packages/vue/CHANGELOG.md | 8 ++++++++ packages/vue/package.json | 4 ++-- 10 files changed, 48 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9879d49b24..96ec6a2009 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.22.2](https://github.com/IBM/carbon-charts/compare/v0.22.1...v0.22.2) (2019-12-16) + +**Note:** Version bump only for package @carbon/charts-monorepo + + + + + ## [0.22.1](https://github.com/IBM/carbon-charts/compare/v0.22.0...v0.22.1) (2019-12-12) diff --git a/lerna.json b/lerna.json index 0b6aac94d7..998cb5a53b 100644 --- a/lerna.json +++ b/lerna.json @@ -12,5 +12,5 @@ ] } }, - "version": "0.22.1" + "version": "0.22.2" } diff --git a/packages/angular/CHANGELOG.md b/packages/angular/CHANGELOG.md index 8393010e05..db135bd36c 100644 --- a/packages/angular/CHANGELOG.md +++ b/packages/angular/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.22.2](https://github.com/IBM/carbon-charts/compare/v0.22.1...v0.22.2) (2019-12-16) + +**Note:** Version bump only for package @carbon/charts-angular + + + + + ## [0.22.1](https://github.com/IBM/carbon-charts/compare/v0.22.0...v0.22.1) (2019-12-12) diff --git a/packages/angular/package.json b/packages/angular/package.json index efb17e51c6..5039ce5686 100644 --- a/packages/angular/package.json +++ b/packages/angular/package.json @@ -1,6 +1,6 @@ { "name": "@carbon/charts-angular", - "version": "0.22.1", + "version": "0.22.2", "description": "Carbon charting components for Angular", "main": "index.js", "scripts": { @@ -39,7 +39,7 @@ "scss" ], "dependencies": { - "@carbon/charts": "^0.22.1" + "@carbon/charts": "^0.22.2" }, "peerDependencies": { "@angular/common": "^6.0.0 || ^7.0.0", diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md index 19e765ba61..49bb0e528e 100644 --- a/packages/core/CHANGELOG.md +++ b/packages/core/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.22.2](https://github.com/IBM/carbon-charts/compare/v0.22.1...v0.22.2) (2019-12-16) + +**Note:** Version bump only for package @carbon/charts + + + + + ## [0.22.1](https://github.com/IBM/carbon-charts/compare/v0.22.0...v0.22.1) (2019-12-12) **Note:** Version bump only for package @carbon/charts diff --git a/packages/core/package.json b/packages/core/package.json index d399b59181..23e9c4bdf0 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@carbon/charts", - "version": "0.22.1", + "version": "0.22.2", "description": "Carbon charting components", "main": "./bundle.js", "module": "./index.js", diff --git a/packages/react/CHANGELOG.md b/packages/react/CHANGELOG.md index d264324d64..d7c3bd2f2c 100644 --- a/packages/react/CHANGELOG.md +++ b/packages/react/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.22.2](https://github.com/IBM/carbon-charts/compare/v0.22.1...v0.22.2) (2019-12-16) + +**Note:** Version bump only for package @carbon/charts-react + + + + + ## [0.22.1](https://github.com/IBM/carbon-charts/compare/v0.22.0...v0.22.1) (2019-12-12) **Note:** Version bump only for package @carbon/charts-react diff --git a/packages/react/package.json b/packages/react/package.json index bc77415a02..8cd7bf01ff 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -1,6 +1,6 @@ { "name": "@carbon/charts-react", - "version": "0.22.1", + "version": "0.22.2", "description": "Carbon charting components for React", "main": "./bundle.js", "scripts": { @@ -44,7 +44,7 @@ }, "homepage": "https://github.com/IBM/carbon-charts#readme", "dependencies": { - "@carbon/charts": "^0.22.1" + "@carbon/charts": "^0.22.2" }, "peerDependencies": { "react": "^16.6.3", diff --git a/packages/vue/CHANGELOG.md b/packages/vue/CHANGELOG.md index c98aafb0f5..5c8c42b0a5 100644 --- a/packages/vue/CHANGELOG.md +++ b/packages/vue/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.22.2](https://github.com/IBM/carbon-charts/compare/v0.22.1...v0.22.2) (2019-12-16) + +**Note:** Version bump only for package @carbon/charts-vue + + + + + ## [0.22.1](https://github.com/IBM/carbon-charts/compare/v0.22.0...v0.22.1) (2019-12-12) **Note:** Version bump only for package @carbon/charts-vue diff --git a/packages/vue/package.json b/packages/vue/package.json index bbf05fe344..602ca05749 100644 --- a/packages/vue/package.json +++ b/packages/vue/package.json @@ -1,6 +1,6 @@ { "name": "@carbon/charts-vue", - "version": "0.22.1", + "version": "0.22.2", "description": "Carbon charting components for Vue", "main": "charts-vue.umd.min.js", "scripts": { @@ -14,7 +14,7 @@ "clean": "rm -rf dist demo/bundle" }, "dependencies": { - "@carbon/charts": "^0.22.1", + "@carbon/charts": "^0.22.2", "vue": "2.5.21" }, "devDependencies": { From d0eb8bd3b4d6665e84040ba303fcea66b36757da Mon Sep 17 00:00:00 2001 From: Natasha DeCoste Date: Mon, 16 Dec 2019 12:41:04 -0500 Subject: [PATCH 06/19] style(core): line chart node styles 433 --- packages/core/src/styles/graphs/_line.scss | 2 +- packages/core/src/styles/graphs/_scatter.scss | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/core/src/styles/graphs/_line.scss b/packages/core/src/styles/graphs/_line.scss index 9b0c93d4af..2d5a058f0e 100644 --- a/packages/core/src/styles/graphs/_line.scss +++ b/packages/core/src/styles/graphs/_line.scss @@ -1,5 +1,5 @@ .#{$prefix}--#{$charts-prefix}--line path.line { pointer-events: none; fill: none; - stroke-width: 1.75; + stroke-width: 1.5; } diff --git a/packages/core/src/styles/graphs/_scatter.scss b/packages/core/src/styles/graphs/_scatter.scss index d98609f567..77965b5092 100644 --- a/packages/core/src/styles/graphs/_scatter.scss +++ b/packages/core/src/styles/graphs/_scatter.scss @@ -9,6 +9,7 @@ g.#{$prefix}--#{$charts-prefix}--scatter { circle.dot.unfilled { fill: $ui-01; + stroke-width: 1.5; } g.lines path.line { From 2a978d8d8551eb1ac95d02e2d474795097c2a93d Mon Sep 17 00:00:00 2001 From: Natasha DeCoste Date: Mon, 16 Dec 2019 12:53:01 -0500 Subject: [PATCH 07/19] fix(core): update tooltip value formatter Tooltip interface was updated to reflect the naming change within tooltip (tooltip looks for a valueFormatter, instead of formatter). Name was updated to be more clear with the addition of supporting completely custom tooltips as well as allowing users to intercept and modify just the value (appending %, $, localizing, etc). --- packages/core/src/interfaces/components.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/src/interfaces/components.ts b/packages/core/src/interfaces/components.ts index c339e8e0ed..30bd9c8fce 100644 --- a/packages/core/src/interfaces/components.ts +++ b/packages/core/src/interfaces/components.ts @@ -52,7 +52,7 @@ export interface TooltipOptions { /** * a function to format the tooltip values */ - formatter?: Function; + valueFormatter?: Function; /** * custom function for returning tooltip HTML * passed an array or object with the data, and then the default tooltip markup From f37423f685b1b918df385b382aa0cd36f80e893c Mon Sep 17 00:00:00 2001 From: carbon-bot Date: Mon, 16 Dec 2019 19:37:05 +0000 Subject: [PATCH 08/19] v0.22.3 --- CHANGELOG.md | 11 +++++++++++ lerna.json | 2 +- packages/angular/CHANGELOG.md | 8 ++++++++ packages/angular/package.json | 4 ++-- packages/core/CHANGELOG.md | 11 +++++++++++ packages/core/package.json | 2 +- packages/react/CHANGELOG.md | 8 ++++++++ packages/react/package.json | 4 ++-- packages/vue/CHANGELOG.md | 8 ++++++++ packages/vue/package.json | 4 ++-- 10 files changed, 54 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 96ec6a2009..de1f4d1b37 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.22.3](https://github.com/IBM/carbon-charts/compare/v0.22.2...v0.22.3) (2019-12-16) + + +### Bug Fixes + +* **core:** update tooltip value formatter ([2a978d8](https://github.com/IBM/carbon-charts/commit/2a978d8)) + + + + + ## [0.22.2](https://github.com/IBM/carbon-charts/compare/v0.22.1...v0.22.2) (2019-12-16) **Note:** Version bump only for package @carbon/charts-monorepo diff --git a/lerna.json b/lerna.json index 998cb5a53b..32aa5d41fe 100644 --- a/lerna.json +++ b/lerna.json @@ -12,5 +12,5 @@ ] } }, - "version": "0.22.2" + "version": "0.22.3" } diff --git a/packages/angular/CHANGELOG.md b/packages/angular/CHANGELOG.md index db135bd36c..a1399d388c 100644 --- a/packages/angular/CHANGELOG.md +++ b/packages/angular/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.22.3](https://github.com/IBM/carbon-charts/compare/v0.22.2...v0.22.3) (2019-12-16) + +**Note:** Version bump only for package @carbon/charts-angular + + + + + ## [0.22.2](https://github.com/IBM/carbon-charts/compare/v0.22.1...v0.22.2) (2019-12-16) **Note:** Version bump only for package @carbon/charts-angular diff --git a/packages/angular/package.json b/packages/angular/package.json index 5039ce5686..5cb5e75601 100644 --- a/packages/angular/package.json +++ b/packages/angular/package.json @@ -1,6 +1,6 @@ { "name": "@carbon/charts-angular", - "version": "0.22.2", + "version": "0.22.3", "description": "Carbon charting components for Angular", "main": "index.js", "scripts": { @@ -39,7 +39,7 @@ "scss" ], "dependencies": { - "@carbon/charts": "^0.22.2" + "@carbon/charts": "^0.22.3" }, "peerDependencies": { "@angular/common": "^6.0.0 || ^7.0.0", diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md index 49bb0e528e..5080963a64 100644 --- a/packages/core/CHANGELOG.md +++ b/packages/core/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.22.3](https://github.com/IBM/carbon-charts/compare/v0.22.2...v0.22.3) (2019-12-16) + + +### Bug Fixes + +* **core:** update tooltip value formatter ([2a978d8](https://github.com/IBM/carbon-charts/commit/2a978d8)) + + + + + ## [0.22.2](https://github.com/IBM/carbon-charts/compare/v0.22.1...v0.22.2) (2019-12-16) **Note:** Version bump only for package @carbon/charts diff --git a/packages/core/package.json b/packages/core/package.json index 23e9c4bdf0..6a21e1aa96 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@carbon/charts", - "version": "0.22.2", + "version": "0.22.3", "description": "Carbon charting components", "main": "./bundle.js", "module": "./index.js", diff --git a/packages/react/CHANGELOG.md b/packages/react/CHANGELOG.md index d7c3bd2f2c..624e3923ef 100644 --- a/packages/react/CHANGELOG.md +++ b/packages/react/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.22.3](https://github.com/IBM/carbon-charts/compare/v0.22.2...v0.22.3) (2019-12-16) + +**Note:** Version bump only for package @carbon/charts-react + + + + + ## [0.22.2](https://github.com/IBM/carbon-charts/compare/v0.22.1...v0.22.2) (2019-12-16) **Note:** Version bump only for package @carbon/charts-react diff --git a/packages/react/package.json b/packages/react/package.json index 8cd7bf01ff..dd10ffde5c 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -1,6 +1,6 @@ { "name": "@carbon/charts-react", - "version": "0.22.2", + "version": "0.22.3", "description": "Carbon charting components for React", "main": "./bundle.js", "scripts": { @@ -44,7 +44,7 @@ }, "homepage": "https://github.com/IBM/carbon-charts#readme", "dependencies": { - "@carbon/charts": "^0.22.2" + "@carbon/charts": "^0.22.3" }, "peerDependencies": { "react": "^16.6.3", diff --git a/packages/vue/CHANGELOG.md b/packages/vue/CHANGELOG.md index 5c8c42b0a5..aa54f95dad 100644 --- a/packages/vue/CHANGELOG.md +++ b/packages/vue/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.22.3](https://github.com/IBM/carbon-charts/compare/v0.22.2...v0.22.3) (2019-12-16) + +**Note:** Version bump only for package @carbon/charts-vue + + + + + ## [0.22.2](https://github.com/IBM/carbon-charts/compare/v0.22.1...v0.22.2) (2019-12-16) **Note:** Version bump only for package @carbon/charts-vue diff --git a/packages/vue/package.json b/packages/vue/package.json index 602ca05749..5c6ee269f9 100644 --- a/packages/vue/package.json +++ b/packages/vue/package.json @@ -1,6 +1,6 @@ { "name": "@carbon/charts-vue", - "version": "0.22.2", + "version": "0.22.3", "description": "Carbon charting components for Vue", "main": "charts-vue.umd.min.js", "scripts": { @@ -14,7 +14,7 @@ "clean": "rm -rf dist demo/bundle" }, "dependencies": { - "@carbon/charts": "^0.22.2", + "@carbon/charts": "^0.22.3", "vue": "2.5.21" }, "devDependencies": { From 38358d7fd4e218ec265c1e97639759ef2fbca933 Mon Sep 17 00:00:00 2001 From: Natasha DeCoste Date: Mon, 16 Dec 2019 14:38:18 -0500 Subject: [PATCH 09/19] style(core): restyle chart backdrop colors (theming) 432 --- packages/core/src/styles/components/_grid.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/core/src/styles/components/_grid.scss b/packages/core/src/styles/components/_grid.scss index 8a67b1f0ee..7ea6c48b55 100644 --- a/packages/core/src/styles/components/_grid.scss +++ b/packages/core/src/styles/components/_grid.scss @@ -1,11 +1,11 @@ .#{$prefix}--#{$charts-prefix}--grid { rect.chart-grid-backdrop { - @if $carbon--theme == $carbon--theme--g90 { + @if $carbon--theme == $carbon--theme--g10 { + fill: $ui-01; + } @else if $carbon--theme == $carbon--theme--g90 { fill: $carbon--gray-100; - } @else if $carbon--theme == $carbon--theme--g100 { - fill: $carbon--black-100; } @else { - fill: $ui-01; + fill: $ui-background; } } From 948b204ff07e8e7145b5eb3667c83815988f8496 Mon Sep 17 00:00:00 2001 From: carbon-bot Date: Mon, 16 Dec 2019 19:55:51 +0000 Subject: [PATCH 10/19] v0.22.4 --- CHANGELOG.md | 8 ++++++++ lerna.json | 2 +- packages/angular/CHANGELOG.md | 8 ++++++++ packages/angular/package.json | 4 ++-- packages/core/CHANGELOG.md | 8 ++++++++ packages/core/package.json | 2 +- packages/react/CHANGELOG.md | 8 ++++++++ packages/react/package.json | 4 ++-- packages/vue/CHANGELOG.md | 8 ++++++++ packages/vue/package.json | 4 ++-- 10 files changed, 48 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index de1f4d1b37..6f2ba2b93d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.22.4](https://github.com/IBM/carbon-charts/compare/v0.22.3...v0.22.4) (2019-12-16) + +**Note:** Version bump only for package @carbon/charts-monorepo + + + + + ## [0.22.3](https://github.com/IBM/carbon-charts/compare/v0.22.2...v0.22.3) (2019-12-16) diff --git a/lerna.json b/lerna.json index 32aa5d41fe..8326a71371 100644 --- a/lerna.json +++ b/lerna.json @@ -12,5 +12,5 @@ ] } }, - "version": "0.22.3" + "version": "0.22.4" } diff --git a/packages/angular/CHANGELOG.md b/packages/angular/CHANGELOG.md index a1399d388c..09e30602b1 100644 --- a/packages/angular/CHANGELOG.md +++ b/packages/angular/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.22.4](https://github.com/IBM/carbon-charts/compare/v0.22.3...v0.22.4) (2019-12-16) + +**Note:** Version bump only for package @carbon/charts-angular + + + + + ## [0.22.3](https://github.com/IBM/carbon-charts/compare/v0.22.2...v0.22.3) (2019-12-16) **Note:** Version bump only for package @carbon/charts-angular diff --git a/packages/angular/package.json b/packages/angular/package.json index 5cb5e75601..96b96874ce 100644 --- a/packages/angular/package.json +++ b/packages/angular/package.json @@ -1,6 +1,6 @@ { "name": "@carbon/charts-angular", - "version": "0.22.3", + "version": "0.22.4", "description": "Carbon charting components for Angular", "main": "index.js", "scripts": { @@ -39,7 +39,7 @@ "scss" ], "dependencies": { - "@carbon/charts": "^0.22.3" + "@carbon/charts": "^0.22.4" }, "peerDependencies": { "@angular/common": "^6.0.0 || ^7.0.0", diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md index 5080963a64..37315f86ad 100644 --- a/packages/core/CHANGELOG.md +++ b/packages/core/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.22.4](https://github.com/IBM/carbon-charts/compare/v0.22.3...v0.22.4) (2019-12-16) + +**Note:** Version bump only for package @carbon/charts + + + + + ## [0.22.3](https://github.com/IBM/carbon-charts/compare/v0.22.2...v0.22.3) (2019-12-16) diff --git a/packages/core/package.json b/packages/core/package.json index 6a21e1aa96..6e8f0119cc 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@carbon/charts", - "version": "0.22.3", + "version": "0.22.4", "description": "Carbon charting components", "main": "./bundle.js", "module": "./index.js", diff --git a/packages/react/CHANGELOG.md b/packages/react/CHANGELOG.md index 624e3923ef..9e4cb3e215 100644 --- a/packages/react/CHANGELOG.md +++ b/packages/react/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.22.4](https://github.com/IBM/carbon-charts/compare/v0.22.3...v0.22.4) (2019-12-16) + +**Note:** Version bump only for package @carbon/charts-react + + + + + ## [0.22.3](https://github.com/IBM/carbon-charts/compare/v0.22.2...v0.22.3) (2019-12-16) **Note:** Version bump only for package @carbon/charts-react diff --git a/packages/react/package.json b/packages/react/package.json index dd10ffde5c..6c07fbd429 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -1,6 +1,6 @@ { "name": "@carbon/charts-react", - "version": "0.22.3", + "version": "0.22.4", "description": "Carbon charting components for React", "main": "./bundle.js", "scripts": { @@ -44,7 +44,7 @@ }, "homepage": "https://github.com/IBM/carbon-charts#readme", "dependencies": { - "@carbon/charts": "^0.22.3" + "@carbon/charts": "^0.22.4" }, "peerDependencies": { "react": "^16.6.3", diff --git a/packages/vue/CHANGELOG.md b/packages/vue/CHANGELOG.md index aa54f95dad..f0c9a2e341 100644 --- a/packages/vue/CHANGELOG.md +++ b/packages/vue/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.22.4](https://github.com/IBM/carbon-charts/compare/v0.22.3...v0.22.4) (2019-12-16) + +**Note:** Version bump only for package @carbon/charts-vue + + + + + ## [0.22.3](https://github.com/IBM/carbon-charts/compare/v0.22.2...v0.22.3) (2019-12-16) **Note:** Version bump only for package @carbon/charts-vue diff --git a/packages/vue/package.json b/packages/vue/package.json index 5c6ee269f9..5e3830a688 100644 --- a/packages/vue/package.json +++ b/packages/vue/package.json @@ -1,6 +1,6 @@ { "name": "@carbon/charts-vue", - "version": "0.22.3", + "version": "0.22.4", "description": "Carbon charting components for Vue", "main": "charts-vue.umd.min.js", "scripts": { @@ -14,7 +14,7 @@ "clean": "rm -rf dist demo/bundle" }, "dependencies": { - "@carbon/charts": "^0.22.3", + "@carbon/charts": "^0.22.4", "vue": "2.5.21" }, "devDependencies": { From 4e5ab5c04f36eadbe9ba628aec634495f5386883 Mon Sep 17 00:00:00 2001 From: Eliad Moosavi Date: Mon, 16 Dec 2019 16:14:03 -0500 Subject: [PATCH 11/19] feat(core): add spacer components --- packages/core/src/axis-chart.ts | 28 ++++++++++++++++++- packages/core/src/chart.ts | 28 ++++++++++++++++++- .../core/src/components/essentials/legend.ts | 19 ++----------- .../core/src/components/essentials/title.ts | 8 ------ packages/core/src/components/index.ts | 5 +++- packages/core/src/components/layout/spacer.ts | 16 +++++++++++ packages/core/src/configuration.ts | 6 ++++ 7 files changed, 82 insertions(+), 28 deletions(-) create mode 100644 packages/core/src/components/layout/spacer.ts diff --git a/packages/core/src/axis-chart.ts b/packages/core/src/axis-chart.ts index c6c3c24a75..b23c017628 100644 --- a/packages/core/src/axis-chart.ts +++ b/packages/core/src/axis-chart.ts @@ -12,7 +12,8 @@ import { Legend, Title, Tooltip, - TooltipBar + TooltipBar, + Spacer } from "./components/index"; import { Tools } from "./tools"; @@ -79,6 +80,17 @@ export class AxisChart extends Chart { fullFrameComponentDirection = LayoutDirection.COLUMN_REVERSE; } + const legendSpacerComponent = { + id: "spacer", + components: [ + new Spacer(this.model, this.services) + ], + growth: { + x: LayoutGrowth.PREFERRED, + y: LayoutGrowth.FIXED + } + }; + const fullFrameComponent = { id: "full-frame", components: [ @@ -87,6 +99,7 @@ export class AxisChart extends Chart { this.services, [ legendComponent, + legendSpacerComponent, graphFrameComponent ], { @@ -104,6 +117,19 @@ export class AxisChart extends Chart { const topLevelLayoutComponents = []; if (this.model.getOptions().title) { topLevelLayoutComponents.push(titleComponent); + + const titleSpacerComponent = { + id: "spacer", + components: [ + new Spacer(this.model, this.services) + ], + growth: { + x: LayoutGrowth.PREFERRED, + y: LayoutGrowth.FIXED + } + }; + + topLevelLayoutComponents.push(titleSpacerComponent); } topLevelLayoutComponents.push(fullFrameComponent); diff --git a/packages/core/src/chart.ts b/packages/core/src/chart.ts index eae77ca60b..06f0eaf232 100644 --- a/packages/core/src/chart.ts +++ b/packages/core/src/chart.ts @@ -14,7 +14,8 @@ import { Component, Title, Legend, LayoutComponent, - Tooltip + Tooltip, + Spacer } from "./components"; import { Tools } from "./tools"; @@ -168,6 +169,17 @@ export class Chart { fullFrameComponentDirection = LayoutDirection.COLUMN_REVERSE; } + const legendSpacerComponent = { + id: "spacer", + components: [ + new Spacer(this.model, this.services) + ], + growth: { + x: LayoutGrowth.PREFERRED, + y: LayoutGrowth.FIXED + } + }; + const fullFrameComponent = { id: "full-frame", components: [ @@ -176,6 +188,7 @@ export class Chart { this.services, [ legendComponent, + legendSpacerComponent, graphFrameComponent ], { @@ -193,6 +206,19 @@ export class Chart { const topLevelLayoutComponents = []; if (this.model.getOptions().title) { topLevelLayoutComponents.push(titleComponent); + + const titleSpacerComponent = { + id: "spacer", + components: [ + new Spacer(this.model, this.services) + ], + growth: { + x: LayoutGrowth.PREFERRED, + y: LayoutGrowth.FIXED + } + }; + + topLevelLayoutComponents.push(titleSpacerComponent); } topLevelLayoutComponents.push(fullFrameComponent); diff --git a/packages/core/src/components/essentials/legend.ts b/packages/core/src/components/essentials/legend.ts index ba2e30b362..ecd329a80a 100644 --- a/packages/core/src/components/essentials/legend.ts +++ b/packages/core/src/components/essentials/legend.ts @@ -58,17 +58,6 @@ export class Legend extends Component { if (legendClickable && addedLegendItems.size() > 0) { this.addEventListeners(); } - - const legendPosition = Tools.getProperty(options, "legend", "position"); - if (legendPosition === LegendPositions.BOTTOM || legendPosition === LegendPositions.TOP) { - // TODO - Replace with layout component margins - DOMUtils.appendOrSelect(svg, "rect.spacer") - .attr("x", 0) - .attr("y", 10) - .attr("width", 20) - .attr("height", 20) - .attr("fill", "none"); - } } breakItemsIntoLines(addedLegendItems) { @@ -101,7 +90,7 @@ export class Legend extends Component { const previousLegendItem = select(svg.selectAll("g.legend-item").nodes()[i - 1]); if (itemIndexInLine === 0 || previousLegendItem.empty() || legendOrientation === LegendOrientations.VERTICAL) { - if (legendOrientation === LegendOrientations.VERTICAL) { + if (legendOrientation === LegendOrientations.VERTICAL && i !== 0) { lineNumber++; } } else { @@ -117,11 +106,7 @@ export class Legend extends Component { } } - const legendPosition = Tools.getProperty(options, "legend", "position"); - let yOffset = 0; - if (legendPosition === LegendPositions.BOTTOM) { - yOffset = 20; - } + const yOffset = 0; // Position checkbox // TODO - Replace with layout component margins diff --git a/packages/core/src/components/essentials/title.ts b/packages/core/src/components/essentials/title.ts index 34e1120db1..8674abcde2 100644 --- a/packages/core/src/components/essentials/title.ts +++ b/packages/core/src/components/essentials/title.ts @@ -57,14 +57,6 @@ export class Title extends Component { .attr("y", 20) .text(this.model.getOptions().title); - // TODO - Replace with layout component margins - DOMUtils.appendOrSelect(svg, "rect.spacer") - .attr("x", 0) - .attr("y", 20) - .attr("width", 20) - .attr("height", 20) - .attr("fill", "none"); - // title needs to first render so that we can check for overflow this.truncateTitle(); } diff --git a/packages/core/src/components/index.ts b/packages/core/src/components/index.ts index e060733ee9..78dc364ad0 100644 --- a/packages/core/src/components/index.ts +++ b/packages/core/src/components/index.ts @@ -16,9 +16,12 @@ export * from "./graphs/scatter"; export * from "./graphs/pie"; export * from "./graphs/donut"; +// Layout +export * from "./layout/spacer"; +export * from "./layout/layout"; + // MISC export * from "./axes/two-dimensional-axes"; export * from "./axes/axis"; export * from "./axes/grid"; export * from "./axes/horizontal-zero-line"; -export * from "./layout/layout"; diff --git a/packages/core/src/components/layout/spacer.ts b/packages/core/src/components/layout/spacer.ts new file mode 100644 index 0000000000..19e43c8416 --- /dev/null +++ b/packages/core/src/components/layout/spacer.ts @@ -0,0 +1,16 @@ +// Internal Imports +import { Component } from "../component"; +import * as Configuration from "../../configuration"; + +export class Spacer extends Component { + type = "spacer"; + + render() { + this.getContainerSVG().append("rect") + .attr("x", 0) + .attr("y", 0) + .attr("width", this.configs.size || Configuration.spacers.default.size) + .attr("height", this.configs.size || Configuration.spacers.default.size) + .attr("opacity", 0); + } +} \ No newline at end of file diff --git a/packages/core/src/configuration.ts b/packages/core/src/configuration.ts index 56129f60fb..0d0e686973 100644 --- a/packages/core/src/configuration.ts +++ b/packages/core/src/configuration.ts @@ -272,3 +272,9 @@ export const axis = { rotateIfSmallerThan: 30 } }; + +export const spacers = { + default: { + size: 24 + } +}; From 5c4c04409f359a885b95855a76b184ee5c55a847 Mon Sep 17 00:00:00 2001 From: Eliad Moosavi Date: Mon, 16 Dec 2019 16:14:32 -0500 Subject: [PATCH 12/19] fix lint error --- packages/core/src/components/layout/spacer.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/src/components/layout/spacer.ts b/packages/core/src/components/layout/spacer.ts index 19e43c8416..7d53e716e0 100644 --- a/packages/core/src/components/layout/spacer.ts +++ b/packages/core/src/components/layout/spacer.ts @@ -13,4 +13,4 @@ export class Spacer extends Component { .attr("height", this.configs.size || Configuration.spacers.default.size) .attr("opacity", 0); } -} \ No newline at end of file +} From fb52381de98938d2ee59fb6349a04dc0aa03433e Mon Sep 17 00:00:00 2001 From: Eliad Moosavi Date: Tue, 17 Dec 2019 11:45:32 -0500 Subject: [PATCH 13/19] add carbon charts team as CODEOWNERS --- CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CODEOWNERS b/CODEOWNERS index 6264da7db0..a291506964 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1 +1 @@ -* @theiliad @natashadecoste +* @theiliad @natashadecoste @carbon-design-system/carbon-charts From f71b80e9c320578f37691ad4a3d4030e9c371f6f Mon Sep 17 00:00:00 2001 From: carbon-bot Date: Tue, 17 Dec 2019 17:02:49 +0000 Subject: [PATCH 14/19] v0.23.0 --- CHANGELOG.md | 11 +++++++++++ lerna.json | 2 +- packages/angular/CHANGELOG.md | 8 ++++++++ packages/angular/package.json | 4 ++-- packages/core/CHANGELOG.md | 11 +++++++++++ packages/core/package.json | 2 +- packages/react/CHANGELOG.md | 8 ++++++++ packages/react/package.json | 4 ++-- packages/vue/CHANGELOG.md | 8 ++++++++ packages/vue/package.json | 4 ++-- 10 files changed, 54 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f2ba2b93d..40d1f1a74f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [0.23.0](https://github.com/IBM/carbon-charts/compare/v0.22.4...v0.23.0) (2019-12-17) + + +### Features + +* **core:** add spacer components ([4e5ab5c](https://github.com/IBM/carbon-charts/commit/4e5ab5c)) + + + + + ## [0.22.4](https://github.com/IBM/carbon-charts/compare/v0.22.3...v0.22.4) (2019-12-16) **Note:** Version bump only for package @carbon/charts-monorepo diff --git a/lerna.json b/lerna.json index 8326a71371..d3f0e1a49b 100644 --- a/lerna.json +++ b/lerna.json @@ -12,5 +12,5 @@ ] } }, - "version": "0.22.4" + "version": "0.23.0" } diff --git a/packages/angular/CHANGELOG.md b/packages/angular/CHANGELOG.md index 09e30602b1..5185e3eb3d 100644 --- a/packages/angular/CHANGELOG.md +++ b/packages/angular/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [0.23.0](https://github.com/IBM/carbon-charts/compare/v0.22.4...v0.23.0) (2019-12-17) + +**Note:** Version bump only for package @carbon/charts-angular + + + + + ## [0.22.4](https://github.com/IBM/carbon-charts/compare/v0.22.3...v0.22.4) (2019-12-16) **Note:** Version bump only for package @carbon/charts-angular diff --git a/packages/angular/package.json b/packages/angular/package.json index 96b96874ce..27ab415764 100644 --- a/packages/angular/package.json +++ b/packages/angular/package.json @@ -1,6 +1,6 @@ { "name": "@carbon/charts-angular", - "version": "0.22.4", + "version": "0.23.0", "description": "Carbon charting components for Angular", "main": "index.js", "scripts": { @@ -39,7 +39,7 @@ "scss" ], "dependencies": { - "@carbon/charts": "^0.22.4" + "@carbon/charts": "^0.23.0" }, "peerDependencies": { "@angular/common": "^6.0.0 || ^7.0.0", diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md index 37315f86ad..b47e147b2d 100644 --- a/packages/core/CHANGELOG.md +++ b/packages/core/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [0.23.0](https://github.com/IBM/carbon-charts/compare/v0.22.4...v0.23.0) (2019-12-17) + + +### Features + +* **core:** add spacer components ([4e5ab5c](https://github.com/IBM/carbon-charts/commit/4e5ab5c)) + + + + + ## [0.22.4](https://github.com/IBM/carbon-charts/compare/v0.22.3...v0.22.4) (2019-12-16) **Note:** Version bump only for package @carbon/charts diff --git a/packages/core/package.json b/packages/core/package.json index 6e8f0119cc..e40ff68cce 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@carbon/charts", - "version": "0.22.4", + "version": "0.23.0", "description": "Carbon charting components", "main": "./bundle.js", "module": "./index.js", diff --git a/packages/react/CHANGELOG.md b/packages/react/CHANGELOG.md index 9e4cb3e215..96579f8abd 100644 --- a/packages/react/CHANGELOG.md +++ b/packages/react/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [0.23.0](https://github.com/IBM/carbon-charts/compare/v0.22.4...v0.23.0) (2019-12-17) + +**Note:** Version bump only for package @carbon/charts-react + + + + + ## [0.22.4](https://github.com/IBM/carbon-charts/compare/v0.22.3...v0.22.4) (2019-12-16) **Note:** Version bump only for package @carbon/charts-react diff --git a/packages/react/package.json b/packages/react/package.json index 6c07fbd429..4d7dac7ce9 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -1,6 +1,6 @@ { "name": "@carbon/charts-react", - "version": "0.22.4", + "version": "0.23.0", "description": "Carbon charting components for React", "main": "./bundle.js", "scripts": { @@ -44,7 +44,7 @@ }, "homepage": "https://github.com/IBM/carbon-charts#readme", "dependencies": { - "@carbon/charts": "^0.22.4" + "@carbon/charts": "^0.23.0" }, "peerDependencies": { "react": "^16.6.3", diff --git a/packages/vue/CHANGELOG.md b/packages/vue/CHANGELOG.md index f0c9a2e341..1622939155 100644 --- a/packages/vue/CHANGELOG.md +++ b/packages/vue/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [0.23.0](https://github.com/IBM/carbon-charts/compare/v0.22.4...v0.23.0) (2019-12-17) + +**Note:** Version bump only for package @carbon/charts-vue + + + + + ## [0.22.4](https://github.com/IBM/carbon-charts/compare/v0.22.3...v0.22.4) (2019-12-16) **Note:** Version bump only for package @carbon/charts-vue diff --git a/packages/vue/package.json b/packages/vue/package.json index 5e3830a688..d45796f614 100644 --- a/packages/vue/package.json +++ b/packages/vue/package.json @@ -1,6 +1,6 @@ { "name": "@carbon/charts-vue", - "version": "0.22.4", + "version": "0.23.0", "description": "Carbon charting components for Vue", "main": "charts-vue.umd.min.js", "scripts": { @@ -14,7 +14,7 @@ "clean": "rm -rf dist demo/bundle" }, "dependencies": { - "@carbon/charts": "^0.22.4", + "@carbon/charts": "^0.23.0", "vue": "2.5.21" }, "devDependencies": { From 80e3228984eaf2cc8907edf3f59e2bb808a50f6f Mon Sep 17 00:00:00 2001 From: Eliad Moosavi Date: Tue, 17 Dec 2019 12:23:45 -0500 Subject: [PATCH 15/19] add basic WAI graphics roles to main chart elements --- packages/core/src/components/axes/axis.ts | 8 ++++++-- packages/core/src/components/essentials/legend.ts | 4 ++-- packages/core/src/interfaces/a11y.ts | 6 ++++++ packages/core/src/interfaces/index.ts | 1 + 4 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 packages/core/src/interfaces/a11y.ts diff --git a/packages/core/src/components/axes/axis.ts b/packages/core/src/components/axes/axis.ts index 23996238e8..cbd7f257e9 100644 --- a/packages/core/src/components/axes/axis.ts +++ b/packages/core/src/components/axes/axis.ts @@ -1,6 +1,6 @@ // Internal Imports import { Component } from "../component"; -import { AxisPositions, ScaleTypes, AxisTypes } from "../../interfaces"; +import { AxisPositions, ScaleTypes, AxisTypes, Roles } from "../../interfaces"; import { Tools } from "../../tools"; import { ChartModel } from "../../model"; import { DOMUtils } from "../../services"; @@ -228,12 +228,16 @@ export class Axis extends Component { const container = DOMUtils.appendOrSelect(svg, `g.axis.${axisPosition}`); const axisRefExists = !container.select(`g.ticks`).empty(); let axisRef = DOMUtils.appendOrSelect(container, `g.ticks`); + if (!axisRefExists) { + axisRef.attr("role", `${Roles.GRAPHICS_OBJECT} ${Roles.GROUP}`); + } // We draw the invisible axis because of the async nature of d3 transitions // To be able to tell the final width & height of the axis when initiaing the transition // The invisible axis is updated instantly and without a transition const invisibleAxisRef = DOMUtils.appendOrSelect(container, `g.ticks.invisible`) - .style("opacity", "0"); + .style("opacity", "0") + .attr("aria-hidden", true); // Position and transition the axis switch (axisPosition) { diff --git a/packages/core/src/components/essentials/legend.ts b/packages/core/src/components/essentials/legend.ts index ecd329a80a..a9729a8e33 100644 --- a/packages/core/src/components/essentials/legend.ts +++ b/packages/core/src/components/essentials/legend.ts @@ -2,7 +2,7 @@ import * as Configuration from "../../configuration"; import { Component } from "../component"; import { Tools } from "../../tools"; -import { LegendOrientations, LegendPositions } from "../../interfaces"; +import { LegendOrientations, Roles } from "../../interfaces"; import { DOMUtils } from "../../services"; // D3 Imports @@ -12,7 +12,7 @@ export class Legend extends Component { type = "legend"; render() { - const svg = this.getContainerSVG(); + const svg = this.getContainerSVG().attr("role", Roles.GRAPHICS_DOCUMENT); const options = this.model.getOptions(); const legendItems = svg.selectAll("g.legend-item") diff --git a/packages/core/src/interfaces/a11y.ts b/packages/core/src/interfaces/a11y.ts new file mode 100644 index 0000000000..cc0ecee876 --- /dev/null +++ b/packages/core/src/interfaces/a11y.ts @@ -0,0 +1,6 @@ +export enum Roles { + GRAPHICS_DOCUMENT = "graphics-document", + GRAPHICS_OBJECT = "graphics-object", + GRAPHICS_SYMBOL = "graphics-symbol", + GROUP = "group" +}; diff --git a/packages/core/src/interfaces/index.ts b/packages/core/src/interfaces/index.ts index 281db0405d..73f0ed7253 100644 --- a/packages/core/src/interfaces/index.ts +++ b/packages/core/src/interfaces/index.ts @@ -1,3 +1,4 @@ +export * from "./a11y"; export * from "./axis-scales"; export * from "./charts"; export * from "./components"; From 6a29b104850142aa9e793d7a0a350d3d0c5c2c69 Mon Sep 17 00:00:00 2001 From: Eliad Moosavi Date: Tue, 17 Dec 2019 12:24:30 -0500 Subject: [PATCH 16/19] fix lint error --- packages/core/src/interfaces/a11y.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/src/interfaces/a11y.ts b/packages/core/src/interfaces/a11y.ts index cc0ecee876..0061d9bf02 100644 --- a/packages/core/src/interfaces/a11y.ts +++ b/packages/core/src/interfaces/a11y.ts @@ -3,4 +3,4 @@ export enum Roles { GRAPHICS_OBJECT = "graphics-object", GRAPHICS_SYMBOL = "graphics-symbol", GROUP = "group" -}; +} From 1216ed6b9ba595dd53ca73c884d96dc200323252 Mon Sep 17 00:00:00 2001 From: Eliad Moosavi Date: Tue, 17 Dec 2019 12:54:38 -0500 Subject: [PATCH 17/19] feat(core, react, angular, vue): add WAI-ARIA tags to elements --- .../core/src/components/graphs/bar-grouped.ts | 12 +++++++--- .../core/src/components/graphs/bar-simple.ts | 11 ++++++--- .../core/src/components/graphs/bar-stacked.ts | 11 ++++++--- packages/core/src/components/graphs/line.ts | 6 +++++ packages/core/src/components/graphs/pie.ts | 23 ++++++++++++++----- .../core/src/components/graphs/scatter.ts | 11 ++++++--- 6 files changed, 56 insertions(+), 18 deletions(-) diff --git a/packages/core/src/components/graphs/bar-grouped.ts b/packages/core/src/components/graphs/bar-grouped.ts index 68e49f88e2..a149350646 100644 --- a/packages/core/src/components/graphs/bar-grouped.ts +++ b/packages/core/src/components/graphs/bar-grouped.ts @@ -1,11 +1,11 @@ // Internal Imports import { Bar } from "./bar"; +import { TooltipTypes, Roles } from "../../interfaces"; // D3 Imports import { select } from "d3-selection"; import { color } from "d3-color"; import { ScaleBand, scaleBand } from "d3-scale"; -import { TooltipTypes } from "../../interfaces"; export class GroupedBar extends Bar { type = "grouped-bar"; @@ -67,7 +67,9 @@ export class GroupedBar extends Bar { // Add the bar groups that need to be introduced const barGroupsEnter = barGroups.enter() .append("g") - .classed("bars", true); + .classed("bars", true) + .attr("role", Roles.GROUP) + .attr("aria-labelledby", d => d); // Update data on all bars const bars = barGroupsEnter.merge(barGroups) @@ -98,7 +100,11 @@ export class GroupedBar extends Bar { return Math.abs(this.services.axes.getYValue(d, i) - this.services.axes.getYValue(0)); }) .attr("fill", d => this.model.getFillScale()[d.datasetLabel](d.label)) - .attr("opacity", 1); + .attr("opacity", 1) + // a11y + .attr("role", Roles.GRAPHICS_SYMBOL) + .attr("aria-roledescription", "bar") + .attr("aria-label", d => d.value); // Add event listeners to elements drawn this.addEventListeners(); diff --git a/packages/core/src/components/graphs/bar-simple.ts b/packages/core/src/components/graphs/bar-simple.ts index 4bc7bcd04f..64f76f36c9 100644 --- a/packages/core/src/components/graphs/bar-simple.ts +++ b/packages/core/src/components/graphs/bar-simple.ts @@ -1,10 +1,10 @@ // Internal Imports import { Bar } from "./bar"; +import { TooltipTypes, Roles } from "../../interfaces"; // D3 Imports import { select } from "d3-selection"; import { color } from "d3-color"; -import { TooltipTypes } from "../../interfaces"; export class SimpleBar extends Bar { type = "simple-bar"; @@ -35,7 +35,8 @@ export class SimpleBar extends Bar { // Add the bar groups that need to be introduced const barGroupsEnter = barGroups.enter() .append("g") - .classed("bars", true); + .classed("bars", true) + .attr("role", Roles.GROUP); // Update data on all bars const bars = barGroupsEnter.merge(barGroups) @@ -66,7 +67,11 @@ export class SimpleBar extends Bar { .attr("height", (d, i) => { return Math.abs(this.services.axes.getYValue(d, i) - this.services.axes.getYValue(0)); }) - .attr("opacity", 1); + .attr("opacity", 1) + // a11y + .attr("role", Roles.GRAPHICS_SYMBOL) + .attr("aria-roledescription", "bar") + .attr("aria-label", d => d.value); // Add event listeners to elements drawn this.addEventListeners(); diff --git a/packages/core/src/components/graphs/bar-stacked.ts b/packages/core/src/components/graphs/bar-stacked.ts index a192893dc2..feab2c2094 100644 --- a/packages/core/src/components/graphs/bar-stacked.ts +++ b/packages/core/src/components/graphs/bar-stacked.ts @@ -1,7 +1,7 @@ // Internal Imports -import { ScaleTypes, TooltipTypes } from "../../interfaces/enums"; import { Tools } from "../../tools"; import { Bar } from "./bar"; +import { Roles, ScaleTypes, TooltipTypes } from "../../interfaces"; // D3 Imports import { select } from "d3-selection"; @@ -111,7 +111,8 @@ export class StackedBar extends Bar { // Add bar groups that need to be introduced barGroups.enter() .append("g") - .classed("bars", true); + .classed("bars", true) + .attr("role", Roles.GROUP); // Update data on all bars const bars = svg.selectAll("g.bars").selectAll("rect.bar") @@ -146,7 +147,11 @@ export class StackedBar extends Bar { return height; }) - .attr("opacity", 1); + .attr("opacity", 1) + // a11y + .attr("role", Roles.GRAPHICS_SYMBOL) + .attr("aria-roledescription", "bar") + .attr("aria-label", d => d.value); // Add event listeners for the above elements this.addEventListeners(); diff --git a/packages/core/src/components/graphs/line.ts b/packages/core/src/components/graphs/line.ts index ba85eaa44c..b5d315679b 100644 --- a/packages/core/src/components/graphs/line.ts +++ b/packages/core/src/components/graphs/line.ts @@ -1,6 +1,7 @@ // Internal Imports import { Component } from "../component"; import * as Configuration from "../../configuration"; +import { Roles } from "../../interfaces"; // D3 Imports import { select } from "d3-selection"; @@ -81,6 +82,11 @@ export class Line extends Component { return parentDatum.data; }) + // a11y + .attr("role", Roles.GRAPHICS_SYMBOL) + .attr("aria-roledescription", "line") + .attr("aria-label", d => d.map(datum => datum.value || datum).join(",")) + // Transition .transition(this.services.transitions.getTransition("line-update-enter", animate)) .attr("opacity", 1) .attr("class", "line") diff --git a/packages/core/src/components/graphs/pie.ts b/packages/core/src/components/graphs/pie.ts index 18638c0a7a..95e7749421 100644 --- a/packages/core/src/components/graphs/pie.ts +++ b/packages/core/src/components/graphs/pie.ts @@ -2,7 +2,7 @@ import { Component } from "../component"; import { DOMUtils } from "../../services"; import { Tools } from "../../tools"; -import { CalloutDirections, TooltipTypes } from "../../interfaces/enums"; +import { CalloutDirections, Roles, TooltipTypes } from "../../interfaces"; // D3 Imports import { select } from "d3-selection"; @@ -81,7 +81,9 @@ export class Pie extends Component { .sort((a: any, b: any) => a.index - b.index); // Update data on all slices - const paths = DOMUtils.appendOrSelect(svg, "g.slices").selectAll("path.slice") + const slicesGroup = DOMUtils.appendOrSelect(svg, "g.slices") + .attr("role", Roles.GROUP); + const paths = slicesGroup.selectAll("path.slice") .data(pieLayoutData, d => d.data.label); // Remove slices that need to be exited @@ -101,13 +103,18 @@ export class Pie extends Component { .attr("d", this.arc) .transition(this.services.transitions.getTransition("pie-slice-enter-update", animate)) .attr("opacity", 1) + // a11y + .attr("role", Roles.GRAPHICS_SYMBOL) + .attr("aria-roledescription", "slice") + .attr("aria-label", d => `${d.value}, ${Tools.convertValueToPercentage(d.data.value, dataList) + "%"}`) + // Tween .attrTween("d", function (a) { return arcTween.bind(this)(a, self.arc); }); // Draw the slice labels - const labels = DOMUtils.appendOrSelect(svg, "g.labels") - .selectAll("text.pie-label") + const labelsGroup = DOMUtils.appendOrSelect(svg, "g.labels").attr("role", Roles.GROUP); + const labels = labelsGroup.selectAll("text.pie-label") .data(pieLayoutData, (d: any) => d.data.label); // Remove labels that are existing @@ -193,7 +200,8 @@ export class Pie extends Component { } renderCallouts(calloutData: any[]) { - const svg = DOMUtils.appendOrSelect(this.getContainerSVG(), "g.callouts"); + const svg = DOMUtils.appendOrSelect(this.getContainerSVG(), "g.callouts") + .attr("role", Roles.GROUP); const options = this.model.getOptions(); // Update data on callouts @@ -204,7 +212,10 @@ export class Pie extends Component { const enteringCallouts = callouts.enter() .append("g") - .classed("callout", true); + .classed("callout", true) + // a11y + .attr("role", `${Roles.GRAPHICS_SYMBOL} ${Roles.GROUP}`) + .attr("aria-roledescription", "label callout"); // Update data values for each callout // For the horizontal and vertical lines to use diff --git a/packages/core/src/components/graphs/scatter.ts b/packages/core/src/components/graphs/scatter.ts index 6ade3280df..e369a40f77 100644 --- a/packages/core/src/components/graphs/scatter.ts +++ b/packages/core/src/components/graphs/scatter.ts @@ -1,9 +1,9 @@ // Internal Imports import { Component } from "../component"; +import { TooltipTypes, Roles } from "../../interfaces"; // D3 Imports import { select } from "d3-selection"; -import { TooltipTypes } from "../../interfaces"; export class Scatter extends Component { type = "scatter"; @@ -37,7 +37,8 @@ export class Scatter extends Component { // Add the dot groups that need to be introduced const dotGroupsEnter = dotGroups.enter() .append("g") - .classed("dots", true); + .classed("dots", true) + .attr("role", Roles.GROUP); // Update data on all circles const dots = dotGroupsEnter.merge(dotGroups) @@ -67,7 +68,11 @@ export class Scatter extends Component { }) .attr("fill-opacity", filled ? 0.2 : 1) .attr("stroke", d => this.model.getStrokeColor(d.datasetLabel, d.label, d.value)) - .attr("opacity", 1); + .attr("opacity", 1) + // a11y + .attr("role", Roles.GRAPHICS_SYMBOL) + .attr("aria-roledescription", "point") + .attr("aria-label", d => d.value); // Add event listeners to elements drawn this.addEventListeners(); From 668832c93cd2fbc0f8a41d05a79f152f868507ee Mon Sep 17 00:00:00 2001 From: Eliad Moosavi Date: Tue, 17 Dec 2019 12:55:01 -0500 Subject: [PATCH 18/19] remove deprecated accessibility flag from interfaces --- packages/core/src/interfaces/charts.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/core/src/interfaces/charts.ts b/packages/core/src/interfaces/charts.ts index 144b45ca6e..7e21896aa8 100644 --- a/packages/core/src/interfaces/charts.ts +++ b/packages/core/src/interfaces/charts.ts @@ -6,10 +6,6 @@ import { ChartTheme } from "./enums"; * Base chart options common to any chart */ export interface BaseChartOptions { - /** - * boolean to enable accessibility mode - */ - accessibility?: boolean; /** * boolean to disable animations (enabled by default) */ From fb21492df9d58b36ea1565d7fee9bd3ea02a6216 Mon Sep 17 00:00:00 2001 From: carbon-bot Date: Tue, 17 Dec 2019 19:42:34 +0000 Subject: [PATCH 19/19] v0.24.0 --- CHANGELOG.md | 11 +++++++++++ lerna.json | 2 +- packages/angular/CHANGELOG.md | 8 ++++++++ packages/angular/package.json | 4 ++-- packages/core/CHANGELOG.md | 11 +++++++++++ packages/core/package.json | 2 +- packages/react/CHANGELOG.md | 8 ++++++++ packages/react/package.json | 4 ++-- packages/vue/CHANGELOG.md | 8 ++++++++ packages/vue/package.json | 4 ++-- 10 files changed, 54 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 40d1f1a74f..cd981a6be3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [0.24.0](https://github.com/IBM/carbon-charts/compare/v0.23.0...v0.24.0) (2019-12-17) + + +### Features + +* **core, react, angular, vue:** add WAI-ARIA tags to elements ([1216ed6](https://github.com/IBM/carbon-charts/commit/1216ed6)) + + + + + # [0.23.0](https://github.com/IBM/carbon-charts/compare/v0.22.4...v0.23.0) (2019-12-17) diff --git a/lerna.json b/lerna.json index d3f0e1a49b..d51f05afe5 100644 --- a/lerna.json +++ b/lerna.json @@ -12,5 +12,5 @@ ] } }, - "version": "0.23.0" + "version": "0.24.0" } diff --git a/packages/angular/CHANGELOG.md b/packages/angular/CHANGELOG.md index 5185e3eb3d..861b54d176 100644 --- a/packages/angular/CHANGELOG.md +++ b/packages/angular/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [0.24.0](https://github.com/IBM/carbon-charts/compare/v0.23.0...v0.24.0) (2019-12-17) + +**Note:** Version bump only for package @carbon/charts-angular + + + + + # [0.23.0](https://github.com/IBM/carbon-charts/compare/v0.22.4...v0.23.0) (2019-12-17) **Note:** Version bump only for package @carbon/charts-angular diff --git a/packages/angular/package.json b/packages/angular/package.json index 27ab415764..ae1dcdb374 100644 --- a/packages/angular/package.json +++ b/packages/angular/package.json @@ -1,6 +1,6 @@ { "name": "@carbon/charts-angular", - "version": "0.23.0", + "version": "0.24.0", "description": "Carbon charting components for Angular", "main": "index.js", "scripts": { @@ -39,7 +39,7 @@ "scss" ], "dependencies": { - "@carbon/charts": "^0.23.0" + "@carbon/charts": "^0.24.0" }, "peerDependencies": { "@angular/common": "^6.0.0 || ^7.0.0", diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md index b47e147b2d..6eeafc5885 100644 --- a/packages/core/CHANGELOG.md +++ b/packages/core/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [0.24.0](https://github.com/IBM/carbon-charts/compare/v0.23.0...v0.24.0) (2019-12-17) + + +### Features + +* **core, react, angular, vue:** add WAI-ARIA tags to elements ([1216ed6](https://github.com/IBM/carbon-charts/commit/1216ed6)) + + + + + # [0.23.0](https://github.com/IBM/carbon-charts/compare/v0.22.4...v0.23.0) (2019-12-17) diff --git a/packages/core/package.json b/packages/core/package.json index e40ff68cce..1a5a3029f7 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@carbon/charts", - "version": "0.23.0", + "version": "0.24.0", "description": "Carbon charting components", "main": "./bundle.js", "module": "./index.js", diff --git a/packages/react/CHANGELOG.md b/packages/react/CHANGELOG.md index 96579f8abd..3c891a8ce0 100644 --- a/packages/react/CHANGELOG.md +++ b/packages/react/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [0.24.0](https://github.com/IBM/carbon-charts/compare/v0.23.0...v0.24.0) (2019-12-17) + +**Note:** Version bump only for package @carbon/charts-react + + + + + # [0.23.0](https://github.com/IBM/carbon-charts/compare/v0.22.4...v0.23.0) (2019-12-17) **Note:** Version bump only for package @carbon/charts-react diff --git a/packages/react/package.json b/packages/react/package.json index 4d7dac7ce9..4770f4dde6 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -1,6 +1,6 @@ { "name": "@carbon/charts-react", - "version": "0.23.0", + "version": "0.24.0", "description": "Carbon charting components for React", "main": "./bundle.js", "scripts": { @@ -44,7 +44,7 @@ }, "homepage": "https://github.com/IBM/carbon-charts#readme", "dependencies": { - "@carbon/charts": "^0.23.0" + "@carbon/charts": "^0.24.0" }, "peerDependencies": { "react": "^16.6.3", diff --git a/packages/vue/CHANGELOG.md b/packages/vue/CHANGELOG.md index 1622939155..eadc399e80 100644 --- a/packages/vue/CHANGELOG.md +++ b/packages/vue/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [0.24.0](https://github.com/IBM/carbon-charts/compare/v0.23.0...v0.24.0) (2019-12-17) + +**Note:** Version bump only for package @carbon/charts-vue + + + + + # [0.23.0](https://github.com/IBM/carbon-charts/compare/v0.22.4...v0.23.0) (2019-12-17) **Note:** Version bump only for package @carbon/charts-vue diff --git a/packages/vue/package.json b/packages/vue/package.json index d45796f614..c2f57d91be 100644 --- a/packages/vue/package.json +++ b/packages/vue/package.json @@ -1,6 +1,6 @@ { "name": "@carbon/charts-vue", - "version": "0.23.0", + "version": "0.24.0", "description": "Carbon charting components for Vue", "main": "charts-vue.umd.min.js", "scripts": { @@ -14,7 +14,7 @@ "clean": "rm -rf dist demo/bundle" }, "dependencies": { - "@carbon/charts": "^0.23.0", + "@carbon/charts": "^0.24.0", "vue": "2.5.21" }, "devDependencies": {