administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-04-12 10:07:36 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix activity stream group from being highlighted prematurely

Browse Source
This commit is contained in:
Josh Hawkins 2025-10-07 08:24:20 -05:00
parent 950d8e74f5
commit f673398053
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
web/src/components/player/HlsVideoPlayer.tsx
View File

@ -321,6 +321,7 @@ export default function HlsVideoPlayer({
videoDimensions.height > 0 && (
<div className="absolute z-50 size-full">
<ObjectTrackOverlay
key={`${selectedObjectId}-${currentTime}`}
camera={camera}
selectedObjectId={selectedObjectId}
currentTime={currentTime}

28
web/src/components/timeline/ActivityStream.tsx
View File

@ -18,7 +18,7 @@ export default function ActivityStream({
const { selectedObjectId } = useActivityStream();
const scrollRef = useRef<HTMLDivElement>(null);
// Group activities by timestamp (within 1 second resolution window)
// group activities by timestamp (within 1 second resolution window)
const groupedActivities = useMemo(() => {
const groups: { [key: number]: ObjectLifecycleSequence[] } = {};
@ -31,10 +31,15 @@ export default function ActivityStream({
});
return Object.entries(groups)
.map(([timestamp, activities]) => ({
timestamp: parseInt(timestamp),
activities: activities.sort((a, b) => a.timestamp - b.timestamp),
}))
.map(([_timestamp, activities]) => {
const sortedActivities = activities.sort(
(a, b) => a.timestamp - b.timestamp,
);
return {
timestamp: sortedActivities[0].timestamp, // use the earliest activity timestamp
activities: sortedActivities,
};
})
.sort((a, b) => a.timestamp - b.timestamp);
}, [timelineData]);
@ -57,9 +62,14 @@ export default function ActivityStream({
useEffect(() => {
if (!scrollRef.current) return;
const currentGroupIndex = filteredGroups.findIndex(
(group) => group.timestamp >= currentTime,
);
// Find the last group where timestamp <= currentTime
let currentGroupIndex = -1;
for (let i = filteredGroups.length - 1; i >= 0; i--) {
if (filteredGroups[i].timestamp <= currentTime) {
currentGroupIndex = i;
break;
}
}
if (currentGroupIndex !== -1) {
const element = scrollRef.current.children[
@ -72,7 +82,7 @@ export default function ActivityStream({
});
}
}
}, [currentTime, filteredGroups]);
}, [filteredGroups, currentTime]);
return (
<div