IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

TimeSeries: Fix memory leak on viz re-init caused by KeyboardPlugin

Browse Source
This commit is contained in:
Leon Sorokin 2022-08-18 07:09:37 -05:00 committed by GitHub
parent a915977002
commit 329aab7395
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
packages/grafana-ui/src/components/uPlot/plugins/KeyboardPlugin.tsx
View File

@ -87,7 +87,7 @@ const initHook = (u: uPlot) => {
window.requestAnimationFrame(handlePressedKeys);
};
vizLayoutViz.addEventListener('keydown', (e) => {
const onKeyDown = (e: KeyboardEvent) => {
if (e.key === 'Tab') {
// Hide the cursor if the user tabs away
u.setCursor({ left: -5, top: -5 });
@ -112,9 +112,9 @@ const initHook = (u: uPlot) => {
window.requestAnimationFrame(handlePressedKeys);
}
}
});
};
vizLayoutViz.addEventListener('keyup', (e) => {
const onKeyUp = (e: KeyboardEvent) => {
if (!KNOWN_KEYS.has(e.key)) {
return;
}
@ -129,9 +129,9 @@ const initHook = (u: uPlot) => {
u.setSelect(u.select);
dragStartX = null;
}
});
};
vizLayoutViz.addEventListener('focus', (e) => {
const onFocus = () => {
// We only want to initialize the cursor if the user is using keyboard controls
if (!vizLayoutViz?.matches(':focus-visible')) {
return;
@ -141,14 +141,30 @@ const initHook = (u: uPlot) => {
const drawWidth = parseFloat(u.over.style.width);
const drawHeight = parseFloat(u.over.style.height);
u.setCursor({ left: drawWidth / 2, top: drawHeight / 2 });
});
};
vizLayoutViz.addEventListener('blur', (e) => {
const onBlur = () => {
keysLastHandledAt = null;
dragStartX = null;
pressedKeys.clear();
u.setSelect({ left: 0, top: 0, width: 0, height: 0 }, false);
});
};
vizLayoutViz.addEventListener('keydown', onKeyDown);
vizLayoutViz.addEventListener('keyup', onKeyUp);
vizLayoutViz.addEventListener('focus', onFocus);
vizLayoutViz.addEventListener('blur', onBlur);
const onDestroy = () => {
vizLayoutViz?.removeEventListener('keydown', onKeyDown);
vizLayoutViz?.removeEventListener('keyup', onKeyUp);
vizLayoutViz?.removeEventListener('focus', onFocus);
vizLayoutViz?.removeEventListener('blur', onBlur);
vizLayoutViz = null;
};
(u.hooks.destroy ??= []).push(onDestroy);
};
/**