Skip to content

Commit

Permalink
Add ability to select all on desktop (#12044)
Browse files Browse the repository at this point in the history
* Add ability to select all review items

* Refactor keybaord listener
  • Loading branch information
NickM-27 committed Jun 18, 2024
1 parent 4bca405 commit e6790d9
Show file tree
Hide file tree
Showing 6 changed files with 64 additions and 29 deletions.
10 changes: 8 additions & 2 deletions web/src/components/card/ExportCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,14 @@ export default function ExportCard({

useKeyboardListener(
editName != undefined ? ["Enter"] : [],
(_, down, repeat) => {
if (down && !repeat && editName && editName.update.length > 0) {
(key, modifiers) => {
if (
key == "Enter" &&
modifiers.down &&
!modifiers.repeat &&
editName &&
editName.update.length > 0
) {
onRename(exportedRecording.id, editName.update);
setEditName(undefined);
}
Expand Down
34 changes: 15 additions & 19 deletions web/src/components/player/VideoControls.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ import {
MdVolumeOff,
MdVolumeUp,
} from "react-icons/md";
import useKeyboardListener from "@/hooks/use-keyboard-listener";
import useKeyboardListener, {
KeyModifiers,
} from "@/hooks/use-keyboard-listener";
import { VolumeSlider } from "../ui/slider";
import FrigatePlusIcon from "../icons/FrigatePlusIcon";
import {
Expand Down Expand Up @@ -137,42 +139,36 @@ export default function VideoControls({
}, [volume, muted]);

const onKeyboardShortcut = useCallback(
(key: string, down: boolean, repeat: boolean) => {
(key: string, modifiers: KeyModifiers) => {
if (!modifiers.down) {
return;
}

switch (key) {
case "ArrowDown":
if (down) {
onSeek(-1);
}
onSeek(-1);
break;
case "ArrowLeft":
if (down) {
onSeek(-10);
}
onSeek(-10);
break;
case "ArrowRight":
if (down) {
onSeek(10);
}
onSeek(10);
break;
case "ArrowUp":
if (down) {
onSeek(1);
}
onSeek(1);
break;
case "f":
if (toggleFullscreen && down && !repeat) {
if (toggleFullscreen && !modifiers.repeat) {
toggleFullscreen();
}
break;
case "m":
if (setMuted && down && !repeat && video) {
if (setMuted && !modifiers.repeat && video) {
setMuted(!muted);
}
break;
case " ":
if (down) {
onPlayPause(!isPlaying);
}
onPlayPause(!isPlaying);
break;
}
},
Expand Down
12 changes: 9 additions & 3 deletions web/src/hooks/use-keyboard-listener.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
import { useCallback, useEffect } from "react";

export type KeyModifiers = {
down: boolean;
repeat: boolean;
ctrl: boolean;
};

export default function useKeyboardListener(
keys: string[],
listener: (key: string, down: boolean, repeat: boolean) => void,
listener: (key: string, modifiers: KeyModifiers) => void,
) {
const keyDownListener = useCallback(
(e: KeyboardEvent) => {
Expand All @@ -12,7 +18,7 @@ export default function useKeyboardListener(

if (keys.includes(e.key)) {
e.preventDefault();
listener(e.key, true, e.repeat);
listener(e.key, { down: true, repeat: e.repeat, ctrl: e.ctrlKey });
}
},
[keys, listener],
Expand All @@ -26,7 +32,7 @@ export default function useKeyboardListener(

if (keys.includes(e.key)) {
e.preventDefault();
listener(e.key, false, false);
listener(e.key, { down: false, repeat: false, ctrl: false });
}
},
[keys, listener],
Expand Down
4 changes: 2 additions & 2 deletions web/src/pages/Logs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -231,8 +231,8 @@ function Logs() {

useKeyboardListener(
["PageDown", "PageUp", "ArrowDown", "ArrowUp"],
(key, down, _) => {
if (!down) {
(key, modifiers) => {
if (!modifiers.down) {
return;
}

Expand Down
27 changes: 27 additions & 0 deletions web/src/views/events/EventView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ import { toast } from "sonner";
import { cn } from "@/lib/utils";
import { FilterList, LAST_24_HOURS_KEY } from "@/types/filter";
import { GiSoundWaves } from "react-icons/gi";
import useKeyboardListener from "@/hooks/use-keyboard-listener";

type EventViewProps = {
reviewItems?: SegmentedReviewData;
Expand Down Expand Up @@ -158,6 +159,17 @@ export default function EventView({
},
[selectedReviews, setSelectedReviews, onOpenRecording, markItemAsReviewed],
);
const onSelectAllReviews = useCallback(() => {
if (!currentReviewItems || currentReviewItems.length == 0) {
return;
}

if (selectedReviews.length < currentReviewItems.length) {
setSelectedReviews(currentReviewItems.map((seg) => seg.id));
} else {
setSelectedReviews([]);
}
}, [currentReviewItems, selectedReviews]);

const exportReview = useCallback(
(id: string) => {
Expand Down Expand Up @@ -376,6 +388,7 @@ export default function EventView({
markItemAsReviewed={markItemAsReviewed}
markAllItemsAsReviewed={markAllItemsAsReviewed}
onSelectReview={onSelectReview}
onSelectAllReviews={onSelectAllReviews}
pullLatestData={pullLatestData}
/>
)}
Expand Down Expand Up @@ -417,6 +430,7 @@ type DetectionReviewProps = {
markItemAsReviewed: (review: ReviewSegment) => void;
markAllItemsAsReviewed: (currentItems: ReviewSegment[]) => void;
onSelectReview: (review: ReviewSegment, ctrl: boolean) => void;
onSelectAllReviews: () => void;
pullLatestData: () => void;
};
function DetectionReview({
Expand All @@ -434,6 +448,7 @@ function DetectionReview({
markItemAsReviewed,
markAllItemsAsReviewed,
onSelectReview,
onSelectAllReviews,
pullLatestData,
}: DetectionReviewProps) {
const reviewTimelineRef = useRef<HTMLDivElement>(null);
Expand Down Expand Up @@ -580,6 +595,18 @@ function DetectionReview({
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [startTime]);

// keyboard

useKeyboardListener(["a"], (key, modifiers) => {
if (modifiers.repeat || !modifiers.down) {
return;
}

if (key == "a" && modifiers.ctrl) {
onSelectAllReviews();
}
});

return (
<>
<div
Expand Down
6 changes: 3 additions & 3 deletions web/src/views/live/LiveCameraView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -482,12 +482,12 @@ function PtzControlPanel({

useKeyboardListener(
["ArrowLeft", "ArrowRight", "ArrowUp", "ArrowDown", "+", "-"],
(key, down, repeat) => {
if (repeat) {
(key, modifiers) => {
if (modifiers.repeat) {
return;
}

if (!down) {
if (!modifiers.down) {
sendPtz("STOP");
return;
}
Expand Down

0 comments on commit e6790d9

Please sign in to comment.