Merge branch 'master' of https://github.com/carbon-design-system/carb…

…on-charts into feat-scatter-custompoints
carbon-design-system · Jan 17, 2020 · b3ab5aa · b3ab5aa
2 parents ed04f98 + 08752c5
commit b3ab5aa
Show file tree

Hide file tree

Showing 136 changed files with 1,245 additions and 487 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,4 @@ storybook-dist
 package-lock.json
 .cache/
 pages/
+storybook-static/
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,74 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.26.0](https://github.com/IBM/carbon-charts/compare/v0.25.0...v0.26.0) (2020-01-16)
+
+
+### Features
+
+* **core:** add event dispatches for mouseover, mousemove, click & mouseout for all graphs ([284012c](https://github.com/IBM/carbon-charts/commit/284012c))
+
+
+
+
+
+# [0.25.0](https://github.com/IBM/carbon-charts/compare/v0.24.5...v0.25.0) (2020-01-10)
+
+
+### Features
+
+* **angular:** add v8 to angular peerDependencies ([c147419](https://github.com/IBM/carbon-charts/commit/c147419))
+
+
+
+
+
+## [0.24.5](https://github.com/IBM/carbon-charts/compare/v0.24.4...v0.24.5) (2020-01-10)
+
+
+### Bug Fixes
+
+* **core:** fix to allow chart to toggle on and off using attribute/css properties ([77e26af](https://github.com/IBM/carbon-charts/commit/77e26af))
+
+
+
+
+
+## [0.24.4](https://github.com/IBM/carbon-charts/compare/v0.24.3...v0.24.4) (2020-01-06)
+
+
+### Bug Fixes
+
+* **demos:** add IBM Plex Sans Condensed to the core demo site ([1761a36](https://github.com/IBM/carbon-charts/commit/1761a36))
+
+
+
+
+
+## [0.24.3](https://github.com/IBM/carbon-charts/compare/v0.24.2...v0.24.3) (2019-12-19)
+
+**Note:** Version bump only for package @carbon/charts-monorepo
+
+
+
+
+
+## [0.24.2](https://github.com/IBM/carbon-charts/compare/v0.24.1...v0.24.2) (2019-12-19)
+
+**Note:** Version bump only for package @carbon/charts-monorepo
+
+
+
+
+
+## [0.24.1](https://github.com/IBM/carbon-charts/compare/v0.24.0...v0.24.1) (2019-12-18)
+
+**Note:** Version bump only for package @carbon/charts-monorepo
+
+
+
+
+
 # [0.24.0](https://github.com/IBM/carbon-charts/compare/v0.23.0...v0.24.0) (2019-12-17)
 
 

diff --git a/README.md b/README.md
@@ -13,7 +13,8 @@
 			<img src="https://img.shields.io/npm/v/@carbon/charts.svg" />
 		</a>
 		<img src="https://img.shields.io/badge/comp-IE11%2B-blue.svg" />
-		<img alt="semantic-versioning" src="https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--versioning-e10079.svg">
+		<img alt="semantic-versioning" src="https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--ver-e10079.svg" />
+		<img alt="semantic-versioning" src="https://img.shields.io/badge/downloads-+5k%2Fweek-green" />
 	</p>
 </p>
 

diff --git a/lerna.json b/lerna.json
@@ -12,5 +12,5 @@
 			]
 		}
 	},
-	"version": "0.24.0"
+	"version": "0.26.0"
 }
diff --git a/packages/angular/.storybook/addons.js b/packages/angular/.storybook/addons.js
@@ -1 +1,2 @@
 import "@storybook/addon-options/register";
+import '@storybook/addon-knobs/register';
diff --git a/packages/angular/.storybook/config.js b/packages/angular/.storybook/config.js
@@ -3,8 +3,10 @@ import { setOptions } from "@storybook/addon-options";
 
 setOptions({
   name: "Carbon Charts - Angular Wrappers",
-  showAddonPanel: false,
-  sortStoriesByKind: true
+  showAddonPanel: true,
+  sortStoriesByKind: true,
+  panelPosition: 'bottom',
+  showDownPanel: true
 });
 
 // load global styles
@@ -13,7 +15,6 @@ require("!style-loader!css-loader!@carbon/charts/dist/styles.css");
 
 const req = require.context("../stories", true, /.stories.ts$/);
 function loadStories() {
-
 	req.keys().forEach(filename => {
 		req(filename);
 	});

diff --git a/packages/angular/CHANGELOG.md b/packages/angular/CHANGELOG.md
@@ -3,6 +3,65 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.26.0](https://github.com/IBM/carbon-charts/compare/v0.25.0...v0.26.0) (2020-01-16)
+
+**Note:** Version bump only for package @carbon/charts-angular
+
+
+
+
+
+# [0.25.0](https://github.com/IBM/carbon-charts/compare/v0.24.5...v0.25.0) (2020-01-10)
+
+
+### Features
+
+* **angular:** add v8 to angular peerDependencies ([c147419](https://github.com/IBM/carbon-charts/commit/c147419))
+
+
+
+
+
+## [0.24.5](https://github.com/IBM/carbon-charts/compare/v0.24.4...v0.24.5) (2020-01-10)
+
+**Note:** Version bump only for package @carbon/charts-angular
+
+
+
+
+
+## [0.24.4](https://github.com/IBM/carbon-charts/compare/v0.24.3...v0.24.4) (2020-01-06)
+
+**Note:** Version bump only for package @carbon/charts-angular
+
+
+
+
+
+## [0.24.3](https://github.com/IBM/carbon-charts/compare/v0.24.2...v0.24.3) (2019-12-19)
+
+**Note:** Version bump only for package @carbon/charts-angular
+
+
+
+
+
+## [0.24.2](https://github.com/IBM/carbon-charts/compare/v0.24.1...v0.24.2) (2019-12-19)
+
+**Note:** Version bump only for package @carbon/charts-angular
+
+
+
+
+
+## [0.24.1](https://github.com/IBM/carbon-charts/compare/v0.24.0...v0.24.1) (2019-12-18)
+
+**Note:** Version bump only for package @carbon/charts-angular
+
+
+
+
+
 # [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

diff --git a/packages/angular/package.json b/packages/angular/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@carbon/charts-angular",
-	"version": "0.24.0",
+	"version": "0.26.0",
 	"description": "Carbon charting components for Angular",
 	"main": "index.js",
 	"scripts": {
@@ -39,12 +39,12 @@
 		"scss"
 	],
 	"dependencies": {
-		"@carbon/charts": "^0.24.0"
+		"@carbon/charts": "^0.26.0"
 	},
 	"peerDependencies": {
-		"@angular/common": "^6.0.0 || ^7.0.0",
-		"@angular/compiler": "^6.0.0 || ^7.0.0",
-		"@angular/core": "^6.0.0 || ^7.0.0",
+		"@angular/common": "^6.0.0 || ^7.0.0 || ^8.0.0",
+		"@angular/compiler": "^6.0.0 || ^7.0.0 || ^8.0.0",
+		"@angular/core": "^6.0.0 || ^7.0.0 || ^8.0.0",
 		"rxjs": "^6.0.0",
 		"zone.js": "^0.8.29 || ^0.9.0"
 	},
@@ -62,12 +62,12 @@
 		"@angular/platform-browser": "7.2.15",
 		"@angular/platform-browser-dynamic": "7.2.15",
 		"@babel/core": "7.3.4",
+		"@storybook/addon-knobs": "5.0.11",
 		"@storybook/addon-options": "5.0.11",
 		"@storybook/angular": "5.0.11",
 		"@types/node": "12.11.7",
 		"babel-loader": "8.0.5",
 		"core-js": "3.0.0",
-		"d3": "4.11.0",
 		"ng-packagr": "5.7.1",
 		"rxjs": "6.3.3",
 		"tsickle": "0.37.1",

diff --git a/packages/angular/stories/bar.stories.ts b/packages/angular/stories/bar.stories.ts
@@ -1,4 +1,5 @@
 import { storiesOf } from "@storybook/angular";
+import { withKnobs, object } from "@storybook/addon-knobs";
 
 import { ChartsModule } from "../src/charts.module";
 
@@ -26,15 +27,16 @@ const template = barType => `
 </ibm-${barType}-bar-chart>
 `;
 
-const stories = storiesOf("Bar", module);
+const stories = storiesOf("Bar", module).addDecorator(withKnobs);
+
 stories.add(simpleBarOptions.title, () => ({
 	template: template("simple"),
 	moduleMetadata: {
 		imports: [ChartsModule]
 	},
 	props: {
-		data: simpleBarData,
-		options: addWidthAndHeight(simpleBarOptions)
+		data: object("Data", simpleBarData),
+		options: object("Options", addWidthAndHeight(simpleBarOptions))
 	}
 }));
 
@@ -44,8 +46,8 @@ stories.add(simpleBarTimeSeriesOptions.title, () => ({
 		imports: [ChartsModule]
 	},
 	props: {
-		data: simpleBarTimeSeriesData,
-		options: addWidthAndHeight(simpleBarTimeSeriesOptions)
+		data: object("Data", simpleBarTimeSeriesData),
+		options: object("Options", addWidthAndHeight(simpleBarTimeSeriesOptions))
 	}
 }));
 
@@ -55,8 +57,8 @@ stories.add(groupedBarOptions.title, () => ({
 		imports: [ChartsModule]
 	},
 	props: {
-		data: groupedBarData,
-		options: addWidthAndHeight(groupedBarOptions)
+		data: object("Data", groupedBarData),
+		options: object("Options", addWidthAndHeight(groupedBarOptions))
 	}
 }));
 
@@ -66,8 +68,8 @@ stories.add(stackedBarOptions.title, () => ({
 		imports: [ChartsModule]
 	},
 	props: {
-		data: stackedBarData,
-		options: addWidthAndHeight(stackedBarOptions)
+		data: object("Data", stackedBarData),
+		options: object("Options", addWidthAndHeight(stackedBarOptions))
 	}
 }));
 
@@ -77,7 +79,7 @@ stories.add(stackedBarTimeSeriesOptions.title, () => ({
 		imports: [ChartsModule]
 	},
 	props: {
-		data: stackedBarTimeSeriesData,
-		options: addWidthAndHeight(stackedBarTimeSeriesOptions)
+		data: object("Data", stackedBarTimeSeriesData),
+		options: object("Options", addWidthAndHeight(stackedBarTimeSeriesOptions))
 	}
 }));
diff --git a/packages/angular/stories/line.stories.ts b/packages/angular/stories/line.stories.ts
@@ -1,4 +1,5 @@
 import { storiesOf } from "@storybook/angular";
+import { withKnobs, object } from "@storybook/addon-knobs";
 
 import { ChartsModule } from "../src/charts.module";
 
@@ -20,15 +21,16 @@ const template = `
 </ibm-line-chart>
 `;
 
-const stories = storiesOf("Line", module);
+const stories = storiesOf("Line", module).addDecorator(withKnobs);
+
 stories.add(lineOptions.title, () => ({
 	template,
 	moduleMetadata: {
 		imports: [ChartsModule]
 	},
 	props: {
-		data: lineData,
-		options: addWidthAndHeight(lineOptions)
+		data: object("Data", lineData),
+		options: object("Options", addWidthAndHeight(lineOptions))
 	}
 }));
 
@@ -38,7 +40,7 @@ stories.add(lineTimeSeriesOptions.title, () => ({
 		imports: [ChartsModule]
 	},
 	props: {
-		data: lineTimeSeriesData,
-		options: addWidthAndHeight(lineTimeSeriesOptions)
+		data: object("Data", lineTimeSeriesData),
+		options: object("Options", addWidthAndHeight(lineTimeSeriesOptions))
 	}
 }));
diff --git a/packages/angular/stories/pie-donut.stories.ts b/packages/angular/stories/pie-donut.stories.ts
@@ -1,4 +1,5 @@
 import { storiesOf } from "@storybook/angular";
+import { withKnobs, object } from "@storybook/addon-knobs";
 
 import { ChartsModule } from "../src/charts.module";
 
@@ -11,7 +12,8 @@ import {
 } from "../../core/demo/demo-data/index";
 import { addWidthAndHeight } from "./commons";
 
-const pieStories = storiesOf("Pie", module);
+const pieStories = storiesOf("Pie", module).addDecorator(withKnobs);
+
 pieStories.add(pieOptions.title, () => ({
 	template: `
 		<ibm-pie-chart
@@ -24,12 +26,13 @@ pieStories.add(pieOptions.title, () => ({
 		imports: [ChartsModule]
 	},
 	props: {
-		data: pieData,
-		options: addWidthAndHeight(pieOptions)
+		data: object("Data", pieData),
+		options: object("Options", addWidthAndHeight(pieOptions))
 	}
 }));
 
-const donutStories = storiesOf("Donut", module);
+const donutStories = storiesOf("Donut", module).addDecorator(withKnobs);
+
 donutStories.add(donutOptions.title, () => ({
 	template: `
 		<ibm-donut-chart
@@ -42,7 +45,7 @@ donutStories.add(donutOptions.title, () => ({
 		imports: [ChartsModule]
 	},
 	props: {
-		data: donutData,
-		options: addWidthAndHeight(donutOptions)
+		data: object("Data", donutData),
+		options: object("Options", addWidthAndHeight(donutOptions))
 	}
 }));
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,3 +10,4 @@ storybook-dist @@
     package-lock.json
     .cache/
     pages/
+    storybook-static/
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		import "@storybook/addon-options/register";
		import '@storybook/addon-knobs/register';