diff --git a/.changeset/blue-kings-switch.md b/.changeset/blue-kings-switch.md
new file mode 100644
index 00000000000..409b0760dba
--- /dev/null
+++ b/.changeset/blue-kings-switch.md
@@ -0,0 +1,5 @@
+---
+'@talend/design-system': patch
+---
+
+TDOPS-5671 - Fix Design System tooltip display in case of empty value
diff --git a/packages/design-system/src/components/Tooltip/Tooltip.cy.tsx b/packages/design-system/src/components/Tooltip/Tooltip.cy.tsx
index 8e1c7f90ca1..3792732d748 100644
--- a/packages/design-system/src/components/Tooltip/Tooltip.cy.tsx
+++ b/packages/design-system/src/components/Tooltip/Tooltip.cy.tsx
@@ -1,4 +1,5 @@
/* eslint-disable testing-library/prefer-screen-queries */
+
/* eslint-disable testing-library/await-async-queries */
import { Tooltip } from './Tooltip';
@@ -16,6 +17,18 @@ context('', () => {
cy.findByTestId('my.tooltip').should('be.visible');
});
+ it('should not show a tooltip when empty title', () => {
+ cy.mount(
+
+
+ ,
+ );
+
+ cy.findByTestId('my.tooltip').should('not.exist');
+ cy.get('button').click();
+ cy.findByTestId('my.tooltip').should('not.exist');
+ });
+
it('Should be able to override baseId', () => {
const tooltipBaseId = 'base-id';
cy.mount(
diff --git a/packages/design-system/src/components/Tooltip/Tooltip.tsx b/packages/design-system/src/components/Tooltip/Tooltip.tsx
index bf8348fe8e6..57f91d7c928 100644
--- a/packages/design-system/src/components/Tooltip/Tooltip.tsx
+++ b/packages/design-system/src/components/Tooltip/Tooltip.tsx
@@ -91,23 +91,25 @@ export const Tooltip = ({ id, children, title, placement = 'top', ...rest }: Too
children,
{
...getReferenceProps(),
- 'aria-describedby': safeId,
+ ...(title && { 'aria-describedby': safeId }),
},
floating.refs.setReference,
)}
-
-
-
- {title}
-
-
+ {!!title && (
+
+
+
+ {title}
+
+
+ )}
>
);
};