Skip to content

armgit / dub

Public Imported from GitHub
0

The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.

Prevent scroll-to-top on filter clicks (#3659)

Pedro Ladeira98059de46f74
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/analytics-partners-table.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/analytics-partners-table.tsx
index 028a7a6f8e..c749b23626 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/analytics-partners-table.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/analytics-partners-table.tsx
@@ -59,6 +59,7 @@ export function AnalyticsPartnersTable() {
queryParams({
set: { partnerId: stagedPartnerIds.join(",") },
del: "page",
+ scroll: false,
});
setStagedPartnerIds(null);
}, [queryParams, stagedPartnerIds]);
@@ -66,7 +67,7 @@ export function AnalyticsPartnersTable() {
const clearFilter = useCallback(() => {
setStagedPartnerIds(null);
if (searchParams.has("partnerId")) {
- queryParams({ del: ["partnerId", "page"] });
+ queryParams({ del: ["partnerId", "page"], scroll: false });
}
}, [queryParams, searchParams]);
@@ -116,7 +117,7 @@ export function AnalyticsPartnersTable() {
isApplied={activePartnerIdsFromUrl.includes(partnerId)}
onToggle={() => toggleStagePartner(partnerId)}
onApplyImmediate={() => {
- queryParams({ set: { partnerId }, del: "page" });
+ queryParams({ set: { partnerId }, del: "page", scroll: false });
setStagedPartnerIds(null);
}}
/>
diff --git a/apps/web/ui/analytics/bar-list.tsx b/apps/web/ui/analytics/bar-list.tsx
index 67421d3b5f..17b5151290 100644
--- a/apps/web/ui/analytics/bar-list.tsx
+++ b/apps/web/ui/analytics/bar-list.tsx
@@ -44,7 +44,7 @@ export function BarList({
onClearFilter,
onClearSelection,
onApplyFilterValues,
- onImmediateFilter,
+ onRowFilterItem,
}: {
tab: string;
unit: string;
@@ -79,7 +79,7 @@ export function BarList({
onClearFilter?: () => void;
onClearSelection?: () => void;
onApplyFilterValues?: (values: string[]) => void;
- onImmediateFilter?: (value: string) => void;
+ onRowFilterItem?: (value: string) => void;
}) {
const [search, setSearch] = useState("");
const [modalSelectedValues, setModalSelectedValues] = useState<string[]>(
@@ -164,13 +164,13 @@ export function BarList({
: undefined
: undefined,
onRowClick:
- data.filterValue && onImmediateFilter
+ data.filterValue && onRowFilterItem
? !limit
? () => {
- onImmediateFilter(data.filterValue!);
+ onRowFilterItem(data.filterValue!);
setShowModal(false);
}
- : () => onImmediateFilter(data.filterValue!)
+ : () => onRowFilterItem(data.filterValue!)
: undefined,
}));
diff --git a/apps/web/ui/analytics/device-section.tsx b/apps/web/ui/analytics/device-section.tsx
index 6a33a075c0..daef326252 100644
--- a/apps/web/ui/analytics/device-section.tsx
+++ b/apps/web/ui/analytics/device-section.tsx
@@ -39,9 +39,12 @@ export function DeviceSection() {
const onApplyFilterValues = useCallback(
(values: string[]) => {
if (values.length === 0) {
- queryParams({ del: singularTabName });
+ queryParams({ del: singularTabName, scroll: false });
} else {
- queryParams({ set: { [singularTabName]: values.join(",") } });
+ queryParams({
+ set: { [singularTabName]: values.join(",") },
+ scroll: false,
+ });
}
setSelectedItems([]);
},
@@ -129,7 +132,7 @@ export function DeviceSection() {
onClearFilter={onClearFilter}
onClearSelection={() => setSelectedItems([])}
onApplyFilterValues={onApplyFilterValues}
- onImmediateFilter={(val) => onApplyFilterValues([val])}
+ onRowFilterItem={(val) => onApplyFilterValues([val])}
{...(limit && { limit })}
/>
) : (
diff --git a/apps/web/ui/analytics/location-section.tsx b/apps/web/ui/analytics/location-section.tsx
index a0139727b0..a8f5303362 100644
--- a/apps/web/ui/analytics/location-section.tsx
+++ b/apps/web/ui/analytics/location-section.tsx
@@ -46,9 +46,12 @@ export function LocationSection() {
const onApplyFilterValues = useCallback(
(values: string[]) => {
if (values.length === 0) {
- queryParams({ del: singularTabName });
+ queryParams({ del: singularTabName, scroll: false });
} else {
- queryParams({ set: { [singularTabName]: values.join(",") } });
+ queryParams({
+ set: { [singularTabName]: values.join(",") },
+ scroll: false,
+ });
}
setSelectedItems([]);
},
@@ -162,7 +165,7 @@ export function LocationSection() {
onClearFilter={onClearFilter}
onClearSelection={() => setSelectedItems([])}
onApplyFilterValues={onApplyFilterValues}
- onImmediateFilter={(val) => onApplyFilterValues([val])}
+ onRowFilterItem={(val) => onApplyFilterValues([val])}
{...(limit && { limit })}
/>
) : (
diff --git a/apps/web/ui/analytics/partner-section.tsx b/apps/web/ui/analytics/partner-section.tsx
index 9a4666713f..4451b437b7 100644
--- a/apps/web/ui/analytics/partner-section.tsx
+++ b/apps/web/ui/analytics/partner-section.tsx
@@ -112,9 +112,12 @@ export function PartnerSection() {
(values: string[]) => {
if (!filterParamKey) return;
if (values.length === 0) {
- queryParams({ del: filterParamKey });
+ queryParams({ del: filterParamKey, scroll: false });
} else {
- queryParams({ set: { [filterParamKey]: values.join(",") } });
+ queryParams({
+ set: { [filterParamKey]: values.join(",") },
+ scroll: false,
+ });
}
setSelectedItems([]);
},
@@ -258,10 +261,8 @@ export function PartnerSection() {
onApplyFilterValues={
filterParamKey ? onApplyFilterValues : undefined
}
- onImmediateFilter={
- filterParamKey
- ? (val) => onApplyFilterValues([val])
- : undefined
+ onRowFilterItem={
+ filterParamKey ? (val) => onApplyFilterValues([val]) : undefined
}
{...(limit && { limit })}
/>
diff --git a/apps/web/ui/analytics/referrers-utms.tsx b/apps/web/ui/analytics/referrers-utms.tsx
index 3747e75eea..bf7bb4bd82 100644
--- a/apps/web/ui/analytics/referrers-utms.tsx
+++ b/apps/web/ui/analytics/referrers-utms.tsx
@@ -78,9 +78,12 @@ export function ReferrersUTMs() {
const onApplyFilterValues = useCallback(
(values: string[]) => {
if (values.length === 0) {
- queryParams({ del: singularTabName });
+ queryParams({ del: singularTabName, scroll: false });
} else {
- queryParams({ set: { [singularTabName]: values.join(",") } });
+ queryParams({
+ set: { [singularTabName]: values.join(",") },
+ scroll: false,
+ });
}
setSelectedItems([]);
},
@@ -216,7 +219,7 @@ export function ReferrersUTMs() {
onClearFilter={onClearFilter}
onClearSelection={() => setSelectedItems([])}
onApplyFilterValues={onApplyFilterValues}
- onImmediateFilter={(val) => onApplyFilterValues([val])}
+ onRowFilterItem={(val) => onApplyFilterValues([val])}
{...(limit && { limit })}
/>
) : (
diff --git a/apps/web/ui/analytics/top-links.tsx b/apps/web/ui/analytics/top-links.tsx
index 1fd3f92f63..5ec86aff53 100644
--- a/apps/web/ui/analytics/top-links.tsx
+++ b/apps/web/ui/analytics/top-links.tsx
@@ -94,9 +94,12 @@ export function TopLinks() {
if (!filterParamKey) return;
if (values.length === 0) {
- queryParams({ del: filterParamKey });
+ queryParams({ del: filterParamKey, scroll: false });
} else {
- queryParams({ set: { [filterParamKey]: values.join(",") } });
+ queryParams({
+ set: { [filterParamKey]: values.join(",") },
+ scroll: false,
+ });
}
setSelectedItems([]);
@@ -251,10 +254,8 @@ export function TopLinks() {
onApplyFilterValues={
filterParamKey ? onApplyFilterValues : undefined
}
- onImmediateFilter={
- filterParamKey
- ? (val) => onApplyFilterValues([val])
- : undefined
+ onRowFilterItem={
+ filterParamKey ? (val) => onApplyFilterValues([val]) : undefined
}
{...(limit && { limit })}
/>