From 5e7795fff5af1b683eeca46da5bad247f312253d Mon Sep 17 00:00:00 2001
From: Frida <fridaerdal@hotmail.no>
Date: Tue, 21 Oct 2025 11:54:19 +0200
Subject: [PATCH 1/7] =?UTF-8?q?fix(eds-core-react):=20=F0=9F=90=9B=20Updat?=
 =?UTF-8?q?e=20Tooltip=20component=20to=20use=20mergeRefs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This fixes the warning related to accessing element.ref directly, which is no longer supported in React 19.
---
 .../src/components/Tooltip/Tooltip.tsx        | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/packages/eds-core-react/src/components/Tooltip/Tooltip.tsx b/packages/eds-core-react/src/components/Tooltip/Tooltip.tsx
index 8436d8b724..1df2544cbb 100644
--- a/packages/eds-core-react/src/components/Tooltip/Tooltip.tsx
+++ b/packages/eds-core-react/src/components/Tooltip/Tooltip.tsx
@@ -8,6 +8,7 @@ import {
   useMemo,
   useEffect,
   ReactNode,
+  ReactElement,
 } from 'react'
 import { createPortal } from 'react-dom'
 import styled from 'styled-components'
@@ -136,9 +137,9 @@ export const Tooltip = forwardRef<HTMLDivElement, TooltipProps>(
       ],
       whileElementsMounted: autoUpdate,
     })
-    const anchorRef = useMemo(
-      () => mergeRefs<HTMLElement>(refs.setReference, children?.ref),
-      [refs.setReference, children?.ref],
+    const mergedAnchorRef = useMemo(
+      () => mergeRefs<HTMLElement>(refs.setReference),
+      [refs.setReference],
     )
     const tooltipRef = useMemo(
       () => mergeRefs<HTMLDivElement>(refs.setFloating, ref),
@@ -188,11 +189,12 @@ export const Tooltip = forwardRef<HTMLDivElement, TooltipProps>(
       }
     })
 
