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

…on-charts into sparkline-with-scale-color-option * 'master' of https://github.com/carbon-design-system/carbon-charts: (24 commits) v0.41.4 Merge pull request carbon-design-system#882 from theiliad/demo-treemap-fix docs(core): add theme & API tutorials to storybook (carbon-design-system#883) v0.41.3 Merge pull request carbon-design-system#880 from sophiiae/fix-import-colors fix(core): use fill:transparent for toolbar controls (carbon-design-system#884) v0.41.2 fix(core): tooltips should hide when mouseout is triggered on the chart holder (carbon-design-system#887) fix(core): sanitize user provided axis domains add treemap to the component status table v0.41.1 Merge pull request carbon-design-system#719 from theiliad/tree-map fix(core): correct axis title paddings in y-axes (carbon-design-system#873) v0.41.0 fix: use fill:none to allow transparent toolbar control background (carbon-design-system#858) feat(core): add alignment options for gauge charts (carbon-design-system#877) v0.40.14 fix(core): replace import to lodash with lodash-es fix(core): only set zoombar data and sanitize date values if a cartesian time-series chart v0.40.13 ...
JennChao · Nov 17, 2020 · 266090e · 266090e
2 parents 8efa34a + b41033a
commit 266090e
Show file tree

Hide file tree

