Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/JennChao/carbon-charts in…
Browse files Browse the repository at this point in the history
…to axis-option

* 'master' of https://github.com/JennChao/carbon-charts:
  v0.37.1
  Merge pull request carbon-design-system#800 from metonym/fix-svelte-base-chart
  • Loading branch information
JennChao committed Sep 15, 2020
2 parents 3d76d40 + 67675cf commit 7095c75
Show file tree
Hide file tree
Showing 13 changed files with 64 additions and 15 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.37.1](https://github.com/carbon-design-system/carbon-charts/compare/v0.37.0...v0.37.1) (2020-09-14)

**Note:** Version bump only for package @carbon/charts-monorepo





# [0.37.0](https://github.com/carbon-design-system/carbon-charts/compare/v0.36.4...v0.37.0) (2020-09-11)


Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@
]
}
},
"version": "0.37.0"
"version": "0.37.1"
}
8 changes: 8 additions & 0 deletions packages/angular/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.37.1](https://github.com/carbon-design-system/carbon-charts/compare/v0.37.0...v0.37.1) (2020-09-14)

**Note:** Version bump only for package @carbon/charts-angular





# [0.37.0](https://github.com/carbon-design-system/carbon-charts/compare/v0.36.4...v0.37.0) (2020-09-11)

**Note:** Version bump only for package @carbon/charts-angular
Expand Down
4 changes: 2 additions & 2 deletions packages/angular/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@carbon/charts-angular",
"version": "0.37.0",
"version": "0.37.1",
"description": "Carbon charting components for Angular",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -40,7 +40,7 @@
"scss"
],
"dependencies": {
"@carbon/charts": "^0.37.0"
"@carbon/charts": "^0.37.1"
},
"peerDependencies": {
"@angular/common": "^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0",
Expand Down
8 changes: 8 additions & 0 deletions packages/core/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.37.1](https://github.com/carbon-design-system/carbon-charts/compare/v0.37.0...v0.37.1) (2020-09-14)

**Note:** Version bump only for package @carbon/charts





# [0.37.0](https://github.com/carbon-design-system/carbon-charts/compare/v0.36.4...v0.37.0) (2020-09-11)


Expand Down
2 changes: 1 addition & 1 deletion packages/core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@carbon/charts",
"version": "0.37.0",
"version": "0.37.1",
"description": "Carbon charting components",
"main": "./bundle.js",
"module": "./index.js",
Expand Down
8 changes: 8 additions & 0 deletions packages/react/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.37.1](https://github.com/carbon-design-system/carbon-charts/compare/v0.37.0...v0.37.1) (2020-09-14)

**Note:** Version bump only for package @carbon/charts-react





# [0.37.0](https://github.com/carbon-design-system/carbon-charts/compare/v0.36.4...v0.37.0) (2020-09-11)

**Note:** Version bump only for package @carbon/charts-react
Expand Down
4 changes: 2 additions & 2 deletions packages/react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@carbon/charts-react",
"version": "0.37.0",
"version": "0.37.1",
"description": "Carbon charting components for React",
"main": "./bundle.js",
"module": "./index.js",
Expand Down Expand Up @@ -46,7 +46,7 @@
},
"homepage": "https://github.com/carbon-design-system/carbon-charts#readme",
"dependencies": {
"@carbon/charts": "^0.37.0"
"@carbon/charts": "^0.37.1"
},
"peerDependencies": {
"react": "^16.6.3",
Expand Down
8 changes: 8 additions & 0 deletions packages/svelte/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.37.1](https://github.com/carbon-design-system/carbon-charts/compare/v0.37.0...v0.37.1) (2020-09-14)

**Note:** Version bump only for package @carbon/charts-svelte





# [0.37.0](https://github.com/carbon-design-system/carbon-charts/compare/v0.36.4...v0.37.0) (2020-09-11)

**Note:** Version bump only for package @carbon/charts-svelte
Expand Down
4 changes: 2 additions & 2 deletions packages/svelte/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@carbon/charts-svelte",
"version": "0.37.0",
"version": "0.37.1",
"description": "Carbon charting components for Svelte",
"main": "./bundle.js",
"module": "./index.js",
Expand Down Expand Up @@ -47,7 +47,7 @@
},
"homepage": "https://github.com/carbon-design-system/carbon-charts#readme",
"dependencies": {
"@carbon/charts": "^0.37.0"
"@carbon/charts": "^0.37.1"
},
"peerDependencies": {
"svelte": "^3.20.x"
Expand Down
11 changes: 6 additions & 5 deletions packages/svelte/src/BaseChart.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@
const dispatch = createEventDispatcher();
const id = "chart-" + Math.random().toString(36);
let ref = undefined;
let chart = undefined;
let ref = null;
let chart = null;
onMount(() => {
/**
* CodeSandbox does not resolve Svelte components from the `svelte` package.json entry.
* This causes `bind:ref` to be `undefined`; the chart can't mount to the element.
*
*
* We fallback to manually querying the DOM for the chart holder element because
* CodeSandbox does not use uncompiled Svelte source code.
*
*
* See https://github.com/sveltejs/svelte/issues/2937
*/
const element = ref || document.getElementById(id);
Expand All @@ -30,7 +30,8 @@
return () => {
if (chart) {
chart.destroy();
chart.components.forEach((component) => component.destroy());
chart = null;
dispatch("destroy");
}
};
Expand Down
8 changes: 8 additions & 0 deletions packages/vue/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.37.1](https://github.com/carbon-design-system/carbon-charts/compare/v0.37.0...v0.37.1) (2020-09-14)

**Note:** Version bump only for package @carbon/charts-vue





# [0.37.0](https://github.com/carbon-design-system/carbon-charts/compare/v0.36.4...v0.37.0) (2020-09-11)

**Note:** Version bump only for package @carbon/charts-vue
Expand Down
4 changes: 2 additions & 2 deletions packages/vue/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@carbon/charts-vue",
"version": "0.37.0",
"version": "0.37.1",
"description": "Carbon charting components for Vue",
"main": "charts-vue.umd.min.js",
"scripts": {
Expand All @@ -14,7 +14,7 @@
"clean": "rm -rf dist demo/bundle"
},
"dependencies": {
"@carbon/charts": "^0.37.0",
"@carbon/charts": "^0.37.1",
"vue": "2.5.21"
},
"devDependencies": {
Expand Down

0 comments on commit 7095c75

Please sign in to comment.