Skip to content
Merged
Changes from all commits
Commits
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
28 changes: 21 additions & 7 deletions src/components/RecentActivity/LiveView/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
import { format } from "date-fns";
import { UIEvent, useEffect, useMemo, useRef, useState } from "react";
import {
UIEvent,
useCallback,
useEffect,
useMemo,
useRef,
useState
} from "react";
import useDimensions from "react-cool-dimensions";
import useScrollbarSize from "react-scrollbar-size";

Expand Down Expand Up @@ -181,7 +188,7 @@ export const LiveView = (props: LiveViewProps) => {
const previousWidth = usePrevious(width);
const [containerInitialWidth, setContainerInitialWidth] =
useState<number>(width);
const chartContainerRef = useRef<HTMLDivElement>(null);
const chartContainerRef = useRef<HTMLDivElement | null>(null);
const [chartWidth, setChartWidth] = useState<number>(width);
const previousChartWidth = usePrevious(chartWidth);
const [isZoomed, setIsZoomed] = useState(false);
Expand All @@ -190,10 +197,6 @@ export const LiveView = (props: LiveViewProps) => {
const [scrollPercentagePosition, setScrollPercentagePosition] = useState(1);
const scrollbar = useScrollbarSize();

useEffect(() => {
observe(chartContainerRef.current);
}, [observe, chartContainerRef.current]);

useEffect(() => {
if (previousWidth !== width) {
setContainerInitialWidth(width);
Expand All @@ -212,6 +215,14 @@ export const LiveView = (props: LiveViewProps) => {
}
}, [previousChartWidth, chartWidth, scrollPercentagePosition]);

const getChartContainerRef = useCallback(
(el: HTMLDivElement | null) => {
observe(el);
chartContainerRef.current = el;
},
[observe]
);

const persistScrollPosition = () => {
const el = chartContainerRef.current;
if (el) {
Expand Down Expand Up @@ -477,7 +488,10 @@ export const LiveView = (props: LiveViewProps) => {
</ComposedChart>
</ResponsiveContainer>
</s.AxisChartContainer>
<s.ChartContainer ref={chartContainerRef} onScroll={handleScroll}>
<s.ChartContainer
ref={getChartContainerRef}
onScroll={handleScroll}
>
<ResponsiveContainer
width={isZoomed ? chartWidth : "100%"}
height={"100%"}
Expand Down