Skip to content

fix: 修复图表在隐藏 dom 下渲染的尺寸问题 #2599

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
Sep 22, 2021
Merged

fix: 修复图表在隐藏 dom 下渲染的尺寸问题 #2599

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
46 changes: 37 additions & 9 deletions src/utils/resize-sensor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export function getComputedStyle(element: HTMLElement, prop: string) {
}
}

function attachResizeEvent(element: HTMLElement, resized: Function) {
function attachResizeEvent(element: HTMLElement, resized: () => void) {
if (!(element as any).resizedAttached) {
(element as any).resizedAttached = new EventQueue();
(element as any).resizedAttached.add(resized);
Expand All @@ -37,9 +37,8 @@ function attachResizeEvent(element: HTMLElement, resized: Function) {
return;
}

const resizeSensor = ((element as any).resizeSensor = document.createElement(
'div'
));
const resizeSensor = ((element as any).resizeSensor =
document.createElement('div'));
resizeSensor.className = 'resize-sensor';
let style =
'position: absolute; left: 0; top: 0; right: 0; bottom: 0; overflow: scroll; z-index: -1; visibility: hidden;';
Expand Down Expand Up @@ -84,6 +83,16 @@ function attachResizeEvent(element: HTMLElement, resized: Function) {
lastHeight = element.offsetHeight;
};

const appeared = function () {
reset();

// 如果初始是隐藏状态，首次显示也触发resize事件。
if (isHidden) {
changed();
isHidden = false;
}
};

reset();

let changed = function () {
Expand All @@ -100,6 +109,14 @@ function attachResizeEvent(element: HTMLElement, resized: Function) {
}
};

let removeEvent = function (el: HTMLElement, name: string, cb: Function) {
if ((el as any).detachEvent) {
(el as any).detachEvent('on' + name, cb);
} else {
el.removeEventListener(name, cb as any);
}
};

let onScroll = function (e: Event) {
if (
element.offsetWidth != lastWidth ||
Expand All @@ -112,7 +129,14 @@ function attachResizeEvent(element: HTMLElement, resized: Function) {

addEvent(expand, 'scroll', onScroll);
addEvent(shrink, 'scroll', onScroll);
addEvent(appear, 'animationstart', reset);
addEvent(appear, 'animationstart', appeared);
let isHidden = !expand.offsetWidth;

return () => {
removeEvent(expand, 'scroll', onScroll);
removeEvent(shrink, 'scroll', onScroll);
removeEvent(appear, 'animationstart', appeared);
};
}

function detach(element: HTMLElement) {
Expand All @@ -134,27 +158,31 @@ function detach(element: HTMLElement) {

export function resizeSensor(
element: HTMLElement,
callback: Function
callback: () => void
): () => void;
export function resizeSensor(
element: HTMLElement,
callback: Function,
callback: () => void,
once: boolean = false
) {
let disposeEvent: (() => void) | undefined = undefined;

if (once) {
attachResizeEvent(element, function (this: any) {
disposeEvent = attachResizeEvent(element, function (this: any) {
callback.apply(this, arguments);
disposeEvent?.();
detach(element);
});
return;
}

attachResizeEvent(element, callback);
disposeEvent = attachResizeEvent(element, callback);
let detached = false;

return function () {
if (detached) return;
detached = true;
disposeEvent?.();
detach(element);
};
}