@equinor/eds-core-react 1.0.1 → 1.0.2

package/README.md

@@ -3,7 +3,7 @@
 Available components to help style your React application as an Equinor application. We publish new components regularly so make sure to check back often!
 
 Make sure to check out our [Storybook](https://storybook.eds.equinor.com/) for more examples!
-Read the [changelog](https://github.com/equinor/design-system/blob/develop/packages/eds-core-react/CHANGELOG.md) for details on specific releases.
+Read the [changelog](https://github.com/equinor/design-system/blob/main/packages/eds-core-react/CHANGELOG.md) for details on specific releases.
 
 ## Installation
 

package/dist/eds-core-react.cjs

@@ -1184,7 +1184,7 @@ const Tooltip$2 = /*#__PURE__*/react.forwardRef(function Tooltip({
     })],
     whileElementsMounted: react$1.autoUpdate
   });
-  const anchorRef = react.useMemo(() => edsUtils.mergeRefs(refs.setReference, children?.ref), [refs.setReference, children?.ref]);
+  const mergedAnchorRef = react.useMemo(() => edsUtils.mergeRefs(refs.setReference), [refs.setReference]);
   const tooltipRef = react.useMemo(() => edsUtils.mergeRefs(refs.setFloating, ref), [refs.setFloating, ref]);
   const {
     getReferenceProps,
@@ -1229,11 +1229,13 @@ const Tooltip$2 = /*#__PURE__*/react.forwardRef(function Tooltip({
       });
     }
   });
-  const updatedChildren = /*#__PURE__*/react.cloneElement(children, {
-    ...getReferenceProps({
-      ...children.props,
-      ref: anchorRef
-    })
+  const updatedChildren = /*#__PURE__*/react.cloneElement(children,
+  // eslint-disable-line @typescript-eslint/no-explicit-any
+  {
+    ...getReferenceProps(children.props),
+    ref: edsUtils.mergeRefs(
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-member-access
+    children.props.ref, mergedAnchorRef)
   });
   react.useEffect(() => {
     if (!elements.floating) return;
@@ -1265,7 +1267,7 @@ const Tooltip$2 = /*#__PURE__*/react.forwardRef(function Tooltip({
     })]
   });
   return /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
-    children: [shouldOpen && open && !disabled && /*#__PURE__*/reactDom.createPortal(TooltipEl, portalContainer ?? rootElement ?? document.body), updatedChildren]
+    children: [updatedChildren, shouldOpen && open && !disabled && /*#__PURE__*/reactDom.createPortal(TooltipEl, portalContainer ?? rootElement ?? document.body)]
   });
 });
 

package/dist/esm/components/Tooltip/Tooltip.js

@@ -62,7 +62,7 @@ const Tooltip = /*#__PURE__*/forwardRef(function Tooltip({
     })],
     whileElementsMounted: autoUpdate
   });
-  const anchorRef = useMemo(() => mergeRefs(refs.setReference, children?.ref), [refs.setReference, children?.ref]);
+  const mergedAnchorRef = useMemo(() => mergeRefs(refs.setReference), [refs.setReference]);
   const tooltipRef = useMemo(() => mergeRefs(refs.setFloating, ref), [refs.setFloating, ref]);
   const {
     getReferenceProps,
@@ -107,11 +107,13 @@ const Tooltip = /*#__PURE__*/forwardRef(function Tooltip({
       });
     }
   });
-  const updatedChildren = /*#__PURE__*/cloneElement(children, {
-    ...getReferenceProps({
-      ...children.props,
-      ref: anchorRef
-    })
+  const updatedChildren = /*#__PURE__*/cloneElement(children,
+  // 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.props.ref, mergedAnchorRef)
   });
   useEffect(() => {
     if (!elements.floating) return;
@@ -143,7 +145,7 @@ const Tooltip = /*#__PURE__*/forwardRef(function Tooltip({
     })]
   });
   return /*#__PURE__*/jsxs(Fragment, {
-    children: [shouldOpen && open && !disabled && /*#__PURE__*/createPortal(TooltipEl, portalContainer ?? rootElement ?? document.body), updatedChildren]
+    children: [updatedChildren, shouldOpen && open && !disabled && /*#__PURE__*/createPortal(TooltipEl, portalContainer ?? rootElement ?? document.body)]
   });
 });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@equinor/eds-core-react",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "The React implementation of the Equinor Design System",
   "sideEffects": [
     "**/*.css"
@@ -84,9 +84,9 @@
     "@tanstack/react-virtual": "3.13.12",
     "downshift": "9.0.8",
     "react-aria": "^3.43.1",
-    "@equinor/eds-tokens": "1.1.2",
+    "@equinor/eds-icons": "^1.0.0",
     "@equinor/eds-utils": "1.0.1",
-    "@equinor/eds-icons": "^1.0.0"
+    "@equinor/eds-tokens": "1.1.3"
   },
   "scripts": {
     "build": "rollup -c --bundleConfigAsCjs && tsc -p tsconfig.build.json",