The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Multi-select for the partners section and prevent scrolling to the top (#3699)
Pedro Ladeira0059b9a5c17c
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/partner-analytics-filter-cell.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/partner-analytics-filter-cell.tsxindex b9bf739872..318d2651d6 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/partner-analytics-filter-cell.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/partner-analytics-filter-cell.tsx@@ -55,11 +55,7 @@ export function PartnerAnalyticsFilterCell({onClick={(e) => {e.stopPropagation();if (isApplied) return;- if (isStaged) {- onToggle();- } else {- onApplyImmediate();- }+ onToggle();}}className={cn("flex size-6 shrink-0 items-center justify-center rounded-lg transition-all duration-200",diff --git a/apps/web/ui/layout/main-nav.tsx b/apps/web/ui/layout/main-nav.tsxindex 349922c1cc..7c315124ca 100644--- a/apps/web/ui/layout/main-nav.tsx+++ b/apps/web/ui/layout/main-nav.tsx@@ -1,8 +1,12 @@"use client";-import { useMediaQuery } from "@dub/ui";+import {+ consumePendingDashboardScrollTop,+ DUB_DASHBOARD_MAIN_SCROLL_ID,+ useMediaQuery,+} from "@dub/ui";import { cn } from "@dub/utils";-import { usePathname } from "next/navigation";+import { usePathname, useSearchParams } from "next/navigation";import {ComponentType,createContext,@@ -11,6 +15,7 @@ import {ReactNode,SetStateAction,useEffect,+ useLayoutEffect,useState,} from "react";import { useUpgradeBannerVisible } from "./upgrade-banner";@@ -39,6 +44,7 @@ export function MainNav({newsContent?: ReactNode;}>) {const pathname = usePathname();+ const searchParams = useSearchParams();const { isDesktop } = useMediaQuery();const [isOpen, setIsOpen] = useState(false);@@ -54,6 +60,21 @@ export function MainNav({setIsOpen(false);}, [pathname]);+ useLayoutEffect(() => {+ const top = consumePendingDashboardScrollTop();+ if (top === null) return;+ const el = document.getElementById(DUB_DASHBOARD_MAIN_SCROLL_ID);+ if (!el) return;+ const apply = () => {+ el.scrollTop = top;+ };+ apply();+ // Next/React may reset nested scroll after layout; re-apply on the next frame(s).+ requestAnimationFrame(() => {+ requestAnimationFrame(apply);+ });+ }, [searchParams.toString()]);+return (<div className="min-h-screen lg:grid lg:grid-cols-[min-content_minmax(0,1fr)]">{/* Side nav backdrop */}@@ -90,7 +111,10 @@ export function MainNav({isUpgradeBannerVisible ? "mt-12 h-[calc(100vh-48px)]" : "h-screen",)}>- <div className="relative h-full overflow-y-auto bg-neutral-100 pt-px lg:rounded-xl lg:bg-white">+ <div+ id={DUB_DASHBOARD_MAIN_SCROLL_ID}+ className="relative h-full overflow-y-auto bg-neutral-100 pt-px lg:rounded-xl lg:bg-white"+ ><SideNavContext.Provider value={{ isOpen, setIsOpen }}>{children}</SideNavContext.Provider>diff --git a/packages/ui/src/hooks/use-router-stuff.ts b/packages/ui/src/hooks/use-router-stuff.tsindex e68ce5d1a8..72a58d7eff 100644--- a/packages/ui/src/hooks/use-router-stuff.ts+++ b/packages/ui/src/hooks/use-router-stuff.ts@@ -7,6 +7,18 @@ import {} from "next/navigation";import { useCallback } from "react";+/** Scroll container for app dashboard main column (`MainNav`); not `window`. */+export const DUB_DASHBOARD_MAIN_SCROLL_ID = "dub-dashboard-main-scroll";++let pendingDashboardScrollTop: number | null = null;++/** Call after URL updates (e.g. in `useLayoutEffect`) to restore nested scroll. */+export function consumePendingDashboardScrollTop(): number | null {+ const top = pendingDashboardScrollTop;+ pendingDashboardScrollTop = null;+ return top;+}+export function useRouterStuff() {const pathname = usePathname();const router = useRouter();@@ -74,6 +86,16 @@ export function useRouterStuff() {queryString.length > 0 ? `?${queryString}` : ""}`;if (getNewPath) return newPath;++ // Nested overflow container scroll is not preserved by Next's `scroll: false` (window-only).+ if (+ scroll === false &&+ typeof document !== "undefined"+ ) {+ const el = document.getElementById(DUB_DASHBOARD_MAIN_SCROLL_ID);+ if (el) pendingDashboardScrollTop = el.scrollTop;+ }+if (replace) {router.replace(newPath, { scroll: false });} else {