Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

fix(segments): scrollable popovers inside the segment dialog (#1166)

Goldflag2a7abe172eb3
diff --git a/client/src/app/[site]/components/SubHeader/Filters/FilterChip.tsx b/client/src/app/[site]/components/SubHeader/Filters/FilterChip.tsx
index 77c8855c9..8a40ac836 100644
--- a/client/src/app/[site]/components/SubHeader/Filters/FilterChip.tsx
+++ b/client/src/app/[site]/components/SubHeader/Filters/FilterChip.tsx
@@ -30,12 +30,15 @@ export function FilterChip({
onRemove,
availableFilters,
disabled,
+ modal,
}: {
filter: Filter;
onUpdate: (filter: Filter) => void;
onRemove: () => void;
availableFilters?: FilterParameter[];
disabled?: boolean;
+ /** Set when the chip is rendered inside a dialog so its popovers can scroll. */
+ modal?: boolean;
}) {
const t = useExtracted();
const { getRegionName } = useGetRegionName();
@@ -48,7 +51,7 @@ export function FilterChip({
return (
<ButtonGroup>
- <ParameterPopover filter={filter} onUpdate={onUpdate} availableFilters={availableFilters}>
+ <ParameterPopover filter={filter} onUpdate={onUpdate} availableFilters={availableFilters} modal={modal}>
<Button
variant="secondary"
size="sm"
@@ -62,7 +65,7 @@ export function FilterChip({
{getParameterLabel(filter.parameter)}
</Button>
</ParameterPopover>
- <OperatorPopover filter={filter} onUpdate={onUpdate}>
+ <OperatorPopover filter={filter} onUpdate={onUpdate} modal={modal}>
<Button
variant="secondary"
size="sm"
@@ -73,7 +76,7 @@ export function FilterChip({
</Button>
</OperatorPopover>
{operatorNeedsValue(filter.type) && (
- <ValuePopover filter={filter} onUpdate={onUpdate}>
+ <ValuePopover filter={filter} onUpdate={onUpdate} modal={modal}>
<Button
variant="secondary"
size="sm"
diff --git a/client/src/app/[site]/components/SubHeader/Filters/OperatorPopover.tsx b/client/src/app/[site]/components/SubHeader/Filters/OperatorPopover.tsx
index c1d30620a..91eaf74e0 100644
--- a/client/src/app/[site]/components/SubHeader/Filters/OperatorPopover.tsx
+++ b/client/src/app/[site]/components/SubHeader/Filters/OperatorPopover.tsx
@@ -21,10 +21,13 @@ export function OperatorPopover({
filter,
onUpdate,
children,
+ modal,
}: {
filter: Filter;
onUpdate: (filter: Filter) => void;
children: React.ReactNode;
+ /** Set when rendered inside a dialog: the dialog's scroll lock otherwise swallows wheel events in the portaled popover. */
+ modal?: boolean;
}) {
const t = useExtracted();
const getOperatorMenuLabel = useOperatorMenuLabel();
@@ -43,7 +46,7 @@ export function OperatorPopover({
};
return (
- <Popover open={open} onOpenChange={setOpen}>
+ <Popover open={open} onOpenChange={setOpen} modal={modal}>
<PopoverTrigger asChild>{children}</PopoverTrigger>
<PopoverContent className="w-56 p-0" align="start">
<div className="px-3 pt-3 pb-1 text-sm font-medium">{t("Operator")}</div>
diff --git a/client/src/app/[site]/components/SubHeader/Filters/ParameterPopover.tsx b/client/src/app/[site]/components/SubHeader/Filters/ParameterPopover.tsx
index 947c5d973..27b433e43 100644
--- a/client/src/app/[site]/components/SubHeader/Filters/ParameterPopover.tsx
+++ b/client/src/app/[site]/components/SubHeader/Filters/ParameterPopover.tsx
@@ -20,10 +20,13 @@ export function ParameterPopover({
onUpdate,
availableFilters,
children,
+ modal,
}: {
filter: Filter;
onUpdate: (filter: Filter) => void;
availableFilters?: FilterParameter[];
+ /** Set when rendered inside a dialog: the dialog's scroll lock otherwise swallows wheel events in the portaled popover. */
+ modal?: boolean;
children: React.ReactNode;
}) {
const t = useExtracted();
@@ -62,7 +65,7 @@ export function ParameterPopover({
};
return (
- <Popover open={open} onOpenChange={setOpen}>
+ <Popover open={open} onOpenChange={setOpen} modal={modal}>
<PopoverTrigger asChild>{children}</PopoverTrigger>
<PopoverContent className="w-64 p-0" align="start">
<Command>
diff --git a/client/src/app/[site]/components/SubHeader/Filters/SegmentDialog.tsx b/client/src/app/[site]/components/SubHeader/Filters/SegmentDialog.tsx
index 6b5202803..ff517c44b 100644
--- a/client/src/app/[site]/components/SubHeader/Filters/SegmentDialog.tsx
+++ b/client/src/app/[site]/components/SubHeader/Filters/SegmentDialog.tsx
@@ -240,11 +240,13 @@ function SegmentForm({ onOpenChange, siteId, segment, initialFilters, availableF
key={filterKeys[index]}
filter={filter}
availableFilters={availableFilters}
+ modal
onUpdate={next => setFilters(filters.map((f, i) => (i === index ? next : f)))}
onRemove={() => setFilters(filters.filter((_, i) => i !== index))}
/>
))}
- <Popover open={pickerOpen} onOpenChange={handlePickerOpenChange}>
+ {/* modal: the dialog's scroll lock otherwise swallows wheel events in this portaled popover */}
+ <Popover open={pickerOpen} onOpenChange={handlePickerOpenChange} modal>
<PopoverTrigger asChild>
<Button type="button" size="sm" variant="outline" className="gap-1.5">
<Plus className="h-4 w-4" />
diff --git a/client/src/app/[site]/components/SubHeader/Filters/ValuePopover.tsx b/client/src/app/[site]/components/SubHeader/Filters/ValuePopover.tsx
index c31739621..eb0334810 100644
--- a/client/src/app/[site]/components/SubHeader/Filters/ValuePopover.tsx
+++ b/client/src/app/[site]/components/SubHeader/Filters/ValuePopover.tsx
@@ -60,10 +60,13 @@ export function ValuePopover({
filter,
onUpdate,
children,
+ modal,
}: {
filter: Filter;
onUpdate: (filter: Filter) => void;
children: React.ReactNode;
+ /** Set when rendered inside a dialog: the dialog's scroll lock otherwise swallows wheel events in the portaled popover. */
+ modal?: boolean;
}) {
const t = useExtracted();
const [open, setOpen] = useState(false);
@@ -142,6 +145,7 @@ export function ValuePopover({
return (
<Popover
+ modal={modal}
open={open}
onOpenChange={isOpen => {
if (!isOpen && needsTextInput) commitTextInput();