administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-04-05 14:47:40 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #101 from ibs0d/claude/add-fit-to-screen-mode-XvHoV

Browse Source 
Fix fit-to-screen drag types to match EventCallback signature
This commit is contained in:
ibs0d 2026-03-22 11:05:11 +11:00 committed by GitHub
commit f74910a20d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 40 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
web/src/views/live/DraggableGridLayout.tsx
View File

@ -467,27 +467,41 @@ export default function DraggableGridLayout({
}, [fitToScreen, fitGridParams, cameras, includeBirdseye, birdseyeConfig]);
const [fitLayoutOverride, setFitLayoutOverride] = useState<Layout | undefined>();
const draggedItemRef = useRef<string | null>(null);
const fitDragRef = useRef<string | null>(null);
useEffect(() => {
setFitLayoutOverride(undefined);
}, [fitGridParams, cameras, includeBirdseye]);
const handleFitDrag = useCallback(
(_layout: Layout, _oldItem: LayoutItem, layoutItem: LayoutItem) => {
draggedItemRef.current = layoutItem.i;
(
_layout: Layout,
_oldItem: LayoutItem | null,
newItem: LayoutItem | null,
) => {
if (newItem) {
fitDragRef.current = newItem.i;
}
},
[],
);
const handleFitDragStop = useCallback(
(newLayout: Layout, _oldItem: LayoutItem, layoutItem: LayoutItem) => {
(
_layout: Layout,
_oldItem: LayoutItem | null,
newItem: LayoutItem | null,
_placeholder: LayoutItem | null,
event: Event,
) => {
if (!fitToScreen || !fitGridParams) return;
const w = fitGridParams.gridUnitsPerCam;
const colsPerRow = fitGridParams.colsPerRow;
const draggedId = draggedItemRef.current ?? layoutItem.i;
draggedItemRef.current = null;
const draggedId = fitDragRef.current ?? newItem?.i;
fitDragRef.current = null;
if (!draggedId) return;
const currentOrder = fitLayoutOverride ?? fitLayout ?? [];
const orderedNames = [...currentOrder]
@ -497,10 +511,24 @@ export default function DraggableGridLayout({
})
.map((item) => item.i);
const dropCenterX = layoutItem.x + w / 2;
const dropCenterY = layoutItem.y + w / 2;
const targetCol = Math.min(Math.floor(dropCenterX / w), colsPerRow - 1);
const targetRow = Math.floor(dropCenterY / w);
const gridEl = containerRef.current?.querySelector(
".grid-layout",
) as HTMLElement | null;
if (!gridEl) return;
const mouseEvent = event as MouseEvent;
const rect = gridEl.getBoundingClientRect();
const mouseRelX = mouseEvent.clientX - rect.left;
const mouseRelY = mouseEvent.clientY - rect.top;
const cellWidthPx = rect.width / colsPerRow;
const cellHeightPx = cellHeight * w;
const targetCol = Math.max(
0,
Math.min(Math.floor(mouseRelX / cellWidthPx), colsPerRow - 1),
);
const targetRow = Math.max(0, Math.floor(mouseRelY / cellHeightPx));
const totalRows = Math.ceil(orderedNames.length / colsPerRow);
const clampedRow = Math.min(targetRow, totalRows - 1);
const targetIndex = Math.min(
@ -510,7 +538,7 @@ export default function DraggableGridLayout({
const sourceIndex = orderedNames.indexOf(draggedId);
if (sourceIndex === -1 || sourceIndex === targetIndex) {
setFitLayoutOverride((prev) => prev);
setFitLayoutOverride((prev) => (prev ? [...prev] : prev));
return;
}
@ -530,7 +558,7 @@ export default function DraggableGridLayout({
setFitLayoutOverride(normalized);
},
[fitToScreen, fitGridParams, fitLayoutOverride, fitLayout],
[fitToScreen, fitGridParams, fitLayoutOverride, fitLayout, cellHeight, containerRef],
);
const activeGridLayout = useMemo(() => {