Showing 78 changed files with 1,983 additions and 650 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,92 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.41.4](https://github.com/carbon-design-system/carbon-charts/compare/v0.41.3...v0.41.4) (2020-11-16)
+
+**Note:** Version bump only for package @carbon/charts-monorepo
+
+
+
+
+
+## [0.41.3](https://github.com/carbon-design-system/carbon-charts/compare/v0.41.2...v0.41.3) (2020-11-16)
+
+
+### Bug Fixes
+
+* **core:** use fill:transparent for toolbar controls ([#884](https://github.com/carbon-design-system/carbon-charts/issues/884)) ([681ec23](https://github.com/carbon-design-system/carbon-charts/commit/681ec23705d54bbf47f0e71655983ecbbebc7dd8))
+
+
+
+
+
+## [0.41.2](https://github.com/carbon-design-system/carbon-charts/compare/v0.41.1...v0.41.2) (2020-11-13)
+
+
+### Bug Fixes
+
+* **core:** sanitize user provided axis domains ([5865b7a](https://github.com/carbon-design-system/carbon-charts/commit/5865b7a16ea424314115b05af818eed9449d2564))
+* **core:** tooltips should hide when mouseout is triggered on the chart holder ([#887](https://github.com/carbon-design-system/carbon-charts/issues/887)) ([9ee5210](https://github.com/carbon-design-system/carbon-charts/commit/9ee5210497032108857f503b69eff2c73b22cf06))
+
+
+
+
+
+## [0.41.1](https://github.com/carbon-design-system/carbon-charts/compare/v0.41.0...v0.41.1) (2020-11-10)
+
+
+### Bug Fixes
+
+* **core:** correct axis title paddings in y-axes ([#873](https://github.com/carbon-design-system/carbon-charts/issues/873)) ([8a27a5f](https://github.com/carbon-design-system/carbon-charts/commit/8a27a5f65cbc55a878e603c9aa96c6f38d6ea10d)), closes [#859](https://github.com/carbon-design-system/carbon-charts/issues/859)
+
+
+
+
+
+# [0.41.0](https://github.com/carbon-design-system/carbon-charts/compare/v0.40.14...v0.41.0) (2020-11-10)
+
+
+### Bug Fixes
+
+* use fill:none to allow transparent toolbar control background ([#858](https://github.com/carbon-design-system/carbon-charts/issues/858)) ([e4bf1bf](https://github.com/carbon-design-system/carbon-charts/commit/e4bf1bf45f59b5a4521aa2b6e5856715f148b1d5))
+* **core:** only set zoombar data and sanitize date values if a cartesian time-series chart ([88c8fa1](https://github.com/carbon-design-system/carbon-charts/commit/88c8fa1feee0d8866608bc39426638afb1c81294))
+
+
+### Features
+
+* **core:** add alignment options for gauge charts ([#877](https://github.com/carbon-design-system/carbon-charts/issues/877)) ([5d4a621](https://github.com/carbon-design-system/carbon-charts/commit/5d4a621e4b92e3e1fdaa9a3318467c84379e8881))
+
+
+
+
+
+## [0.40.14](https://github.com/carbon-design-system/carbon-charts/compare/v0.40.13...v0.40.14) (2020-11-09)
+
+
+### Bug Fixes
+
+* **core:** replace import to lodash with lodash-es ([700ba09](https://github.com/carbon-design-system/carbon-charts/commit/700ba0989ca130c2b750acc868b5bc36192f6f07))
+
+
+
+
+
+## [0.40.13](https://github.com/carbon-design-system/carbon-charts/compare/v0.40.12...v0.40.13) (2020-11-06)
+
+**Note:** Version bump only for package @carbon/charts-monorepo
+
+
+
+
+
+## [0.40.12](https://github.com/carbon-design-system/carbon-charts/compare/v0.40.11...v0.40.12) (2020-11-06)
+
+**Note:** Version bump only for package @carbon/charts-monorepo
+
+
+
+
+
 ## [0.40.11](https://github.com/carbon-design-system/carbon-charts/compare/v0.40.10...v0.40.11) (2020-11-03)
 
 **Note:** Version bump only for package @carbon/charts-monorepo

diff --git a/README.md b/README.md
@@ -49,12 +49,13 @@ Read the release change logs [here](./CHANGELOG.md)
 | Pie         | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark:
 | Step        | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark:
 | Scatter     | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark:
-| Radar     | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark:
+| Radar       | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark:
 | Area        | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark:
-| Gauge        | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark:
-| Meter        | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark:
-| Sparkline        | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark:
-| Combo        | :hourglass_flowing_sand: | :hourglass_flowing_sand: | :hourglass_flowing_sand: | :hourglass_flowing_sand: | :hourglass_flowing_sand: |
+| Gauge       | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark:
+| Meter       | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark:
+| Sparkline   | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark:
+| Treemap     | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark:
+| Combo       | :hourglass_flowing_sand: | :hourglass_flowing_sand: | :hourglass_flowing_sand: | :hourglass_flowing_sand: | :hourglass_flowing_sand: |
 
 ## Bugs and feature requests
 

diff --git a/lerna.json b/lerna.json
@@ -12,5 +12,5 @@
 			]
 		}
 	},
-	"version": "0.40.11"
+	"version": "0.41.4"
 }
diff --git a/packages/angular/CHANGELOG.md b/packages/angular/CHANGELOG.md
@@ -3,6 +3,70 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.41.4](https://github.com/carbon-design-system/carbon-charts/compare/v0.41.3...v0.41.4) (2020-11-16)
+
+**Note:** Version bump only for package @carbon/charts-angular
+
+
+
+
+
+## [0.41.3](https://github.com/carbon-design-system/carbon-charts/compare/v0.41.2...v0.41.3) (2020-11-16)
+
+**Note:** Version bump only for package @carbon/charts-angular
+
+
+
+
+
+## [0.41.2](https://github.com/carbon-design-system/carbon-charts/compare/v0.41.1...v0.41.2) (2020-11-13)
+
+**Note:** Version bump only for package @carbon/charts-angular
+
+
+
+
+
+## [0.41.1](https://github.com/carbon-design-system/carbon-charts/compare/v0.41.0...v0.41.1) (2020-11-10)
+
+**Note:** Version bump only for package @carbon/charts-angular
+
+
+
+
+
+# [0.41.0](https://github.com/carbon-design-system/carbon-charts/compare/v0.40.14...v0.41.0) (2020-11-10)
+
+**Note:** Version bump only for package @carbon/charts-angular
+
+
+
+
+
+## [0.40.14](https://github.com/carbon-design-system/carbon-charts/compare/v0.40.13...v0.40.14) (2020-11-09)
+
+**Note:** Version bump only for package @carbon/charts-angular
+
+
+
+
+
+## [0.40.13](https://github.com/carbon-design-system/carbon-charts/compare/v0.40.12...v0.40.13) (2020-11-06)
+
+**Note:** Version bump only for package @carbon/charts-angular
+
+
+
+
+
+## [0.40.12](https://github.com/carbon-design-system/carbon-charts/compare/v0.40.11...v0.40.12) (2020-11-06)
+
+**Note:** Version bump only for package @carbon/charts-angular
+
+
+
+
+
 ## [0.40.11](https://github.com/carbon-design-system/carbon-charts/compare/v0.40.10...v0.40.11) (2020-11-03)
 
 **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.40.11",
+	"version": "0.41.4",
 	"description": "Carbon charting components for Angular",
 	"main": "index.js",
 	"scripts": {
@@ -40,7 +40,7 @@
 		"scss"
 	],
 	"dependencies": {
-		"@carbon/charts": "^0.40.11"
+		"@carbon/charts": "^0.41.4"
 	},
 	"peerDependencies": {
 		"@angular/common": "^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0",

diff --git a/packages/angular/src/charts.module.ts b/packages/angular/src/charts.module.ts
@@ -15,6 +15,7 @@ import { PieChartComponent } from "./pie-chart.component";
 import { ScatterChartComponent } from "./scatter-chart.component";
 import { MeterChartComponent } from "./meter-chart.component";
 import { RadarChartComponent } from "./radar-chart.component";
+import { TreemapChartComponent } from "./treemap-chart.component";
 
 @NgModule({
 	imports: [
@@ -34,7 +35,8 @@ import { RadarChartComponent } from "./radar-chart.component";
 		PieChartComponent,
 		ScatterChartComponent,
 		MeterChartComponent,
-		RadarChartComponent
+		RadarChartComponent,
+		TreemapChartComponent
 	],
 	exports: [
 		BaseChart,
@@ -50,7 +52,8 @@ import { RadarChartComponent } from "./radar-chart.component";
 		PieChartComponent,
 		ScatterChartComponent,
 		MeterChartComponent,
-		RadarChartComponent
+		RadarChartComponent,
+		TreemapChartComponent
 	]
 })
 

diff --git a/packages/angular/src/index.ts b/packages/angular/src/index.ts
@@ -13,3 +13,4 @@ export * from "./pie-chart.component";
 export * from "./scatter-chart.component";
 export * from "./meter-chart.component";
 export * from "./radar-chart.component";
+export * from "./treemap-chart.component";
diff --git a/packages/angular/src/treemap-chart.component.ts b/packages/angular/src/treemap-chart.component.ts
@@ -0,0 +1,34 @@
+import {
+	Component,
+	AfterViewInit
+} from "@angular/core";
+
+import { BaseChart } from "./base-chart.component";
+
+import { TreemapChart } from "@carbon/charts";
+
+/**
+ * Wrapper around `TreemapChart` in carbon charts library
+ *
+ * Most functions just call their equivalent from the chart library.
+ */
+@Component({
+	selector: "ibm-treemap-chart",
+	template: ``
+})
+export class TreemapChartComponent extends BaseChart implements AfterViewInit {
+	/**
+	 * Runs after view init to create a chart, attach it to `elementRef` and draw it.
+	 */
+	ngAfterViewInit() {
+		this.chart = new TreemapChart(
+			this.elementRef.nativeElement,
+			{
+				data: this.data,
+				options: this.options
+			}
+		);
+
+		Object.assign(this, this.chart);
+	}
+}
diff --git a/packages/angular/stories/all.stories.ts b/packages/angular/stories/all.stories.ts
@@ -46,6 +46,9 @@ storybookDemoGroups.forEach(demoGroup => {
 
 	// Loop through the demos for the group
 	demoGroup.demos.forEach(demo => {
+		if (demo.isHighScale) {
+			return;
+		}
 		groupStories.add(demo.title, () => ({
 			template: getTemplate(demo),
 			moduleMetadata: {

diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
@@ -3,29 +3,100 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [0.40.11](https://github.com/carbon-design-system/carbon-charts/compare/v0.40.10...v0.40.11) (2020-11-03)
+## [0.41.4](https://github.com/carbon-design-system/carbon-charts/compare/v0.41.3...v0.41.4) (2020-11-16)
 
 **Note:** Version bump only for package @carbon/charts
 
 
 
 
 
-## [0.40.10](https://github.com/carbon-design-system/carbon-charts/compare/v0.40.9...v0.40.10) (2020-11-03)
+## [0.41.3](https://github.com/carbon-design-system/carbon-charts/compare/v0.41.2...v0.41.3) (2020-11-16)
 
-**Note:** Version bump only for package @carbon/charts
 
+### Bug Fixes
+
+* **core:** use fill:transparent for toolbar controls ([#884](https://github.com/carbon-design-system/carbon-charts/issues/884)) ([681ec23](https://github.com/carbon-design-system/carbon-charts/commit/681ec23705d54bbf47f0e71655983ecbbebc7dd8))
 
 
 
 
-## [0.40.9](https://github.com/carbon-design-system/carbon-charts/compare/v0.40.8...v0.40.9) (2020-11-03)
+
+## [0.41.2](https://github.com/carbon-design-system/carbon-charts/compare/v0.41.1...v0.41.2) (2020-11-13)
+
+
+### Bug Fixes
+
+* **core:** sanitize user provided axis domains ([5865b7a](https://github.com/carbon-design-system/carbon-charts/commit/5865b7a16ea424314115b05af818eed9449d2564))
+* **core:** tooltips should hide when mouseout is triggered on the chart holder ([#887](https://github.com/carbon-design-system/carbon-charts/issues/887)) ([9ee5210](https://github.com/carbon-design-system/carbon-charts/commit/9ee5210497032108857f503b69eff2c73b22cf06))
+
+
+
+
+
+## [0.41.1](https://github.com/carbon-design-system/carbon-charts/compare/v0.41.0...v0.41.1) (2020-11-10)
+
+
+### Bug Fixes
+
+* **core:** correct axis title paddings in y-axes ([#873](https://github.com/carbon-design-system/carbon-charts/issues/873)) ([8a27a5f](https://github.com/carbon-design-system/carbon-charts/commit/8a27a5f65cbc55a878e603c9aa96c6f38d6ea10d)), closes [#859](https://github.com/carbon-design-system/carbon-charts/issues/859)
+
+
+
+
+
+# Change Log
+
+All notable changes to this project will be documented in this file. See
+[Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+# [0.41.0](https://github.com/carbon-design-system/carbon-charts/compare/v0.40.14...v0.41.0) (2020-11-10)
+
+
+### Bug Fixes
+
+* use fill:none to allow transparent toolbar control background ([#858](https://github.com/carbon-design-system/carbon-charts/issues/858)) ([e4bf1bf](https://github.com/carbon-design-system/carbon-charts/commit/e4bf1bf45f59b5a4521aa2b6e5856715f148b1d5))
+* **core:** only set zoombar data and sanitize date values if a cartesian time-series chart ([88c8fa1](https://github.com/carbon-design-system/carbon-charts/commit/88c8fa1feee0d8866608bc39426638afb1c81294))
+
+
+### Features
+
+* **core:** add alignment options for gauge charts ([#877](https://github.com/carbon-design-system/carbon-charts/issues/877)) ([5d4a621](https://github.com/carbon-design-system/carbon-charts/commit/5d4a621e4b92e3e1fdaa9a3318467c84379e8881))
+
+
+
+
+
+## [0.40.14](https://github.com/carbon-design-system/carbon-charts/compare/v0.40.13...v0.40.14) (2020-11-09)
+
+
+### Bug Fixes
+
+* **core:** replace import to lodash with lodash-es ([700ba09](https://github.com/carbon-design-system/carbon-charts/commit/700ba0989ca130c2b750acc868b5bc36192f6f07))
+
+
+
+
+
+## [0.40.13](https://github.com/carbon-design-system/carbon-charts/compare/v0.40.12...v0.40.13) (2020-11-06)
 
 **Note:** Version bump only for package @carbon/charts
 
+## [0.40.12](https://github.com/carbon-design-system/carbon-charts/compare/v0.40.11...v0.40.12) (2020-11-06)
 
+**Note:** Version bump only for package @carbon/charts
+
+## [0.40.11](https://github.com/carbon-design-system/carbon-charts/compare/v0.40.10...v0.40.11) (2020-11-03)
 
+**Note:** Version bump only for package @carbon/charts
 
+## [0.40.10](https://github.com/carbon-design-system/carbon-charts/compare/v0.40.9...v0.40.10) (2020-11-03)
+
+**Note:** Version bump only for package @carbon/charts
+
+## [0.40.9](https://github.com/carbon-design-system/carbon-charts/compare/v0.40.8...v0.40.9) (2020-11-03)
+
+**Note:** Version bump only for package @carbon/charts
 
 # Change Log
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,5 +12,5 @@ @@
     			]
     		}
     	},
-    	"version": "0.40.11"
+    	"version": "0.41.4"
     }