Better solution to #17545. No need for alignAttr anymore.

highcharts · Nov 18, 2023 · 69fc2c2 · 69fc2c2
1 parent affb4e7
commit 69fc2c2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/ts/Extensions/OverlappingDataLabels.ts b/ts/Extensions/OverlappingDataLabels.ts
@@ -278,10 +278,9 @@ function hideOrShow(label: SVGElement, chart: Chart): boolean {
                 isLabelAffected = true;
 
                 // Animate or set the opacity
-                label.alignAttr.opacity = newOpacity;
                 label[label.isOld ? 'animate' : 'attr'](
-                    label.alignAttr,
-                    null as any,
+                    { opacity: newOpacity },
+                    void 0,
                     complete
                 );
                 fireEvent(chart, 'afterHideOverlappingLabel');

diff --git a/ts/Series/Funnel/FunnelSeries.ts b/ts/Series/Funnel/FunnelSeries.ts
@@ -214,7 +214,7 @@ class FunnelSeries extends PieSeries {
         options.verticalAlign = 'bottom';
 
         // Call the parent method
-        if (!inside || point.visible) {
+        if (inside && point.visible) {
             baseAlignDataLabel.call(
                 series,
                 point,
@@ -223,9 +223,6 @@ class FunnelSeries extends PieSeries {
                 alignTo,
                 isNew
             );
-            // Delete `alignAttr` for funnel and pyramid, because it is not
-            // used, but caused problems with the overlapping logic (#17545)
-            delete dataLabel.alignAttr;
         }
 
         if (inside) {