From f0c60b422d18dc8490b4a8a64f78ff9dc0372ce1 Mon Sep 17 00:00:00 2001
From: Alex Molodyh <140214274+amolodyh-hyland@users.noreply.github.com>
Date: Wed, 29 Jul 2026 21:00:54 -0700
Subject: [PATCH] AAE-48705 Fix for datatable column name wrapping when
 hovering over it (#12081)

---
 .../datatable/datatable.component.html        |  1 +
 .../datatable/datatable.component.scss        | 19 ++++++++++++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/lib/core/src/lib/datatable/components/datatable/datatable.component.html b/lib/core/src/lib/datatable/components/datatable/datatable.component.html
index 1f7155ba39..547e3cc5bf 100644
--- a/lib/core/src/lib/datatable/components/datatable/datatable.component.html
+++ b/lib/core/src/lib/datatable/components/datatable/datatable.component.html
@@ -145,6 +145,7 @@
                                     }
 
                                     <span
+                                        class="adf-datatable-cell-header-sort-indicator"
                                         [class.adf-datatable__header--sorted-asc]="isColumnSorted(col, 'asc')"
                                         [class.adf-datatable__header--sorted-desc]="isColumnSorted(col, 'desc')"
                                     >
diff --git a/lib/core/src/lib/datatable/components/datatable/datatable.component.scss b/lib/core/src/lib/datatable/components/datatable/datatable.component.scss
index 0e54008f39..f684b0062e 100644
--- a/lib/core/src/lib/datatable/components/datatable/datatable.component.scss
+++ b/lib/core/src/lib/datatable/components/datatable/datatable.component.scss
@@ -562,17 +562,21 @@ $data-table-cell-min-width-file-size: $data-table-cell-min-width-1 !default;
         align-items: center;
     }
 
+    &.adf-sortable .adf-datatable-cell-header-sort-indicator {
+        display: inline-flex;
+        align-items: center;
+        justify-content: center;
+        box-sizing: border-box;
+        flex: 0 0 24px;
+        min-width: 0;
+    }
+
     .adf-datatable__header--sorted-asc,
     .adf-datatable__header--sorted-desc {
-        padding-right: 0.25rem;
-
         &::after {
             @include mixins.typo-icon;
 
             content: '\e5d8';
-            left: 5px;
-            right: 5px;
-            position: relative;
             vertical-align: middle;
         }
     }
@@ -605,6 +609,11 @@ $data-table-cell-min-width-file-size: $data-table-cell-min-width-1 !default;
     }
 
     .adf-datatable-cell-header-drag-icon {
+        display: inline-flex;
+        align-items: center;
+        justify-content: center;
+        flex: 0 0 24px;
+        min-width: 0;
         margin-left: auto;
         cursor: move;
         margin-right: -0.5rem;