Merge branch 'master' into tool-bar

carbon-design-system · Aug 13, 2020 · 2b07934 · 2b07934
2 parents a4060bb + 2dd96c5
commit 2b07934
Show file tree

Hide file tree

Showing 17 changed files with 83 additions and 15 deletions.
diff --git 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.35.0](https://github.com/carbon-design-system/carbon-charts/compare/v0.34.11...v0.35.0) (2020-08-13)
+
+
+### Features
+
+* **svelte:** add Meter chart wrapper ([#744](https://github.com/carbon-design-system/carbon-charts/issues/744)) ([8ed23b1](https://github.com/carbon-design-system/carbon-charts/commit/8ed23b176d168714ed4c0b481fda71eb8bed4106))
+
+
+
+
+
 ## [0.34.11](https://github.com/carbon-design-system/carbon-charts/compare/v0.34.10...v0.34.11) (2020-08-12)
 
 **Note:** Version bump only for package @carbon/charts-monorepo

diff --git a/README.md b/README.md
@@ -16,9 +16,10 @@
 
 ## Packages
 - [Vanilla](./packages/core)
-- [Angular](./packages/angular)
 - [React](./packages/react)
+- [Angular](./packages/angular)
 - [Vue](./packages/vue)
+- [Svelte](./packages/svelte)
 
 <a href="https://www.netlify.com" target="_blank">
   <img src="https://www.netlify.com/img/global/badges/netlify-color-accent.svg"/>

diff --git a/lerna.json b/lerna.json
@@ -12,5 +12,5 @@
 			]
 		}
 	},
-	"version": "0.34.11"
+	"version": "0.35.0"
 }
