From cf9c019310697d5e76e756b9ff96fea4a164f9e9 Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Wed, 18 Aug 2021 16:16:33 -0400 Subject: [PATCH] revert: change to events canvas (#38023) (#38027) (cherry picked from commit 7b813c81acc66b3cd6b99fd6744df7ec6eeccb33) Co-authored-by: An --- .../components/uPlot/geometries/EventsCanvas.tsx | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/packages/grafana-ui/src/components/uPlot/geometries/EventsCanvas.tsx b/packages/grafana-ui/src/components/uPlot/geometries/EventsCanvas.tsx index 38d7c9e85a4..fe2b5e7cbb1 100644 --- a/packages/grafana-ui/src/components/uPlot/geometries/EventsCanvas.tsx +++ b/packages/grafana-ui/src/components/uPlot/geometries/EventsCanvas.tsx @@ -1,5 +1,5 @@ import { DataFrame, DataFrameFieldIndex } from '@grafana/data'; -import React, { useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react'; +import React, { useLayoutEffect, useMemo, useState } from 'react'; import { usePlotContext } from '../context'; import { Marker } from './Marker'; import { XYCanvas } from './XYCanvas'; @@ -21,25 +21,13 @@ export function EventsCanvas({ id, events, renderEventMarker, mapEventToXYCoords // render token required to re-render annotation markers. Rendering lines happens in uPlot and the props do not change // so we need to force the re-render when the draw hook was performed by uPlot const [renderToken, setRenderToken] = useState(0); - const isMounted = useRef(false); useLayoutEffect(() => { - if (isMounted.current === false) { - return; - } config.addHook('draw', () => { setRenderToken((s) => s + 1); }); }, [config, setRenderToken]); - // clean up action to avoid memory leak - useEffect(() => { - isMounted.current = true; - return () => { - isMounted.current = false; - }; - }, []); - const eventMarkers = useMemo(() => { const markers: React.ReactNode[] = []; const plotInstance = plotCtx.plot;