Browse Source

Made the Requested Changes

pull/3954/head
VeerChaurasia 10 months ago
parent
commit
a31d0196bc
  1. 4
      libs/ui/src/lib/treemap-chart/interfaces/interfaces.ts
  2. 31
      libs/ui/src/lib/treemap-chart/treemap-chart.component.ts

4
libs/ui/src/lib/treemap-chart/interfaces/interfaces.ts

@ -0,0 +1,4 @@
export interface ColorConfig {
backgroundColor: string;
fontColor: string;
}

31
libs/ui/src/lib/treemap-chart/treemap-chart.component.ts

@ -9,6 +9,7 @@ import {
PortfolioPosition PortfolioPosition
} from '@ghostfolio/common/interfaces'; } from '@ghostfolio/common/interfaces';
import { ColorScheme, DateRange } from '@ghostfolio/common/types'; import { ColorScheme, DateRange } from '@ghostfolio/common/types';
import { ColorConfig } from './interfaces/interfaces';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { import {
@ -35,10 +36,6 @@ import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
const { gray, green, red } = require('open-color'); const { gray, green, red } = require('open-color');
interface ColorConfig {
backgroundColor: string;
fontColor: string;
}
@Component({ @Component({
changeDetection: ChangeDetectionStrategy.OnPush, changeDetection: ChangeDetectionStrategy.OnPush,
@ -68,6 +65,22 @@ export class GfTreemapChartComponent
public constructor() { public constructor() {
Chart.register(LinearScale, Tooltip, TreemapController, TreemapElement); Chart.register(LinearScale, Tooltip, TreemapController, TreemapElement);
} }
public ngAfterViewInit() {
if (this.holdings) {
this.initialize();
}
}
public ngOnChanges() {
if (this.holdings) {
this.initialize();
}
}
public ngOnDestroy() {
this.chart?.destroy();
}
private getColorConfig( private getColorConfig(
annualizedNetPerformancePercent: number, annualizedNetPerformancePercent: number,
@ -199,13 +212,13 @@ export class GfTreemapChartComponent
annualizedNetPerformancePercentWithCurrencyEffect * 100 annualizedNetPerformancePercentWithCurrencyEffect * 100
) / 100; ) / 100;
const colorConfig = this.getColorConfig( const {backgroundColor} = this.getColorConfig(
annualizedNetPerformancePercentWithCurrencyEffect, annualizedNetPerformancePercentWithCurrencyEffect,
positiveNetPerformancePercentsRange, positiveNetPerformancePercentsRange,
negativeNetPerformancePercentsRange negativeNetPerformancePercentsRange
); );
return colorConfig.backgroundColor; return backgroundColor;
}, },
borderRadius: 4, borderRadius: 4,
key: 'allocationInPercentage', key: 'allocationInPercentage',
@ -232,13 +245,13 @@ export class GfTreemapChartComponent
annualizedNetPerformancePercentWithCurrencyEffect * 100 annualizedNetPerformancePercentWithCurrencyEffect * 100
) / 100; ) / 100;
const colorConfig = this.getColorConfig( const {fontColor} = this.getColorConfig(
annualizedNetPerformancePercentWithCurrencyEffect, annualizedNetPerformancePercentWithCurrencyEffect,
positiveNetPerformancePercentsRange, positiveNetPerformancePercentsRange,
negativeNetPerformancePercentsRange negativeNetPerformancePercentsRange
); );
return colorConfig.fontColor; return fontColor;
}, },
display: true, display: true,
font: [{ size: 16 }, { lineHeight: 1.5, size: 14 }], font: [{ size: 16 }, { lineHeight: 1.5, size: 14 }],
@ -344,4 +357,4 @@ export class GfTreemapChartComponent
yAlign: 'center' yAlign: 'center'
}; };
} }
} }
Loading…
Cancel
Save