Skip to content

Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.

💄 Pin dialog header and footer and scroll the content between them (#3504)

Luke Vellafd09e10ef510
diff --git a/apps/web/src/app/[locale]/(space)/settings/api-keys/components/create-api-key-button.tsx b/apps/web/src/app/[locale]/(space)/settings/api-keys/components/create-api-key-button.tsx
index 8fc05543b..d943c5831 100644
--- a/apps/web/src/app/[locale]/(space)/settings/api-keys/components/create-api-key-button.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/api-keys/components/create-api-key-button.tsx
@@ -188,7 +188,7 @@ export function CreateApiKeyButton() {
)}
/>
</div>
- <DialogFooter className="mt-6">
+ <DialogFooter>
<Button
variant="primary"
type="submit"
diff --git a/apps/web/src/app/[locale]/control-panel/users/dialogs/ban-user-dialog.tsx b/apps/web/src/app/[locale]/control-panel/users/dialogs/ban-user-dialog.tsx
index c473ead85..4320d79b4 100644
--- a/apps/web/src/app/[locale]/control-panel/users/dialogs/ban-user-dialog.tsx
+++ b/apps/web/src/app/[locale]/control-panel/users/dialogs/ban-user-dialog.tsx
@@ -112,7 +112,7 @@ export function BanUserDialog({
</FormItem>
)}
/>
- <DialogFooter className="mt-6">
+ <DialogFooter>
<DialogClose render={<Button />}>
<Trans i18nKey="cancel" defaults="Cancel" />
</DialogClose>
diff --git a/apps/web/src/app/[locale]/control-panel/users/dialogs/delete-user-dialog.tsx b/apps/web/src/app/[locale]/control-panel/users/dialogs/delete-user-dialog.tsx
index 22bf1a7c4..e3fc63640 100644
--- a/apps/web/src/app/[locale]/control-panel/users/dialogs/delete-user-dialog.tsx
+++ b/apps/web/src/app/[locale]/control-panel/users/dialogs/delete-user-dialog.tsx
@@ -112,7 +112,7 @@ export function DeleteUserDialog({
</FormItem>
)}
/>
- <DialogFooter className="mt-6">
+ <DialogFooter>
<DialogClose render={<Button />}>
<Trans i18nKey="cancel" defaults="Cancel" />
</DialogClose>
diff --git a/apps/web/src/features/billing/components/pay-wall-dialog.tsx b/apps/web/src/features/billing/components/pay-wall-dialog.tsx
index 321308636..e212acb8a 100644
--- a/apps/web/src/features/billing/components/pay-wall-dialog.tsx
+++ b/apps/web/src/features/billing/components/pay-wall-dialog.tsx
@@ -313,7 +313,7 @@ export function PayWallDialog({
>
<DialogContent
size="4xl"
- className="overflow-hidden p-0 lg:min-h-[500px]"
+ className="*:data-[slot=dialog-scroller]:p-0 lg:min-h-[min(500px,calc(100dvh-2rem))]"
>
<Tabs
value={selectedPlan}
diff --git a/apps/web/src/features/event-types/components/create-event-type-dialog.tsx b/apps/web/src/features/event-types/components/create-event-type-dialog.tsx
index 4ac6f6cbe..f88953558 100644
--- a/apps/web/src/features/event-types/components/create-event-type-dialog.tsx
+++ b/apps/web/src/features/event-types/components/create-event-type-dialog.tsx
@@ -96,7 +96,7 @@ export function CreateEventTypeDialog({ open, onOpenChange }: DialogProps) {
showDescription={showDescription}
setShowDescription={setShowDescription}
/>
- <DialogFooter className="pt-2">
+ <DialogFooter>
<DialogClose
render={
<Button type="button" disabled={createEventType.isPending} />
diff --git a/apps/web/src/features/event-types/components/edit-event-type-dialog.tsx b/apps/web/src/features/event-types/components/edit-event-type-dialog.tsx
index a544b6d3c..189ac8d54 100644
--- a/apps/web/src/features/event-types/components/edit-event-type-dialog.tsx
+++ b/apps/web/src/features/event-types/components/edit-event-type-dialog.tsx
@@ -110,7 +110,7 @@ export function EditEventTypeDialog({
showDescription={showDescription}
setShowDescription={setShowDescription}
/>
- <DialogFooter className="pt-2">
+ <DialogFooter>
<DialogClose
render={
<Button type="button" disabled={updateEventType.isPending} />
diff --git a/apps/web/src/features/space/components/create-space-dialog.tsx b/apps/web/src/features/space/components/create-space-dialog.tsx
index 14db3e256..d0f2b7aba 100644
--- a/apps/web/src/features/space/components/create-space-dialog.tsx
+++ b/apps/web/src/features/space/components/create-space-dialog.tsx
@@ -84,7 +84,7 @@ export function CreateSpaceDialog(props: DialogProps) {
</FormItem>
)}
/>
- <DialogFooter className="mt-4">
+ <DialogFooter>
<Button
loading={form.formState.isSubmitting}
type="submit"
diff --git a/apps/web/src/features/webhook/components/create-webhook-button.tsx b/apps/web/src/features/webhook/components/create-webhook-button.tsx
index 8225da0ac..91d8cc316 100644
--- a/apps/web/src/features/webhook/components/create-webhook-button.tsx
+++ b/apps/web/src/features/webhook/components/create-webhook-button.tsx
@@ -205,7 +205,7 @@ export function CreateWebhookButton() {
)}
/>
</div>
- <DialogFooter className="mt-6">
+ <DialogFooter>
<DialogClose render={<Button />}>
<Trans i18nKey="cancel" defaults="Cancel" />
</DialogClose>
diff --git a/packages/tailwind-config/shared-styles.css b/packages/tailwind-config/shared-styles.css
index fe5f7b35c..cb34241a7 100644
--- a/packages/tailwind-config/shared-styles.css
+++ b/packages/tailwind-config/shared-styles.css
@@ -1,6 +1,13 @@
@import "tailwindcss";
@custom-variant dark (&:where(.dark, .dark *));
+/* A dialog header or footer at the top level of the dialog's scroll area
+ * (directly, or inside a top-level form), where it pins to the edge. */
+@custom-variant dialog-edge (:is(
+ [data-slot="dialog-scroller"],
+ [data-slot="dialog-scroller"] > form
+ )
+ > &);
@plugin "@tailwindcss/typography";
@plugin "tailwindcss-animate";
diff --git a/packages/ui/src/command.tsx b/packages/ui/src/command.tsx
index cda477407..9560c80bf 100644
--- a/packages/ui/src/command.tsx
+++ b/packages/ui/src/command.tsx
@@ -44,7 +44,11 @@ const CommandDialog = ({
}: CommandDialogProps) => {
return (
<Dialog {...props}>
- <DialogContent showCloseButton={false} size="xl" className="p-0">
+ <DialogContent
+ showCloseButton={false}
+ size="xl"
+ className="*:data-[slot=dialog-scroller]:p-0"
+ >
{title != null && (
<DialogTitle className="sr-only">{title}</DialogTitle>
)}
diff --git a/packages/ui/src/dialog.tsx b/packages/ui/src/dialog.tsx
index e3cddbbc0..44db13bc5 100644
--- a/packages/ui/src/dialog.tsx
+++ b/packages/ui/src/dialog.tsx
@@ -49,7 +49,7 @@ function DialogOverlay({
const dialogVariants = cva(
cn(
- "data-closed:fade-out-0 data-open:fade-in-0 data-closed:zoom-out-95 data-open:zoom-in-95 fixed top-[50%] left-[50%] z-50 grid w-full max-w-[calc(100%-2rem)] translate-x-[-50%] translate-y-[-50%] gap-4 rounded-2xl border border-popover-border bg-popover p-4 shadow-lg outline-none duration-200 data-closed:animate-out data-open:animate-in",
+ "data-closed:fade-out-0 data-open:fade-in-0 data-closed:zoom-out-95 data-open:zoom-in-95 fixed top-[50%] left-[50%] z-50 flex max-h-[calc(100dvh-2rem)] w-full max-w-[calc(100%-2rem)] translate-x-[-50%] translate-y-[-50%] flex-col overflow-hidden rounded-2xl border border-popover-border bg-popover shadow-lg outline-none duration-200 data-closed:animate-out data-open:animate-in",
),
{
variants: {
@@ -87,9 +87,14 @@ function DialogContent({
className={cn(dialogVariants({ size }), className)}
{...props}
>
- {children}
+ <div
+ data-slot="dialog-scroller"
+ className="grid min-h-0 grow gap-4 overflow-y-auto overscroll-contain p-4"
+ >
+ {children}
+ </div>
{showCloseButton && (
- <DialogClose className="absolute top-4 right-4 rounded-xs opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-hidden focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none [&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0">
+ <DialogClose className="absolute top-4 right-4 z-20 rounded-xs opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-hidden focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none [&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0">
<XIcon />
<span className="sr-only">Close</span>
</DialogClose>
@@ -100,7 +105,16 @@ function DialogContent({
}
function DialogHeader({ className, ...props }: React.ComponentProps<"div">) {
- return <div data-slot="dialog-header" className={cn(className)} {...props} />;
+ return (
+ <div
+ data-slot="dialog-header"
+ className={cn(
+ "dialog-edge:sticky dialog-edge:-top-4 dialog-edge:z-10 dialog-edge:-mx-4 dialog-edge:-mt-4 dialog-edge:bg-popover dialog-edge:px-4 dialog-edge:pt-4 dialog-edge:pr-12 dialog-edge:pb-2",
+ className,
+ )}
+ {...props}
+ />
+ );
}
function DialogFooter({ className, ...props }: React.ComponentProps<"div">) {
@@ -109,6 +123,7 @@ function DialogFooter({ className, ...props }: React.ComponentProps<"div">) {
data-slot="dialog-footer"
className={cn(
"flex flex-col-reverse gap-2 sm:flex-row sm:justify-end",
+ "dialog-edge:sticky dialog-edge:-bottom-4 dialog-edge:z-10 dialog-edge:-mx-4 dialog-edge:mt-2 dialog-edge:-mb-4 dialog-edge:border-popover-border dialog-edge:border-t dialog-edge:bg-card dialog-edge:px-4 dialog-edge:py-3",
className,
)}
{...props}