From 69fc2c22a5c6400dc95253fc1135fd7a7b06a09d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torstein=20H=C3=B8nsi?= <torstein@highsoft.com>
Date: Fri, 17 Nov 2023 23:50:01 +0100
Subject: [PATCH] Better solution to #17545. No need for alignAttr anymore.

---
 ts/Extensions/OverlappingDataLabels.ts | 5 ++---
 ts/Series/Funnel/FunnelSeries.ts       | 5 +----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/ts/Extensions/OverlappingDataLabels.ts b/ts/Extensions/OverlappingDataLabels.ts
index 89ad0c122bc..52156bda8bf 100644
--- 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
index a44c7559c18..e808a4c262f 100644
--- 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) {