diff --git 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.35.0](https://github.com/carbon-design-system/carbon-charts/compare/v0.34.11...v0.35.0) (2020-08-13)
+
+**Note:** Version bump only for package @carbon/charts-angular
+
+
+
+
+
 ## [0.34.11](https://github.com/carbon-design-system/carbon-charts/compare/v0.34.10...v0.34.11) (2020-08-12)
 
 **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.34.11",
+	"version": "0.35.0",
 	"description": "Carbon charting components for Angular",
 	"main": "index.js",
 	"scripts": {
@@ -40,7 +40,7 @@
 		"scss"
 	],
 	"dependencies": {
-		"@carbon/charts": "^0.34.11"
+		"@carbon/charts": "^0.35.0"
 	},
 	"peerDependencies": {
 		"@angular/common": "^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0",

diff --git 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.35.0](https://github.com/carbon-design-system/carbon-charts/compare/v0.34.11...v0.35.0) (2020-08-13)
+
+**Note:** Version bump only for package @carbon/charts
+
+
+
+
+
 ## [0.34.11](https://github.com/carbon-design-system/carbon-charts/compare/v0.34.10...v0.34.11) (2020-08-12)
 
 **Note:** Version bump only for package @carbon/charts

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@carbon/charts",
-	"version": "0.34.11",
+	"version": "0.35.0",
 	"description": "Carbon charting components",
 	"main": "./bundle.js",
 	"module": "./index.js",

diff --git a/packages/core/src/components/axes/grid-brush.ts b/packages/core/src/components/axes/grid-brush.ts
@@ -130,13 +130,15 @@ export class ChartBrush extends Component {
 					xScale.invert(selection[0]),
 					xScale.invert(selection[1])
 				];
-
 				if (
 					selection != null &&
 					event.sourceEvent != null &&
 					(event.sourceEvent.type === "mousemove" ||
 						event.sourceEvent.type === "mouseup" ||
-						event.sourceEvent.type === "mousedown")
+						event.sourceEvent.type === "mousedown" ||
+						event.sourceEvent.type === "touchstart" ||
+						event.sourceEvent.type === "touchmove" ||
+						event.sourceEvent.type === "touchend")
 				) {
 					// dispatch selection events
 					let zoomBarEventType;

diff --git a/packages/core/src/components/axes/zoom-bar.ts b/packages/core/src/components/axes/zoom-bar.ts
@@ -266,12 +266,15 @@ export class ZoomBar extends Component {
 		}
 
 		// be aware that the value of d3.event changes during an event!
-		// update zoomDomain only if the event comes from mouse event
+		// update zoomDomain only if the event comes from mouse/touch event
 		if (
 			event.sourceEvent != null &&
 			(event.sourceEvent.type === "mousemove" ||
 				event.sourceEvent.type === "mouseup" ||
-				event.sourceEvent.type === "mousedown")
+				event.sourceEvent.type === "mousedown" ||
+				event.sourceEvent.type === "touchstart" ||
+				event.sourceEvent.type === "touchmove" ||
+				event.sourceEvent.type === "touchend")
 		) {
 			// only if zoomDomain is never set or needs update
 			if (

diff --git 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.35.0](https://github.com/carbon-design-system/carbon-charts/compare/v0.34.11...v0.35.0) (2020-08-13)
+
+**Note:** Version bump only for package @carbon/charts-react
+
+
+
+
+
 ## [0.34.11](https://github.com/carbon-design-system/carbon-charts/compare/v0.34.10...v0.34.11) (2020-08-12)
 
 **Note:** Version bump only for package @carbon/charts-react

diff --git a/packages/react/package.json b/packages/react/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@carbon/charts-react",
-	"version": "0.34.11",
+	"version": "0.35.0",
 	"description": "Carbon charting components for React",
 	"main": "./bundle.js",
 	"module": "./index.js",
@@ -46,7 +46,7 @@
 	},
 	"homepage": "https://github.com/carbon-design-system/carbon-charts#readme",
 	"dependencies": {
-		"@carbon/charts": "^0.34.11"
+		"@carbon/charts": "^0.35.0"
 	},
 	"peerDependencies": {
 		"react": "^16.6.3",

diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/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.35.0](https://github.com/carbon-design-system/carbon-charts/compare/v0.34.11...v0.35.0) (2020-08-13)
+
+
+### Features
+
+* **svelte:** add Meter chart wrapper ([#744](https://github.com/carbon-design-system/carbon-charts/issues/744)) ([8ed23b1](https://github.com/carbon-design-system/carbon-charts/commit/8ed23b176d168714ed4c0b481fda71eb8bed4106))
+
+
+
+
+
 ## [0.34.11](https://github.com/carbon-design-system/carbon-charts/compare/v0.34.10...v0.34.11) (2020-08-12)
 
 **Note:** Version bump only for package @carbon/charts-svelte

diff --git a/packages/svelte/package.json b/packages/svelte/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@carbon/charts-svelte",
-	"version": "0.34.11",
+	"version": "0.35.0",
 	"description": "Carbon charting components for Svelte",
 	"main": "./bundle.js",
 	"module": "./index.js",
@@ -47,7 +47,7 @@
 	},
 	"homepage": "https://github.com/carbon-design-system/carbon-charts#readme",
 	"dependencies": {
-		"@carbon/charts": "^0.34.11"
+		"@carbon/charts": "^0.35.0"
 	},
 	"peerDependencies": {
 		"svelte": "^3.20.x"

diff --git a/packages/svelte/src/MeterChart.svelte b/packages/svelte/src/MeterChart.svelte
@@ -0,0 +1,6 @@
+<script>
+  import { MeterChart } from "@carbon/charts";
+  import BaseChart from "./BaseChart.svelte";
+</script>
+
+<BaseChart {...$$restProps} Chart={MeterChart} on:load on:update on:destroy />
diff --git a/packages/svelte/src/index.js b/packages/svelte/src/index.js
@@ -10,6 +10,7 @@ import PieChart from "./PieChart.svelte";
 import ScatterChart from "./ScatterChart.svelte";
 import RadarChart from "./RadarChart.svelte";
 import GaugeChart from "./GaugeChart.svelte";
+import MeterChart from "./MeterChart.svelte";
 
 export {
 	AreaChart,
@@ -24,4 +25,5 @@ export {
 	ScatterChart,
 	RadarChart,
 	GaugeChart,
+	MeterChart
 };
diff --git 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.35.0](https://github.com/carbon-design-system/carbon-charts/compare/v0.34.11...v0.35.0) (2020-08-13)
+
+**Note:** Version bump only for package @carbon/charts-vue
+
+
+
+
+
 ## [0.34.11](https://github.com/carbon-design-system/carbon-charts/compare/v0.34.10...v0.34.11) (2020-08-12)
 
 **Note:** Version bump only for package @carbon/charts-vue

diff --git a/packages/vue/package.json b/packages/vue/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@carbon/charts-vue",
-	"version": "0.34.11",
+	"version": "0.35.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.34.11",
+		"@carbon/charts": "^0.35.0",
 		"vue": "2.5.21"
 	},
 	"devDependencies": {
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,5 +12,5 @@ @@
     			]
     		}
     	},
-    	"version": "0.34.11"
+    	"version": "0.35.0"
     }