From 12612df416cc8b10af08d318f514dab51171ea71 Mon Sep 17 00:00:00 2001 From: Andre Date: Thu, 31 Mar 2022 12:08:16 +0200 Subject: [PATCH 1/2] feat(core): Pass treemap data to `getFillColor` --- packages/core/CHANGELOG.md | 10 ++++++++++ packages/core/src/components/graphs/treemap.ts | 14 ++++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md index aa48aad2c0..30716606a0 100644 --- a/packages/core/CHANGELOG.md +++ b/packages/core/CHANGELOG.md @@ -3,6 +3,16 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [Unreleased] + +### Added + +* **core:** pass treemap data to `getFillColor` + + + + + # [0.56.0](https://github.com/carbon-design-system/carbon-charts/compare/v0.55.1...v0.56.0) (2022-03-28) diff --git a/packages/core/src/components/graphs/treemap.ts b/packages/core/src/components/graphs/treemap.ts index 536905732c..023a0a9301 100644 --- a/packages/core/src/components/graphs/treemap.ts +++ b/packages/core/src/components/graphs/treemap.ts @@ -168,7 +168,7 @@ export class Treemap extends Component { .attr('height', (d) => d.y1 - d.y0) .style('fill', (d) => { while (d.depth > 1) d = d.parent; - return this.model.getFillColor(d.data.name); + return this.model.getFillColor(d.data.name, undefined, d); }); // Update all clip paths @@ -220,7 +220,7 @@ export class Treemap extends Component { let parent = d; while (parent.depth > 1) parent = parent.parent; const color = hsl( - this.model.getFillColor(parent.data.name) + this.model.getFillColor(parent.data.name, undefined, d) ); return [ { @@ -285,7 +285,9 @@ export class Treemap extends Component { ) .style('fill', (d: any) => { const customColor = self.model.getFillColor( - d.parent.data.name + d.parent.data.name, + undefined, + d ); if (customColor) { fillColor = customColor; @@ -361,7 +363,11 @@ export class Treemap extends Component { }) ) .style('fill', (d: any) => - self.model.getFillColor(d.parent.data.name) + self.model.getFillColor( + d.parent.data.name, + undefined, + d + ) ); // Dispatch mouse event From 5abbd7e481c9b5fca891cebe7a0509b56b2e2d8c Mon Sep 17 00:00:00 2001 From: Andre Date: Thu, 7 Apr 2022 09:09:37 +0200 Subject: [PATCH 2/2] fix: Pass leaf data to `getFillColor` --- packages/core/src/components/graphs/treemap.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/core/src/components/graphs/treemap.ts b/packages/core/src/components/graphs/treemap.ts index 023a0a9301..6062a302d7 100644 --- a/packages/core/src/components/graphs/treemap.ts +++ b/packages/core/src/components/graphs/treemap.ts @@ -167,8 +167,7 @@ export class Treemap extends Component { .attr('width', (d) => d.x1 - d.x0) .attr('height', (d) => d.y1 - d.y0) .style('fill', (d) => { - while (d.depth > 1) d = d.parent; - return this.model.getFillColor(d.data.name, undefined, d); + return this.model.getFillColor(d.parent.data.name, undefined, d); }); // Update all clip paths