diff --git a/web/sections/GalleryItems.tsx b/web/sections/GalleryItems.tsx index 984c63a..601bad2 100644 --- a/web/sections/GalleryItems.tsx +++ b/web/sections/GalleryItems.tsx @@ -1,5 +1,5 @@ import { useCallback, useEffect, useRef, useState } from 'react'; -import { ArrowDown, ArrowUp, Plus, Trash2 } from 'lucide-react'; +import { GripVertical, Plus, Trash2 } from 'lucide-react'; import { Button } from '@/components/ui/button'; import { Input } from '@/components/ui/input'; import { useClient } from 'hooks/useClient'; @@ -69,15 +69,44 @@ export const GalleryItems = ({ galleryId, onChanged }: { galleryId: number; onCh } }; - /** Every id, in order — which is what makes two items claiming a position impossible. */ - const move = (index: number, by: -1 | 1) => { - if (!gallery) return; + /* + Reordering by dragging, the same way the page rows do it. + + The list rearranges as the pointer crosses a row rather than on drop, so what you see while + dragging is what you will get. The write happens once, at the end, and it sends EVERY id in order — + which is what makes two items claiming a position impossible. + + It replaced a pair of arrows per row. Nine items meant eighteen buttons and four presses to move + something from the bottom to the top. + */ + const [dragged, setDragged] = useState(null); + const orderedRef = useRef(null); + + const moveOver = (event: React.DragEvent, overId: number) => { + if (dragged === null || !gallery) return; + // Without this the drop is refused and the browser animates the row back to where it started. + event.preventDefault(); + if (dragged === overId) return; + const next = [...gallery.items]; - const target = index + by; - if (target < 0 || target >= next.length) return; - [next[index], next[target]] = [next[target]!, next[index]!]; + const from = next.findIndex((one) => one.id === dragged); + const to = next.findIndex((one) => one.id === overId); + if (from < 0 || to < 0) return; + + next.splice(to, 0, next.splice(from, 1)[0]!); + orderedRef.current = next; + setGallery({ ...gallery, items: next }); + }; + + const commitOrder = () => { + const ordered = orderedRef.current; + setDragged(null); + orderedRef.current = null; + // Dropped where it started, or outside the list. Nothing moved, so nothing is written. + if (!ordered) return; + void send(() => - clientRef.current.put(`/fofos-admin/galleries/${galleryId}/items/order`, { ids: next.map((one) => one.id) }), + clientRef.current.put(`/fofos-admin/galleries/${galleryId}/items/order`, { ids: ordered.map((one) => one.id) }), ); }; @@ -93,8 +122,30 @@ export const GalleryItems = ({ galleryId, onChanged }: { galleryId: number; onCh