From 7c838653d60d5cae114721fdeed1148c095541e8 Mon Sep 17 00:00:00 2001 From: Pavel Feldman Date: Mon, 11 Sep 2023 18:16:02 -0700 Subject: [PATCH] chore: fix the split view, reset window on timeline click (#27007) --- packages/trace-viewer/src/ui/timeline.tsx | 9 ++------- packages/web/src/components/splitView.tsx | 4 ++-- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/packages/trace-viewer/src/ui/timeline.tsx b/packages/trace-viewer/src/ui/timeline.tsx index ef6fba675a..05d5caa6e5 100644 --- a/packages/trace-viewer/src/ui/timeline.tsx +++ b/packages/trace-viewer/src/ui/timeline.tsx @@ -182,15 +182,10 @@ export const Timeline: React.FunctionComponent<{ const action = model?.actions.findLast(action => action.startTime <= time); if (action) onSelected(action); - // Include both, last action as well as the click position. - if (selectedTime && (time < selectedTime.minimum || time > selectedTime.maximum)) { - const minimum = action ? Math.max(Math.min(action.startTime, time), boundaries.minimum) : boundaries.minimum; - const maximum = action ? Math.min(Math.max(action.endTime, time), boundaries.maximum) : boundaries.maximum; - setSelectedTime({ minimum, maximum }); - } + setSelectedTime(undefined); } setDragWindow(undefined); - }, [boundaries, dragWindow, measure, model, selectedTime, setSelectedTime, onSelected]); + }, [boundaries, dragWindow, measure, model, setSelectedTime, onSelected]); const onMouseMove = React.useCallback((event: React.MouseEvent) => { if (!ref.current) diff --git a/packages/web/src/components/splitView.tsx b/packages/web/src/components/splitView.tsx index d28b19a638..1bcdc030ea 100644 --- a/packages/web/src/components/splitView.tsx +++ b/packages/web/src/components/splitView.tsx @@ -47,11 +47,11 @@ export const SplitView: React.FC = ({ let size: number; if (orientation === 'vertical') { size = vSize / window.devicePixelRatio; - if (measure && measure.height < vSize) + if (measure && measure.height < size) size = measure.height - 10; } else { size = hSize / window.devicePixelRatio; - if (measure && measure.width < hSize) + if (measure && measure.width < size) size = measure.width - 10; }