Skip to content

fix: ref check to avoid loop #342

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

Merged
merged 1 commit into from
Mar 16, 2023
Merged

fix: ref check to avoid loop #342

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 7 additions & 7 deletions src/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import Portal from '@rc-component/portal';
import classNames from 'classnames';
import type { CSSMotionProps } from 'rc-motion';
import ResizeObserver from 'rc-resize-observer';
import { isDOM } from 'rc-util/lib/Dom/findDOMNode';
import useEvent from 'rc-util/lib/hooks/useEvent';
import useId from 'rc-util/lib/hooks/useId';
import useLayoutEffect from 'rc-util/lib/hooks/useLayoutEffect';
import { isDOM } from 'rc-util/lib/Dom/findDOMNode';
import * as React from 'react';
import type { TriggerContextProps } from './context';
import TriggerContext from './context';
Expand Down Expand Up @@ -214,23 +214,23 @@ export function generateTrigger(
const id = useId();
const [popupEle, setPopupEle] = React.useState<HTMLDivElement>(null);

const setPopupRef = React.useCallback((node: HTMLDivElement) => {
if (isDOM(node)) {
const setPopupRef = useEvent((node: HTMLDivElement) => {
if (isDOM(node) && popupEle !== node) {
setPopupEle(node);
}

parentContext?.registerSubPopup(id, node);
}, []);
});

// =========================== Target ===========================
// Use state to control here since `useRef` update not trigger render
const [targetEle, setTargetEle] = React.useState<HTMLElement>(null);

const setTargetRef = React.useCallback((node: HTMLElement) => {
if (isDOM(node)) {
const setTargetRef = useEvent((node: HTMLElement) => {
if (isDOM(node) && targetEle !== node) {
setTargetEle(node);
}
}, []);
});

// ========================== Children ==========================
const child = React.Children.only(children) as React.ReactElement;
Expand Down