* Fix queue drag to only activate on handle and number, not entire row Restricts drag listeners to the grab handle icon and order number badge using setActivatorNodeRef, and removes touch-none from the whole row so mobile users can scroll without accidentally reordering the queue. https://claude.ai/code/session_01HPtNkL5m9xhYgtzWaGViSC * Code review cleanup: use GripVertical icon and add drag activation constraint - Replace inline SVG drag handle with GripVertical from lucide-react, which is already used project-wide - Add activationConstraint (distance: 8px) to PointerSensor so a touch on the handle doesn't immediately hijack scroll before the user has moved far enough to signal intent to drag https://claude.ai/code/session_01HPtNkL5m9xhYgtzWaGViSC * Fix O(n²) lookup, memoize components and callbacks in QueueSection - Build a participantMap (Map<id, participant>) with useMemo so each queue item lookup is O(1) instead of O(n) per render - Memoize queueIds array for SortableContext to avoid churn - Wrap handleDragEnd in useCallback so DndContext gets a stable reference - Wrap SortableQueueItem in memo so it skips re-renders when props haven't changed (important since the parent re-renders every second during a live draft from timer-update socket events) - Pass onRemoveFromQueue and onMakePick directly as props instead of creating new arrow functions per item per render; SortableQueueItem now calls them with the relevant id itself https://claude.ai/code/session_01HPtNkL5m9xhYgtzWaGViSC --------- Co-authored-by: Claude <noreply@anthropic.com>
223 lines
6.1 KiB
TypeScript
223 lines
6.1 KiB
TypeScript
import { memo, useCallback, useMemo } from "react";
|
||
import { GripVertical } from "lucide-react";
|
||
import { Button } from "~/components/ui/button";
|
||
import { Badge } from "~/components/ui/badge";
|
||
import { AutodraftSettings } from "~/components/AutodraftSettings";
|
||
import {
|
||
DndContext,
|
||
closestCenter,
|
||
KeyboardSensor,
|
||
PointerSensor,
|
||
useSensor,
|
||
useSensors,
|
||
} from "@dnd-kit/core";
|
||
import type { DragEndEvent } from "@dnd-kit/core";
|
||
import {
|
||
arrayMove,
|
||
SortableContext,
|
||
sortableKeyboardCoordinates,
|
||
useSortable,
|
||
verticalListSortingStrategy,
|
||
} from "@dnd-kit/sortable";
|
||
import { CSS } from "@dnd-kit/utilities";
|
||
|
||
interface QueueSectionProps {
|
||
queue: Array<{
|
||
id: string;
|
||
participantId: string;
|
||
}>;
|
||
availableParticipants: Array<{
|
||
id: string;
|
||
name: string;
|
||
sport: { name: string };
|
||
}>;
|
||
seasonId: string;
|
||
teamId: string;
|
||
isMyTurn: boolean;
|
||
canPick: boolean;
|
||
userAutodraft: {
|
||
isEnabled: boolean;
|
||
mode: "next_pick" | "while_on";
|
||
queueOnly: boolean;
|
||
};
|
||
onRemoveFromQueue: (queueId: string) => void;
|
||
onAutodraftUpdate: (isEnabled: boolean, mode: "next_pick" | "while_on", queueOnly: boolean) => void;
|
||
onReorder: (participantIds: string[]) => void;
|
||
onMakePick?: (participantId: string) => void;
|
||
}
|
||
|
||
// Sortable queue item component
|
||
const SortableQueueItem = memo(function SortableQueueItem({
|
||
item,
|
||
index,
|
||
participantName,
|
||
sportName,
|
||
canPick,
|
||
onRemove,
|
||
onDraft,
|
||
}: {
|
||
item: { id: string; participantId: string };
|
||
index: number;
|
||
participantName: string;
|
||
sportName?: string;
|
||
canPick: boolean;
|
||
onRemove: (queueId: string) => void;
|
||
onDraft?: (participantId: string) => void;
|
||
}) {
|
||
const {
|
||
attributes,
|
||
listeners,
|
||
setNodeRef,
|
||
setActivatorNodeRef,
|
||
transform,
|
||
transition,
|
||
isDragging,
|
||
} = useSortable({ id: item.id });
|
||
|
||
const style = {
|
||
transform: CSS.Transform.toString(transform),
|
||
transition,
|
||
opacity: isDragging ? 0.5 : 1,
|
||
};
|
||
|
||
return (
|
||
<div
|
||
ref={setNodeRef}
|
||
style={style}
|
||
{...attributes}
|
||
className={`flex items-center justify-between p-2 rounded-lg ${
|
||
canPick ? "bg-electric/10 border border-electric/40" : "bg-muted"
|
||
}`}
|
||
>
|
||
<div className="flex items-center gap-2 flex-1 min-w-0">
|
||
<div
|
||
ref={setActivatorNodeRef}
|
||
{...listeners}
|
||
className="flex items-center gap-2 flex-shrink-0 cursor-grab active:cursor-grabbing touch-none"
|
||
>
|
||
<GripVertical className="w-4 h-4 text-muted-foreground" />
|
||
<Badge variant="default" className="text-xs">{index + 1}</Badge>
|
||
</div>
|
||
<div className="min-w-0">
|
||
<p className="font-semibold text-sm truncate">{participantName}</p>
|
||
{sportName && <p className="text-xs text-muted-foreground">{sportName}</p>}
|
||
</div>
|
||
</div>
|
||
<div className="flex items-center gap-1 flex-shrink-0 ml-2">
|
||
{canPick && onDraft && (
|
||
<Button
|
||
variant="default"
|
||
size="sm"
|
||
className="h-7 text-xs bg-electric text-background hover:bg-electric/90"
|
||
onClick={() => onDraft(item.participantId)}
|
||
>
|
||
Draft
|
||
</Button>
|
||
)}
|
||
<Button
|
||
variant="ghost"
|
||
size="icon"
|
||
className="h-7 w-7 text-destructive hover:text-destructive hover:bg-destructive/10"
|
||
onClick={() => onRemove(item.id)}
|
||
title="Remove from queue"
|
||
>
|
||
<span className="text-lg">×</span>
|
||
</Button>
|
||
</div>
|
||
</div>
|
||
);
|
||
});
|
||
|
||
export const QueueSection = memo(function QueueSection({
|
||
queue,
|
||
availableParticipants,
|
||
seasonId,
|
||
teamId,
|
||
isMyTurn,
|
||
canPick,
|
||
userAutodraft,
|
||
onRemoveFromQueue,
|
||
onAutodraftUpdate,
|
||
onReorder,
|
||
onMakePick,
|
||
}: QueueSectionProps) {
|
||
const sensors = useSensors(
|
||
useSensor(PointerSensor, {
|
||
activationConstraint: { distance: 8 },
|
||
}),
|
||
useSensor(KeyboardSensor, {
|
||
coordinateGetter: sortableKeyboardCoordinates,
|
||
})
|
||
);
|
||
|
||
const participantMap = useMemo(
|
||
() => new Map(availableParticipants.map((p) => [p.id, p])),
|
||
[availableParticipants]
|
||
);
|
||
|
||
const queueIds = useMemo(() => queue.map((item) => item.id), [queue]);
|
||
|
||
const handleDragEnd = useCallback(
|
||
(event: DragEndEvent) => {
|
||
const { active, over } = event;
|
||
if (over && active.id !== over.id) {
|
||
const oldIndex = queue.findIndex((item) => item.id === active.id);
|
||
const newIndex = queue.findIndex((item) => item.id === over.id);
|
||
const reorderedQueue = arrayMove(queue, oldIndex, newIndex);
|
||
onReorder(reorderedQueue.map((item) => item.participantId));
|
||
}
|
||
},
|
||
[queue, onReorder]
|
||
);
|
||
|
||
return (
|
||
<div className="p-4">
|
||
{/* Queue List */}
|
||
{queue.length === 0 ? (
|
||
<p className="text-muted-foreground text-sm text-center py-8">
|
||
Click participants in Available to add to your queue
|
||
</p>
|
||
) : (
|
||
<DndContext
|
||
sensors={sensors}
|
||
collisionDetection={closestCenter}
|
||
onDragEnd={handleDragEnd}
|
||
>
|
||
<SortableContext
|
||
items={queueIds}
|
||
strategy={verticalListSortingStrategy}
|
||
>
|
||
<div className="space-y-1.5 mb-4">
|
||
{queue.map((item, index) => {
|
||
const participant = participantMap.get(item.participantId);
|
||
return (
|
||
<SortableQueueItem
|
||
key={item.id}
|
||
item={item}
|
||
index={index}
|
||
participantName={participant?.name ?? "Unknown"}
|
||
sportName={participant?.sport.name}
|
||
canPick={canPick}
|
||
onRemove={onRemoveFromQueue}
|
||
onDraft={onMakePick}
|
||
/>
|
||
);
|
||
})}
|
||
</div>
|
||
</SortableContext>
|
||
</DndContext>
|
||
)}
|
||
|
||
{/* Autodraft Settings */}
|
||
<AutodraftSettings
|
||
seasonId={seasonId}
|
||
teamId={teamId}
|
||
isEnabled={userAutodraft.isEnabled}
|
||
mode={userAutodraft.mode}
|
||
queueOnly={userAutodraft.queueOnly}
|
||
isMyTurn={isMyTurn}
|
||
onUpdate={onAutodraftUpdate}
|
||
/>
|
||
</div>
|
||
);
|
||
});
|