Skip to content

Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.

improvement(ui): adopt shared z-index values across v3 primitives (#8083)

Andrew Huang33af35a21f8f
diff --git a/frontend/src/components/v3/generic/AlertDialog/AlertDialog.tsx b/frontend/src/components/v3/generic/AlertDialog/AlertDialog.tsx
index 27638741bb..09dd0b76fb 100644
--- a/frontend/src/components/v3/generic/AlertDialog/AlertDialog.tsx
+++ b/frontend/src/components/v3/generic/AlertDialog/AlertDialog.tsx
@@ -76,7 +76,7 @@ function AlertDialogOverlay({
<AlertDialogPrimitive.Overlay
data-slot="alert-dialog-overlay"
className={cn(
- "fixed inset-0 z-50 bg-black/10 data-closed:animate-out data-closed:duration-100 data-closed:ease-in data-closed:fade-out-0 data-open:animate-in data-open:duration-150 data-open:ease-in data-open:fade-in-0 supports-backdrop-filter:backdrop-blur-xs",
+ "fixed inset-0 z-[var(--z-index-backdrop)] bg-black/10 data-closed:animate-out data-closed:duration-100 data-closed:ease-in data-closed:fade-out-0 data-open:animate-in data-open:duration-150 data-open:ease-in data-open:fade-in-0 supports-backdrop-filter:backdrop-blur-xs",
className
)}
{...props}
@@ -98,7 +98,7 @@ function AlertDialogContent({
data-slot="alert-dialog-content"
data-size={size}
className={cn(
- "group/alert-dialog-content fixed top-1/2 left-1/2 z-50 grid -translate-x-1/2 -translate-y-1/2 gap-4 rounded-lg bg-popover p-4 text-foreground ring-1 ring-foreground/10 outline-none data-closed:animate-out data-closed:duration-100 data-closed:ease-in data-closed:fade-out-0 data-closed:zoom-out-95 data-open:animate-in data-open:duration-150 data-open:ease-in data-open:fade-in-0 data-open:zoom-in-95 data-[size=sm]:max-w-sm",
+ "group/alert-dialog-content fixed top-1/2 left-1/2 z-[var(--z-index-modal)] grid -translate-x-1/2 -translate-y-1/2 gap-4 rounded-lg bg-popover p-4 text-foreground ring-1 ring-foreground/10 outline-none data-closed:animate-out data-closed:duration-100 data-closed:ease-in data-closed:fade-out-0 data-closed:zoom-out-95 data-open:animate-in data-open:duration-150 data-open:ease-in data-open:fade-in-0 data-open:zoom-in-95 data-[size=sm]:max-w-sm",
DIALOG_CONTENT_WIDTH_CLASSNAME,
className
)}
diff --git a/frontend/src/components/v3/generic/Combobox/Combobox.tsx b/frontend/src/components/v3/generic/Combobox/Combobox.tsx
index 727a1b4350..472b83aaaf 100644
--- a/frontend/src/components/v3/generic/Combobox/Combobox.tsx
+++ b/frontend/src/components/v3/generic/Combobox/Combobox.tsx
@@ -303,7 +303,7 @@ const ComboboxPopup = ({
align="start"
sideOffset={4}
collisionPadding={8}
- className="isolate z-[60] max-w-[calc(100vw-1rem)] outline-none"
+ className="isolate z-[var(--z-index-combobox)] max-w-[calc(100vw-1rem)] outline-none"
>
<ComboboxPrimitive.Popup
aria-label={ariaLabel}
diff --git a/frontend/src/components/v3/generic/DataGrid/data-grid.tsx b/frontend/src/components/v3/generic/DataGrid/data-grid.tsx
index 8a64a65676..aa8f2bb301 100644
--- a/frontend/src/components/v3/generic/DataGrid/data-grid.tsx
+++ b/frontend/src/components/v3/generic/DataGrid/data-grid.tsx
@@ -116,7 +116,7 @@ export function DataGrid<TData>({
role="rowgroup"
data-slot="grid-header"
ref={headerRef}
- className="sticky top-0 z-10 grid border-b border-border bg-container"
+ className="sticky top-0 z-[var(--z-index-sticky)] grid border-b border-border bg-container"
>
{table.getHeaderGroups().map((headerGroup, rowIndex) => (
<div
@@ -231,7 +231,7 @@ export function DataGrid<TData>({
role="rowgroup"
data-slot="grid-footer"
ref={footerRef}
- className="sticky bottom-0 z-10 grid border-t border-border bg-container"
+ className="sticky bottom-0 z-[var(--z-index-sticky)] grid border-t border-border bg-container"
>
<div
role="row"
diff --git a/frontend/src/components/v3/generic/Dialog/Dialog.tsx b/frontend/src/components/v3/generic/Dialog/Dialog.tsx
index 59c6635cb0..35dac86ac6 100644
--- a/frontend/src/components/v3/generic/Dialog/Dialog.tsx
+++ b/frontend/src/components/v3/generic/Dialog/Dialog.tsx
@@ -37,7 +37,7 @@ function DialogOverlay({
<DialogPrimitive.Overlay
data-slot="dialog-overlay"
className={cn(
- "fixed inset-0 z-50 bg-black/50 data-[state=closed]:animate-out data-[state=closed]:duration-100 data-[state=closed]:ease-in data-[state=closed]:fade-out-0 data-[state=open]:animate-in data-[state=open]:duration-150 data-[state=open]:ease-in data-[state=open]:fade-in-0",
+ "fixed inset-0 z-[var(--z-index-backdrop)] bg-black/50 data-[state=closed]:animate-out data-[state=closed]:duration-100 data-[state=closed]:ease-in data-[state=closed]:fade-out-0 data-[state=open]:animate-in data-[state=open]:duration-150 data-[state=open]:ease-in data-[state=open]:fade-in-0",
className
)}
{...props}
@@ -65,7 +65,7 @@ function DialogContent({
<DialogPrimitive.Content
data-slot="dialog-content"
className={cn(
- "fixed top-[50%] left-[50%] z-50 flex max-h-[calc(100dvh-2rem)] thin-scrollbar translate-x-[-50%] translate-y-[-50%] flex-col gap-6 overflow-y-auto overscroll-none rounded-lg border border-border bg-popover p-6 text-foreground shadow-lg outline-none has-data-[slot=dialog-footer]:pb-0 data-[state=closed]:animate-out data-[state=closed]:duration-100 data-[state=closed]:ease-in data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[state=open]:animate-in data-[state=open]:duration-150 data-[state=open]:ease-in data-[state=open]:fade-in-0 data-[state=open]:zoom-in-95",
+ "fixed top-[50%] left-[50%] z-[var(--z-index-modal)] flex max-h-[calc(100dvh-2rem)] thin-scrollbar translate-x-[-50%] translate-y-[-50%] flex-col gap-6 overflow-y-auto overscroll-none rounded-lg border border-border bg-popover p-6 text-foreground shadow-lg outline-none has-data-[slot=dialog-footer]:pb-0 data-[state=closed]:animate-out data-[state=closed]:duration-100 data-[state=closed]:ease-in data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[state=open]:animate-in data-[state=open]:duration-150 data-[state=open]:ease-in data-[state=open]:fade-in-0 data-[state=open]:zoom-in-95",
DIALOG_CONTENT_WIDTH_CLASSNAME,
height === "fixed" && "h-[40rem] overflow-hidden",
className
@@ -126,7 +126,7 @@ function DialogFooter({ className, ...props }: React.ComponentProps<"div">) {
<div
data-slot="dialog-footer"
className={cn(
- "sticky bottom-0 z-10 -mx-6 flex shrink-0 flex-row flex-wrap justify-end gap-2 rounded-b-lg border-t border-border bg-container p-4",
+ "sticky bottom-0 z-[var(--z-index-sticky)] -mx-6 flex shrink-0 flex-row flex-wrap justify-end gap-2 rounded-b-lg border-t border-border bg-container p-4",
className
)}
{...props}
diff --git a/frontend/src/components/v3/generic/Dropdown/Dropdown.tsx b/frontend/src/components/v3/generic/Dropdown/Dropdown.tsx
index 3837a06848..7635efe5b1 100644
--- a/frontend/src/components/v3/generic/Dropdown/Dropdown.tsx
+++ b/frontend/src/components/v3/generic/Dropdown/Dropdown.tsx
@@ -38,7 +38,7 @@ function DropdownMenuContent({
className={cn(
"max-h-(--radix-dropdown-menu-content-available-height) origin-(--radix-dropdown-menu-content-transform-origin)",
"data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[state=open]:animate-in data-[state=open]:fade-in-0 data-[state=open]:zoom-in-95",
- "z-50 thin-scrollbar overflow-x-hidden overflow-y-auto rounded-[6px] border border-border bg-popover p-1.5 text-sm text-foreground shadow-md",
+ "z-[var(--z-index-dropdown)] thin-scrollbar overflow-x-hidden overflow-y-auto rounded-[6px] border border-border bg-popover p-1.5 text-sm text-foreground shadow-md",
className
)}
{...props}
@@ -226,7 +226,7 @@ function DropdownMenuSubContent({
<DropdownMenuPrimitive.SubContent
data-slot="dropdown-menu-sub-content"
className={cn(
- "z-50 min-w-[8rem] origin-(--radix-dropdown-menu-content-transform-origin) overflow-hidden rounded-[6px] border border-border bg-popover p-1 text-foreground shadow-lg",
+ "z-[var(--z-index-dropdown)] min-w-[8rem] origin-(--radix-dropdown-menu-content-transform-origin) overflow-hidden rounded-[6px] border border-border bg-popover p-1 text-foreground shadow-lg",
className
)}
sideOffset={sideOffset}
diff --git a/frontend/src/components/v3/generic/HoverCard/HoverCard.tsx b/frontend/src/components/v3/generic/HoverCard/HoverCard.tsx
index 0edb6d69d0..e7755fe011 100644
--- a/frontend/src/components/v3/generic/HoverCard/HoverCard.tsx
+++ b/frontend/src/components/v3/generic/HoverCard/HoverCard.tsx
@@ -26,7 +26,7 @@ function HoverCardContent({
sideOffset={sideOffset}
collisionPadding={collisionPadding}
className={cn(
- "z-50 w-64 origin-(--radix-hover-card-content-transform-origin) rounded-lg bg-popover p-2.5",
+ "z-[var(--z-index-popover)] w-64 origin-(--radix-hover-card-content-transform-origin) rounded-lg bg-popover p-2.5",
"border border-border text-sm text-foreground/90 shadow-md outline-hidden",
"duration-100 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95",
"data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-[side=bottom]:slide-in-from-top-2",
diff --git a/frontend/src/components/v3/generic/Popover/Popover.tsx b/frontend/src/components/v3/generic/Popover/Popover.tsx
index 9cee3064cb..805a6e56a5 100644
--- a/frontend/src/components/v3/generic/Popover/Popover.tsx
+++ b/frontend/src/components/v3/generic/Popover/Popover.tsx
@@ -33,7 +33,7 @@ function PopoverContent({
sideOffset={sideOffset}
collisionPadding={collisionPadding}
className={cn(
- "z-50 w-72 origin-(--radix-popover-content-transform-origin) rounded-lg border border-border bg-popover p-4 text-foreground shadow-md outline-hidden data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[state=open]:animate-in data-[state=open]:fade-in-0 data-[state=open]:zoom-in-95",
+ "z-[var(--z-index-popover)] w-72 origin-(--radix-popover-content-transform-origin) rounded-lg border border-border bg-popover p-4 text-foreground shadow-md outline-hidden data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[state=open]:animate-in data-[state=open]:fade-in-0 data-[state=open]:zoom-in-95",
className
)}
{...props}
diff --git a/frontend/src/components/v3/generic/ReactSelect/styles.ts b/frontend/src/components/v3/generic/ReactSelect/styles.ts
index 663436a194..d33afe56b6 100644
--- a/frontend/src/components/v3/generic/ReactSelect/styles.ts
+++ b/frontend/src/components/v3/generic/ReactSelect/styles.ts
@@ -54,7 +54,7 @@ export const selectStyles: StylesConfig<unknown, boolean, GroupBase<unknown>> =
}),
menuPortal: (provided) => ({
...provided,
- zIndex: 60,
+ zIndex: "var(--z-index-combobox)",
pointerEvents: "auto"
})
};
diff --git a/frontend/src/components/v3/generic/Select/Select.tsx b/frontend/src/components/v3/generic/Select/Select.tsx
index 158743d555..5b4a31d572 100644
--- a/frontend/src/components/v3/generic/Select/Select.tsx
+++ b/frontend/src/components/v3/generic/Select/Select.tsx
@@ -121,7 +121,7 @@ function SelectContent({
data-slot="select-content"
data-align-trigger={position === "item-aligned"}
className={cn(
- "relative z-50 max-h-(--radix-select-content-available-height) min-w-36 origin-(--radix-select-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-md border border-border bg-popover text-foreground shadow-md duration-100 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95 data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-[align-trigger=true]:animate-none data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
+ "relative z-[var(--z-index-dropdown)] max-h-(--radix-select-content-available-height) min-w-36 origin-(--radix-select-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-md border border-border bg-popover text-foreground shadow-md duration-100 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95 data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-[align-trigger=true]:animate-none data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
position === "popper" &&
"data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1",
className
diff --git a/frontend/src/components/v3/generic/SelectedActionBar/SelectedActionBar.tsx b/frontend/src/components/v3/generic/SelectedActionBar/SelectedActionBar.tsx
index 35722008b4..3b207c8efd 100644
--- a/frontend/src/components/v3/generic/SelectedActionBar/SelectedActionBar.tsx
+++ b/frontend/src/components/v3/generic/SelectedActionBar/SelectedActionBar.tsx
@@ -73,7 +73,7 @@ function SelectedActionBar({
<div
data-slot="selected-action-bar-positioner"
className={cn(
- "pointer-events-none fixed inset-x-4 bottom-8 z-40 flex justify-center",
+ "pointer-events-none fixed inset-x-4 bottom-8 z-[var(--z-index-action)] flex justify-center",
"transition-[opacity,translate,filter,scale] ease-out motion-reduce:transition-none",
isVisible
? "translate-y-0 scale-100 opacity-100 blur-none duration-200"
diff --git a/frontend/src/components/v3/generic/Sheet/Sheet.tsx b/frontend/src/components/v3/generic/Sheet/Sheet.tsx
index c897522067..f1ce1baf32 100644
--- a/frontend/src/components/v3/generic/Sheet/Sheet.tsx
+++ b/frontend/src/components/v3/generic/Sheet/Sheet.tsx
@@ -37,7 +37,7 @@ function SheetOverlay({
<SheetPrimitive.Overlay
data-slot="sheet-overlay"
className={cn(
- "fixed inset-0 z-50 bg-black/50 ease-out data-[state=closed]:animate-out data-[state=closed]:duration-250 data-[state=closed]:fade-out-0 data-[state=open]:animate-in data-[state=open]:duration-200 data-[state=open]:fade-in-0",
+ "fixed inset-0 z-[var(--z-index-backdrop)] bg-black/50 ease-out data-[state=closed]:animate-out data-[state=closed]:duration-250 data-[state=closed]:fade-out-0 data-[state=open]:animate-in data-[state=open]:duration-200 data-[state=open]:fade-in-0",
className
)}
{...props}
@@ -75,7 +75,7 @@ function SheetContent({
onInteractOutside?.(e);
}}
className={cn(
- "fixed z-50 flex thin-scrollbar flex-col border-border bg-popover text-foreground shadow-lg outline-0 transition ease-out data-[state=closed]:animate-out data-[state=closed]:duration-250 data-[state=closed]:fade-out-0 data-[state=open]:animate-in data-[state=open]:duration-200 data-[state=open]:fade-in-0",
+ "fixed z-[var(--z-index-modal)] flex thin-scrollbar flex-col border-border bg-popover text-foreground shadow-lg outline-0 transition ease-out data-[state=closed]:animate-out data-[state=closed]:duration-250 data-[state=closed]:fade-out-0 data-[state=open]:animate-in data-[state=open]:duration-200 data-[state=open]:fade-in-0",
side === "right" &&
"inset-y-0 right-0 h-full w-3/4 border-l data-[state=closed]:slide-out-to-right-8 data-[state=open]:slide-in-from-right-2 sm:max-w-md",
side === "left" &&
diff --git a/frontend/src/components/v3/generic/Sidebar/Sidebar.tsx b/frontend/src/components/v3/generic/Sidebar/Sidebar.tsx
index 9193a069d5..3e4ba45d60 100644
--- a/frontend/src/components/v3/generic/Sidebar/Sidebar.tsx
+++ b/frontend/src/components/v3/generic/Sidebar/Sidebar.tsx
@@ -311,7 +311,7 @@ function Sidebar({
data-slot="sidebar-container"
data-side={side}
className={cn(
- "fixed inset-y-0 z-10 hidden h-svh w-(--sidebar-width) border-border transition-[left,right,width] duration-200 ease-linear data-[side=left]:left-0 data-[side=left]:group-data-[collapsible=offcanvas]:left-[calc(var(--sidebar-width)*-1)] data-[side=right]:right-0 data-[side=right]:group-data-[collapsible=offcanvas]:right-[calc(var(--sidebar-width)*-1)] md:flex",
+ "fixed inset-y-0 z-[var(--z-index-sticky)] hidden h-svh w-(--sidebar-width) border-border transition-[left,right,width] duration-200 ease-linear data-[side=left]:left-0 data-[side=left]:group-data-[collapsible=offcanvas]:left-[calc(var(--sidebar-width)*-1)] data-[side=right]:right-0 data-[side=right]:group-data-[collapsible=offcanvas]:right-[calc(var(--sidebar-width)*-1)] md:flex",
// Adjust the padding for floating and inset variants.
variant === "floating" || variant === "inset"
? "p-2 group-data-[collapsible=icon]:w-[calc(var(--sidebar-width-icon)+(--spacing(4))+2px)]"
diff --git a/frontend/src/components/v3/generic/Toast/Toast.tsx b/frontend/src/components/v3/generic/Toast/Toast.tsx
index 907af5b779..f52056558a 100644
--- a/frontend/src/components/v3/generic/Toast/Toast.tsx
+++ b/frontend/src/components/v3/generic/Toast/Toast.tsx
@@ -44,6 +44,7 @@ const Toaster = ({ ...props }: ToasterProps) => {
}}
style={
{
+ zIndex: "var(--z-index-toast)",
"--width": "400px",
"--border-radius": "0.375rem",
"--normal-bg": "var(--color-container)",
diff --git a/frontend/src/components/v3/generic/Tooltip/Tooltip.tsx b/frontend/src/components/v3/generic/Tooltip/Tooltip.tsx
index 4404ba80ef..25e34b7b8b 100644
--- a/frontend/src/components/v3/generic/Tooltip/Tooltip.tsx
+++ b/frontend/src/components/v3/generic/Tooltip/Tooltip.tsx
@@ -44,13 +44,13 @@ function TooltipContent({
sideOffset={sideOffset}
collisionPadding={collisionPadding}
className={cn(
- "!pointer-events-none z-[70] w-fit origin-(--radix-tooltip-content-transform-origin) animate-in rounded-sm bg-border px-3 py-1.5 text-xs text-pretty text-foreground shadow-md fade-in-0 select-none zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95",
+ "!pointer-events-none z-[var(--z-index-tooltip)] w-fit origin-(--radix-tooltip-content-transform-origin) animate-in rounded-sm bg-border px-3 py-1.5 text-xs text-pretty text-foreground shadow-md fade-in-0 select-none zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95",
className
)}
{...props}
>
{children}
- <TooltipPrimitive.Arrow className="z-[70] size-2.5 translate-y-[calc(-50%_-_2px)] rotate-45 rounded-[1px] bg-border fill-border" />
+ <TooltipPrimitive.Arrow className="z-[var(--z-index-tooltip)] size-2.5 translate-y-[calc(-50%_-_2px)] rotate-45 rounded-[1px] bg-border fill-border" />
</TooltipPrimitive.Content>
</TooltipPrimitive.Portal>
);
diff --git a/frontend/src/index.css b/frontend/src/index.css
index ce44f71c43..d8a1a0814a 100644
--- a/frontend/src/index.css
+++ b/frontend/src/index.css
@@ -69,12 +69,14 @@
@theme {
--z-index-sticky: 10;
- --z-index-backdrop: 20;
- --z-index-modal: 30;
- --z-index-dropdown: 40;
+ --z-index-action: 40;
+ --z-index-backdrop: 50;
+ --z-index-modal: 50;
+ --z-index-dropdown: 50;
--z-index-popover: 50;
- --z-index-tooltip: 60;
- --z-index-toast: 70;
+ --z-index-combobox: 60;
+ --z-index-tooltip: 70;
+ --z-index-toast: 999999999;
--breakpoint-dashboard: 1400px;