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(Popup): fix popup invisible position bug #3052

Merged
merged 1 commit into from
Aug 21, 2024
Merged

fix(Popup): fix popup invisible position bug #3052

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: 10 additions & 4 deletions src/popup/Popup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import useWindowSize from '../hooks/useWindowSize';
import { popupDefaultProps } from './defaultProps';
import useDefaultProps from '../hooks/useDefaultProps';
import useAttach from '../hooks/useAttach';
import { getCssVarsValue } from '../_util/dom';

export interface PopupProps extends TdPopupProps {
// 是否触发展开收起动画，内部下拉式组件使用
Expand Down Expand Up @@ -114,15 +115,20 @@ const Popup = forwardRef<PopupRef, PopupProps>((originalProps, ref) => {

const updateTimeRef = useRef(null);
// 监听 trigger 节点或内容变化动态更新 popup 定位
useMutationObserver(getRefDom(triggerRef), () => {
clearTimeout(updateTimeRef.current);
updateTimeRef.current = setTimeout(() => popperRef.current?.update?.(), 0);
useMutationObserver(getRefDom(triggerRef), ([mutation]) => {
const isDisplayNone = getCssVarsValue('display', mutation.target as HTMLElement) === 'none';
if (visible && !isDisplayNone) {
clearTimeout(updateTimeRef.current);
updateTimeRef.current = setTimeout(() => popperRef.current?.update?.(), 0);
}
});
useEffect(() => () => clearTimeout(updateTimeRef.current), []);

// 窗口尺寸变化时调整位置
useEffect(() => {
requestAnimationFrame(() => popperRef.current?.update?.());
if (visible) {
requestAnimationFrame(() => popperRef.current?.update?.());
}
}, [visible, content, windowHeight, windowWidth]);

// 下拉展开时更新内部滚动条
Expand Down
Loading