Merge remote-tracking branch 'carbon-design-system/master'

carbon-design-system · Feb 24, 2019 · 5c1d018 · 5c1d018
2 parents 63713b3 + 8806734
commit 5c1d018
Show file tree

Hide file tree

Showing 18 changed files with 449 additions and 55 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,86 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.9.7](https://github.com/IBM/carbon-charts/compare/v0.9.6...v0.9.7) (2019-02-22)
+
+**Note:** Version bump only for package @carbon/charts-monorepo
+
+
+
+
+
+## [0.9.6](https://github.com/IBM/carbon-charts/compare/v0.9.4...v0.9.6) (2019-02-21)
+
+
+### Bug Fixes
+
+* **bar:** add maxWidth and other bar fixes ([3866d86](https://github.com/IBM/carbon-charts/commit/3866d86))
+
+
+
+
+
+## [0.9.5](https://github.com/IBM/carbon-charts/compare/v0.9.4...v0.9.5) (2019-02-20)
+
+
+### Bug Fixes
+
+* **$core:** Fixes opacity transitions not completing when data is updated. Ensures use SVG vs CSS op ([f6b245e](https://github.com/IBM/carbon-charts/commit/f6b245e))
+
+
+
+
+
+## [0.9.4](https://github.com/IBM/carbon-charts/compare/v0.9.3...v0.9.4) (2019-02-16)
+
+
+### Bug Fixes
+
+* **$browser:** Fix duplication of titles during title resize ([4698efd](https://github.com/IBM/carbon-charts/commit/4698efd))
+
+
+### Features
+
+* **$browser:** Add y axis ([8e2a86b](https://github.com/IBM/carbon-charts/commit/8e2a86b))
+* **$browser:** Y axis titles ([7e03ff7](https://github.com/IBM/carbon-charts/commit/7e03ff7))
+
+
+
+
+
+## [0.9.3](https://github.com/IBM/carbon-charts/compare/v0.9.2...v0.9.3) (2019-02-15)
+
+
+### Bug Fixes
+
+* **core:** Fix NPM vulnerabilities ([73ef611](https://github.com/IBM/carbon-charts/commit/73ef611))
+
+
+
+
+
+## [0.9.2](https://github.com/IBM/carbon-charts/compare/v0.9.1...v0.9.2) (2019-02-15)
+
+
+### Bug Fixes
+
+* **core:** Allow custom circle size for line chart ([5fb93bd](https://github.com/IBM/carbon-charts/commit/5fb93bd))
+
+
+
+
+
+## [0.9.1](https://github.com/IBM/carbon-charts/compare/v0.9.0...v0.9.1) (2019-02-07)
+
+
+### Bug Fixes
+
+* **core:** Allow the usage of different size variants of tooltip ([4f6aa1d](https://github.com/IBM/carbon-charts/commit/4f6aa1d))
+
+
+
+
+
 # [0.9.0](https://github.com/IBM/carbon-charts/compare/v0.8.6...v0.9.0) (2019-01-28)
 
 

diff --git a/README.md b/README.md
@@ -9,6 +9,9 @@
 		<a href="https://travis-ci.org/carbon-design-system/carbon-charts">
 			<img src="https://api.travis-ci.org/carbon-design-system/carbon-charts.svg?branch=master" />
 		</a>
+		<a href="https://app.netlify.com/sites/carbon-charts/deploys">
+			<img src="https://api.netlify.com/api/v1/badges/8dd7641f-6f80-498d-aa95-4716a0fa44e3/deploy-status" />
+		</a>
 		<a href="https://www.npmjs.com/package/@carbon/charts">
 			<img src="https://img.shields.io/npm/v/@carbon/charts.svg" />
 		</a>

diff --git a/lerna.json b/lerna.json
@@ -16,5 +16,5 @@
 			]
 		}
 	},
-	"version": "0.9.0"
+	"version": "0.9.7"
 }
diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
@@ -3,6 +3,80 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.9.7](https://github.com/IBM/carbon-charts/compare/v0.9.6...v0.9.7) (2019-02-22)
+
+**Note:** Version bump only for package @carbon/charts
+
+
+
+
+
+## [0.9.6](https://github.com/IBM/carbon-charts/compare/v0.9.4...v0.9.6) (2019-02-21)
+
+
+### Bug Fixes
+
+* **bar:** add maxWidth and other bar fixes ([3866d86](https://github.com/IBM/carbon-charts/commit/3866d86))
+
+
+
+
+
+## [0.9.5](https://github.com/IBM/carbon-charts/compare/v0.9.4...v0.9.5) (2019-02-20)
+
+
+### Bug Fixes
+
+* **$core:** Fixes opacity transitions not completing when data is updated. Ensures use SVG vs CSS op ([f6b245e](https://github.com/IBM/carbon-charts/commit/f6b245e))
+
+
+
+
+
+## [0.9.4](https://github.com/IBM/carbon-charts/compare/v0.9.3...v0.9.4) (2019-02-16)
+
+
+### Bug Fixes
+
+* **$browser:** Fix duplication of titles during title resize ([4698efd](https://github.com/IBM/carbon-charts/commit/4698efd))
+
+
+
+
+
+## [0.9.3](https://github.com/IBM/carbon-charts/compare/v0.9.2...v0.9.3) (2019-02-15)
+
+
+### Bug Fixes
+
+* **core:** Fix NPM vulnerabilities ([73ef611](https://github.com/IBM/carbon-charts/commit/73ef611))
+
+
+
+
+
+## [0.9.2](https://github.com/IBM/carbon-charts/compare/v0.9.1...v0.9.2) (2019-02-15)
+
+
+### Bug Fixes
+
+* **core:** Allow custom circle size for line chart ([5fb93bd](https://github.com/IBM/carbon-charts/commit/5fb93bd))
+
+
+
+
+
+## [0.9.1](https://github.com/IBM/carbon-charts/compare/v0.9.0...v0.9.1) (2019-02-07)
+
+
+### Bug Fixes
+
+* **core:** Allow the usage of different size variants of tooltip ([4f6aa1d](https://github.com/IBM/carbon-charts/commit/4f6aa1d))
+
+
+
+
+
 # [0.9.0](https://github.com/IBM/carbon-charts/compare/v0.8.6...v0.9.0) (2019-01-28)
 
 

diff --git a/packages/core/demo/demo-data/bar.ts b/packages/core/demo/demo-data/bar.ts
@@ -56,6 +56,7 @@ export const groupedBarOptions = {
 			title: "2018 Annual Sales Figures",
 		},
 		y: {
+			title: "Dollars (CAD)",
 			formatter: axisValue => `${axisValue / 1000}k`,
 			yMaxAdjuster: yMaxValue => yMaxValue * 1.1,
 		},
@@ -67,6 +68,9 @@ export const groupedBarOptions = {
 			formatter: axisValue => `${axisValue * 100}%`
 		}
 	},
+	tooltip: {
+		size: "compact"
+	},
 	legendClickable: true,
 	containerResizable: true
 };
@@ -96,13 +100,17 @@ export const simpleBarOptions = {
 			title: "2018 Annual Sales Figures",
 		},
 		y: {
+			title: "Dollars (CAD)",
 			formatter: axisValue => `${axisValue / 1000}k`,
 			yMaxAdjuster: yMaxValue => yMaxValue * 1.1,
 			stacked: false
 		}
 	},
 	legendClickable: true,
-	containerResizable: true
+	containerResizable: true,
+	bars: {
+		maxWidth: 50
+	}
 };
 
 // Stacked bar
@@ -163,11 +171,15 @@ export const stackedBarOptions = {
 			title: "2018 Annual Sales Figures",
 		},
 		y: {
+			title: "Dollars (CAD)",
 			formatter: axisValue => `${axisValue / 1000}k`,
 			yMaxAdjuster: yMaxValue => yMaxValue * 1.1,
 			stacked: true
 		}
 	},
+	tooltip: {
+		size: "compact"
+	},
 	legendClickable: true,
 	containerResizable: true
 };
diff --git a/packages/core/demo/demo-data/line.ts b/packages/core/demo/demo-data/line.ts
@@ -46,6 +46,7 @@ export const curvedLineOptions = {
 			title: "2018 Annual Sales Figures",
 		},
 		y: {
+			title: "Dollars (CAD)",
 			yMaxAdjuster: yMax => yMax * 1.2,
 			yMinAdjuster: yMin => yMin * 1.2,
 			formatter: axisValue => `${axisValue / 1000}k`
@@ -111,6 +112,7 @@ export const lineOptions = {
 			title: "2018 Annual Sales Figures",
 		},
 		y: {
+			title: "Dollars (CAD)",
 			yMaxAdjuster: yMax => yMax * 1.2,
 			yMinAdjuster: yMin => yMin * 1.2,
 			formatter: axisValue => `${axisValue / 1000}k`,
@@ -130,6 +132,9 @@ export const lineOptions = {
 			]
 		}
 	},
+	points: {
+		radius: 4
+	},
 	legendClickable: true,
 	containerResizable: true
 };
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@carbon/charts",
-  "version": "0.9.0",
+  "version": "0.9.7",
   "description": "Carbon charting components",
   "files": [
     "dist",
@@ -67,7 +67,7 @@
     "webpack": "4.18.0",
     "webpack-bundle-analyzer": "2.13.1",
     "webpack-cli": "3.1.0",
-    "webpack-dev-server": "3.1.8",
+    "webpack-dev-server": "3.1.14",
     "webpack-node-externals": "1.6.0"
   },
   "publishConfig": {