Merge branch 'master' into feat/instrument-js-scope

carbon-design-system · May 14, 2024 · 1724a5c · 1724a5c
2 parents b6555c6 + 76c86ce
commit 1724a5c
Show file tree

Hide file tree

Showing 14 changed files with 90 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,19 @@
 All notable changes to this project will be documented in this file. See
 [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 1.15.8 (2024-05-10)
+
+### Bug Fixes
+
+- **stacked-axis:** number labels breaking the axis
+  ([#1821](https://github.com/carbon-design-system/carbon-charts/issues/1821))
+  ([0aec1f1](https://github.com/carbon-design-system/carbon-charts/commit/0aec1f1f9a9b49694867ec2257da5ccff0926191))
+
+# Change Log
+
+All notable changes to this project will be documented in this file. See
+[Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
 ## 1.15.7 (2024-04-18)
 
 **Note:** Version bump only for package @carbon/charts-monorepo

diff --git a/lerna.json b/lerna.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "node_modules/lerna/schemas/lerna-schema.json",
-	"version": "1.15.7",
+	"version": "1.15.8",
 	"npmClient": "yarn",
 	"command": {
 		"publish": {

diff --git a/packages/angular/CHANGELOG.md b/packages/angular/CHANGELOG.md
@@ -3,6 +3,19 @@
 All notable changes to this project will be documented in this file. See
 [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 1.15.8 (2024-05-10)
+
+### Bug Fixes
+
+- **stacked-axis:** number labels breaking the axis
+  ([#1821](https://github.com/carbon-design-system/carbon-charts/issues/1821))
+  ([0aec1f1](https://github.com/carbon-design-system/carbon-charts/commit/0aec1f1f9a9b49694867ec2257da5ccff0926191))
+
+# Change Log
+
+All notable changes to this project will be documented in this file. See
+[Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
 ## 1.15.7 (2024-04-18)
 
 **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": "1.15.7",
+	"version": "1.15.8",
 	"description": "Carbon Charts component library for Angular",
 	"exports": {
 		"./styles.min.css": "./styles.min.css",

diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
@@ -3,6 +3,19 @@
 All notable changes to this project will be documented in this file. See
 [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 1.15.8 (2024-05-10)
+
+### Bug Fixes
+
+- **stacked-axis:** number labels breaking the axis
+  ([#1821](https://github.com/carbon-design-system/carbon-charts/issues/1821))
+  ([0aec1f1](https://github.com/carbon-design-system/carbon-charts/commit/0aec1f1f9a9b49694867ec2257da5ccff0926191))
+
+# Change Log
+
+All notable changes to this project will be documented in this file. See
+[Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
 ## 1.15.7 (2024-04-18)
 
 **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": "1.15.7",
+	"version": "1.15.8",
 	"description": "Carbon Charts component library",
 	"type": "module",
 	"module": "./dist/index.mjs",

diff --git a/packages/core/src/demo/charts/bar.ts b/packages/core/src/demo/charts/bar.ts
@@ -643,22 +643,22 @@ export const stackedBarData = [
 	{ group: 'Dataset 1', key: 'More', value: 29123 },
 	{ group: 'Dataset 1', key: 'Sold', value: 35213 },
 	{ group: 'Dataset 1', key: 'Restocking', value: 51213 },
-	{ group: 'Dataset 1', key: 'Misc', value: 16932 },
+	{ group: 'Dataset 1', key: 'Misc 1', value: 16932 },
 	{ group: 'Dataset 2', key: 'Qty', value: 32432 },
 	{ group: 'Dataset 2', key: 'More', value: 21312 },
 	{ group: 'Dataset 2', key: 'Sold', value: 56456 },
 	{ group: 'Dataset 2', key: 'Restocking', value: 21312 },
-	{ group: 'Dataset 2', key: 'Misc', value: 34234 },
+	{ group: 'Dataset 2', key: 'Misc 1', value: 34234 },
 	{ group: 'Dataset 3', key: 'Qty', value: 12312 },
 	{ group: 'Dataset 3', key: 'More', value: 23232 },
 	{ group: 'Dataset 3', key: 'Sold', value: 34232 },
 	{ group: 'Dataset 3', key: 'Restocking', value: 12312 },
-	{ group: 'Dataset 3', key: 'Misc', value: 34234 },
+	{ group: 'Dataset 3', key: 'Misc 1', value: 34234 },
 	{ group: 'Dataset 4', key: 'Qty', value: 32423 },
 	{ group: 'Dataset 4', key: 'More', value: 21313 },
 	{ group: 'Dataset 4', key: 'Sold', value: 64353 },
 	{ group: 'Dataset 4', key: 'Restocking', value: 24134 },
-	{ group: 'Dataset 4', key: 'Misc', value: 32423 }
+	{ group: 'Dataset 4', key: 'Misc 1', value: 32423 }
 ]
 
 export const stackedBarOptions = {

diff --git a/packages/core/src/services/scales-cartesian.ts b/packages/core/src/services/scales-cartesian.ts
@@ -27,7 +27,7 @@ import { subMinutes } from 'date-fns/subMinutes'
 import { differenceInSeconds } from 'date-fns/differenceInSeconds'
 import { subSeconds } from 'date-fns/subSeconds'
 import { addSeconds } from 'date-fns/addSeconds'
-import { flatten, uniq } from 'lodash-es'
+import { flatten, omit, uniq } from 'lodash-es'
 import { getProperty } from '@/tools'
 import { axis as axisConfigs } from '@/configuration'
 import { Service } from './service'
@@ -557,7 +557,7 @@ export class CartesianScales extends Service {
 
 				let positiveSum = 0,
 					negativeSum = 0
-				Object.values(numericalValues).forEach((value: number) => {
+				Object.values(omit(numericalValues, 'sharedStackKey')).forEach((value: number) => {
 					if (!isNaN(value)) {
 						if (value < 0) {
 							negativeSum += value

diff --git a/packages/react/CHANGELOG.md b/packages/react/CHANGELOG.md
@@ -3,6 +3,19 @@
 All notable changes to this project will be documented in this file. See
 [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 1.15.8 (2024-05-10)
+
+### Bug Fixes
+
+- **stacked-axis:** number labels breaking the axis
+  ([#1821](https://github.com/carbon-design-system/carbon-charts/issues/1821))
+  ([0aec1f1](https://github.com/carbon-design-system/carbon-charts/commit/0aec1f1f9a9b49694867ec2257da5ccff0926191))
+
+# Change Log
+
+All notable changes to this project will be documented in this file. See
+[Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
 ## 1.15.7 (2024-04-18)
 
 **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": "1.15.7",
+	"version": "1.15.8",
 	"description": "Carbon Charts component library for React",
 	"type": "module",
 	"main": "./dist/index.js",

diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
@@ -3,6 +3,19 @@
 All notable changes to this project will be documented in this file. See
 [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 1.15.8 (2024-05-10)
+
+### Bug Fixes
+
+- **stacked-axis:** number labels breaking the axis
+  ([#1821](https://github.com/carbon-design-system/carbon-charts/issues/1821))
+  ([0aec1f1](https://github.com/carbon-design-system/carbon-charts/commit/0aec1f1f9a9b49694867ec2257da5ccff0926191))
+
+# Change Log
+
+All notable changes to this project will be documented in this file. See
+[Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
 ## 1.15.7 (2024-04-18)
 
 **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": "1.15.7",
+	"version": "1.15.8",
 	"description": "Carbon Charts component library for Svelte",
 	"scripts": {
 		"postinstall": "ibmtelemetry --config=telemetry.yml",

diff --git a/packages/vue/CHANGELOG.md b/packages/vue/CHANGELOG.md
@@ -3,6 +3,19 @@
 All notable changes to this project will be documented in this file. See
 [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 1.15.8 (2024-05-10)
+
+### Bug Fixes
+
+- **stacked-axis:** number labels breaking the axis
+  ([#1821](https://github.com/carbon-design-system/carbon-charts/issues/1821))
+  ([0aec1f1](https://github.com/carbon-design-system/carbon-charts/commit/0aec1f1f9a9b49694867ec2257da5ccff0926191))
+
+# Change Log
+
+All notable changes to this project will be documented in this file. See
+[Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
 ## 1.15.7 (2024-04-18)
 
 **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": "1.15.7",
+	"version": "1.15.8",
 	"description": "Carbon Charts component library for Vue",
 	"type": "module",
 	"module": "./dist/index.mjs",