Skip to content
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

fix: don't call clearTimeout unnecessarily #30109

Closed
wants to merge 2 commits into from
Closed

fix: don't call clearTimeout unnecessarily #30109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
939c4a9
fix: don't call clearTimeout unnecessarily
ling1726 Dec 18, 2023
e33c725
changefile
ling1726 Dec 18, 2023
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
7 changes: 7 additions & 0 deletions change/@fluentui-react-popover-7e7dacac-aba9-4fb0-b535-98d76936c7b3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix: don't call clearTimeout unnecessarily",
"packageName": "@fluentui/react-popover",
"email": "[email protected]",
"dependentChangeType": "patch"
}
24 changes: 17 additions & 7 deletions packages/react-components/react-popover/src/components/Popover/usePopover.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,22 @@ export const usePopover_unstable = (props: PopoverProps): PopoverState => {

const [open, setOpenState] = useOpenState(initialState);

const setOpenTimeoutRef = React.useRef(0);
const setOpenTimeoutRef = React.useRef(-1);
const clearOpenTimeout = React.useCallback(() => {
if (setOpenTimeoutRef.current >= 0) {
clearTimeout(setOpenTimeoutRef.current);
setOpenTimeoutRef.current = -1;
}
}, []);

const setOpenTimeout = (e: OpenPopoverEvents, shouldOpen: boolean) => {
setOpenTimeoutRef.current = setTimeout(() => {
setOpenState(e, shouldOpen);
}, props.mouseLeaveDelay ?? 500);
};

const setOpen = useEventCallback((e: OpenPopoverEvents, shouldOpen: boolean) => {
clearTimeout(setOpenTimeoutRef.current);
clearOpenTimeout();
if (!(e instanceof Event) && e.persist) {
// < React 17 still uses pooled synthetic events
e.persist();
Expand All @@ -73,9 +85,7 @@ export const usePopover_unstable = (props: PopoverProps): PopoverState => {
// FIXME leaking Node timeout type
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
setOpenTimeoutRef.current = setTimeout(() => {
setOpenState(e, shouldOpen);
}, props.mouseLeaveDelay ?? 500);
setOpenTimeout(e, shouldOpen);
} else {
setOpenState(e, shouldOpen);
}
Expand All @@ -85,9 +95,9 @@ export const usePopover_unstable = (props: PopoverProps): PopoverState => {
// Setting state after a component unmounts can cause memory leaks
React.useEffect(() => {
return () => {
clearTimeout(setOpenTimeoutRef.current);
clearOpenTimeout();
};
}, []);
}, [clearOpenTimeout]);

const toggleOpen = React.useCallback<PopoverState['toggleOpen']>(
e => {
Expand Down
Loading