diff --git a/packages/grafana-ui/src/components/Table/TableNG/TableNG.test.tsx b/packages/grafana-ui/src/components/Table/TableNG/TableNG.test.tsx
index 56e38b9cd60..ead8014e550 100644
--- a/packages/grafana-ui/src/components/Table/TableNG/TableNG.test.tsx
+++ b/packages/grafana-ui/src/components/Table/TableNG/TableNG.test.tsx
@@ -451,6 +451,19 @@ describe('TableNG', () => {
expect(screen.getByText('A1')).toBeInTheDocument();
expect(screen.getByText('1')).toBeInTheDocument();
});
+
+ it('shows full column name in title attribute for truncated headers', () => {
+ const { container } = render(
+
+ );
+
+ const headers = container.querySelectorAll('[role="columnheader"]');
+ const firstHeaderSpan = headers[0].querySelector('span');
+ const secondHeaderSpan = headers[1].querySelector('span');
+
+ expect(firstHeaderSpan).toHaveAttribute('title', 'Column A');
+ expect(secondHeaderSpan).toHaveAttribute('title', 'Column B');
+ });
});
describe('Footer options', () => {
diff --git a/packages/grafana-ui/src/components/Table/TableNG/components/HeaderCell.tsx b/packages/grafana-ui/src/components/Table/TableNG/components/HeaderCell.tsx
index 8ccc73a98b9..fc59c08aa3c 100644
--- a/packages/grafana-ui/src/components/Table/TableNG/components/HeaderCell.tsx
+++ b/packages/grafana-ui/src/components/Table/TableNG/components/HeaderCell.tsx
@@ -55,7 +55,9 @@ const HeaderCell: React.FC = ({
{showTypeIcons && (
)}
- {getDisplayName(field)}
+
+ {displayName}
+
{direction && (