feat(gif-mood): masonry wall mode with DnD + flex columns
All checks were successful
Deploy with Docker Compose / deploy (push) Successful in 2m55s
All checks were successful
Deploy with Docker Compose / deploy (push) Successful in 2m55s
- Wall mode: flex columns (no empty bottoms), all GIFs mixed - DnD in wall: SortableContext on current user items only, others are fixed - Own GIFs show drag handle, others show avatar badge - Image min-h skeleton prevents 0-height layout slots while loading Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -149,6 +149,38 @@ function DragHandle(props: React.HTMLAttributes<HTMLDivElement>) {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function SortableWallItem({
|
||||||
|
sessionId,
|
||||||
|
item,
|
||||||
|
currentUserId,
|
||||||
|
canEdit,
|
||||||
|
}: {
|
||||||
|
sessionId: string;
|
||||||
|
item: GifMoodItem;
|
||||||
|
currentUserId: string;
|
||||||
|
canEdit: boolean;
|
||||||
|
}) {
|
||||||
|
const { attributes, listeners, setNodeRef, transform, transition, isDragging } = useSortable({
|
||||||
|
id: item.id,
|
||||||
|
});
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
ref={setNodeRef}
|
||||||
|
style={{ transform: CSS.Transform.toString(transform), transition }}
|
||||||
|
className={`group/card relative ${isDragging ? 'opacity-50 z-50' : ''}`}
|
||||||
|
>
|
||||||
|
<DragHandle {...attributes} {...listeners} />
|
||||||
|
<GifMoodCard
|
||||||
|
sessionId={sessionId}
|
||||||
|
item={item}
|
||||||
|
currentUserId={currentUserId}
|
||||||
|
canEdit={canEdit}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
function SortableGifMoodCard({
|
function SortableGifMoodCard({
|
||||||
sessionId,
|
sessionId,
|
||||||
item,
|
item,
|
||||||
@@ -190,6 +222,7 @@ const GRID_COLS: Record<number, string> = {
|
|||||||
6: 'grid-cols-2 sm:grid-cols-3 md:grid-cols-4 lg:grid-cols-6',
|
6: 'grid-cols-2 sm:grid-cols-3 md:grid-cols-4 lg:grid-cols-6',
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
function GridIcon({ cols }: { cols: number }) {
|
function GridIcon({ cols }: { cols: number }) {
|
||||||
return (
|
return (
|
||||||
<svg width="20" height="14" viewBox="0 0 20 14" fill="none" aria-hidden>
|
<svg width="20" height="14" viewBox="0 0 20 14" fill="none" aria-hidden>
|
||||||
@@ -207,6 +240,21 @@ function GridIcon({ cols }: { cols: number }) {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function MasonryIcon() {
|
||||||
|
return (
|
||||||
|
<svg width="20" height="14" viewBox="0 0 20 14" fill="none" aria-hidden>
|
||||||
|
<rect x={0} y={0} width={4} height={9} rx={1} fill="currentColor" opacity={0.7} />
|
||||||
|
<rect x={0} y={10} width={4} height={4} rx={1} fill="currentColor" opacity={0.4} />
|
||||||
|
<rect x={5} y={0} width={4} height={5} rx={1} fill="currentColor" opacity={0.7} />
|
||||||
|
<rect x={5} y={6} width={4} height={8} rx={1} fill="currentColor" opacity={0.4} />
|
||||||
|
<rect x={10} y={0} width={4} height={11} rx={1} fill="currentColor" opacity={0.7} />
|
||||||
|
<rect x={10} y={12} width={4} height={2} rx={1} fill="currentColor" opacity={0.4} />
|
||||||
|
<rect x={15} y={0} width={4} height={6} rx={1} fill="currentColor" opacity={0.7} />
|
||||||
|
<rect x={15} y={7} width={4} height={7} rx={1} fill="currentColor" opacity={0.4} />
|
||||||
|
</svg>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
export function GifMoodBoard({
|
export function GifMoodBoard({
|
||||||
sessionId,
|
sessionId,
|
||||||
currentUserId,
|
currentUserId,
|
||||||
@@ -217,6 +265,7 @@ export function GifMoodBoard({
|
|||||||
canEdit,
|
canEdit,
|
||||||
}: GifMoodBoardProps) {
|
}: GifMoodBoardProps) {
|
||||||
const [cols, setCols] = useState(4);
|
const [cols, setCols] = useState(4);
|
||||||
|
const [masonry, setMasonry] = useState(false);
|
||||||
const [, startReorderTransition] = useTransition();
|
const [, startReorderTransition] = useTransition();
|
||||||
const [, startHiddenTransition] = useTransition();
|
const [, startHiddenTransition] = useTransition();
|
||||||
|
|
||||||
@@ -259,6 +308,24 @@ export function GifMoodBoard({
|
|||||||
});
|
});
|
||||||
}, [allUsers, currentUserId, owner.id]);
|
}, [allUsers, currentUserId, owner.id]);
|
||||||
|
|
||||||
|
function handleWallDragEnd(event: DragEndEvent) {
|
||||||
|
const { active, over } = event;
|
||||||
|
if (!over || active.id === over.id) return;
|
||||||
|
|
||||||
|
const currentItems =
|
||||||
|
optimisticItems.length > 0 ? optimisticItems : (itemsByUser.get(currentUserId) ?? []);
|
||||||
|
const oldIndex = currentItems.findIndex((i) => i.id === active.id);
|
||||||
|
const newIndex = currentItems.findIndex((i) => i.id === over.id);
|
||||||
|
if (oldIndex === -1 || newIndex === -1) return;
|
||||||
|
|
||||||
|
const reordered = arrayMove(currentItems, oldIndex, newIndex);
|
||||||
|
setOptimisticItems(reordered);
|
||||||
|
|
||||||
|
startReorderTransition(async () => {
|
||||||
|
await reorderGifMoodItems(sessionId, reordered.map((i) => i.id));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
function handleDragEnd(event: DragEndEvent) {
|
function handleDragEnd(event: DragEndEvent) {
|
||||||
const { active, over } = event;
|
const { active, over } = event;
|
||||||
if (!over || active.id === over.id) return;
|
if (!over || active.id === over.id) return;
|
||||||
@@ -277,9 +344,31 @@ export function GifMoodBoard({
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const currentUserItems = optimisticItems.length > 0
|
||||||
|
? optimisticItems
|
||||||
|
: (itemsByUser.get(currentUserId) ?? []);
|
||||||
|
|
||||||
|
const wallItems = useMemo(() => {
|
||||||
|
return sortedUsers.flatMap((user) => {
|
||||||
|
const isCurrentUser = user.id === currentUserId;
|
||||||
|
const serverItems = itemsByUser.get(user.id) ?? [];
|
||||||
|
const uItems = isCurrentUser && optimisticItems.length > 0 ? optimisticItems : serverItems;
|
||||||
|
const userRatingEntry = ratings.find((r) => r.userId === user.id);
|
||||||
|
if (!isCurrentUser && (uItems.length === 0 || userRatingEntry?.hidden)) return [];
|
||||||
|
return uItems;
|
||||||
|
});
|
||||||
|
}, [sortedUsers, itemsByUser, currentUserId, optimisticItems, ratings]);
|
||||||
|
|
||||||
|
// Distribute items into N columns round-robin so each column only takes its items' height
|
||||||
|
const wallColumns = useMemo(() => {
|
||||||
|
const columns: GifMoodItem[][] = Array.from({ length: cols }, () => []);
|
||||||
|
wallItems.forEach((item, i) => columns[i % cols].push(item));
|
||||||
|
return columns;
|
||||||
|
}, [wallItems, cols]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="space-y-10">
|
<div className="space-y-10">
|
||||||
{/* Column size control */}
|
{/* Layout controls */}
|
||||||
<div className="flex justify-end">
|
<div className="flex justify-end">
|
||||||
<div className="inline-flex items-center gap-1 rounded-xl border border-border bg-card p-1">
|
<div className="inline-flex items-center gap-1 rounded-xl border border-border bg-card p-1">
|
||||||
{[4, 5, 6].map((n) => (
|
{[4, 5, 6].map((n) => (
|
||||||
@@ -287,7 +376,7 @@ export function GifMoodBoard({
|
|||||||
key={n}
|
key={n}
|
||||||
onClick={() => setCols(n)}
|
onClick={() => setCols(n)}
|
||||||
className={`flex items-center justify-center rounded-lg px-2.5 py-1.5 transition-all ${
|
className={`flex items-center justify-center rounded-lg px-2.5 py-1.5 transition-all ${
|
||||||
cols === n
|
!masonry && cols === n
|
||||||
? 'bg-primary text-primary-foreground shadow-sm'
|
? 'bg-primary text-primary-foreground shadow-sm'
|
||||||
: 'text-muted hover:text-foreground hover:bg-card-hover'
|
: 'text-muted hover:text-foreground hover:bg-card-hover'
|
||||||
}`}
|
}`}
|
||||||
@@ -296,9 +385,70 @@ export function GifMoodBoard({
|
|||||||
<GridIcon cols={n} />
|
<GridIcon cols={n} />
|
||||||
</button>
|
</button>
|
||||||
))}
|
))}
|
||||||
|
<div className="w-px h-5 bg-border mx-0.5" />
|
||||||
|
<button
|
||||||
|
onClick={() => setMasonry((m) => !m)}
|
||||||
|
className={`flex items-center justify-center rounded-lg px-2.5 py-1.5 transition-all ${
|
||||||
|
masonry
|
||||||
|
? 'bg-primary text-primary-foreground shadow-sm'
|
||||||
|
: 'text-muted hover:text-foreground hover:bg-card-hover'
|
||||||
|
}`}
|
||||||
|
title="Vue mur"
|
||||||
|
>
|
||||||
|
<MasonryIcon />
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{sortedUsers.map((user, index) => {
|
|
||||||
|
{/* Wall mode: flex columns so each column only takes its items' height */}
|
||||||
|
{masonry && (
|
||||||
|
<DndContext
|
||||||
|
sensors={sensors}
|
||||||
|
collisionDetection={closestCenter}
|
||||||
|
onDragEnd={handleWallDragEnd}
|
||||||
|
>
|
||||||
|
<SortableContext
|
||||||
|
items={currentUserItems.map((i) => i.id)}
|
||||||
|
strategy={rectSortingStrategy}
|
||||||
|
>
|
||||||
|
<div className="flex gap-4 items-start">
|
||||||
|
{wallColumns.map((colItems, colIdx) => (
|
||||||
|
<div key={colIdx} className="flex-1 min-w-0 flex flex-col gap-4">
|
||||||
|
{colItems.map((item) =>
|
||||||
|
item.userId === currentUserId && canEdit ? (
|
||||||
|
<SortableWallItem
|
||||||
|
key={item.id}
|
||||||
|
sessionId={sessionId}
|
||||||
|
item={item}
|
||||||
|
currentUserId={currentUserId}
|
||||||
|
canEdit={canEdit}
|
||||||
|
/>
|
||||||
|
) : (
|
||||||
|
<div key={item.id} className="relative group/wall">
|
||||||
|
<div className="absolute top-2 left-2 z-10 opacity-80 group-hover/wall:opacity-100 transition-opacity drop-shadow-sm">
|
||||||
|
<Avatar email={item.user.email} name={item.user.name} size={30} />
|
||||||
|
</div>
|
||||||
|
<GifMoodCard
|
||||||
|
sessionId={sessionId}
|
||||||
|
item={item}
|
||||||
|
currentUserId={currentUserId}
|
||||||
|
canEdit={canEdit}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
)}
|
||||||
|
{colIdx === 0 && canEdit && currentUserItems.length < GIF_MOOD_MAX_ITEMS && (
|
||||||
|
<GifMoodAddForm sessionId={sessionId} currentCount={currentUserItems.length} />
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</SortableContext>
|
||||||
|
</DndContext>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* Grid mode: per-user sections */}
|
||||||
|
{!masonry && sortedUsers.map((user, index) => {
|
||||||
const isCurrentUser = user.id === currentUserId;
|
const isCurrentUser = user.id === currentUserId;
|
||||||
const serverItems = itemsByUser.get(user.id) ?? [];
|
const serverItems = itemsByUser.get(user.id) ?? [];
|
||||||
const userItems =
|
const userItems =
|
||||||
@@ -397,8 +547,9 @@ export function GifMoodBoard({
|
|||||||
</div>
|
</div>
|
||||||
) : null}
|
) : null}
|
||||||
|
|
||||||
{/* Grid */}
|
{/* Items */}
|
||||||
{!showHidden && isCurrentUser && canEdit ? (
|
{!showHidden && (
|
||||||
|
isCurrentUser && canEdit ? (
|
||||||
<DndContext
|
<DndContext
|
||||||
sensors={sensors}
|
sensors={sensors}
|
||||||
collisionDetection={closestCenter}
|
collisionDetection={closestCenter}
|
||||||
@@ -429,7 +580,7 @@ export function GifMoodBoard({
|
|||||||
</div>
|
</div>
|
||||||
</SortableContext>
|
</SortableContext>
|
||||||
</DndContext>
|
</DndContext>
|
||||||
) : !showHidden ? (
|
) : (
|
||||||
<div className={`grid ${GRID_COLS[cols]} gap-4 items-start`}>
|
<div className={`grid ${GRID_COLS[cols]} gap-4 items-start`}>
|
||||||
{userItems.map((item) => (
|
{userItems.map((item) => (
|
||||||
<GifMoodCard
|
<GifMoodCard
|
||||||
@@ -446,10 +597,12 @@ export function GifMoodBoard({
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
) : null}
|
)
|
||||||
|
)}
|
||||||
</section>
|
</section>
|
||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ export const GifMoodCard = memo(function GifMoodCard({
|
|||||||
const [itemVersion, setItemVersion] = useState(item);
|
const [itemVersion, setItemVersion] = useState(item);
|
||||||
const [isPending, startTransition] = useTransition();
|
const [isPending, startTransition] = useTransition();
|
||||||
const [imgError, setImgError] = useState(false);
|
const [imgError, setImgError] = useState(false);
|
||||||
|
const [imgLoaded, setImgLoaded] = useState(false);
|
||||||
const [isFocused, setIsFocused] = useState(false);
|
const [isFocused, setIsFocused] = useState(false);
|
||||||
const textareaRef = useRef<HTMLTextAreaElement>(null);
|
const textareaRef = useRef<HTMLTextAreaElement>(null);
|
||||||
|
|
||||||
@@ -78,7 +79,8 @@ export const GifMoodCard = memo(function GifMoodCard({
|
|||||||
<img
|
<img
|
||||||
src={item.gifUrl}
|
src={item.gifUrl}
|
||||||
alt="GIF"
|
alt="GIF"
|
||||||
className="w-full block"
|
className={`w-full block ${imgLoaded ? '' : 'min-h-[80px]'}`}
|
||||||
|
onLoad={() => setImgLoaded(true)}
|
||||||
onError={() => setImgError(true)}
|
onError={() => setImgError(true)}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|||||||
Reference in New Issue
Block a user