diff --git a/CHANGELOG.md b/CHANGELOG.md index 7960756bbe..94a880d274 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.11.4](https://github.com/IBM/carbon-charts/compare/v0.11.3...v0.11.4) (2019-03-25) + +**Note:** Version bump only for package @carbon/charts-monorepo + + + + + ## [0.11.3](https://github.com/IBM/carbon-charts/compare/v0.11.2...v0.11.3) (2019-03-21) **Note:** Version bump only for package @carbon/charts-monorepo diff --git a/lerna.json b/lerna.json index 3db94475c0..4d9b1dd18b 100644 --- a/lerna.json +++ b/lerna.json @@ -16,5 +16,5 @@ ] } }, - "version": "0.11.3" + "version": "0.11.4" } diff --git a/packages/angular/CHANGELOG.md b/packages/angular/CHANGELOG.md index be73035b9e..8cac86b8a0 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.11.4](https://github.com/IBM/carbon-charts/compare/v0.11.3...v0.11.4) (2019-03-25) + +**Note:** Version bump only for package @carbon/charts-angular + + + + + ## [0.7.10](https://github.com/IBM/carbon-charts/compare/v0.7.9...v0.7.10) (2018-11-28) **Note:** Version bump only for package @carbon/charts-angular diff --git a/packages/angular/package.json b/packages/angular/package.json index a096cdc29b..711aa981b9 100644 --- a/packages/angular/package.json +++ b/packages/angular/package.json @@ -1,7 +1,7 @@ { "$schema": "./node_modules/ng-packagr/package.schema.json", "name": "@carbon/charts-angular", - "version": "0.7.10", + "version": "0.11.4", "description": "Carbon charting components for Angular", "main": "index.js", "scripts": { diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md index dd7ab3dc6f..3086d298a5 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.11.4](https://github.com/IBM/carbon-charts/compare/v0.11.3...v0.11.4) (2019-03-25) + +**Note:** Version bump only for package @carbon/charts + + + + + # [0.11.0](https://github.com/IBM/carbon-charts/compare/v0.10.5...v0.11.0) (2019-03-12) diff --git a/packages/core/package.json b/packages/core/package.json index d84a143865..cc41ace28b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@carbon/charts", - "version": "0.11.0", + "version": "0.11.4", "description": "Carbon charting components", "scripts": { "demo:server": "webpack-dev-server --config webpack.config.js --watch", diff --git a/packages/react/CHANGELOG.md b/packages/react/CHANGELOG.md index 798de510a5..94d27763db 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.11.4](https://github.com/IBM/carbon-charts/compare/v0.11.3...v0.11.4) (2019-03-25) + +**Note:** Version bump only for package @carbon/charts-react + + + + + ## [0.11.2](https://github.com/IBM/carbon-charts/compare/v0.11.1...v0.11.2) (2019-03-20) diff --git a/packages/react/package.json b/packages/react/package.json index 5c5f213900..7dbcb50fbc 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -1,6 +1,6 @@ { "name": "@carbon/charts-react", - "version": "0.11.2", + "version": "0.11.4", "description": "Carbon charting components for React", "main": "index.js", "scripts": { @@ -22,7 +22,7 @@ }, "homepage": "https://github.com/IBM/carbon-charts#readme", "dependencies": { - "@carbon/charts": "^0.11.0" + "@carbon/charts": "^0.11.4" }, "peerDependencies": { "react": "^16.6.3", diff --git a/packages/vue/CHANGELOG.md b/packages/vue/CHANGELOG.md index fe04efba58..cf1fccb945 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.11.4](https://github.com/carbon-design-system/carbon-charts/compare/v0.11.3...v0.11.4) (2019-03-25) + +**Note:** Version bump only for package @carbon/charts-vue + + + + + ## [0.11.3](https://github.com/carbon-design-system/carbon-charts/compare/v0.11.2...v0.11.3) (2019-03-21) **Note:** Version bump only for package @carbon/charts-vue diff --git a/packages/vue/package.json b/packages/vue/package.json index 2a95670971..69b608e148 100644 --- a/packages/vue/package.json +++ b/packages/vue/package.json @@ -1,6 +1,6 @@ { "name": "@carbon/charts-vue", - "version": "0.11.3", + "version": "0.11.4", "description": "Carbon charting components for Vue", "main": "index.js", "scripts": { @@ -14,7 +14,7 @@ "clean": "rm -rf dist demo/bundle" }, "dependencies": { - "@carbon/charts": "^0.11.0", + "@carbon/charts": "^0.11.4", "vue": "2.5.21" }, "devDependencies": { diff --git a/packages/vue/src/ccv-line-chart.vue b/packages/vue/src/ccv-line-chart.vue new file mode 100644 index 0000000000..2cfd96d0c4 --- /dev/null +++ b/packages/vue/src/ccv-line-chart.vue @@ -0,0 +1,20 @@ + + + diff --git a/packages/vue/stories/line-demo-data.js b/packages/vue/stories/line-demo-data.js new file mode 100644 index 0000000000..01b4d05582 --- /dev/null +++ b/packages/vue/stories/line-demo-data.js @@ -0,0 +1,115 @@ +import { colors } from "../helpers/commons"; + +export const curvedLineData = { + labels: ["Qty", "More", "Sold", "Restocking", "Misc"], + datasets: [ + { + label: "Dataset 1", + backgroundColors: [colors[0]], + data: [ + 65000, + 79000, + 49213, + 51213, + 16932 + ] + }, + { + label: "Dataset 2", + backgroundColors: [colors[1]], + data: [ + 80000, + 21312, + 56456, + 21312, + 0 + ] + }, + { + label: "Dataset 3", + backgroundColors: [colors[2]], + data: [ + 12312, + 34232, + 39232, + 12312, + 34234 + ] + } + ] +}; + +export const curvedLineOptions = { + accessibility: false, + scales: { + x: { + title: "2018 Annual Sales Figures", + }, + y: { + formatter: axisValue => `${axisValue / 1000}k` + }, + y2: { + ticks: { + max: 1, + min: 0 + } + } + }, + curve: "curveNatural", + legendClickable: true, + containerResizable: true +}; + + +export const lineData = { + labels: ["Qty", "More", "Sold", "Restocking", "Misc"], + datasets: [ + { + label: "Dataset 1", + backgroundColors: [colors[0]], + data: [ + 0, + 0, + 0, + 0, + 0 + ] + }, + { + label: "Dataset 2", + backgroundColors: [colors[1]], + data: [ + 0, + 10000, + 20000, + 30000, + 40000 + ] + }, + { + label: "Dataset 3", + backgroundColors: [colors[2]], + data: [ + 0, + 20000, + 40000, + 60000, + 80000 + ] + } + ] +}; + +export const lineOptions = { + accessibility: false, + scales: { + x: { + title: "2018 Annual Sales Figures", + }, + y: { + formatter: axisValue => `${axisValue / 1000}k` + } + }, + legendClickable: true, + containerResizable: true +}; diff --git a/packages/vue/stories/line.stories.js b/packages/vue/stories/line.stories.js new file mode 100644 index 0000000000..1423145135 --- /dev/null +++ b/packages/vue/stories/line.stories.js @@ -0,0 +1,65 @@ +import { storiesOf } from '@storybook/vue'; + +import CcvLineChart from '../src/ccv-line-chart'; +import { + curvedLineData, + curvedLineOptions, + lineData, + lineOptions +} from './line-demo-data'; + +const lineStories = storiesOf('Line', module); + +lineStories.add('Basic', () => ({ + components: { CcvLineChart }, + data() { + return { lineData, lineOptions }; + }, + template: + '', +})); + +lineStories.add('Natural Curve', () => ({ + components: { CcvLineChart }, + data() { + return { curvedLineData, curvedLineOptions }; + }, + template: + '', +})); + +lineStories.add('Bundle Curve', () => ({ + components: { CcvLineChart }, + data() { + return { + curvedLineData, + curveBundleOptions: Object.assign({}, curvedLineOptions, {curve: "curveBundle"}) + }; + }, + template: + '', +})); + +lineStories.add('Monotone Y Curve', () => ({ + components: { CcvLineChart }, + data() { + return { + curvedLineData, + curveMonotoneYOptions: Object.assign({}, curvedLineOptions, {curve: 'curveMonotoneY'}) + }; + }, + template: + '', +})); + +lineStories.add('Monotone X Curve', () => ({ + components: { CcvLineChart }, + data() { + return { + curvedLineData, + curveMonotoneXOptions: Object.assign({}, curvedLineOptions, {curve: "curveMonotoneX"}) + }; + }, + template: + '', +}));