Skip to content

Defer mounting Search filter dropdown content until opened #96287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TMisiukiewicz wants to merge 3 commits into
base: main
Choose a base branch
from
+12 −2
Open

Defer mounting Search filter dropdown content until opened #96287

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c05319c
Defer mounting Search filter dropdown content until opened
TMisiukiewicz Jul 16, 2026
fd8f812
Preserve hook order by deferring mounted subtree, not the popover call
TMisiukiewicz Jul 16, 2026
64d270a
Latch hasEverExpanded on actual open, batched with toggle
TMisiukiewicz Jul 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions src/components/Search/FilterDropdowns/FilterPopupButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@ function FilterPopupButton({viewportOffsetTop, popoverWidth, wrapperStyle, popov
const triggerRef = useRef<View | null>(null);
const anchorRef = useRef<View | null>(null);
const [isOverlayVisible, setIsOverlayVisible] = useState(false);
// Defer mounting the (potentially heavy) popover content until the dropdown is first opened, then keep it
// mounted so the close animation and reopening stay instant. The content is otherwise mounted eagerly on
// screen focus even while hidden, which runs each filter selector's expensive option-building on page load.
const [hasEverExpanded, setHasEverExpanded] = useState(false);
const [customPopoverWidth, setCustomPopoverWidth] = useState<number | undefined>(undefined);
const {calculatePopoverPosition} = usePopoverPosition();

Expand All @@ -90,6 +94,11 @@ function FilterPopupButton({viewportOffsetTop, popoverWidth, wrapperStyle, popov
const calculatePopoverPositionAndToggleOverlay = () => {
calculatePopoverPosition(anchorRef, popoverAnchorAlignment).then((position) => {
setPopoverTriggerPosition({...position, vertical: position.vertical});
// Latch in the same batch as the open (and only when it will actually open, mirroring toggleOverlay's
// alert-modal guard) so the deferred subtree mounts together with the popover becoming visible.
if (!isOverlayVisible && !willAlertModalBecomeVisible) {
setHasEverExpanded(true);
}
toggleOverlay();
Comment thread
TMisiukiewicz marked this conversation as resolved.
});
};
Expand All @@ -107,8 +116,9 @@ function FilterPopupButton({viewportOffsetTop, popoverWidth, wrapperStyle, popov
{/* Dropdown Trigger */}
{renderButton({ref: triggerRef, onPress: calculatePopoverPositionAndToggleOverlay, isExpanded: isOverlayVisible})}

{/* Dropdown overlay */}
{isFocused && (
{/* Dropdown overlay. Gated on hasEverExpanded so the (potentially heavy) content subtree isn't mounted
until the dropdown is first opened — PopoverWithMeasuredContentBase mounts children even while hidden. */}
{isFocused && hasEverExpanded && (
<PopoverWithMeasuredContent
anchorRef={triggerRef}
avoidKeyboard
Expand Down
Loading