Skip to content

fix: added scroll y to default content area in dialogs #3300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ogzhanolguncu merged 2 commits into from
Jun 11, 2025
Merged

fix: added scroll y to default content area in dialogs #3300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e96eb9
added scroll y to default content area in dialogs
MichaelUnkey Jun 5, 2025
c6ad698
Merge branch 'main' into dialog-scrollable-description
MichaelUnkey Jun 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...dashboard/app/(app)/apis/[apiId]/keys/[keyAuthId]/[keyId]/components/rbac/permissions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export function PermissionList({ roles, keyId }: PermissionTreeProps) {
});

return (
<Card className="h-full">
<Card className="flex flex-col flex-grow h-full min-h-[250px]">
<CardHeader className="pb-0">
<div className="mb-2">
<CardTitle>Roles</CardTitle>
Expand Down
2 changes: 1 addition & 1 deletion internal/ui/src/components/dialog/dialog-container.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export const DialogContainer = ({
<Dialog open={isOpen} onOpenChange={onOpenChange}>
<DialogContent
className={cn(
"drop-shadow-2xl border-gray-4 max-h-[90vh] overflow-y-auto !rounded-2xl p-0 gap-0",
"drop-shadow-2xl border-gray-4 max-h-[90vh] overflow-hidden !rounded-2xl p-0 gap-0 flex flex-col flex-grow",
"w-[90%] md:w-[70%] lg:w-[70%] xl:w-[50%] 2xl:w-[45%] max-w-[600px] max-h-[90vh] sm:max-h-[90vh] md:max-h-[70vh] lg:max-h-[90vh] xl:max-h-[80vh]",
className,
)}
Expand Down
7 changes: 6 additions & 1 deletion internal/ui/src/components/dialog/parts/dialog-parts.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,12 @@ export const DefaultDialogContentArea = ({
className,
}: DefaultDialogContentAreaProps) => {
return (
<div className={cn("bg-grayA-2 flex flex-col gap-4 py-4 px-6 text-gray-11", className)}>
<div
className={cn(
"bg-grayA-2 flex flex-col gap-4 py-4 px-6 text-gray-11 overflow-y-auto scrollbar-hide flex-grow",
className,
)}
>
{children}
</div>
);
Expand Down
Loading