-    const updatedChildren = cloneElement(children, {
-      ...getReferenceProps({
-        ...children.props,
-        ref: anchorRef,
-      }),
+    const updatedChildren = cloneElement(children as ReactElement<any>, {
+      ...getReferenceProps(children.props),
+      ref: mergeRefs(
+        (children as ReactElement<any>).props.ref,
+        mergedAnchorRef,
+      ),
     })
 
     useEffect(() => {
@@ -228,6 +230,7 @@ export const Tooltip = forwardRef<HTMLDivElement, TooltipProps>(
 
     return (
       <>
+        {updatedChildren}
         {shouldOpen &&
           open &&
           !disabled &&
@@ -235,7 +238,6 @@ export const Tooltip = forwardRef<HTMLDivElement, TooltipProps>(
             TooltipEl,
             portalContainer ?? rootElement ?? document.body,
           )}
-        {updatedChildren}
       </>
     )
   },

From ead6ee8ddb2473fa7b0fc49c1fb4dce7170a33d3 Mon Sep 17 00:00:00 2001
From: Frida <fridaerdal@hotmail.no>
Date: Tue, 21 Oct 2025 15:27:35 +0200
Subject: [PATCH 2/7] Add test to cover ref issue

---
 .../src/components/Tooltip/Tooltip.test.tsx   | 33 +++++++++++++++++--
 .../__snapshots__/Tooltip.test.tsx.snap       |  2 +-
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/packages/eds-core-react/src/components/Tooltip/Tooltip.test.tsx b/packages/eds-core-react/src/components/Tooltip/Tooltip.test.tsx
index f669c6a0c0..a4108dd403 100644
--- a/packages/eds-core-react/src/components/Tooltip/Tooltip.test.tsx
+++ b/packages/eds-core-react/src/components/Tooltip/Tooltip.test.tsx
@@ -1,8 +1,10 @@
 /* eslint-disable no-undef */
-import { fireEvent, render, screen, act } from '@testing-library/react'
+import { fireEvent, render, screen, act, cleanup } from '@testing-library/react'
 import { axe } from 'jest-axe'
+import '@testing-library/jest-dom'
 import styled from 'styled-components'
 import { Tooltip, Button } from '../../'
+import { createRef } from 'react'
 
 const StyledTooltip = styled(Tooltip)`
   background: red;
@@ -20,6 +22,9 @@ beforeAll(() => {
 })
 
 describe('Tooltip', () => {
+  afterEach(() => {
+    cleanup()
+  })
   it('Matches snapshot', async () => {
     render(
       <Tooltip title="Tooltip" enterDelay={0}>
@@ -76,7 +81,7 @@ describe('Tooltip', () => {
     await act(() => new Promise((r) => setTimeout(r, openDelay)))
 
     const tooltip = await screen.findByRole('tooltip')
-    expect(tooltip).toHaveStyleRule('background', 'red')
+    expect(tooltip).toHaveStyle('background: red')
   })
   it('is visible when content is being hovered', async () => {
     render(
@@ -174,4 +179,28 @@ describe('Tooltip', () => {
 
     expect(handler).toBeCalled()
   })
+  it('should render correctly when the wrapped component has a ref', async () => {
+    const buttonRef = createRef<HTMLButtonElement>()
+    render(
+      <Tooltip title="Tooltip" enterDelay={0}>
+        <Button ref={buttonRef}>Test</Button>
+      </Tooltip>,
+    )
+
+    const button = screen.getByText('Test')
+
+    fireEvent.focus(button)
+
+    expect(await screen.findByRole('tooltip')).toBeInTheDocument()
+  })
+  it('should forward refs to the wrapped component', async () => {
+    const ref = createRef()
+    render(
+      <Tooltip title="Tooltip">
+        <Button ref={ref}>Test</Button>
+      </Tooltip>,
+    )
+
+    expect(ref.current).toBeInstanceOf(HTMLButtonElement)
+  })
 })
diff --git a/packages/eds-core-react/src/components/Tooltip/__snapshots__/Tooltip.test.tsx.snap b/packages/eds-core-react/src/components/Tooltip/__snapshots__/Tooltip.test.tsx.snap
index bc10bc9bcc..52ce3e6dcb 100644
--- a/packages/eds-core-react/src/components/Tooltip/__snapshots__/Tooltip.test.tsx.snap
+++ b/packages/eds-core-react/src/components/Tooltip/__snapshots__/Tooltip.test.tsx.snap
@@ -53,7 +53,7 @@ exports[`Tooltip Matches snapshot 1`] = `
 <div
   class="c0 eds-tooltip "
   data-floating-ui-focusable=""
-  id="«r0»"
+  id="_r_0_"
   popover="manual"
   role="tooltip"
   style="position: absolute; top: 14px; left: 8px;"

From d097458118786c2a61cccb6c913f328478ad6692 Mon Sep 17 00:00:00 2001
From: Frida <fridaerdal@hotmail.no>
Date: Tue, 21 Oct 2025 16:32:52 +0200
Subject: [PATCH 3/7] chore: trigger CI rebuild after main branch migration


From adf295e8c6a4cea9261b9bf139edcd12fd6dc8d1 Mon Sep 17 00:00:00 2001
From: Frida <fridaerdal@hotmail.no>
Date: Tue, 21 Oct 2025 16:39:17 +0200
Subject: [PATCH 4/7] test: Use explicit ID in Tooltip snapshot test for
 consistency

---
 packages/eds-core-react/src/components/Tooltip/Tooltip.test.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/eds-core-react/src/components/Tooltip/Tooltip.test.tsx b/packages/eds-core-react/src/components/Tooltip/Tooltip.test.tsx
index a4108dd403..32c90fbadf 100644
--- a/packages/eds-core-react/src/components/Tooltip/Tooltip.test.tsx
+++ b/packages/eds-core-react/src/components/Tooltip/Tooltip.test.tsx
@@ -27,7 +27,7 @@ describe('Tooltip', () => {
   })
   it('Matches snapshot', async () => {
     render(
-      <Tooltip title="Tooltip" enterDelay={0}>
+      <Tooltip title="Tooltip" enterDelay={0} id="test-tooltip">
         <span>Test</span>
       </Tooltip>,
     )

From 5136e7882d2b9eaa8f2f96f7af927317318ab6fa Mon Sep 17 00:00:00 2001
From: Frida <fridaerdal@hotmail.no>
Date: Wed, 22 Oct 2025 09:18:24 +0200
Subject: [PATCH 5/7] Try to remove id to make snapshot deterministic

---
 .../eds-core-react/src/components/Tooltip/Tooltip.test.tsx   | 5 ++++-
 .../components/Tooltip/__snapshots__/Tooltip.test.tsx.snap   | 1 -
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/eds-core-react/src/components/Tooltip/Tooltip.test.tsx b/packages/eds-core-react/src/components/Tooltip/Tooltip.test.tsx
index 32c90fbadf..bc5f727d9c 100644
--- a/packages/eds-core-react/src/components/Tooltip/Tooltip.test.tsx
+++ b/packages/eds-core-react/src/components/Tooltip/Tooltip.test.tsx
@@ -27,7 +27,7 @@ describe('Tooltip', () => {
   })
   it('Matches snapshot', async () => {
     render(
-      <Tooltip title="Tooltip" enterDelay={0} id="test-tooltip">
+      <Tooltip title="Tooltip" enterDelay={0}>
         <span>Test</span>
       </Tooltip>,
     )
@@ -35,6 +35,9 @@ describe('Tooltip', () => {
     const content = screen.getByText('Test')
     fireEvent.mouseEnter(content)
     const tooltip = await screen.findByRole('tooltip')
+
+    // Remove the auto-generated ID to make snapshot deterministic
+    tooltip.removeAttribute('id')
     expect(tooltip).toMatchSnapshot()
   })
   it('Should pass a11y test', async () => {
diff --git a/packages/eds-core-react/src/components/Tooltip/__snapshots__/Tooltip.test.tsx.snap b/packages/eds-core-react/src/components/Tooltip/__snapshots__/Tooltip.test.tsx.snap
index 52ce3e6dcb..da0f7f27f5 100644
--- a/packages/eds-core-react/src/components/Tooltip/__snapshots__/Tooltip.test.tsx.snap
+++ b/packages/eds-core-react/src/components/Tooltip/__snapshots__/Tooltip.test.tsx.snap
@@ -53,7 +53,6 @@ exports[`Tooltip Matches snapshot 1`] = `
 <div
   class="c0 eds-tooltip "
   data-floating-ui-focusable=""
-  id="_r_0_"
   popover="manual"
   role="tooltip"
   style="position: absolute; top: 14px; left: 8px;"

From b8fcd8ca61c4c13cfc32ee9247adf28c0c401e6d Mon Sep 17 00:00:00 2001
From: Frida <fridaerdal@hotmail.no>
Date: Wed, 22 Oct 2025 09:42:50 +0200
Subject: [PATCH 6/7] Fix prettier

---
 .../eds-core-react/src/components/Tooltip/Tooltip.test.tsx | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/packages/eds-core-react/src/components/Tooltip/Tooltip.test.tsx b/packages/eds-core-react/src/components/Tooltip/Tooltip.test.tsx
index bc5f727d9c..4d34029424 100644
--- a/packages/eds-core-react/src/components/Tooltip/Tooltip.test.tsx
+++ b/packages/eds-core-react/src/components/Tooltip/Tooltip.test.tsx
@@ -1,5 +1,5 @@
 /* eslint-disable no-undef */
-import { fireEvent, render, screen, act, cleanup } from '@testing-library/react'
+import { fireEvent, render, screen, act } from '@testing-library/react'
 import { axe } from 'jest-axe'
 import '@testing-library/jest-dom'
 import styled from 'styled-components'
@@ -22,9 +22,6 @@ beforeAll(() => {
 })
 
 describe('Tooltip', () => {
-  afterEach(() => {
-    cleanup()
-  })
   it('Matches snapshot', async () => {
     render(
       <Tooltip title="Tooltip" enterDelay={0}>
@@ -196,7 +193,7 @@ describe('Tooltip', () => {
 
     expect(await screen.findByRole('tooltip')).toBeInTheDocument()
   })
-  it('should forward refs to the wrapped component', async () => {
+  it('should forward refs to the wrapped component', () => {
     const ref = createRef()
     render(
       <Tooltip title="Tooltip">

From 7d2b2ccdb1336bf0026ac0f2105e4040945a2b0b Mon Sep 17 00:00:00 2001
From: Frida <fridaerdal@hotmail.no>
Date: Wed, 22 Oct 2025 09:55:39 +0200
Subject: [PATCH 7/7] resolve eslint errors in tooltip

---
 .../src/components/Tooltip/Tooltip.tsx         | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/packages/eds-core-react/src/components/Tooltip/Tooltip.tsx b/packages/eds-core-react/src/components/Tooltip/Tooltip.tsx
index 1df2544cbb..c84f31cc10 100644
--- a/packages/eds-core-react/src/components/Tooltip/Tooltip.tsx
+++ b/packages/eds-core-react/src/components/Tooltip/Tooltip.tsx
@@ -189,13 +189,17 @@ export const Tooltip = forwardRef<HTMLDivElement, TooltipProps>(
       }
     })
 
-    const updatedChildren = cloneElement(children as ReactElement<any>, {
-      ...getReferenceProps(children.props),
-      ref: mergeRefs(
-        (children as ReactElement<any>).props.ref,
-        mergedAnchorRef,
-      ),
-    })
+    const updatedChildren = cloneElement(
+      children as ReactElement<any>, // eslint-disable-line @typescript-eslint/no-explicit-any
+      {
+        ...getReferenceProps(children.props),
+        ref: mergeRefs(
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-member-access
+          (children as ReactElement<any>).props.ref,
+          mergedAnchorRef,
+        ),
+      },
+    )
 
     useEffect(() => {
       if (!elements.floating) return