fix: normalize drop indicator to single line between channels

Port the SpaceSidebar normalization pattern: convert 'before B'
to 'after A' so only one drop indicator renders at any gap.
Fixes double-line visual glitch and unreliable drops when cursor
is between two channels. Also adjust indicator offsets from
top-0/bottom-0 to -top-[1px]/-bottom-[1px] to center in the gap.
This commit is contained in:
Jannis Braun
2026-03-20 21:07:20 +01:00
parent ebe34a710b
commit 99e6f2f249
2 changed files with 53 additions and 9 deletions
+27 -4
View File
@@ -14,17 +14,25 @@ export interface DropTarget {
targetType: 'channel' | 'category';
}
export interface LayoutItem {
id: string;
type: 'channel' | 'category';
}
interface UseDragManagerOpts {
scrollContainerRef: RefObject<HTMLElement | null>;
canManage: boolean;
canMoveMembers: boolean;
/** Flat ordered list of all visible items in sidebar order — used to normalize
* 'before B' into 'after A' so only a single drop indicator line renders. */
orderedItems: LayoutItem[];
onChannelDrop: (dragId: string, target: DropTarget) => void;
onCategoryDrop: (dragId: string, target: DropTarget) => void;
onVoiceUserDrop: (userId: string, fromChannelId: string, toChannelId: string) => void;
}
export function useDragManager(opts: UseDragManagerOpts) {
const { scrollContainerRef, canManage, canMoveMembers, onChannelDrop, onCategoryDrop, onVoiceUserDrop } = opts;
const { scrollContainerRef, canManage, canMoveMembers, orderedItems, onChannelDrop, onCategoryDrop, onVoiceUserDrop } = opts;
const [activeDrag, setActiveDrag] = useState<DragState | null>(null);
const [dropTarget, setDropTarget] = useState<DropTarget | null>(null);
@@ -58,9 +66,24 @@ export function useDragManager(opts: UseDragManagerOpts) {
e.dataTransfer.dropEffect = 'move';
const rect = e.currentTarget.getBoundingClientRect();
const midY = rect.top + rect.height / 2;
const position: 'before' | 'after' = e.clientY < midY ? 'before' : 'after';
setDropTarget({ targetId, position, targetType });
}, [activeDrag]);
let position: 'before' | 'after' = e.clientY < midY ? 'before' : 'after';
// Normalize 'before' to previous item's 'after' so a single drop indicator
// line renders between items, eliminating the double-line visual glitch
let resolvedId = targetId;
let resolvedType = targetType;
if (position === 'before') {
const idx = orderedItems.findIndex(item => item.id === targetId);
if (idx > 0) {
const prev = orderedItems[idx - 1]!;
resolvedId = prev.id;
resolvedType = prev.type;
position = 'after';
}
}
setDropTarget({ targetId: resolvedId, position, targetType: resolvedType });
}, [activeDrag, orderedItems]);
const handleDragEnd = useCallback(() => {
clearState();