awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-20 10:23:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4772 from Infisical/fix/made-upgrade-license-modal-intrusive

Browse Source 
[ENG-3937] fix: makes upgrade license modal intrusive
This commit is contained in:
Piyush Gupta
2025-10-31 20:11:32 +05:30
committed by GitHub
parent d07a26b834 1c6e9874a8
commit fcc5329225
3 changed files with 46 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/components/v2/Modal/Modal.tsx
+16 -10
View File
@@ -14,6 +14,7 @@ export type ModalContentProps = Omit<DialogPrimitive.DialogContentProps, "title"
bodyClassName?: string;
onClose?: () => void;
overlayClassName?: string;
showCloseButton?: boolean;
};
export const ModalContent = forwardRef<HTMLDivElement, ModalContentProps>(
@@ -27,6 +28,7 @@ export const ModalContent = forwardRef<HTMLDivElement, ModalContentProps>(
footerContent,
bodyClassName,
onClose,
showCloseButton = true,
...props
},
forwardedRef
@@ -57,15 +59,17 @@ export const ModalContent = forwardRef<HTMLDivElement, ModalContentProps>(
{children}
</CardBody>
{footerContent && <CardFooter>{footerContent}</CardFooter>}
<DialogPrimitive.Close aria-label="Close" asChild onClick={onClose}>
<IconButton
variant="plain"
ariaLabel="close"
className="absolute top-4 right-6 rounded-sm text-bunker-400 hover:text-bunker-50"
>
<FontAwesomeIcon icon={faTimes} size="lg" className="cursor-pointer" />
</IconButton>
</DialogPrimitive.Close>
{showCloseButton && (
<DialogPrimitive.Close aria-label="Close" asChild onClick={onClose}>
<IconButton
variant="plain"
ariaLabel="close"
className="absolute top-4 right-6 rounded-sm text-bunker-400 hover:text-bunker-50"
>
<FontAwesomeIcon icon={faTimes} size="lg" className="cursor-pointer" />
</IconButton>
</DialogPrimitive.Close>
)}
</Card>
</DialogPrimitive.Content>
</DialogPrimitive.Portal>
@@ -74,7 +78,9 @@ export const ModalContent = forwardRef<HTMLDivElement, ModalContentProps>(
ModalContent.displayName = "ModalContent";
export type ModalProps = Omit<DialogPrimitive.DialogProps, "open"> & { isOpen?: boolean };
export type ModalProps = Omit<DialogPrimitive.DialogProps, "open"> & {
isOpen?: boolean;
};
export const Modal = ({ isOpen, ...props }: ModalProps) => (
<DialogPrimitive.Root open={isOpen} {...props} />
);