Skip to content

fix(Popover): 修复Popover动态渲染时的bug #363

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
kagol merged 1 commit into from
Mar 31, 2022
Merged

fix(Popover): 修复Popover动态渲染时的bug #363

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
10 changes: 5 additions & 5 deletions packages/devui-vue/devui/overlay/src/flexible-overlay/use-flexible-overlay.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ function adjustArrowPosition(isArrowCenter: boolean, point: Point, placement: Pl
export function useOverlay(props: FlexibleOverlayProps, emit: EmitEventFn): UseOverlayFn {
const overlayRef = ref<HTMLElement | undefined>();
const arrowRef = ref<HTMLElement | undefined>();
let originParent = null;
const updateArrowPosition = (arrowEl: HTMLElement, placement: Placement, point: Point, overlayEl: HTMLElement) => {
const { x, y } = adjustArrowPosition(props.isArrowCenter, point, placement, overlayEl.getBoundingClientRect());
const staticSide = {
Expand Down Expand Up @@ -67,22 +68,21 @@ export function useOverlay(props: FlexibleOverlayProps, emit: EmitEventFn): UseO
watch(
() => props.modelValue,
() => {
const originParent = getScrollParent(props.origin);
if (props.modelValue && props.origin) {
originParent = getScrollParent(props.origin);
nextTick(updatePosition);
originParent.addEventListener('scroll', updatePosition);
originParent?.addEventListener('scroll', updatePosition);
originParent !== window && window.addEventListener('scroll', updatePosition);
window.addEventListener('resize', updatePosition);
} else {
originParent.removeEventListener('scroll', updatePosition);
originParent?.removeEventListener('scroll', updatePosition);
originParent !== window && window.removeEventListener('scroll', updatePosition);
window.removeEventListener('resize', updatePosition);
}
}
);
onUnmounted(() => {
const originParent = getScrollParent(props.origin);
originParent.removeEventListener('scroll', updatePosition);
originParent?.removeEventListener('scroll', updatePosition);
originParent !== window && window.removeEventListener('scroll', updatePosition);
window.removeEventListener('resize', updatePosition);
});
Expand Down