Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.
TypeScript i18nextnext-authnextjspostgresqlprismareact-emailt3-stacktailwindcsstrpcturborepotypescriptzod
🐛 Fix the double scrollbar on the invite and admin poll pages (#3299)
Luke Vellaedccee792e90
diff --git a/apps/web/src/app/[locale]/invite/[urlId]/invite-page.tsx b/apps/web/src/app/[locale]/invite/[urlId]/invite-page.tsxindex 48c2d8041..0790f2f7b 100644--- a/apps/web/src/app/[locale]/invite/[urlId]/invite-page.tsx+++ b/apps/web/src/app/[locale]/invite/[urlId]/invite-page.tsx@@ -90,7 +90,7 @@ export function InvitePage({}return (- <div className="page-bg-gray-100 h-dvh overflow-auto p-3 lg:p-6 dark:bg-gray-900">+ <div className="page-bg-gray-100 relative h-dvh overflow-auto p-3 lg:p-6 dark:bg-gray-900"><mainid="main-content"tabIndex={-1}diff --git a/apps/web/src/features/poll/components/poll-layout.tsx b/apps/web/src/features/poll/components/poll-layout.tsxindex e1ff87df0..b34f03f94 100644--- a/apps/web/src/features/poll/components/poll-layout.tsx+++ b/apps/web/src/features/poll/components/poll-layout.tsx@@ -33,7 +33,7 @@ const Layout = ({ children }: React.PropsWithChildren) => {const pollLink = `/poll/${poll.id}`;const pathname = usePathname();return (- <div className="page-bg-gray-100 h-dvh overflow-auto dark:bg-gray-900">+ <div className="page-bg-gray-100 relative h-dvh overflow-auto dark:bg-gray-900"><div className="sticky top-0 z-40 border-b bg-gray-100/90 p-3 backdrop-blur-lg sm:flex-row dark:bg-gray-900/90"><div className="flex justify-between"><div className="flex min-w-0 items-center gap-x-2.5">diff --git a/apps/web/tests/space-branding.spec.ts b/apps/web/tests/space-branding.spec.tsindex 0355cf989..45d63d1ff 100644--- a/apps/web/tests/space-branding.spec.ts+++ b/apps/web/tests/space-branding.spec.ts@@ -92,4 +92,27 @@ test.describe("space branding on the invite page", () => {await readPrimaryVar(page);await expect(page.getByText("Powered by")).toBeVisible();});++ test("the footer credit stays inside the page's own scroll container", async ({+ page,+ }) => {+ await prisma.space.update({+ where: { id: spaceId },+ data: { tier: "hobby", hideAttribution: false },+ });++ // Short enough that the footer lands below the fold of the page's+ // scroller, where a badly anchored descendant would extend the document+ // instead and give the page a second scrollbar.+ await page.setViewportSize({ width: 1280, height: 400 });+ await readPrimaryVar(page);+ await expect(page.getByText("Powered by")).toBeAttached();++ const documentOverflow = await page.evaluate(+ () =>+ document.documentElement.scrollHeight -+ document.documentElement.clientHeight,+ );+ expect(documentOverflow).toBe(0);+ });});