@equinor/eds-core-react 0.18.0-envis.2 → 0.19.0-dev.20220405

package/dist/esm/components/Popover/Popover.tokens.js

@@ -15,10 +15,8 @@ const {
   },
   spacings: {
     comfortable: {
-      x_large: spacingXlarge,
       medium: spacingMedium,
-      small: spacingSmall,
-      x_small: spacingXsmall
+      small: spacingSmall
     }
   },
   shape: {
@@ -30,7 +28,6 @@ const {
 const popover = {
   background,
   typography: header,
-  minHeight: '48px',
   maxWidth: '560px',
   maxHeight: '80vh',
   entities: {
@@ -45,16 +42,9 @@ const popover = {
         right: '-5px'
       }
     },
-    closeButton: {
-      width: spacingXlarge,
-      height: spacingXlarge,
-      spacings: {
-        top: spacingSmall
-      }
-    },
     title: {
       spacings: {
-        top: spacingXsmall
+        top: '12px'
       }
     }
   },

package/dist/esm/components/Popover/PopoverActions.js

@@ -0,0 +1,28 @@
+import { forwardRef } from 'react';
+import styled, { css } from 'styled-components';
+import { jsx } from 'react/jsx-runtime';
+
+const StyledPopoverActions = styled.div.withConfig({
+  displayName: "PopoverActions__StyledPopoverActions",
+  componentId: "sc-1dkrhw6-0"
+})(_ref => {
+  let {
+    theme
+  } = _ref;
+  return css(["display:grid;grid-gap:8px;grid-auto-flow:column;align-items:center;padding:0 ", " 0 ", ";:last-child{padding-bottom:", ";}:first-child{padding-top:", ";}"], theme.spacings.right, theme.spacings.left, theme.spacings.bottom, theme.spacings.top);
+});
+const PopoverActions = /*#__PURE__*/forwardRef(function PopoverActions(_ref2, ref) {
+  let {
+    children,
+    ...rest
+  } = _ref2;
+  const props = {
+    ref,
+    ...rest
+  };
+  return /*#__PURE__*/jsx(StyledPopoverActions, { ...props,
+    children: children
+  });
+});
+
+export { PopoverActions };

package/dist/esm/components/Popover/PopoverContent.js

@@ -1,15 +1,21 @@
 import { forwardRef } from 'react';
-import styled from 'styled-components';
+import styled, { css } from 'styled-components';
 import { jsx } from 'react/jsx-runtime';
 
 const ContentWrapper = styled.div.withConfig({
   displayName: "PopoverContent__ContentWrapper",
   componentId: "sc-vwww9h-0"
-})(["overflow:hidden;"]);
-const PopoverContent = /*#__PURE__*/forwardRef(function PopoverContent({
-  children,
-  ...rest
-}, ref) {
+})(_ref => {
+  let {
+    theme
+  } = _ref;
+  return css(["overflow:hidden;padding:0 ", " 0 ", ";:last-child{padding-bottom:", ";}:first-child{padding-top:", ";}"], theme.spacings.right, theme.spacings.left, theme.spacings.bottom, theme.spacings.top);
+});
+const PopoverContent = /*#__PURE__*/forwardRef(function PopoverContent(_ref2, ref) {
+  let {
+    children,
+    ...rest
+  } = _ref2;
   const props = { ...rest,
     ref
   };

package/dist/esm/components/Popover/PopoverHeader.js

@@ -0,0 +1,36 @@
+import { forwardRef } from 'react';
+import styled, { css } from 'styled-components';
+import { jsxs, jsx } from 'react/jsx-runtime';
+import { Divider } from '../Divider/Divider.js';
+
+const StyledPopoverHeader = styled.div.withConfig({
+  displayName: "PopoverHeader__StyledPopoverHeader",
+  componentId: "sc-ibcx7p-0"
+})(_ref => {
+  let {
+    theme
+  } = _ref;
+  return css(["display:flex;justify-content:space-between;align-items:center;padding:", " ", " 0 ", ";"], theme.entities.title.spacings.top, theme.spacings.right, theme.spacings.left);
+});
+const StyledDivider = styled(Divider).withConfig({
+  displayName: "PopoverHeader__StyledDivider",
+  componentId: "sc-ibcx7p-1"
+})(["margin-bottom:0;"]);
+const PopoverHeader = /*#__PURE__*/forwardRef(function PopoverHeader(_ref2, ref) {
+  let {
+    children,
+    ...rest
+  } = _ref2;
+  const props = { ...rest,
+    ref
+  };
+  return /*#__PURE__*/jsxs("div", { ...props,
+    children: [/*#__PURE__*/jsx(StyledPopoverHeader, {
+      children: children
+    }), /*#__PURE__*/jsx(StyledDivider, {
+      variant: "small"
+    })]
+  });
+});
+
+export { PopoverHeader };

package/dist/esm/components/Popover/PopoverTitle.js

@@ -1,37 +1,26 @@
 import { forwardRef } from 'react';
 import styled, { css } from 'styled-components';
-import { jsxs, jsx } from 'react/jsx-runtime';
-import { Divider } from '../Divider/Divider.js';
+import { jsx } from 'react/jsx-runtime';
 
 const StyledPopoverTitle = styled.div.withConfig({
   displayName: "PopoverTitle__StyledPopoverTitle",
   componentId: "sc-1ben8su-0"
-})(({
-  theme
-}) => {
-  return css(["margin-right:", ";max-width:calc(", " - ", ");overflow:hidden;margin-top:-", ";"], theme.entities.closeButton.width, theme.maxWidth, theme.entities.closeButton.width, theme.entities.title.spacings.top);
+})(_ref => {
+  let {
+    theme
+  } = _ref;
+  return css(["max-width:", ";margin-right:", ";overflow:hidden;"], theme.maxWidth, theme.spacings.right);
 });
-const StyledDivider = styled(Divider).withConfig({
-  displayName: "PopoverTitle__StyledDivider",
-  componentId: "sc-1ben8su-1"
-})(({
-  theme
-}) => {
-  return css(["margin-left:-", ";margin-right:-", ";margin-bottom:0;width:auto;max-width:", ";"], theme.spacings.left, theme.spacings.right, theme.maxWidth);
-});
-const PopoverTitle = /*#__PURE__*/forwardRef(function PopoverTitle({
-  children,
-  ...rest
-}, ref) {
+const PopoverTitle = /*#__PURE__*/forwardRef(function PopoverTitle(_ref2, ref) {
+  let {
+    children,
+    ...rest
+  } = _ref2;
   const props = { ...rest,
     ref
   };
-  return /*#__PURE__*/jsxs("div", { ...props,
-    children: [/*#__PURE__*/jsx(StyledPopoverTitle, {
-      children: children
-    }), /*#__PURE__*/jsx(StyledDivider, {
-      variant: "small"
-    })]
+  return /*#__PURE__*/jsx(StyledPopoverTitle, { ...props,
+    children: children
   });
 });
 

package/dist/esm/components/Popover/index.js

@@ -1,11 +1,17 @@
 import { Popover as Popover$1 } from './Popover.js';
 import { PopoverTitle } from './PopoverTitle.js';
 import { PopoverContent } from './PopoverContent.js';
+import { PopoverHeader } from './PopoverHeader.js';
+import { PopoverActions } from './PopoverActions.js';
 
 const Popover = Popover$1;
 Popover.Title = PopoverTitle;
 Popover.Content = PopoverContent;
+Popover.Header = PopoverHeader;
+Popover.Actions = PopoverActions;
 Popover.Title.displayName = 'Popover.Title';
 Popover.Content.displayName = 'Popover.Content';
+Popover.Header.displayName = 'Popover.Header';
+Popover.Actions.displayName = 'Popover.Actions';
 
 export { Popover };

package/dist/esm/components/Progress/Circular/CircularProgress.js

@@ -7,9 +7,12 @@ const indeterminate = keyframes(["100%{transform:rotate(360deg);}"]);
 const Svg = styled.svg.withConfig({
   displayName: "CircularProgress__Svg",
   componentId: "sc-hib054-0"
-})(["display:inline-block;", ";"], ({
-  variant
-}) => variant === 'indeterminate' ? css(["animation:", " 1.4s linear infinite;"], indeterminate) : css(["transform:rotate(-90deg);"]));
+})(["display:inline-block;", ";"], _ref => {
+  let {
+    variant
+  } = _ref;
+  return variant === 'indeterminate' ? css(["animation:", " 1.4s linear infinite;"], indeterminate) : css(["transform:rotate(-90deg);"]);
+});
 const TrackCircle = styled.circle.withConfig({
   displayName: "CircularProgress__TrackCircle",
   componentId: "sc-hib054-1"
@@ -34,13 +37,14 @@ const getToken = color => {
   };
 };
 
-const CircularProgress = /*#__PURE__*/forwardRef(function CircularProgress({
-  variant = 'indeterminate',
-  value = null,
-  size = 48,
-  color = 'primary',
-  ...rest
-}, ref) {
+const CircularProgress = /*#__PURE__*/forwardRef(function CircularProgress(_ref2, ref) {
+  let {
+    variant = 'indeterminate',
+    value = null,
+    size = 48,
+    color = 'primary',
+    ...rest
+  } = _ref2;
   const thickness = 4;
   const progress = Math.round(value);
   const trackStyle = {};

package/dist/esm/components/Progress/Dots/DotProgress.js

@@ -7,9 +7,12 @@ const opacity = keyframes(["0%{opacity:1;}100%{opacity:0.5;}"]);
 const Svg = styled.svg.withConfig({
   displayName: "DotProgress__Svg",
   componentId: "sc-1s6o2q7-0"
-})(["fill:", ";circle{&:nth-child(1){animation:", " 1s ease infinite;}&:nth-child(2){animation:", " 1s ease 0.2s infinite;}&:nth-child(3){animation:", " 1s ease 0.4s infinite;}}"], ({
-  color
-}) => color, opacity, opacity, opacity);
+})(["fill:", ";circle{&:nth-child(1){animation:", " 1s ease infinite;}&:nth-child(2){animation:", " 1s ease 0.2s infinite;}&:nth-child(3){animation:", " 1s ease 0.4s infinite;}}"], _ref => {
+  let {
+    color
+  } = _ref;
+  return color;
+}, opacity, opacity, opacity);
 
 const getColor = color => {
   if (DotProgress_tokens[color]) {
@@ -19,11 +22,12 @@ const getColor = color => {
   return color;
 };
 
-const DotProgress = /*#__PURE__*/forwardRef(function DotProgress({
-  color = 'neutral',
-  size = 32,
-  ...rest
-}, ref) {
+const DotProgress = /*#__PURE__*/forwardRef(function DotProgress(_ref2, ref) {
+  let {
+    color = 'neutral',
+    size = 32,
+    ...rest
+  } = _ref2;
   const props = { ...rest,
     color: getColor(color),
     ref

package/dist/esm/components/Progress/Linear/LinearProgress.js

@@ -16,11 +16,12 @@ const IndeterminateProgressBar = styled.div.withConfig({
   displayName: "LinearProgress__IndeterminateProgressBar",
   componentId: "sc-5orxpi-2"
 })(["width:75%;border-radius:50px;position:absolute;left:0;bottom:0;top:0;transition:transform 0.2s linear;transform-origin:left;background-color:", ";animation:", " 1.5s cubic-bezier(0.165,0.84,0.44,1) 1s infinite;"], primary.entities.progress.background, indeterminate);
-const LinearProgress = /*#__PURE__*/forwardRef(function LinearProgress({
-  variant = 'indeterminate',
-  value = null,
-  ...rest
-}, ref) {
+const LinearProgress = /*#__PURE__*/forwardRef(function LinearProgress(_ref, ref) {
+  let {
+    variant = 'indeterminate',
+    value = null,
+    ...rest
+  } = _ref;
   const props = { ...rest,
     ref
   };

package/dist/esm/components/Progress/Star/StarProgress.js

@@ -8,16 +8,20 @@ const determinate = keyframes(["0%{opacity:0;}10%{opacity:0.05;}20%{opacity:0.2;
 const Svg = styled.svg.withConfig({
   displayName: "StarProgress__Svg",
   componentId: "sc-c0byj9-0"
-})(["fill:", ";", ""], token.background, ({
-  variant,
-  progress
-}) => variant === 'indeterminate' ? css(["path{&:nth-child(1){animation:", " 1.3s linear infinite;}&:nth-child(2){animation:", " 1.3s linear 0.3s infinite;}&:nth-child(3){animation:", " 1.3s linear 0.4s infinite;}&:nth-child(4){animation:", " 1.3s linear 0.6s infinite;}&:nth-child(5){animation:", " 1.3s linear 0.8s infinite;}&:nth-child(6){animation:", " 1.3s linear 1s infinite;}}"], indeterminate, indeterminate, indeterminate, indeterminate, indeterminate, indeterminate) : css(["path{animation:", " 1.3s linear;&:nth-child(6){animation-play-state:", ";}&:nth-child(5){animation-play-state:", ";}&:nth-child(4){animation-play-state:", ";}&:nth-child(3){animation-play-state:", ";}&:nth-child(2){animation-play-state:", ";}&:nth-child(1){animation-play-state:", ";}}"], determinate, progress > 90 ? 'running' : 'paused', progress > 80 ? 'running' : 'paused', progress > 60 ? 'running' : 'paused', progress > 40 ? 'running' : 'paused', progress > 20 ? 'running' : 'paused', progress <= 20 ? 'running' : 'paused'));
-const StarProgress = /*#__PURE__*/forwardRef(function StarProgress({
-  variant = 'indeterminate',
-  value = null,
-  size = 48,
-  ...rest
-}, ref) {
+})(["fill:", ";", ""], token.background, _ref => {
+  let {
+    variant,
+    progress
+  } = _ref;
+  return variant === 'indeterminate' ? css(["path{&:nth-child(1){animation:", " 1.3s linear infinite;}&:nth-child(2){animation:", " 1.3s linear 0.3s infinite;}&:nth-child(3){animation:", " 1.3s linear 0.4s infinite;}&:nth-child(4){animation:", " 1.3s linear 0.6s infinite;}&:nth-child(5){animation:", " 1.3s linear 0.8s infinite;}&:nth-child(6){animation:", " 1.3s linear 1s infinite;}}"], indeterminate, indeterminate, indeterminate, indeterminate, indeterminate, indeterminate) : css(["path{animation:", " 1.3s linear;&:nth-child(6){animation-play-state:", ";}&:nth-child(5){animation-play-state:", ";}&:nth-child(4){animation-play-state:", ";}&:nth-child(3){animation-play-state:", ";}&:nth-child(2){animation-play-state:", ";}&:nth-child(1){animation-play-state:", ";}}"], determinate, progress > 90 ? 'running' : 'paused', progress > 80 ? 'running' : 'paused', progress > 60 ? 'running' : 'paused', progress > 40 ? 'running' : 'paused', progress > 20 ? 'running' : 'paused', progress <= 20 ? 'running' : 'paused');
+});
+const StarProgress = /*#__PURE__*/forwardRef(function StarProgress(_ref2, ref) {
+  let {
+    variant = 'indeterminate',
+    value = null,
+    size = 48,
+    ...rest
+  } = _ref2;
   const progress = Math.round(value);
   const height = size * 1.2;
   const width = size;

package/dist/esm/components/Radio/Radio.js

@@ -2,57 +2,79 @@ import { forwardRef, useMemo } from 'react';
 import styled, { ThemeProvider } from 'styled-components';
 import { radio_button_selected, radio_button_unselected } from '@equinor/eds-icons';
 import { comfortable } from './Radio.tokens.js';
+import { outlineTemplate, typographyTemplate, spacingsTemplate, useToken } from '@equinor/eds-utils';
 import { jsxs, jsx } from 'react/jsx-runtime';
-import { outlineTemplate } from '../../utils/templates/focus.js';
-import { typographyTemplate, spacingsTemplate } from '../../utils/templates/index.js';
 import { useEds } from '../EdsProvider/eds.context.js';
-import { useToken } from '../../hooks/useToken.js';
 
 /* eslint camelcase: "off" */
-const Input = styled.input.attrs(({
-  type = 'radio'
-}) => ({
-  type
-})).withConfig({
+const Input = styled.input.attrs(_ref => {
+  let {
+    type = 'radio'
+  } = _ref;
+  return {
+    type
+  };
+}).withConfig({
   displayName: "Radio__Input",
   componentId: "sc-we59oz-0"
-})(["--scale:", ";appearance:none;width:100%;height:100%;margin:0;grid-area:input;transform:scale(var(--scale));cursor:", ";&:focus{outline:none;}&[data-focus-visible-added]:focus + svg{", "}&:focus-visible + svg{", "}&:not(:checked) ~ svg path[name='selected']{display:none;}&:not(:checked) ~ svg path[name='unselected']{display:inline;}&:checked ~ svg path[name='unselected']{display:none;}&:checked ~ svg path[name='selected']{display:inline;}"], ({
-  theme,
-  iconSize
-}) => parseFloat(theme.clickbound.height) / iconSize, ({
-  disabled
-}) => disabled ? 'not-allowed' : 'pointer', ({
-  theme
-}) => outlineTemplate(theme.states.focus.outline), ({
-  theme
-}) => outlineTemplate(theme.states.focus.outline));
+})(["--scale:", ";appearance:none;width:100%;height:100%;margin:0;grid-area:input;transform:scale(var(--scale));cursor:", ";&:focus{outline:none;}&[data-focus-visible-added]:focus + svg{", "}&:focus-visible + svg{", "}&:not(:checked) ~ svg path[name='selected']{display:none;}&:not(:checked) ~ svg path[name='unselected']{display:inline;}&:checked ~ svg path[name='unselected']{display:none;}&:checked ~ svg path[name='selected']{display:inline;}"], _ref2 => {
+  let {
+    theme,
+    iconSize
+  } = _ref2;
+  return parseFloat(theme.clickbound.height) / iconSize;
+}, _ref3 => {
+  let {
+    disabled
+  } = _ref3;
+  return disabled ? 'not-allowed' : 'pointer';
+}, _ref4 => {
+  let {
+    theme
+  } = _ref4;
+  return outlineTemplate(theme.states.focus.outline);
+}, _ref5 => {
+  let {
+    theme
+  } = _ref5;
+  return outlineTemplate(theme.states.focus.outline);
+});
 const StyledLabel = styled.label.withConfig({
   displayName: "Radio__StyledLabel",
   componentId: "sc-we59oz-1"
-})(["display:inline-flex;align-items:center;cursor:", ";"], ({
-  disabled
-}) => disabled ? 'not-allowed' : 'pointer');
-const StyledPath = styled.path.attrs(({
-  icon
-}) => ({
-  fillRule: 'evenodd',
-  clipRule: 'evenodd',
-  d: icon.svgPathData
-})).withConfig({
+})(["display:inline-flex;align-items:center;cursor:", ";"], _ref6 => {
+  let {
+    disabled
+  } = _ref6;
+  return disabled ? 'not-allowed' : 'pointer';
+});
+const StyledPath = styled.path.attrs(_ref7 => {
+  let {
+    icon
+  } = _ref7;
+  return {
+    fillRule: 'evenodd',
+    clipRule: 'evenodd',
+    d: icon.svgPathData
+  };
+}).withConfig({
   displayName: "Radio__StyledPath",
   componentId: "sc-we59oz-2"
 })([""]);
-const Svg = styled.svg.attrs(({
-  height,
-  width,
-  fill
-}) => ({
-  name: null,
-  xmlns: 'http://www.w3.org/2000/svg',
-  height,
-  width,
-  fill
-})).withConfig({
+const Svg = styled.svg.attrs(_ref8 => {
+  let {
+    height,
+    width,
+    fill
+  } = _ref8;
+  return {
+    name: null,
+    xmlns: 'http://www.w3.org/2000/svg',
+    height,
+    width,
+    fill
+  };
+}).withConfig({
   displayName: "Radio__Svg",
   componentId: "sc-we59oz-3"
 })(["grid-area:input;pointer-events:none;"]);
@@ -63,19 +85,29 @@ const LabelText = styled.span.withConfig({
 const InputWrapper = styled.span.withConfig({
   displayName: "Radio__InputWrapper",
   componentId: "sc-we59oz-5"
-})(["", " display:inline-grid;grid:[input] 1fr / [input] 1fr;border-radius:50%;cursor:", ";@media (hover:hover) and (pointer:fine){&:hover{background-color:", ";}}"], ({
-  theme
-}) => spacingsTemplate(theme.spacings), ({
-  disabled
-}) => disabled ? 'not-allowed' : 'pointer', ({
-  disabled
-}) => disabled ? 'transparent' : comfortable.states.hover.background);
-const Radio = /*#__PURE__*/forwardRef(function Radio({
-  label,
-  disabled = false,
-  className,
-  ...rest
-}, ref) {
+})(["", " display:inline-grid;grid:[input] 1fr / [input] 1fr;border-radius:50%;cursor:", ";@media (hover:hover) and (pointer:fine){&:hover{background-color:", ";}}"], _ref9 => {
+  let {
+    theme
+  } = _ref9;
+  return spacingsTemplate(theme.spacings);
+}, _ref10 => {
+  let {
+    disabled
+  } = _ref10;
+  return disabled ? 'not-allowed' : 'pointer';
+}, _ref11 => {
+  let {
+    disabled
+  } = _ref11;
+  return disabled ? 'transparent' : comfortable.states.hover.background;
+});
+const Radio = /*#__PURE__*/forwardRef(function Radio(_ref12, ref) {
+  let {
+    label,
+    disabled = false,
+    className,
+    ...rest
+  } = _ref12;
   const {
     density
   } = useEds();

package/dist/esm/components/Radio/Radio.tokens.js

@@ -31,6 +31,11 @@ const {
   clickbounds: {
     default__base: clicboundSize,
     compact__standard: compactClickboundSize
+  },
+  interactions: {
+    focused: {
+      width: focusOutlineWidth
+    }
   }
 } = tokens;
 const comfortable = {
@@ -56,9 +61,9 @@ const comfortable = {
       outline: {
         type: 'outline',
         style: 'dashed',
-        width: '1px',
+        width: focusOutlineWidth,
         color: focusOutlineColor,
-        offset: '11px'
+        offset: '10px'
       }
     }
   },
@@ -78,9 +83,9 @@ const comfortable = {
           outline: {
             type: 'outline',
             style: 'dashed',
-            width: '1px',
+            width: focusOutlineWidth,
             color: focusOutlineColor,
-            offset: '3px'
+            offset: '2px'
           }
         }
       }

package/dist/esm/components/Scrim/Scrim.js

@@ -1,9 +1,8 @@
-import { forwardRef } from 'react';
+import { forwardRef, useRef } from 'react';
 import styled from 'styled-components';
 import { scrim } from './Scrim.tokens.js';
+import { useCombinedRefs, useHideBodyScroll, useGlobalKeyPress } from '@equinor/eds-utils';
 import { jsx } from 'react/jsx-runtime';
-import { useHideBodyScroll } from '../../hooks/useHideBodyScroll.js';
-import { useGlobalKeyPress } from '../../hooks/useGlobalKeyPress.js';
 
 const {
   height,
@@ -13,22 +12,24 @@ const {
 const StyledScrim = styled.div.withConfig({
   displayName: "Scrim__StyledScrim",
   componentId: "sc-1fr7uvy-0"
-})(["width:", ";height:", ";background:", ";position:fixed;z-index:500;top:0;left:0;align-items:center;justify-content:center;display:flex;"], width, height, background);
+})(["width:", ";height:", ";background:", ";position:fixed;z-index:1300;top:0;left:0;align-items:center;justify-content:center;display:flex;"], width, height, background);
 const ScrimContent = styled.div.withConfig({
   displayName: "Scrim__ScrimContent",
   componentId: "sc-1fr7uvy-1"
 })(["width:auto;height:auto;"]);
-const Scrim = /*#__PURE__*/forwardRef(function Scrim({
-  children,
-  onClose,
-  open,
-  isDismissable = false,
-  ...rest
-}, ref) {
+const Scrim = /*#__PURE__*/forwardRef(function Scrim(_ref, ref) {
+  let {
+    children,
+    onClose,
+    open,
+    isDismissable = false,
+    ...rest
+  } = _ref;
+  const scrimRef = useRef(null);
+  const combinedScrimRef = useCombinedRefs(scrimRef, ref);
   const props = { ...rest,
     open,
-    isDismissable,
-    ref
+    isDismissable
   };
   useHideBodyScroll(open);
   useGlobalKeyPress('Escape', () => {
@@ -38,27 +39,22 @@ const Scrim = /*#__PURE__*/forwardRef(function Scrim({
   });
 
   const handleMouseClose = event => {
-    if (event) {
+    if (event && event.target === scrimRef.current) {
       if (event.type === 'click' && isDismissable && open) {
         onClose && onClose();
       }
     }
   };
 
-  const handleContentClick = event => {
-    // Avoid event bubbling inside dialog/content inside scrim
-    event.stopPropagation();
-  };
-
   if (!open) {
     return null;
   }
 
   return /*#__PURE__*/jsx(StyledScrim, {
     onClick: handleMouseClose,
+    ref: combinedScrimRef,
     ...props,
     children: /*#__PURE__*/jsx(ScrimContent, {
-      onClick: handleContentClick,
       children: children
     })
   });