Skip to content

Commit 0150d55

Browse files
authored
Merge pull request #5131 from ag-grid/AG-15866/fix_label_itemStyler_highlight
AG-15866 Fix `label.itemStyler` highlight updates
2 parents dcb7f2f + e75f541 commit 0150d55

File tree

19 files changed

+46
-23
lines changed

19 files changed

+46
-23
lines changed

packages/ag-charts-community/src/chart/series/polar/donutSeries.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1862,7 +1862,11 @@ export class DonutSeries extends PolarSeries<PieDonutNodeDatum, AgDonutSeriesOpt
18621862
}
18631863

18641864
protected override hasItemStylers(): boolean {
1865-
const { itemStyler, calloutLabel, sectorLabel } = this.properties;
1866-
return (itemStyler ?? calloutLabel.itemStyler ?? sectorLabel.itemStyler) != null;
1865+
return !(
1866+
this.properties.itemStyler == null &&
1867+
this.properties.calloutLabel.itemStyler == null &&
1868+
this.properties.sectorLabel.itemStyler == null &&
1869+
this.properties.innerLabels.every((innerLabel) => innerLabel.itemStyler == null)
1870+
);
18671871
}
18681872
}

packages/ag-charts-community/src/chart/series/series.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -656,16 +656,16 @@ export abstract class Series<
656656
// Force re-check of layer z-index
657657
this.setSeriesIndex(this.declarationOrder);
658658

659-
if (currentHighlightState === previousHighlightState) {
659+
// Check if there are any itemStylers that might need to react to highlight changes
660+
const hasItemStylers = this.hasItemStylers();
661+
662+
if (!hasItemStylers && currentHighlightState === previousHighlightState) {
660663
this.hasChangesOnHighlight = false;
661664
return;
662665
}
663666

664667
const { highlightedSeries, unhighlightedItem, unhighlightedSeries } = this.properties.highlight;
665668

666-
// Check if there are any itemStylers that might need to react to highlight changes
667-
const hasItemStylers = this.hasItemStylers();
668-
669669
this.hasChangesOnHighlight =
670670
hasItemStylers ||
671671
!isEmptyObject(highlightedSeries) ||

packages/ag-charts-enterprise/src/series/chord/chordSeries.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -628,6 +628,10 @@ export class ChordSeries extends FlowProportionSeries<
628628
}
629629

630630
protected override hasItemStylers(): boolean {
631-
return this.properties.node.itemStyler != null || this.properties.link.itemStyler != null;
631+
return (
632+
this.properties.node.itemStyler != null ||
633+
this.properties.link.itemStyler != null ||
634+
this.properties.label.itemStyler != null
635+
);
632636
}
633637
}

packages/ag-charts-enterprise/src/series/funnel/baseFunnelSeries.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -642,6 +642,6 @@ export abstract class BaseFunnelSeries<
642642
}
643643

644644
protected override hasItemStylers(): boolean {
645-
return this.properties.itemStyler != null;
645+
return this.properties.itemStyler != null || this.properties.label.itemStyler != null;
646646
}
647647
}

packages/ag-charts-enterprise/src/series/heatmap/heatmapSeries.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -605,6 +605,6 @@ export class HeatmapSeries extends _ModuleSupport.CartesianSeries<
605605
}
606606

607607
protected override hasItemStylers(): boolean {
608-
return this.properties.itemStyler != null;
608+
return this.properties.itemStyler != null || this.properties.label.itemStyler != null;
609609
}
610610
}

packages/ag-charts-enterprise/src/series/linear-gauge/linearGaugeSeries.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1265,6 +1265,6 @@ export class LinearGaugeSeries extends _ModuleSupport.Series<
12651265
}
12661266

12671267
protected override hasItemStylers(): boolean {
1268-
return false;
1268+
return this.properties.label.itemStyler != null;
12691269
}
12701270
}

packages/ag-charts-enterprise/src/series/map-line/mapLineSeries.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -730,6 +730,6 @@ export class MapLineSeries extends TopologySeries<
730730
}
731731

732732
protected override hasItemStylers(): boolean {
733-
return this.properties.itemStyler != null;
733+
return this.properties.itemStyler != null || this.properties.label.itemStyler != null;
734734
}
735735
}

packages/ag-charts-enterprise/src/series/map-marker/mapMarkerSeries.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -922,6 +922,6 @@ export class MapMarkerSeries
922922
}
923923

924924
protected override hasItemStylers(): boolean {
925-
return this.properties.itemStyler != null;
925+
return this.properties.itemStyler != null || this.properties.label.itemStyler != null;
926926
}
927927
}

packages/ag-charts-enterprise/src/series/map-shape/mapShapeSeries.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -755,6 +755,6 @@ export class MapShapeSeries
755755
}
756756

757757
protected override hasItemStylers(): boolean {
758-
return this.properties.itemStyler != null;
758+
return this.properties.itemStyler != null || this.properties.label.itemStyler != null;
759759
}
760760
}

packages/ag-charts-enterprise/src/series/nightingale/nightingaleSeries.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,6 @@ export class NightingaleSeries extends RadialColumnSeriesBase<_ModuleSupport.Sec
6666
}
6767

6868
protected override hasItemStylers(): boolean {
69-
return this.properties.itemStyler != null;
69+
return this.properties.itemStyler != null || this.properties.label.itemStyler != null;
7070
}
7171
}

0 commit comments

Comments
 (0)