From 84a4a176f0ce2996bc3132a3e4031727ab510ec5 Mon Sep 17 00:00:00 2001 From: Jacob Parker Date: Wed, 27 Nov 2024 14:30:46 +0000 Subject: [PATCH] AG-13501 Fix inconsistent use of visibility --- .../src/chart/series/cartesian/bubbleSeries.ts | 3 +-- .../chart/series/cartesian/scatterSeries.ts | 18 +++--------------- .../src/chart/series/series.ts | 2 ++ .../src/chart/series/seriesProperties.ts | 3 ++- .../series/candlestick/candlestickSeries.ts | 2 +- .../src/series/funnel/baseFunnelSeries.ts | 2 +- .../src/series/ohlc/ohlcSeries.ts | 2 +- .../src/series/radar/radarSeries.ts | 3 ++- .../src/series/radial-bar/radialBarSeries.ts | 16 ++++------------ .../radial-column/radialColumnSeriesBase.ts | 14 +++----------- .../src/series/range-bar/rangeBarSeries.ts | 8 +------- 11 files changed, 21 insertions(+), 52 deletions(-) diff --git a/packages/ag-charts-community/src/chart/series/cartesian/bubbleSeries.ts b/packages/ag-charts-community/src/chart/series/cartesian/bubbleSeries.ts index dbfe4db6f5..be3eacbe91 100644 --- a/packages/ag-charts-community/src/chart/series/cartesian/bubbleSeries.ts +++ b/packages/ag-charts-community/src/chart/series/cartesian/bubbleSeries.ts @@ -150,7 +150,7 @@ export class BubbleSeries extends CartesianSeries extends BaseProperties< @Validate(STRING, { optional: true }) id?: string; + // Private - use series.visible @Validate(BOOLEAN) - visible: boolean = true; + protected readonly visible: boolean = true; @Validate(REAL_NUMBER, { optional: true }) focusPriority?: number = Infinity; diff --git a/packages/ag-charts-enterprise/src/series/candlestick/candlestickSeries.ts b/packages/ag-charts-enterprise/src/series/candlestick/candlestickSeries.ts index 1925b111a4..022d0b32c8 100644 --- a/packages/ag-charts-enterprise/src/series/candlestick/candlestickSeries.ts +++ b/packages/ag-charts-enterprise/src/series/candlestick/candlestickSeries.ts @@ -236,6 +236,7 @@ export class CandlestickSeries extends OhlcSeriesBase { id, data, ctx: { legendManager }, + visible, } = this; const { xKey, @@ -198,7 +199,6 @@ export class OhlcSeries extends OhlcSeriesBase { item: { up, down }, showInLegend, legendItemName, - visible, } = this.properties; if (!data?.length || !xKey || legendType !== 'category') { diff --git a/packages/ag-charts-enterprise/src/series/radar/radarSeries.ts b/packages/ag-charts-enterprise/src/series/radar/radarSeries.ts index e1e6509544..4779bce8a1 100644 --- a/packages/ag-charts-enterprise/src/series/radar/radarSeries.ts +++ b/packages/ag-charts-enterprise/src/series/radar/radarSeries.ts @@ -308,7 +308,8 @@ export abstract class RadarSeries extends _ModuleSupport.PolarSeries< selection: _ModuleSupport.Selection<_ModuleSupport.Marker, RadarNodeDatum>, highlight: boolean ) { - const { angleKey, radiusKey, marker, visible } = this.properties; + const { visible } = this; + const { angleKey, radiusKey, marker } = this.properties; const { itemStyler } = marker; let selectionData: RadarNodeDatum[] = []; diff --git a/packages/ag-charts-enterprise/src/series/radial-bar/radialBarSeries.ts b/packages/ag-charts-enterprise/src/series/radial-bar/radialBarSeries.ts index a77eee7826..26e183f9fa 100644 --- a/packages/ag-charts-enterprise/src/series/radial-bar/radialBarSeries.ts +++ b/packages/ag-charts-enterprise/src/series/radial-bar/radialBarSeries.ts @@ -93,15 +93,6 @@ export class RadialBarSeries extends _ModuleSupport.PolarSeries< return new Sector(); } - override addChartEventListeners(): void { - this.destroyFns.push( - this.ctx.chartEventManager?.addListener('legend-item-click', (event) => this.onLegendItemClick(event)), - this.ctx.chartEventManager?.addListener('legend-item-double-click', (event) => - this.onLegendItemDoubleClick(event) - ) - ); - } - override getSeriesDomain(direction: _ModuleSupport.ChartAxisDirection): any[] { const { dataModel, processedData } = this; if (!processedData || !dataModel) return []; @@ -116,10 +107,11 @@ export class RadialBarSeries extends _ModuleSupport.PolarSeries< } override async processData(dataController: _ModuleSupport.DataController) { - const { angleKey, radiusKey, normalizedTo, visible } = this.properties; + const { visible } = this; + const { angleKey, radiusKey, normalizedTo } = this.properties; const animationEnabled = !this.ctx.animationManager.isSkipped(); - if (!this.properties.isValid() || !(visible || animationEnabled)) return; + if (!this.properties.isValid()) return; const stackGroupId = this.getStackId(); const stackGroupTrailingId = `${stackGroupId}-trailing`; @@ -137,7 +129,7 @@ export class RadialBarSeries extends _ModuleSupport.PolarSeries< extraProps.push(animationValidation()); } - const visibleProps = this.visible || !animationEnabled ? {} : { forceValue: 0 }; + const visibleProps = visible || !animationEnabled ? {} : { forceValue: 0 }; const radiusScaleType = this.axes[ChartAxisDirection.Y]?.scale.type; const angleScaleType = this.axes[ChartAxisDirection.X]?.scale.type; diff --git a/packages/ag-charts-enterprise/src/series/radial-column/radialColumnSeriesBase.ts b/packages/ag-charts-enterprise/src/series/radial-column/radialColumnSeriesBase.ts index ea530099a5..26caf45d27 100644 --- a/packages/ag-charts-enterprise/src/series/radial-column/radialColumnSeriesBase.ts +++ b/packages/ag-charts-enterprise/src/series/radial-column/radialColumnSeriesBase.ts @@ -97,15 +97,6 @@ export abstract class RadialColumnSeriesBase< }); } - override addChartEventListeners(): void { - this.destroyFns.push( - this.ctx.chartEventManager?.addListener('legend-item-click', (event) => this.onLegendItemClick(event)), - this.ctx.chartEventManager?.addListener('legend-item-double-click', (event) => - this.onLegendItemDoubleClick(event) - ) - ); - } - override getSeriesDomain(direction: _ModuleSupport.ChartAxisDirection): any[] { const { dataModel, processedData } = this; if (!processedData || !dataModel) return []; @@ -122,10 +113,11 @@ export abstract class RadialColumnSeriesBase< protected abstract getStackId(): string; override async processData(dataController: _ModuleSupport.DataController) { - const { angleKey, radiusKey, normalizedTo, visible } = this.properties; + const { visible } = this; + const { angleKey, radiusKey, normalizedTo } = this.properties; const animationEnabled = !this.ctx.animationManager.isSkipped(); - if (!this.properties.isValid() || !(visible || animationEnabled)) return; + if (!this.properties.isValid()) return; const stackGroupId = this.getStackId(); const stackGroupTrailingId = `${stackGroupId}-trailing`; diff --git a/packages/ag-charts-enterprise/src/series/range-bar/rangeBarSeries.ts b/packages/ag-charts-enterprise/src/series/range-bar/rangeBarSeries.ts index 8deb6baabe..c33bca011e 100644 --- a/packages/ag-charts-enterprise/src/series/range-bar/rangeBarSeries.ts +++ b/packages/ag-charts-enterprise/src/series/range-bar/rangeBarSeries.ts @@ -235,13 +235,7 @@ export class RangeBarSeries extends _ModuleSupport.AbstractBarSeries< } override createNodeData() { - const { - data, - dataModel, - groupScale, - processedData, - properties: { visible }, - } = this; + const { data, dataModel, groupScale, processedData, visible } = this; const xAxis = this.getCategoryAxis(); const yAxis = this.getValueAxis();