Fix merge conflicts

sumup-oss · Jan 21, 2025 · cd7ebc1 · cd7ebc1
1 parent 29182d5
commit cd7ebc1
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 2 deletions.
diff --git a/packages/circuit-ui/components/Dialog/Dialog.tsx b/packages/circuit-ui/components/Dialog/Dialog.tsx
@@ -120,6 +120,7 @@ export const Dialog = forwardRef<HTMLDialogElement, DialogProps>(
       preventClose = false,
       animationDuration = 0,
       onCloseStart,
+      locale,
       ...rest
     } = useI18n(props, translations);
     const dialogRef = useRef<HTMLDialogElement>(null);

diff --git a/packages/circuit-ui/components/Popover/Popover.module.css b/packages/circuit-ui/components/Popover/Popover.module.css
@@ -12,7 +12,6 @@
 
 .menu {
   box-sizing: border-box;
-  visibility: hidden;
   max-height: var(--popover-max-height);
   padding: var(--cui-spacings-byte) 0;
   overflow-y: auto;

diff --git a/packages/circuit-ui/components/Toggletip/Toggletip.module.css b/packages/circuit-ui/components/Toggletip/Toggletip.module.css
@@ -3,7 +3,6 @@
   --tooltip-arrow-size: calc(var(--cui-spacings-byte) * 1.414);
 
   z-index: var(--cui-z-index-popover);
-  visibility: hidden;
   width: max-content;
   max-width: 360px;
   max-width: min(360px, 100vw);